diff --git a/third_party/nixpkgs/.git-blame-ignore-revs b/third_party/nixpkgs/.git-blame-ignore-revs
index 7778595da4..05ce9aec01 100644
--- a/third_party/nixpkgs/.git-blame-ignore-revs
+++ b/third_party/nixpkgs/.git-blame-ignore-revs
@@ -203,3 +203,6 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b
# sqlc: format with nixfmt
2bdec131b2bb2c8563f4556d741d34ccb77409e2
+
+# treewide: migrate packages to pkgs/by-name, take 1
+571c71e6f73af34a229414f51585738894211408
diff --git a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/module_request.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/module_request.md
new file mode 100644
index 0000000000..db0b68cfe4
--- /dev/null
+++ b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/module_request.md
@@ -0,0 +1,27 @@
+---
+name: Module requests
+about: For NixOS modules that you would like to see
+title: 'Module request: MODULENAME'
+labels: '9.needs: module (new)'
+assignees: ''
+
+---
+
+### Description
+
+
+
+### Notify maintainers
+
+
+
+-----
+
+Note for maintainers: Please tag this issue in your PR.
+
+---
+
+Add a :+1: [reaction] to [issues you find important].
+
+[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
+[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc
diff --git a/third_party/nixpkgs/ci/OWNERS b/third_party/nixpkgs/ci/OWNERS
index 233a76d86a..f94fdbc77e 100644
--- a/third_party/nixpkgs/ci/OWNERS
+++ b/third_party/nixpkgs/ci/OWNERS
@@ -206,6 +206,12 @@ pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt
pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt
pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
+# Java
+/doc/languages-frameworks/java.section.md @NixOS/java
+/doc/languages-frameworks/gradle.section.md @NixOS/java
+/doc/languages-frameworks/maven.section.md @NixOS/java
+/pkgs/top-level/java-packages.nix @NixOS/java
+
# Jetbrains
/pkgs/applications/editors/jetbrains @edwtjo
@@ -229,7 +235,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/servers/sql/postgresql @NixOS/postgres
/nixos/modules/services/databases/postgresql.md @NixOS/postgres
/nixos/modules/services/databases/postgresql.nix @NixOS/postgres
-/nixos/tests/postgresql.nix @NixOS/postgres
+/nixos/tests/postgresql @NixOS/postgres
# Hardened profile & related modules
/nixos/modules/profiles/hardened.nix @joachifm
@@ -248,13 +254,13 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
# Network Time Daemons
/pkgs/by-name/ch/chrony @thoughtpolice
-/pkgs/tools/networking/ntp @thoughtpolice
-/pkgs/tools/networking/openntpd @thoughtpolice
+/pkgs/by-name/nt/ntp @thoughtpolice
+/pkgs/by-name/op/openntpd @thoughtpolice
/nixos/modules/services/networking/ntp @thoughtpolice
# Network
-/pkgs/tools/networking/kea/default.nix @mweinelt
-/pkgs/tools/networking/babeld/default.nix @mweinelt
+/pkgs/by-name/ke/kea @mweinelt
+/pkgs/by-name/ba/babeld @mweinelt
/nixos/modules/services/networking/babeld.nix @mweinelt
/nixos/modules/services/networking/kea.nix @mweinelt
/nixos/modules/services/networking/knot.nix @mweinelt
@@ -407,12 +413,12 @@ pkgs/by-name/lx/lxc* @adamcstephens
# GNU Tar & Zip
/pkgs/tools/archivers/gnutar @RossComputerGuy
-/pkgs/tools/archivers/zip @RossComputerGuy
+/pkgs/by-name/zi/zip @RossComputerGuy
# SELinux
-/pkgs/os-specific/linux/checkpolicy @RossComputerGuy
-/pkgs/os-specific/linux/libselinux @RossComputerGuy
-/pkgs/os-specific/linux/libsepol @RossComputerGuy
+/pkgs/by-name/ch/checkpolicy @RossComputerGuy
+/pkgs/by-name/li/libselinux @RossComputerGuy
+/pkgs/by-name/li/libsepol @RossComputerGuy
# installShellFiles
/pkgs/by-name/in/installShellFiles/* @Ericson2314
diff --git a/third_party/nixpkgs/doc/hooks/aws-c-common.section.md b/third_party/nixpkgs/doc/hooks/aws-c-common.section.md
new file mode 100644
index 0000000000..c631f61589
--- /dev/null
+++ b/third_party/nixpkgs/doc/hooks/aws-c-common.section.md
@@ -0,0 +1,4 @@
+# `aws-c-common` {#aws-c-common}
+
+This hook exposes its own [CMake](#cmake) modules by setting [`CMAKE_MODULE_PATH`](https://cmake.org/cmake/help/latest/variable/CMAKE_MODULE_PATH.html) through [the `cmakeFlags` variable](#cmake-flags)
+to the nonstandard `$out/lib/cmake` directory, as a workaround for [an upstream bug](https://github.com/awslabs/aws-c-common/issues/844).
diff --git a/third_party/nixpkgs/doc/hooks/index.md b/third_party/nixpkgs/doc/hooks/index.md
index f4e05c2262..e4b744056c 100644
--- a/third_party/nixpkgs/doc/hooks/index.md
+++ b/third_party/nixpkgs/doc/hooks/index.md
@@ -8,6 +8,7 @@ The stdenv built-in hooks are documented in [](#ssec-setup-hooks).
autoconf.section.md
automake.section.md
autopatchelf.section.md
+aws-c-common.section.md
bmake.section.md
breakpoint.section.md
cernlib.section.md
diff --git a/third_party/nixpkgs/doc/stdenv/platform-notes.chapter.md b/third_party/nixpkgs/doc/stdenv/platform-notes.chapter.md
index b3d0252c19..7e06a9bab3 100644
--- a/third_party/nixpkgs/doc/stdenv/platform-notes.chapter.md
+++ b/third_party/nixpkgs/doc/stdenv/platform-notes.chapter.md
@@ -2,242 +2,301 @@
## Darwin (macOS) {#sec-darwin}
-Some common issues when packaging software for Darwin:
+The Darwin `stdenv` differs from most other ones in Nixpkgs in a few key ways.
+These differences reflect the default assumptions for building software on that platform.
+In many cases, you can ignore these differences because the software you are packaging is already written with them in mind.
+When you do that, write your derivation as normal. You don’t have to include any Darwin-specific special cases.
+The easiest way to know whether your derivation requires special handling for Darwin is to write it as if it doesn’t and see if it works.
+If it does, you’re done; skip the rest of this.
-- The Darwin `stdenv` uses clang instead of gcc. When referring to the compiler `$CC` or `cc` will work in both cases. Some builds hardcode gcc/g++ in their build scripts, that can usually be fixed with using something like `makeFlags = [ "CC=cc" ];` or by patching the build scripts.
+- Darwin uses Clang by default instead of GCC. Packages that refer to `$CC` or `cc` should just work in most cases.
+ Some packages may hardcode `gcc` or `g++`. You can usually fix that by setting `makeFlags = [ "CC=cc" "CXX=C++" ]`.
+ If that does not work, you will have to patch the build scripts yourself to use the correct compiler for Darwin.
+- Darwin needs an SDK to build software.
+ The SDK provides a default set of frameworks and libraries to build software, most of which are specific to Darwin.
+ There are multiple versions of the SDK packages in Nixpkgs, but one is included by default in the `stdenv`.
+ Usually, you don’t have to change or pick a different SDK. When in doubt, use the default.
+- The SDK used by your build can be found using the `DEVELOPER_DIR` environment variable.
+ There are also versions of this variable available when cross-compiling depending on the SDK’s role.
+ The `SDKROOT` variable is also set with the path to the SDK’s libraries and frameworks.
+ `SDKROOT` is always a sub-folder of `DEVELOPER_DIR`.
+- Darwin includes a platform-specific tool called `xcrun` to help builds locate binaries they need.
+ A version of `xcrun` is part of the `stdenv` on Darwin.
+ If your package invokes `xcrun` via an absolute path (such as `/usr/bin/xcrun`), you will need to patch the build scripts to use `xcrun` instead.
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- # ...
- buildPhase = ''
- $CC -o hello hello.c
- '';
- }
- ```
+To reiterate: you usually don’t have to worry about this stuff.
+Start with writing your derivation as if everything is already set up for you (because in most cases it already is).
+If you run into issues or failures, continue reading below for how to deal with the most common issues you may encounter.
-- On Darwin, libraries are linked using absolute paths, libraries are resolved by their `install_name` at link time. Sometimes packages won’t set this correctly causing the library lookups to fail at runtime. This can be fixed by adding extra linker flags or by running `install_name_tool -id` during the `fixupPhase`.
+### Darwin Issue Troubleshooting {#sec-darwin-troubleshooting}
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- # ...
- makeFlags = lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib";
- }
- ```
+#### Package requires a non-default SDK or fails to build due to missing frameworks or symbols {#sec-darwin-troubleshooting-using-sdks}
-- Even if the libraries are linked using absolute paths and resolved via their `install_name` correctly, tests can sometimes fail to run binaries. This happens because the `checkPhase` runs before the libraries are installed.
+In some cases, you may have to use a non-default SDK.
+This can happen when a package requires APIs that are not present in the default SDK.
+For example, Metal Performance Shaders were added in macOS 12.
+If the default SDK is 11.3, then a package that requires Metal Performance Shaders will fail to build due to missing frameworks and symbols.
- This can usually be solved by running the tests after the `installPhase` or alternatively by using `DYLD_LIBRARY_PATH`. More information about this variable can be found in the *dyld(1)* manpage.
+To use a non-default SDK, add it to your derivation’s `buildInputs`.
+It is not necessary to override the SDK in the `stdenv` nor is it necessary to override the SDK used by your dependencies.
+If your derivation needs a non-default SDK at build time (e.g., for a `depsBuildBuild` compiler), see the cross-compilation documentation for which input you should use.
- ```
- dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib
- Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq
- Reason: image not found
- ./tests/jqtest: line 5: 75779 Abort trap: 6
- ```
+When determining whether to use a non-default SDK, consider the following:
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- # ...
- doInstallCheck = true;
- installCheckTarget = "check";
- }
- ```
+- Try building your derivation with the default SDK. If it works, you’re done.
+- If the package specifies a specific version, use that. See below for how to map Xcode version to SDK version.
+- If the package’s documentation indicates it supports optional features on newer SDKs, consider using the SDK that enables those features.
+ If you’re not sure, use the default SDK.
-- Some packages assume Xcode is available and use `xcrun` to resolve build tools like `clang`, etc. The Darwin stdenv includes `xcrun`, and it will return the path to any binary available in a build.
+Note: It is possible to have multiple, different SDK versions in your inputs.
+When that happens, the one with the highest version is always used.
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- # ...
- nativeBuildInputs = [ bison ];
- buildCommand = ''
- xcrun bison foo.y # produces foo.tab.c
- # ...
- '';
- }
- ```
- The package `xcbuild` can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues.
-
- Note: Some packages may hardcode an absolute path to `xcrun`, `xcodebuild`, or `xcode-select`. Those paths should be removed or replaced.
-
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- prePatch = ''
- substituteInPlace Makefile \
- --replace-fail /usr/bin/xcrun xcrun
- # or: --replace-fail /usr/bin/xcrun '${lib.getExe' buildPackages.xcbuild "xcrun"}'
- '';
- }
- ```
-
-- Multiple SDKs are available for use in nixpkgs. Each platform has a default SDK (10.12.2 for x86_64-darwin and 11.3 for aarch64-darwin), which is available as the `apple-sdk` package.
-
- The SDK provides the necessary headers and text-based stubs to link common frameworks and libraries (such as libSystem, which is effectively Darwin’s libc). Projects will sometimes indicate which SDK to use by the Xcode version. As a rule of thumb, subtract one from the Xcode version to get the available SDK in nixpkgs.
-
- The `DEVELOPER_DIR` variable in the build environment has the path to the SDK in the build environment. The `SDKROOT` variable there contains a sysroot with the framework, header, and library paths. You can reference an SDK’s sysroot from Nix using the `sdkroot` attribute on the SDK package. Note that it is preferable to use `SDKROOT` because the latter will be resolved to the highest SDK version of any available to your derivation.
-
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- # ...
- env.PACKAGE_SPECIFIC_SDK_VAR = apple-sdk_10_15.sdkroot;
- # or
- buildInputs = [ apple-sdk_10_15 ];
- postPatch = ''
- export PACKAGE_SPECIFIC_SDK_VAR=$SDKROOT
- '';
- }
- ```
-
- The following is a list of Xcode versions, the SDK version in nixpkgs, and the attribute to use to add it. Generally, only the last SDK release for a major version is packaged (each _x_ in 10._x_ until 10.15 is considered a major version).
-
- | Xcode version | SDK version | nixpkgs attribute |
- |--------------------|---------------------------------------------------|-------------------|
- | Varies by platform | 10.12.2 (x86_64-darwin)
11.3 (aarch64-darwin) | `apple-sdk` |
- | 8.0–8.3.3 | 10.12.2 | `apple-sdk_10_12` |
- | 9.0–9.4.1 | 10.13.2 | `apple-sdk_10_13` |
- | 10.0–10.3 | 10.14.6 | `apple-sdk_10_14` |
- | 11.0–11.7 | 10.15.6 | `apple-sdk_10_15` |
- | 12.0–12.5.1 | 11.3 | `apple-sdk_11` |
- | 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
- | 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
- | 15.0–15.4 | 14.4 | `apple-sdk_14` |
- | 16.0 | 15.0 | `apple-sdk_15` |
-
- To use a non-default SDK, add it to your build inputs.
-
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- # ...
- buildInputs = [ apple-sdk_15 ]; # Uses the 15.0 SDK instead of the default SDK for the platform.
- }
- ```
-
- If your derivation has multiple SDKs its inputs (e.g., because they have been propagated by its dependencies), it will use the highest SDK version available.
-
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3"; # Upstream specifies that it needs Xcode 12 to build, so use the 11.3 SDK.
- # ...
- buildInputs = [ apple-sdk_11 ];
- nativeBuildInputs = [ swift ]; # Propagates the 13.3 SDK, so the 13.3 SDK package will be used instead of the 11.3 SDK.
- }
- ```
-
-- When a package indicates a minimum supported version, also called the deployment target, you can set it in your derivation using `darwinMinVersionHook`. If you need to set a minimum version higher than the default SDK, you should also add the corresponding SDK to your `buildInputs`.
-
- The deployment target controls how Darwin handles availability and access to some APIs. In most cases, if a deployment target is newer than the first availability of an API, that API will be linked directly. Otherwise, the API will be weakly linked and checked at runtime.
-
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3"; # Upstream specifies the minimum supported version as 12.5.
- buildInputs = [ (darwinMinVersionHook "12.5") ];
- }
- ```
-
- If your derivation has multiple versions of this hook in its inputs (e.g., because it has been propagated by one of your dependencies), it will use the highest deployment target available.
-
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3"; # Upstream specifies the minimum supported version as 10.15.
- buildInputs = [ qt6.qtbase (darwinMinVersionHook "10.15") ];
- }
- # Qt 6 specifies a minimum version of 12.0, so the minimum version resolves to 12.0.
- ```
-
-
-- You should rely on the default SDK when possible. If a package specifies a required SDK version, use that version (e.g., libuv requires 11.0, so it should use `apple-sdk_11`). When a package supports multiple SDKs, determine which SDK package to use based on the following rules of thumb:
-
- - If a package supports multiple SDK versions, use the lowest supported SDK version by the package (but no lower than the default SDK). That ensures maximal platform compatibility for the package.
-
- - If a package specifies a range of supported SDK versions _and_ a minimum supported version, assume the package is using availability checks to support the indicated minimum version. Add the highest supported SDK and a `darwinMinVersionHook` set to the minimum version supported by the upstream package.
-
- Warning: Avoid using newer SDKs than an upstream package supports. When a binary is linked on Darwin, the SDK version used to build it is recorded in the binary. Runtime behavior can vary based on the SDK version, which may work fine but can also result in unexpected behavior or crashes when building with an unsupported SDK.
-
- ```nix
- stdenv.mkDerivation {
- name = "foo-1.2.3";
- # ...
- buildInputs = [ apple-sdk_15 (darwinMinVersionHook "10.15") ]; # Upstream builds with the 15.0 SDK but supports 10.15.
- }
- ```
-
-- Libraries that require a minimum version can propagate an appropriate SDK and `darwinMinVersionHook`. Derivations using that library will automatically use an appropriate SDK and minimum version. Even if the library builds with a newer SDK, it should propagate the minimum supported SDK. Derivations that need a newer SDK can add it to their `buildInputs`.
-
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- # ...
- buildInputs = [ apple-sdk_15 ]; # Upstream builds with the 15.0 SDK but supports 10.15.
- propagatedBuildInputs = [ apple-sdk_10_15 (darwinMinVersionHook "10.15") ];
- }
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
# ...
- stdenv.mkDerivation {
- name = "bar-1.2.3";
- # ...
- buildInputs = [ libfoo ]; # Builds with the 10.15 SDK
- }
+ buildInputs = [ apple-sdk_14 ];
+}
+```
+
+#### What is a “deployment target” (or minimum version)? {#sec-darwin-troubleshooting-using-deployment-targets}
+
+The “deployment target” refers to the minimum version of macOS that is expected to run an application.
+In most cases, the default is fine, and you don’t have to do anything else.
+If you’re not sure, don’t do anything, and that will probably be fine.
+
+Some packages require setting a non-default deployment target (or minimum version) to gain access to certain APIs.
+You do that using the `darwinMinVersionHook`, which takes the deployment target version as a parameter.
+There are primarily two ways to determine the deployment target.
+
+- The upstream documentation will specify a deployment target or minimum version. Use that.
+- The build will fail because an API requires a certain version. Use that.
+- In all other cases, you probably don’t need to specify a minimum version. The default is usually good enough.
+
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3"; # Upstream specifies the minimum supported version as 12.5.
+ buildInputs = [ (darwinMinVersionHook "12.5") ];
+}
+```
+
+Note: It is possible to have multiple, different instances of `darwinMinVerisonHook` in your inputs.
+When that happens, the one with the highest version is always used.
+
+#### Picking an SDK version {#sec-darwin-troubleshooting-picking-sdk-version}
+
+The following is a list of Xcode versions, the SDK version in Nixpkgs, and the attribute to use to add it.
+Check your package’s documentation (platform support or installation instructions) to find which Xcode or SDK version to use.
+Generally, only the last SDK release for a major version is packaged (each _x_ in 10._x_ until 10.15 is considered a major version).
+
+| Xcode version | SDK version | Nixpkgs attribute |
+|--------------------|---------------------------------------------------|-------------------|
+| Varies by platform | 10.12.2 (x86_64-darwin)
11.3 (aarch64-darwin) | `apple-sdk` |
+| 8.0–8.3.3 | 10.12.2 | `apple-sdk_10_12` |
+| 9.0–9.4.1 | 10.13.2 | `apple-sdk_10_13` |
+| 10.0–10.3 | 10.14.6 | `apple-sdk_10_14` |
+| 11.0–11.7 | 10.15.6 | `apple-sdk_10_15` |
+| 12.0–12.5.1 | 11.3 | `apple-sdk_11` |
+| 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
+| 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
+| 15.0–15.4 | 14.4 | `apple-sdk_14` |
+| 16.0 | 15.0 | `apple-sdk_15` |
+
+
+#### Darwin Default SDK versions {#sec-darwin-troubleshooting-darwin-defaults}
+
+The current default versions of the deployment target (minimum version) and SDK are indicated by Darwin-specific attributes on the platform. Because of the ways that minimum version and SDK can be changed that are not visible to Nix, they should be treated as lower bounds.
+If you need to parameterize over a specific version, create a function that takes the version as a parameter instead of relying on these attributes.
+
+- `darwinMinVersion` defaults to 10.12 on x86_64-darwin and 11.0 on aarch64-darwin.
+ It sets the default deployment target.
+- `darwinSdkVersion` defaults to 10.12 on x86-64-darwin and 11.0 on aarch64-darwin.
+ Only the major version determines the SDK version, resulting in the 10.12.2 and 11.3 SDKs being used on these platforms respectively.
+
+
+#### `xcrun` cannot find a binary {#sec-darwin-troubleshooting-xcrun}
+
+`xcrun` searches `PATH` and the SDK’s toolchain for binaries to run.
+If it cannot find a required binary, it will fail. When that happens, add the package for that binary to your derivation’s `nativeBuildInputs` (or `nativeCheckInputs` if the failure is happening when running tests).
+
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
# ...
- stdenv.mkDerivation {
- name = "baz-1.2.3";
+ nativeBuildInputs = [ bison ];
+ buildCommand = ''
+ xcrun bison foo.y # produces foo.tab.c
# ...
- buildInputs = [ apple-sdk_12 libfoo ]; # Builds with the 12.3 SDK
- }
- ```
+ '';
+}
+```
-- Many SDK libraries and frameworks use text-based stubs to link against system libraries and frameworks, but several are built from source (typically corresponding to the source releases for the latest release of macOS). Several of these are propagated to your package automatically. They can be accessed via the `darwin` package set along with others that are not propagated by default.
+#### Package requires `xcodebuild` {#sec-darwin-troubleshooting-xcodebuild}
- - libiconv
- - libresolv
- - libsbuf
+The xcbuild package provides an `xcodebuild` command for packages that really depend on Xcode.
+This replacement is not 100% compatible and may run into some issues, but it is able to build many packages.
+To use `xcodebuild`, add `xcbuildHook` to your package’s `nativeBuildInputs`.
+It will provide a `buildPhase` for your derivation.
+You can use `xcbuildFlags` to specify flags to `xcodebuild` such as the required schema.
+If a schema has spaces in its name, you must set `__structuredAttrs` to `true`.
+See MoltenVK for an example of setting up xcbuild.
- Other common libraries are available in Darwin-specific versions with modifications from Apple. Note that these packages may be made the default on Darwin in the future.
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ xcbuildFlags = [
+ "-configuration"
+ "Release"
+ "-project"
+ "libfoo-project.xcodeproj"
+ "-scheme"
+ "libfoo Package (macOS only)"
+ ];
+ __structuredAttrs = true;
+}
+```
- - ICU (compatible with the top-level icu package, but it also provides `libicucore.B.dylib` with an ABI compatible with the Darwin system version)
- - libpcap (compatible with the top-level libpcap, but it includes Darwin-specific extensions)
+##### Fixing absolute paths to `xcodebuild`, `xcrun`, and `PlistBuddy` {#sec-darwin-troubleshooting-xcodebuild-absolute-paths}
-- The legacy SDKs packages are still available in the `darwin` package set under their existing names, but all packages in these SDKs (frameworks, libraries, etc) are stub packages for evaluation compatibility.
+Many build systems hardcode the absolute paths to `xcodebuild`, `xcrun`, and `PlistBuddy` as `/usr/bin/xcodebuild`, `/usr/bin/xcrun`, and `/usr/libexec/PlistBuddy` respectively.
+These paths will need to be replaced with relative paths and the xcbuild package if `xcodebuild` or `PListBuddy` are used.
- In most cases, a derivation can be updated by deleting all of its SDK inputs (frameworks, libraries, etc). If you had to override the SDK, see below for how to do that using the new SDK pattern. If your derivation depends on the layout of the old frameworks or other internal details, you have more work to do.
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ postPatch = ''
+ subsituteInPlace Makefile \
+ --replace-fail '/usr/bin/xcodebuild' 'xcodebuild' \
+ --replace-fail '/usr/bin/xcrun' 'xcrun' \
+ --replace-fail '/usr/bin/PListBuddy' 'PListBuddy'
+ '';
+}
+```
- When a package depended on the location of frameworks, references to those framework packages can usually be replaced with `${apple-sdk.sdkroot}/System` or `$SDKROOT/System`. For example, if you substituted `${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework` in your derivation, you should replace it with `${apple-sdk.sdkroot}/System/Library/Frameworks/OpenGL.framework` or `$SDKROOT/System/Library/Frameworks`. The latter is preferred because it supports using the SDK that is resolved when multiple SDKs are propagated (see above).
+#### How to use libiconv on Darwin {#sec-darwin-troubleshooting-libiconv}
- Note: the new SDK pattern uses the name `apple-sdk` to better align with nixpkgs naming conventions. The old SDK pattern uses `apple_sdk`.
+The libiconv package is included in the SDK by default along with libresolv and libsbuf.
+You do not need to do anything to use these packages. They are available automatically.
+If your derivation needs the `iconv` binary, add the `libiconv` package to your `nativeBuildInputs` (or `nativeCheckInputs` for tests).
-- There are two legacy patterns that are being phased out. These patterns were used in the past to change the SDK version. They have been reimplemented to use the `apple-sdk` packages.
+#### Library install name issues {#sec-darwin-troubleshooting-install-name}
- - `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the 11.0 SDK. It now adds the `apple-sdk_11` package to your derivation’s build inputs.
- - `overrideSDK` - this stdenv adapter would try to replace the frameworks used by your derivation and its transitive dependencies. It now adds the `apple-sdk_11` package for `11.0` or the `apple-sdk_12` package for `12.3`. If `darwinMinVersion` is specified, it will add `darwinMinVersionHook` with the specified minimum version. No other SDK versions are supported.
+Libraries on Darwin are usually linked with absolute paths.
+This is determined by something called an “install name”, which is resolved at link time.
+Sometimes packages will not set this correctly, causing binaries linking to it not to find their libraries at runtime.
+This can be fixed by adding extra linker flags or by using `install_name_tool` to set it in `fixupPhase`.
-- Darwin supports cross-compilation between Darwin platforms. Cross-compilation from Linux is not currently supported but may be supported in the future. To cross-compile to Darwin, you can set `crossSystem` or use one of the Darwin systems in `pkgsCross`. The `darwinMinVersionHook` and the SDKs support cross-compilation. If you need to specify a different SDK version for a `depsBuildBuild` compiler, add it to your `nativeBuildInputs`.
+##### Setting the install name via linker flags {#sec-darwin-troubleshooting-install-name-linker-flags}
- ```nix
- stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- # ...
- depsBuildBuild = [ buildPackages.stdenv.cc ];
- nativeBuildInputs = [ apple-sdk_12 ];
- buildInputs = [ apple-sdk_13 ];
- depsTargetTargetPropagated = [ apple-sdk_14 ];
- }
- # The build-build clang will use the 12.3 SDK while the package build itself will use the 13.3 SDK.
- # Derivations that add this package as an input will have the 14.4 SDK propagated to them.
- ```
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ makeFlags = lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib";
+}
+```
- The different target SDK and hooks are mangled based on role:
+##### Setting the install name using `install_name_tool` {#sec-darwin-troubleshooting-install-name-install_name_tool}
- - `DEVELOPER_DIR_FOR_BUILD` and `MACOSX_DEPLOYMENT_TARGET_FOR_BUILD` for the build platform;
- - `DEVELOPER_DIR` and `MACOSX_DEPLOYMENT_TARGET` for the host platform; and
- - `DEVELOPER_DIR_FOR_TARGET` and `MACOSX_DEPLOYMENT_TARGET_FOR_TARGET` for the build platform.
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ postFixup = ''
+ # `-id ` takes the install name. The last parameter is the path to the library.
+ ${stdenv.cc.targetPrefix}install_name_tool -id "$out/lib/libfoo.dylib" "$out/lib/libfoo.dylib"
+ '';
+}
+```
- In static compilation situations, it is possible for the build and host platform to be the same platform but have different SDKs with the same version (one dynamic and one static). cc-wrapper takes care of handling this distinction.
+Even if libraries are linked using absolute paths and resolved via their install name correctly, tests in `checkPhase` can sometimes fail to run binaries because they are linked against libraries that have not yet been installed.
+This can usually be solved by running the tests after the `installPhase` or by using `DYLD_LIBRARY_PATH` (see {manpage}`dyld(1)` for more on setting `DYLD_LIBRARY_PATH`).
-- The current default versions of the deployment target (minimum version) and SDK are indicated by Darwin-specific attributes on the platform. Because of the ways that minimum version and SDK can be changed that are not visible to Nix, they should be treated as lower bounds. If you need to parameterize over a specific version, create a function that takes the version as a parameter instead of relying on these attributes.
+##### Setting the install name using `fixDarwinDylibNames` hook {#sec-darwin-troubleshooting-install-name-fixDarwinDylibNames}
- - `darwinMinVersion` defaults to 10.12 on x86_64-darwin and 11.0 on aarch64-darwin. It sets the default `MACOSX_DEPLOYMENT_TARGET`.
- - `darwinSdkVersion` defaults to 10.12 on x86-64-darwin and 11.0 on aarch64-darwin. Only the major version determines the SDK version, resulting in the 10.12.2 and 11.3 SDKs being used on these platforms respectively.
+If your package has numerous dylibs needing fixed, while it is preferable to fix the issue in the package’s build, you can update them all by adding the `fixDarwinDylibNames` hook to your `nativeBuildInputs`.
+This hook will scan your package’s outputs for dylibs and correct their install names.
+Note that if any binaries in your outputs linked those dylibs, you may need to use `install_name_tool` to replace references to them with the correct paths.
+
+#### Propagating an SDK (advanced, compilers-only) {#sec-darwin-troubleshooting-propagating-sdks}
+
+The SDK is a package, and it can be propagated.
+`darwinMinVersionHook` with a version specified can also be propagated.
+However, most packages should *not* do this.
+The exception is compilers.
+When you propagate an SDK, it becomes part of your derivation’s public API, and changing the SDK or removing it can be a breaking change.
+That is why propagating it is only recommended for compilers.
+
+When authoring a compiler derivation, propagate the SDK only for the ways you expect users to use your compiler.
+Depending on your expected use cases, you may have to do one or all of these.
+
+- Put it in `depsTargetTargetPropagated` when your compiler is expected to be added to `nativeBuildInputs`.
+ That will ensure the SDK is effectively part of the target derivation’s `buildInputs`.
+- If your compiler uses a hook, put it in the hook’s `depsTargetTargetPropagated` instead.
+ The effect should be the same as the above.
+- If your package uses the builder pattern, update your builder to add the SDK to the derivation’s `buildInputs`.
+
+If you’re not sure whether to propagate an SDK, don’t.
+If your package is a compiler or language, and you’re not sure, ask @NixOS/darwin-maintainers for help deciding.
+
+### Dealing with `darwin.apple_sdk.frameworks` {#sec-darwin-legacy-frameworks}
+
+You may see references to `darwin.apple_sdk.frameworks`.
+This is the legacy SDK pattern, and it is being phased out.
+All packages in `darwin.apple_sdk`, `darwin.apple_sdk_11_0`, and `darwin.apple_sdk_12_3` are stubs that do nothing.
+If your derivation references them, you can delete them. The default SDK should be enough to build your package.
+
+Note: the new SDK pattern uses the name `apple-sdk` to better align with Nixpkgs naming conventions.
+The legacy SDK pattern uses `apple_sdk`.
+You always know you are using the old SDK pattern if the name is `apple_sdk`.
+
+Some derivations may depend on the location of frameworks in those old packages.
+To update your derivation to find them in the new SDK, use `$SDKROOT` instead in `preConfigure`.
+For example, if you substitute `${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework` in `postPatch`, replace it with `$SDKROOT/System/Library/Frameworks/OpenGL.framework` in `preConfigure`.
+
+Note that if your derivation is changing a system path (such as `/System/Library/Frameworks/OpenGL.framework`), you may be able to remove the path.
+Compilers and binutils targeting Darwin look for system paths in the SDK sysroot.
+Some of them (such as Zig or `bindgen` for Rust) depend on it.
+
+#### Updating legacy SDK overrides {#sec-darwin-legacy-frameworks-overrides}
+
+The legacy SDK provided two ways of overriding the default SDK.
+These are both being phased out along with the legacy SDKs.
+They have been updated to set up the new SDK for you, but you should replace them with doing that directly.
+
+- `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the 11.0 SDK.
+ It now adds the `apple-sdk_11` package to your derivation’s build inputs.
+- `overrideSDK` - this stdenv adapter would try to replace the frameworks used by your derivation and its transitive dependencies.
+ It now adds the `apple-sdk_11` package for `11.0` or the `apple-sdk_12` package for `12.3`.
+ If `darwinMinVersion` is specified, it will add `darwinMinVersionHook` with the specified minimum version.
+ No other SDK versions are supported.
+
+### Darwin Cross-Compilation {#sec-darwin-legacy-cross-compilation}
+
+Darwin supports cross-compilation between Darwin platforms.
+Cross-compilation from Linux is not currently supported but may be supported in the future.
+To cross-compile to Darwin, you can set `crossSystem` or use one of the Darwin systems in `pkgsCross`.
+The `darwinMinVersionHook` and the SDKs support cross-compilation.
+If you need to specify a different SDK version for a `depsBuildBuild` compiler, add it to your `nativeBuildInputs`.
+
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ apple-sdk_12 ];
+ buildInputs = [ apple-sdk_13 ];
+ depsTargetTargetPropagated = [ apple-sdk_14 ];
+}
+# The build-build `clang` will use the 12.3 SDK while the package build itself will use the 13.3 SDK.
+# Derivations that add this package as an input will have the 14.4 SDK propagated to them.
+```
+
+The different target SDK and hooks are mangled based on role:
+
+- `DEVELOPER_DIR_FOR_BUILD` and `MACOSX_DEPLOYMENT_TARGET_FOR_BUILD` for the build platform;
+- `DEVELOPER_DIR` and `MACOSX_DEPLOYMENT_TARGET` for the host platform; and
+- `DEVELOPER_DIR_FOR_TARGET` and `MACOSX_DEPLOYMENT_TARGET_FOR_TARGET` for the build platform.
+
+In static compilation situations, it is possible for the build and host platform to be the same platform but have different SDKs with the same version (one dynamic and one static).
+cc-wrapper and bintools-wrapper take care of handling this distinction.
diff --git a/third_party/nixpkgs/lib/minver.nix b/third_party/nixpkgs/lib/minver.nix
index 507d45bba4..cb9c6ee315 100644
--- a/third_party/nixpkgs/lib/minver.nix
+++ b/third_party/nixpkgs/lib/minver.nix
@@ -1,2 +1,2 @@
# Expose the minimum required version for evaluating Nixpkgs
-"2.3"
+"2.3.17"
diff --git a/third_party/nixpkgs/maintainers/README.md b/third_party/nixpkgs/maintainers/README.md
index 118356a516..eb17b0b518 100644
--- a/third_party/nixpkgs/maintainers/README.md
+++ b/third_party/nixpkgs/maintainers/README.md
@@ -175,3 +175,54 @@ for further information.
# nixpkgs-merge-bot
To streamline autoupdates, leverage the nixpkgs-merge-bot by commenting `@NixOS/nixpkgs-merge-bot merge` if the package resides in pkgs-by-name and the commenter is among the package maintainers. The bot ensures that all ofborg checks, except for darwin, are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofborg to finish before attempting the merge again.
+
+# Guidelines for Committers
+
+When merging pull requests, care must be taken to reduce impact to the `master`
+branch. If a commit breaks evaluation, it will affect Ofborg evaluation results
+in other pull requests and block Hydra CI, thus introducing chaos to our
+workflow.
+
+One approach to avoid merging such problematic changes is to wait for
+successful Ofborg evaluation. Additionally, using tools like
+[nixpkgs-review](https://github.com/Mic92/nixpkgs-review) can help spot issues
+early, before Ofborg finishes evaluation.
+
+## Breaking changes
+
+In general breaking changes to `master` and `staging` branches are permitted,
+as long as they are documented in the release notes. Though restrictions might
+apply towards the end of a NixOS release cycle, due to our feature freeze
+mechanism. This is to avoid large-scale breakages shortly before and during
+a Zero Hydra Failures (ZHF) campaign. These restrictions also intend to
+decrease the likelihood of a delayed NixOS release. The feature freeze period
+is documented in the announcement of each release schedule.
+
+> These are some example changes and if they are considered a breaking change
+> during a freeze period:
+>
+> - `foo: 1.2.3 -> 1.2.4` - Assuming this package follows semantic versioning
+> and none of its dependent packages fail to build because of this change, it
+> can be safely merged. Otherwise, if it can be confirmed that there is no
+> major change in its functionality or API, but only adding new features or
+> fixing bugs, it
+> can also be merged.
+> - `unmaintained-software: drop` - If this PR removes a leaf package or the
+> removal doesn't otherwise break other packages, it can be merged.
+> - `cool-tool: rename from fancy-tool` - As long as this PR replaces all
+> references to the old attribute name with the new name and adds an alias,
+> it can be merged.
+> - `libpopular: 4.3.2 -> 5.0.0` - If this PR would trigger many rebuilds
+> and/or target `staging`, it should probably be delayed until after the
+> freeze-period is over. Alternatively, if this PR is for a popular package
+> and doesn't cause many rebuilds, it should also be delayed to reduce risk
+> of breakage. If a PR includes important changes, such as security fixes, it
+> should be brought up to
+> release managers.
+> - `nixos/transmission: refactor` - If this PR adjusts the type, default value
+> or effect of options in the NixOS module, so that users must rewrite their
+> configuration to keep the current behavior unchanged, it should not be
+> merged, as we don't have enough time to collect user feedback and avoid
+> possible breakage. However, it should be accepted if the current behavior
+> is
+> considered broken and is fixed by the PR.
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 90ac8b9459..c069e9b249 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -3536,6 +3536,12 @@
github = "scaredmushroom";
githubId = 45340040;
};
+ caperren = {
+ name = "Corwin Perren";
+ email = "caperren@gmail.com";
+ github = "caperren";
+ githubId = 4566591;
+ };
CaptainJawZ = {
email = "CaptainJawZ@outlook.com";
name = "Danilo Reyes";
@@ -5126,6 +5132,11 @@
githubId = 130508846;
name = "Elliot Cameron";
};
+ deadbaed = {
+ name = "Philippe Loctaux";
+ github = "deadbaed";
+ githubId = 8809909;
+ };
dearrude = {
name = "Ebrahim Nejati";
email = "dearrude@tfwno.gf";
@@ -12538,6 +12549,12 @@
githubId = 40217331;
name = "LizeLive";
};
+ llakala = {
+ email = "elevenaka11@gmail.com";
+ github = "llakala";
+ githubId = 78693624;
+ name = "llakala";
+ };
lluchs = {
email = "lukas.werling@gmail.com";
github = "lluchs";
@@ -13498,6 +13515,12 @@
githubId = 322214;
name = "Mathnerd314";
};
+ mathstlouis = {
+ email = "matfino+gh@gmail.com";
+ github = "mathstlouis";
+ githubId = 35696151;
+ name = "mathstlouis";
+ };
matklad = {
email = "aleksey.kladov@gmail.com";
github = "matklad";
@@ -18596,6 +18619,16 @@
{ fingerprint = "C0A7 A9BB 115B C857 4D75 EA99 BBB7 A680 1DF1 E03F"; }
];
};
+ ritiek = {
+ name = "Ritiek Malhotra";
+ email = "ritiekmalhotra123@gmail.com";
+ matrix = "@ritiek:matrix.org";
+ github = "ritiek";
+ githubId = 20314742;
+ keys = [
+ { fingerprint = "66FF 6099 7B04 845F F4C0 CB4F EB6F C9F9 FC96 4257"; }
+ ];
+ };
rixed = {
email = "rixed-github@happyleptic.org";
github = "rixed";
@@ -18638,6 +18671,12 @@
githubId = 82817;
name = "Robert Kreuzer";
};
+ rksm = {
+ email = "robert@kra.hn";
+ github = "rksm";
+ githubId = 467450;
+ name = "Robert Krahn";
+ };
rlupton20 = {
email = "richard.lupton@gmail.com";
github = "rlupton20";
@@ -18732,6 +18771,13 @@
githubId = 521306;
name = "Rob Glossop";
};
+ robinkrahl = {
+ email = "nix@ireas.org";
+ github = "robinkrahl";
+ githubId = 165115;
+ keys = [ { fingerprint = "EC7E F0F9 B681 4C24 6236 3842 B755 6972 702A FD45"; } ];
+ name = "Robin Krahl";
+ };
roblabla = {
email = "robinlambertz+dev@gmail.com";
github = "roblabla";
@@ -21761,6 +21807,12 @@
githubId = 57180880;
name = "Ansh Tyagi";
};
+ therealgramdalf = {
+ email = "gramdalftech@gmail.com";
+ github = "TheRealGramdalf";
+ githubId = 79593869;
+ name = "Gramdalf";
+ };
therealr5 = {
email = "rouven@rfive.de";
github = "therealr5";
@@ -21891,6 +21943,12 @@
githubId = 1391883;
name = "Tom Hall";
};
+ thtrf = {
+ email = "thtrf@proton.me";
+ github = "thtrf";
+ githubId = 82712122;
+ name = "thtrf";
+ };
Thunderbottom = {
email = "chinmaydpai@gmail.com";
github = "Thunderbottom";
diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate-py/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate-py/pluginupdate.py
index afe60069dd..e37e82fef3 100644
--- a/third_party/nixpkgs/maintainers/scripts/pluginupdate-py/pluginupdate.py
+++ b/third_party/nixpkgs/maintainers/scripts/pluginupdate-py/pluginupdate.py
@@ -4,7 +4,7 @@
# - pkgs/development/lua-modules/updater/updater.py
# format:
-# $ nix run nixpkgs#black maintainers/scripts/pluginupdate.py
+# $ nix run nixpkgs#ruff maintainers/scripts/pluginupdate.py
# type-check:
# $ nix run nixpkgs#python3.pkgs.mypy maintainers/scripts/pluginupdate.py
# linted:
@@ -142,7 +142,7 @@ class Repo:
return loaded
def prefetch(self, ref: Optional[str]) -> str:
- print("Prefetching %s", self.uri)
+ log.info("Prefetching %s", self.uri)
loaded = self._prefetch(ref)
return loaded["sha256"]
@@ -195,7 +195,7 @@ class RepoGitHub(Repo):
xml = req.read()
# Filter out illegal XML characters
- illegal_xml_regex = re.compile(b"[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F]")
+ illegal_xml_regex = re.compile(b"[\x00-\x08\x0b-\x0c\x0e-\x1f\x7f]")
xml = illegal_xml_regex.sub(b"", xml)
root = ET.fromstring(xml)
@@ -256,13 +256,7 @@ class PluginDesc:
@property
def name(self):
- if self.alias is None:
- return self.repo.name
- else:
- return self.alias
-
- def __lt__(self, other):
- return self.repo.name < other.repo.name
+ return self.alias or self.repo.name
@staticmethod
def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> "PluginDesc":
@@ -270,7 +264,12 @@ class PluginDesc:
branch = row["branch"]
repo = make_repo(row["repo"], branch.strip())
repo.token = config.github_token
- return PluginDesc(repo, branch.strip(), row["alias"])
+ return PluginDesc(
+ repo,
+ branch.strip(),
+ # alias is usually an empty string
+ row["alias"] if row["alias"] else None,
+ )
@staticmethod
def load_from_string(config: FetchConfig, line: str) -> "PluginDesc":
@@ -328,12 +327,11 @@ def load_plugins_from_csv(
return plugins
-
def run_nix_expr(expr, nixpkgs: str, **args):
- '''
+ """
:param expr nix expression to fetch current plugins
:param nixpkgs Path towards a nixpkgs checkout
- '''
+ """
with CleanEnvironment(nixpkgs) as nix_path:
cmd = [
"nix",
@@ -382,16 +380,14 @@ class Editor:
fetch_config = FetchConfig(args.proc, args.github_token)
editor = self
for plugin_line in args.add_plugins:
- log.debug("using plugin_line", plugin_line)
+ log.debug("using plugin_line %s", plugin_line)
pdesc = PluginDesc.load_from_string(fetch_config, plugin_line)
- log.debug("loaded as pdesc", pdesc)
+ log.debug("loaded as pdesc %s", pdesc)
append = [pdesc]
editor.rewrite_input(
fetch_config, args.input_file, editor.deprecated, append=append
)
- plugin, _ = prefetch_plugin(
- pdesc,
- )
+ plugin, _ = prefetch_plugin(pdesc)
autocommit = not args.no_commit
if autocommit:
commit(
@@ -406,9 +402,9 @@ class Editor:
# Expects arguments generated by 'update' subparser
def update(self, args):
"""CSV spec"""
- print("the update member function should be overriden in subclasses")
+ print("the update member function should be overridden in subclasses")
- def get_current_plugins(self, nixpkgs) -> List[Plugin]:
+ def get_current_plugins(self, nixpkgs: str) -> List[Plugin]:
"""To fill the cache"""
data = run_nix_expr(self.get_plugins, nixpkgs)
plugins = []
@@ -440,6 +436,7 @@ class Editor:
plugins, redirects = check_results(results)
+ plugins = sorted(plugins, key=lambda v: v[1].normalized_name)
self.generate_nix(plugins, outfile)
return redirects
@@ -559,6 +556,7 @@ class Editor:
parser = self.create_parser()
args = parser.parse_args()
command = args.command or "update"
+ logging.basicConfig()
log.setLevel(LOG_LEVELS[args.debug])
log.info("Chose to run command: %s", command)
self.nixpkgs = args.nixpkgs
@@ -591,25 +589,24 @@ def prefetch_plugin(
p: PluginDesc,
cache: "Optional[Cache]" = None,
) -> Tuple[Plugin, Optional[Repo]]:
- repo, branch, alias = p.repo, p.branch, p.alias
- name = alias or p.repo.name
commit = None
- log.info(f"Fetching last commit for plugin {name} from {repo.uri}@{branch}")
- commit, date = repo.latest_commit()
+ log.info(f"Fetching last commit for plugin {p.name} from {p.repo.uri}@{p.branch}")
+ commit, date = p.repo.latest_commit()
+
cached_plugin = cache[commit] if cache else None
if cached_plugin is not None:
- log.debug("Cache hit !")
- cached_plugin.name = name
+ log.debug(f"Cache hit for {p.name}!")
+ cached_plugin.name = p.name
cached_plugin.date = date
- return cached_plugin, repo.redirect
+ return cached_plugin, p.repo.redirect
- has_submodules = repo.has_submodules()
- log.debug(f"prefetch {name}")
- sha256 = repo.prefetch(commit)
+ has_submodules = p.repo.has_submodules()
+ log.debug(f"prefetch {p.name}")
+ sha256 = p.repo.prefetch(commit)
return (
- Plugin(name, commit, has_submodules, sha256, date=date),
- repo.redirect,
+ Plugin(p.name, commit, has_submodules, sha256, date=date),
+ p.repo.redirect,
)
@@ -624,7 +621,7 @@ def print_download_error(plugin: PluginDesc, ex: Exception):
def check_results(
- results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]]
+ results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]],
) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]:
""" """
failures: List[Tuple[PluginDesc, Exception]] = []
@@ -642,10 +639,9 @@ def check_results(
print(f"{len(results) - len(failures)} plugins were checked", end="")
if len(failures) == 0:
- print()
return plugins, redirects
else:
- print(f", {len(failures)} plugin(s) could not be downloaded:\n")
+ log.error(f", {len(failures)} plugin(s) could not be downloaded:\n")
for plugin, exception in failures:
print_download_error(plugin, exception)
@@ -738,10 +734,7 @@ def rewrite_input(
append: List[PluginDesc] = [],
):
log.info("Rewriting input file %s", input_file)
- plugins = load_plugins_from_csv(
- config,
- input_file,
- )
+ plugins = load_plugins_from_csv(config, input_file)
plugins.extend(append)
@@ -753,15 +746,25 @@ def rewrite_input(
deprecations = json.load(f)
# TODO parallelize this step
for pdesc, new_repo in redirects.items():
- log.info("Rewriting input file %s", input_file)
+ log.info("Resolving deprecated plugin %s -> %s", pdesc.name, new_repo.name)
new_pdesc = PluginDesc(new_repo, pdesc.branch, pdesc.alias)
+
old_plugin, _ = prefetch_plugin(pdesc)
new_plugin, _ = prefetch_plugin(new_pdesc)
+
if old_plugin.normalized_name != new_plugin.normalized_name:
deprecations[old_plugin.normalized_name] = {
"new": new_plugin.normalized_name,
"date": cur_date_iso,
}
+
+ # remove plugin from index file, so we won't add it to deprecations again
+ for i, plugin in enumerate(plugins):
+ if plugin.name == pdesc.name:
+ plugins.pop(i)
+ break
+ plugins.append(new_pdesc)
+
with open(deprecated, "w") as f:
json.dump(deprecations, f, indent=4, sort_keys=True)
f.write("\n")
@@ -772,7 +775,7 @@ def rewrite_input(
fieldnames = ["repo", "branch", "alias"]
writer = csv.DictWriter(f, fieldnames, dialect="unix", quoting=csv.QUOTE_NONE)
writer.writeheader()
- for plugin in sorted(plugins):
+ for plugin in sorted(plugins, key=lambda x: x.name):
writer.writerow(asdict(plugin))
@@ -792,9 +795,11 @@ def update_plugins(editor: Editor, args):
log.info("Start updating plugins")
if args.proc > 1 and args.github_token == None:
- log.warning("You have enabled parallel updates but haven't set a github token.\n"
- "You may be hit with `HTTP Error 429: too many requests` as a consequence."
- "Either set --proc=1 or --github-token=YOUR_TOKEN. ")
+ log.warning(
+ "You have enabled parallel updates but haven't set a github token.\n"
+ "You may be hit with `HTTP Error 429: too many requests` as a consequence."
+ "Either set --proc=1 or --github-token=YOUR_TOKEN. "
+ )
fetch_config = FetchConfig(args.proc, args.github_token)
update = editor.get_update(args.input_file, args.outfile, fetch_config)
@@ -810,11 +815,9 @@ def update_plugins(editor: Editor, args):
if autocommit:
try:
repo = git.Repo(os.getcwd())
- updated = datetime.now(tz=UTC).strftime('%Y-%m-%d')
+ updated = datetime.now(tz=UTC).strftime("%Y-%m-%d")
print(args.outfile)
- commit(repo,
- f"{editor.attr_path}: update on {updated}", [args.outfile]
- )
+ commit(repo, f"{editor.attr_path}: update on {updated}", [args.outfile])
except git.InvalidGitRepositoryError as e:
print(f"Not in a git repository: {e}", file=sys.stderr)
sys.exit(1)
diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix
index b4f5551050..3deec6c115 100644
--- a/third_party/nixpkgs/maintainers/team-list.nix
+++ b/third_party/nixpkgs/maintainers/team-list.nix
@@ -497,6 +497,19 @@ with lib.maintainers;
shortName = "Input-Output Global employees";
};
+ java = {
+ githubTeams = [ "java" ];
+ members = [
+ chayleaf
+ fliegendewurst
+ infinidoge
+ tomodachi94
+ ];
+ shortName = "Java";
+ scope = "Maintainers of the Nixpkgs Java ecosystem (JDK, JVM, Java, Gradle, Maven, Ant, and adjacent projects)";
+ enableFeatureFreezePing = true;
+ };
+
jitsi = {
members = [
cleeyv
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md
index 49e9813555..335618dbc4 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -109,6 +109,8 @@
- [Firefly-iii Data Importer](https://github.com/firefly-iii/data-importer), a data importer for Firefly-III. Available as [services.firefly-iii-data-importer](options.html#opt-services.firefly-iii-data-importer.enable).
+- [Dashy](https://dashy.to), an open source, highly customizable, easy to use, privacy-respecting dashboard app. Available as [services.dashy](options.html#opt-services.dashy).
+
- [QGroundControl], a ground station support and configuration manager for the PX4 and APM Flight Stacks. Available as [programs.qgroundcontrol](options.html#opt-programs.qgroundcontrol.enable).
- [Eintopf](https://eintopf.info), a community event and calendar web application. Available as [services.eintopf](options.html#opt-services.eintopf.enable).
@@ -195,6 +197,8 @@
## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
+- Nixpkgs now requires Nix 2.3.17 or newer to allow for zstd compressed binary artifacts.
+
- The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details.
- The NVIDIA driver no longer defaults to the proprietary kernel module with versions >= 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open modules.
diff --git a/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix b/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix
index 08d6b16790..6a11ba0891 100644
--- a/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix
+++ b/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix
@@ -11,14 +11,12 @@ in
type = lib.types.bool;
default = false;
description = ''
- Enables udev rules for Nitrokey devices. By default grants access
- to users in the "nitrokey" group. You may want to install the
- nitrokey-app package, depending on your device and needs.
+ Enables udev rules for Nitrokey devices.
'';
};
};
config = lib.mkIf cfg.enable {
- services.udev.packages = [ pkgs.libnitrokey ];
+ services.udev.packages = [ pkgs.nitrokey-udev-rules ];
};
}
diff --git a/third_party/nixpkgs/nixos/modules/programs/localsend.nix b/third_party/nixpkgs/nixos/modules/programs/localsend.nix
index 47f54246a4..a4580057ba 100644
--- a/third_party/nixpkgs/nixos/modules/programs/localsend.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/localsend.nix
@@ -12,14 +12,19 @@ in
options.programs.localsend = {
enable = lib.mkEnableOption "localsend, an open source cross-platform alternative to AirDrop";
- openFirewall = lib.mkEnableOption "opening the firewall port ${toString firewallPort} for receiving files" // {
- default = true;
- };
+ package = lib.mkPackageOption pkgs "localsend" { };
+
+ openFirewall =
+ lib.mkEnableOption "opening the firewall port ${toString firewallPort} for receiving files"
+ // {
+ default = true;
+ };
};
config = lib.mkIf cfg.enable {
- environment.systemPackages = [ pkgs.localsend ];
+ environment.systemPackages = [ cfg.package ];
networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ firewallPort ];
+ networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ firewallPort ];
};
meta.maintainers = with lib.maintainers; [ pandapip1 ];
diff --git a/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix b/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix
index 780f4d7763..085775af17 100644
--- a/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix
@@ -101,7 +101,12 @@ in {
};
};
- systemd.packages = [ cfg.package ];
+ systemd = {
+ packages = [ cfg.package ];
+ tmpfiles.rules = [
+ "d /etc/openvpn3/configs 0750 openvpn openvpn - -"
+ ];
+ };
};
meta.maintainers = with lib.maintainers; [ shamilton progrm_jarvis ];
diff --git a/third_party/nixpkgs/nixos/modules/security/acme/default.nix b/third_party/nixpkgs/nixos/modules/security/acme/default.nix
index 4af92d8779..140fa590ef 100644
--- a/third_party/nixpkgs/nixos/modules/security/acme/default.nix
+++ b/third_party/nixpkgs/nixos/modules/security/acme/default.nix
@@ -183,7 +183,6 @@ let
certToConfig = cert: data: let
acmeServer = data.server;
useDns = data.dnsProvider != null;
- useDnsOrS3 = useDns || data.s3Bucket != null;
destPath = "/var/lib/acme/${cert}";
selfsignedDeps = lib.optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ];
@@ -367,13 +366,11 @@ let
"/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates"
];
- EnvironmentFile = lib.mkIf useDnsOrS3 data.environmentFile;
+ EnvironmentFile = lib.mkIf (data.environmentFile != null) data.environmentFile;
- Environment = lib.mkIf useDnsOrS3
- (lib.mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles);
+ Environment = lib.mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles;
- LoadCredential = lib.mkIf useDnsOrS3
- (lib.mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles);
+ LoadCredential = lib.mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles;
# Run as root (Prefixed with +)
ExecStartPost = "+" + (pkgs.writeShellScript "acme-postrun" ''
diff --git a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix
index 01608d33d8..9f01a00aad 100644
--- a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix
+++ b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix
@@ -95,7 +95,7 @@ in
after = ["network.target"];
wantedBy = ["multi-user.target"];
script = ''
- ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}
+ exec ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}
'';
serviceConfig = {
User = "boinc";
diff --git a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix
index 1a9a3bdf26..337734488e 100644
--- a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix
+++ b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix
@@ -55,7 +55,12 @@ in
default = "";
};
passwordFile = lib.mkOption {
- type = lib.types.str;
+ type = lib.types.path;
+ example = lib.literalExpression ''
+ pkgs.writeText "roundcube-postgres-passwd.txt" '''
+ hostname:port:database:username:password
+ '''
+ '';
description = ''
Password file for the postgresql connection.
Must be formatted according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html)
diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/hebbot.nix b/third_party/nixpkgs/nixos/modules/services/matrix/hebbot.nix
index 9f344fbe08..ba676422ca 100644
--- a/third_party/nixpkgs/nixos/modules/services/matrix/hebbot.nix
+++ b/third_party/nixpkgs/nixos/modules/services/matrix/hebbot.nix
@@ -70,7 +70,7 @@ in
LoadCredential = "bot-password-file:${cfg.botPasswordFile}";
RestartSec = "10s";
StateDirectory = "hebbot";
- WorkingDirectory = "hebbot";
+ WorkingDirectory = "/var/lib/hebbot";
};
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/guix/default.nix b/third_party/nixpkgs/nixos/modules/services/misc/guix/default.nix
index 2ad30469ac..9cd346a92b 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/guix/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/guix/default.nix
@@ -275,7 +275,7 @@ in
systemd.services.guix-daemon = {
environment = serviceEnv;
script = ''
- ${lib.getExe' package "guix-daemon"} \
+ exec ${lib.getExe' package "guix-daemon"} \
--build-users-group=${cfg.group} \
${lib.optionalString (cfg.substituters.urls != [ ])
"--substitute-urls='${lib.concatStringsSep " " cfg.substituters.urls}'"} \
@@ -384,7 +384,7 @@ in
}
'';
script = ''
- ${lib.getExe' package "guix"} publish \
+ exec ${lib.getExe' package "guix"} publish \
--user=${cfg.publish.user} --port=${builtins.toString cfg.publish.port} \
${lib.escapeShellArgs cfg.publish.extraArgs}
'';
@@ -440,12 +440,10 @@ in
description = "Guix garbage collection";
startAt = cfg.gc.dates;
script = ''
- ${lib.getExe' package "guix"} gc ${lib.escapeShellArgs cfg.gc.extraArgs}
+ exec ${lib.getExe' package "guix"} gc ${lib.escapeShellArgs cfg.gc.extraArgs}
'';
-
serviceConfig = {
Type = "oneshot";
-
PrivateDevices = true;
PrivateNetwork = true;
ProtectControlGroups = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nzbget.nix b/third_party/nixpkgs/nixos/modules/services/misc/nzbget.nix
index a2726d4550..4738baf6d3 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/nzbget.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/nzbget.nix
@@ -1,7 +1,6 @@
{ config, pkgs, lib, ... }:
let
cfg = config.services.nzbget;
- pkg = pkgs.nzbget;
stateDir = "/var/lib/nzbget";
configFile = "${stateDir}/nzbget.conf";
configOpts = lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "-o ${name}=${lib.escapeShellArg (toStr value)}") cfg.settings);
@@ -24,6 +23,8 @@ in
services.nzbget = {
enable = lib.mkEnableOption "NZBGet, for downloading files from news servers";
+ package = lib.mkPackageOption pkgs "nzbget" { };
+
user = lib.mkOption {
type = lib.types.str;
default = "nzbget";
@@ -64,8 +65,8 @@ in
InfoTarget = "screen";
DetailTarget = "screen";
# required paths
- ConfigTemplate = "${pkg}/share/nzbget/nzbget.conf";
- WebDir = "${pkg}/share/nzbget/webui";
+ ConfigTemplate = "${cfg.package}/share/nzbget/nzbget.conf";
+ WebDir = "${cfg.package}/share/nzbget/webui";
# nixos handles package updates
UpdateCheck = "none";
};
@@ -81,7 +82,7 @@ in
preStart = ''
if [ ! -f ${configFile} ]; then
- ${pkgs.coreutils}/bin/install -m 0700 ${pkg}/share/nzbget/nzbget.conf ${configFile}
+ ${pkgs.coreutils}/bin/install -m 0700 ${cfg.package}/share/nzbget/nzbget.conf ${configFile}
fi
'';
@@ -92,8 +93,8 @@ in
Group = cfg.group;
UMask = "0002";
Restart = "on-failure";
- ExecStart = "${pkg}/bin/nzbget --server --configfile ${stateDir}/nzbget.conf ${configOpts}";
- ExecStop = "${pkg}/bin/nzbget --quit";
+ ExecStart = "${cfg.package}/bin/nzbget --server --configfile ${stateDir}/nzbget.conf ${configOpts}";
+ ExecStop = "${cfg.package}/bin/nzbget --quit";
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix b/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix
index 51f3c3e468..89d8b5c537 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix
@@ -12,6 +12,8 @@ in {
on how to set up a reverse proxy
'';
+ package = lib.mkPackageOption pkgs "ombi" { };
+
dataDir = lib.mkOption {
type = lib.types.str;
default = "/var/lib/ombi";
@@ -58,7 +60,7 @@ in {
Type = "simple";
User = cfg.user;
Group = cfg.group;
- ExecStart = "${pkgs.ombi}/bin/Ombi --storage '${cfg.dataDir}' --host 'http://*:${toString cfg.port}'";
+ ExecStart = "${lib.getExe cfg.package} --storage '${cfg.dataDir}' --host 'http://*:${toString cfg.port}'";
Restart = "on-failure";
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix
index 360cdd1c6b..45bb45a53c 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix
@@ -1,37 +1,31 @@
{ config, lib, pkgs, ... }:
-with lib;
-
let
-
cfg = config.services.teamviewer;
-
in
-
{
-
- ###### interface
-
options = {
-
- services.teamviewer.enable = mkEnableOption "TeamViewer daemon";
-
+ services.teamviewer = {
+ enable = lib.mkEnableOption "TeamViewer daemon & system package";
+ package = lib.mkPackageOption pkgs "teamviewer" { };
+ };
};
- ###### implementation
+ config = lib.mkIf (cfg.enable) {
+ environment.systemPackages = [ cfg.package ];
- config = mkIf (cfg.enable) {
-
- environment.systemPackages = [ pkgs.teamviewer ];
-
- services.dbus.packages = [ pkgs.teamviewer ];
+ services.dbus.packages = [ cfg.package ];
systemd.services.teamviewerd = {
description = "TeamViewer remote control daemon";
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ];
- after = [ "network-online.target" "network.target" "dbus.service" ];
+ after = [
+ "network-online.target"
+ "network.target"
+ "dbus.service"
+ ];
requires = [ "dbus.service" ];
preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer";
@@ -39,12 +33,11 @@ in
startLimitBurst = 10;
serviceConfig = {
Type = "simple";
- ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -f";
+ ExecStart = "${cfg.package}/bin/teamviewerd -f";
PIDFile = "/run/teamviewerd.pid";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
Restart = "on-abort";
};
};
};
-
}
diff --git a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix
index a5fa6375c6..72e96df544 100644
--- a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix
+++ b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix
@@ -526,6 +526,7 @@ in
ExecStartPre = "-rm /var/cache/frigate/*.mp4";
ExecStart = "${cfg.package.python.interpreter} -m frigate";
Restart = "on-failure";
+ SyslogIdentifier = "frigate";
User = "frigate";
Group = "frigate";
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dashy.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dashy.nix
new file mode 100644
index 0000000000..47bcab976e
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dashy.nix
@@ -0,0 +1,173 @@
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
+let
+ inherit (lib.types) package str;
+ inherit (lib)
+ mkIf
+ mkOption
+ mkEnableOption
+ mkPackageOption
+ ;
+ cfg = config.services.dashy;
+in
+{
+ options.services.dashy = {
+ enable = mkEnableOption ''
+ Dashy, a highly customizable, easy to use, privacy-respecting dashboard app.
+
+ Note that this builds a static web app as opposed to running a full node server, unlike the default docker image.
+
+ Writing config changes to disk through the UI, triggering a rebuild through the UI and application status checks are
+ unavailable without the node server; Everything else will work fine.
+
+ See the deployment docs for [building from source](https://dashy.to/docs/deployment#build-from-source), [hosting with a CDN](https://dashy.to/docs/deployment#hosting-with-cdn) and [CDN cloud deploy](https://dashy.to/docs/deployment#cdn--cloud-deploy) for more information.
+ '';
+
+ virtualHost = {
+ enableNginx = mkEnableOption "a virtualhost to serve dashy through nginx";
+
+ domain = mkOption {
+ description = ''
+ Domain to use for the virtual host.
+
+ This can be used to change nginx options like
+ ```nix
+ services.nginx.virtualHosts."$\{config.services.dashy.virtualHost.domain}".listen = [ ... ]
+ ```
+ or
+ ```nix
+ services.nginx.virtualHosts."example.com".listen = [ ... ]
+ ```
+ '';
+ type = str;
+ };
+ };
+
+ package = mkPackageOption pkgs "dashy-ui" { };
+
+ finalDrv = mkOption {
+ readOnly = true;
+ default =
+ if cfg.settings != { } then cfg.package.override { inherit (cfg) settings; } else cfg.package;
+ defaultText = ''
+ if cfg.settings != {}
+ then cfg.package.override {inherit (cfg) settings;}
+ else cfg.package;
+ '';
+ type = package;
+ description = ''
+ Final derivation containing the fully built static files
+ '';
+ };
+
+ settings = mkOption {
+ default = { };
+ description = ''
+ Settings serialized into `user-data/conf.yml` before build.
+ If left empty, the default configuration shipped with the package will be used instead.
+
+ Note that the full configuration will be written to the nix store as world readable, which may include secrets such as [password hashes](https://dashy.to/docs/configuring#appconfigauthusers-optional).
+
+ To add files such as icons or backgrounds, you can reference them in line such as
+ ```nix
+ icon = "$\{./icon.png}";
+ ```
+ This will add the file to the nix store upon build, referencing it by file path as expected by Dashy.
+ '';
+ example = ''
+ {
+ appConfig = {
+ cssThemes = [
+ "example-theme-1"
+ "example-theme-2"
+ ];
+ enableFontAwesome = true;
+ fontAwesomeKey = "e9076c7025";
+ theme = "thebe";
+ };
+ pageInfo = {
+ description = "My Awesome Dashboard";
+ navLinks = [
+ {
+ path = "/";
+ title = "Home";
+ }
+ {
+ path = "https://example.com";
+ title = "Example 1";
+ }
+ {
+ path = "https://example.com";
+ title = "Example 2";
+ }
+ ];
+ title = "Dashy";
+ };
+ sections = [
+ {
+ displayData = {
+ collapsed = true;
+ cols = 2;
+ customStyles = "border: 2px dashed red;";
+ itemSize = "large";
+ };
+ items = [
+ {
+ backgroundColor = "#0079ff";
+ color = "#00ffc9";
+ description = "Source code and documentation on GitHub";
+ icon = "fab fa-github";
+ target = "sametab";
+ title = "Source";
+ url = "https://github.com/Lissy93/dashy";
+ }
+ {
+ description = "View currently open issues, or raise a new one";
+ icon = "fas fa-bug";
+ title = "Issues";
+ url = "https://github.com/Lissy93/dashy/issues";
+ }
+ {
+ description = "Live Demo #1";
+ icon = "fas fa-rocket";
+ target = "iframe";
+ title = "Demo 1";
+ url = "https://dashy-demo-1.as93.net";
+ }
+ {
+ description = "Live Demo #2";
+ icon = "favicon";
+ target = "newtab";
+ title = "Demo 2";
+ url = "https://dashy-demo-2.as93.net";
+ }
+ ];
+ name = "Getting Started";
+ }
+ ];
+ }
+ '';
+ inherit (pkgs.formats.json { }) type;
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.nginx = mkIf cfg.virtualHost.enableNginx {
+ enable = true;
+ virtualHosts."${cfg.virtualHost.domain}" = {
+ locations."/" = {
+ root = cfg.finalDrv;
+ tryFiles = "$uri /index.html ";
+ };
+ };
+ };
+ };
+
+ meta.maintainers = [
+ lib.maintainers.therealgramdalf
+ ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix
index 2224ca1d8e..6d9c909c45 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix
@@ -116,7 +116,7 @@ in
description = ''
Configuration for Immich.
See or navigate to
- for
+ for
options and defaults.
Setting it to `null` allows configuring Immich in the web interface.
'';
@@ -270,7 +270,7 @@ in
let
postgresEnv =
if isPostgresUnixSocket then
- { DB_URL = "socket://${cfg.database.host}?dbname=${cfg.database.name}"; }
+ { DB_URL = "postgresql:///${cfg.database.name}?host=${cfg.database.host}"; }
else
{
DB_HOSTNAME = cfg.database.host;
@@ -317,6 +317,11 @@ in
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
inherit (cfg) environment;
+ path = [
+ # gzip and pg_dumpall are used by the backup service
+ pkgs.gzip
+ config.services.postgresql.package
+ ];
serviceConfig = commonServiceConfig // {
ExecStart = lib.getExe cfg.package;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-notify_push.nix
index 961178cedc..475cddf5f7 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-notify_push.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud-notify_push.nix
@@ -48,7 +48,7 @@ in
] (
opt: options.services.nextcloud.config.${opt} // {
default = config.services.nextcloud.config.${opt};
- defaultText = "config.services.nextcloud.config.${opt}";
+ defaultText = lib.literalExpression "config.services.nextcloud.config.${opt}";
}
)
);
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index 1288955272..37e005f128 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -775,13 +775,10 @@ in {
peering-manager = handleTest ./web-apps/peering-manager.nix {};
peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {};
peroxide = handleTest ./peroxide.nix {};
- pg_anonymizer = handleTest ./pg_anonymizer.nix {};
pgadmin4 = handleTest ./pgadmin4.nix {};
pgbouncer = handleTest ./pgbouncer.nix {};
pghero = runTest ./pghero.nix;
- pgjwt = handleTest ./pgjwt.nix {};
pgmanage = handleTest ./pgmanage.nix {};
- pgvecto-rs = handleTest ./pgvecto-rs.nix {};
phosh = handleTest ./phosh.nix {};
photonvision = handleTest ./photonvision.nix {};
photoprism = handleTest ./photoprism.nix {};
@@ -814,13 +811,7 @@ in {
postfix = handleTest ./postfix.nix {};
postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {};
postfixadmin = handleTest ./postfixadmin.nix {};
- postgis = handleTest ./postgis.nix {};
- apache_datasketches = handleTest ./apache_datasketches.nix {};
- postgresql = handleTest ./postgresql.nix {};
- postgresql-jit = handleTest ./postgresql-jit.nix {};
- postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {};
- postgresql-tls-client-cert = handleTest ./postgresql-tls-client-cert.nix {};
- postgresql-wal2json = handleTest ./postgresql-wal2json.nix {};
+ postgresql = handleTest ./postgresql {};
powerdns = handleTest ./powerdns.nix {};
powerdns-admin = handleTest ./powerdns-admin.nix {};
power-profiles-daemon = handleTest ./power-profiles-daemon.nix {};
@@ -1047,7 +1038,6 @@ in {
tiddlywiki = handleTest ./tiddlywiki.nix {};
tigervnc = handleTest ./tigervnc.nix {};
tika = runTest ./tika.nix;
- timescaledb = handleTest ./timescaledb.nix {};
timezone = handleTest ./timezone.nix {};
timidity = handleTestOn ["aarch64-linux" "x86_64-linux"] ./timidity {};
tinc = handleTest ./tinc {};
@@ -1067,7 +1057,6 @@ in {
trezord = handleTest ./trezord.nix {};
trickster = handleTest ./trickster.nix {};
trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};
- tsja = handleTest ./tsja.nix {};
tsm-client-gui = handleTest ./tsm-client-gui.nix {};
ttyd = handleTest ./web-servers/ttyd.nix {};
txredisapi = handleTest ./txredisapi.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/apache_datasketches.nix b/third_party/nixpkgs/nixos/tests/apache_datasketches.nix
deleted file mode 100644
index 2bf099ac79..0000000000
--- a/third_party/nixpkgs/nixos/tests/apache_datasketches.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
- name = "postgis";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ lsix ]; # TODO: Who's the maintener now?
- };
-
- nodes = {
- master =
- { pkgs, ... }:
-
- {
- services.postgresql = let mypg = pkgs.postgresql_15; in {
- enable = true;
- package = mypg;
- extraPlugins = with mypg.pkgs; [
- apache_datasketches
- ];
- };
- };
- };
-
- testScript = ''
- start_all()
- master.wait_for_unit("postgresql")
- master.sleep(10) # Hopefully this is long enough!!
- master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION datasketches;'")
- master.succeed("sudo -u postgres psql -c 'SELECT hll_sketch_to_string(hll_sketch_build(1));'")
- '';
-})
diff --git a/third_party/nixpkgs/nixos/tests/frr.nix b/third_party/nixpkgs/nixos/tests/frr.nix
index a975d4b402..f4cd68c9d3 100644
--- a/third_party/nixpkgs/nixos/tests/frr.nix
+++ b/third_party/nixpkgs/nixos/tests/frr.nix
@@ -5,10 +5,11 @@
#
# All interfaces are in OSPF Area 0.
-import ./make-test-python.nix ({ pkgs, ... }:
+import ./make-test-python.nix (
+ { pkgs, ... }:
let
- ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ipv4.addresses).address;
+ ifAddr = node: iface: (pkgs.lib.head node.networking.interfaces.${iface}.ipv4.addresses).address;
ospfConf1 = ''
router ospf
@@ -25,87 +26,94 @@ import ./make-test-python.nix ({ pkgs, ... }:
'';
in
- {
- name = "frr";
+ {
+ name = "frr";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ ];
- };
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ ];
+ };
- nodes = {
+ nodes = {
- client =
- { nodes, ... }:
- {
- virtualisation.vlans = [ 1 ];
- services.frr = {
- config = ''
- ip route 192.168.0.0/16 ${ifAddr nodes.router1 "eth1"}
- '';
- };
- };
-
- router1 =
- { ... }:
- {
- virtualisation.vlans = [ 1 2 ];
- boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
- networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospfigp -j ACCEPT";
- services.frr = {
- ospfd.enable = true;
- config = ospfConf1;
- };
-
- specialisation.ospf.configuration = {
- services.frr.config = ospfConf2;
- };
- };
-
- router2 =
- { ... }:
- {
- virtualisation.vlans = [ 3 2 ];
- boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
- networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospfigp -j ACCEPT";
- services.frr = {
- ospfd.enable = true;
- config = ospfConf2;
- };
- };
-
- server =
- { nodes, ... }:
- {
- virtualisation.vlans = [ 3 ];
- services.frr = {
- config = ''
- ip route 192.168.0.0/16 ${ifAddr nodes.router2 "eth1"}
- '';
- };
- };
- };
-
- testScript =
+ client =
{ nodes, ... }:
- ''
- start_all()
+ {
+ virtualisation.vlans = [ 1 ];
+ services.frr = {
+ config = ''
+ ip route 192.168.0.0/16 ${ifAddr nodes.router1 "eth1"}
+ '';
+ };
+ };
- # Wait for the networking to start on all machines
- for machine in client, router1, router2, server:
- machine.wait_for_unit("network.target")
+ router1 =
+ { ... }:
+ {
+ virtualisation.vlans = [
+ 1
+ 2
+ ];
+ boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
+ networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospfigp -j ACCEPT";
+ services.frr = {
+ ospfd.enable = true;
+ config = ospfConf1;
+ };
- with subtest("Wait for FRR"):
- for gw in client, router1, router2, server:
- gw.wait_for_unit("frr")
+ specialisation.ospf.configuration = {
+ services.frr.config = ospfConf2;
+ };
+ };
- router1.succeed("${nodes.router1.config.system.build.toplevel}/specialisation/ospf/bin/switch-to-configuration test >&2")
+ router2 =
+ { ... }:
+ {
+ virtualisation.vlans = [
+ 3
+ 2
+ ];
+ boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
+ networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospfigp -j ACCEPT";
+ services.frr = {
+ ospfd.enable = true;
+ config = ospfConf2;
+ };
+ };
- with subtest("Wait for OSPF to form adjacencies"):
- for gw in router1, router2:
- gw.wait_until_succeeds("vtysh -c 'show ip ospf neighbor' | grep Full")
- gw.wait_until_succeeds("vtysh -c 'show ip route' | grep '^O>'")
+ server =
+ { nodes, ... }:
+ {
+ virtualisation.vlans = [ 3 ];
+ services.frr = {
+ config = ''
+ ip route 192.168.0.0/16 ${ifAddr nodes.router2 "eth1"}
+ '';
+ };
+ };
+ };
- with subtest("Test ICMP"):
- client.wait_until_succeeds("ping -4 -c 3 server >&2")
- '';
- })
+ testScript =
+ { nodes, ... }:
+ ''
+ start_all()
+
+ # Wait for the networking to start on all machines
+ for machine in client, router1, router2, server:
+ machine.wait_for_unit("network.target")
+
+ with subtest("Wait for FRR"):
+ for gw in client, router1, router2, server:
+ gw.wait_for_unit("frr")
+
+ router1.succeed("${nodes.router1.system.build.toplevel}/specialisation/ospf/bin/switch-to-configuration test >&2")
+
+ with subtest("Wait for OSPF to form adjacencies"):
+ for gw in router1, router2:
+ gw.wait_until_succeeds("vtysh -c 'show ip ospf neighbor' | grep Full")
+ gw.wait_until_succeeds("vtysh -c 'show ip route' | grep '^O>'")
+
+ with subtest("Test ICMP"):
+ client.wait_until_succeeds("ping -4 -c 3 server >&2")
+ '';
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/localsend.nix b/third_party/nixpkgs/nixos/tests/localsend.nix
index 8c0a6ac681..551b6dd73c 100644
--- a/third_party/nixpkgs/nixos/tests/localsend.nix
+++ b/third_party/nixpkgs/nixos/tests/localsend.nix
@@ -16,6 +16,7 @@ import ./make-test-python.nix (
machine.wait_for_open_port(53317)
machine.wait_for_window("LocalSend", 10)
machine.succeed("netstat --listening --program --tcp | grep -P 'tcp.*53317.*localsend'")
+ machine.succeed("netstat --listening --program --udp | grep -P 'udp.*53317.*localsend'")
'';
}
)
diff --git a/third_party/nixpkgs/nixos/tests/pg_anonymizer.nix b/third_party/nixpkgs/nixos/tests/pg_anonymizer.nix
deleted file mode 100644
index b26e4dca05..0000000000
--- a/third_party/nixpkgs/nixos/tests/pg_anonymizer.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-import ./make-test-python.nix ({ pkgs, lib, ... }: {
- name = "pg_anonymizer";
- meta.maintainers = lib.teams.flyingcircus.members;
-
- nodes.machine = { pkgs, ... }: {
- environment.systemPackages = [ pkgs.pg-dump-anon ];
- services.postgresql = {
- enable = true;
- extraPlugins = ps: [ ps.anonymizer ];
- settings.shared_preload_libraries = [ "anon" ];
- };
- };
-
- testScript = ''
- start_all()
- machine.wait_for_unit("multi-user.target")
- machine.wait_for_unit("postgresql.service")
-
- with subtest("Setup"):
- machine.succeed("sudo -u postgres psql --command 'create database demo'")
- machine.succeed(
- "sudo -u postgres psql -d demo -f ${pkgs.writeText "init.sql" ''
- create extension anon cascade;
- select anon.init();
- create table player(id serial, name text, points int);
- insert into player(id,name,points) values (1,'Foo', 23);
- insert into player(id,name,points) values (2,'Bar',42);
- security label for anon on column player.name is 'MASKED WITH FUNCTION anon.fake_last_name();';
- security label for anon on column player.points is 'MASKED WITH VALUE NULL';
- ''}"
- )
-
- def get_player_table_contents():
- return [
- x.split(',') for x in machine.succeed("sudo -u postgres psql -d demo --csv --command 'select * from player'").splitlines()[1:]
- ]
-
- def check_anonymized_row(row, id, original_name):
- assert row[0] == id, f"Expected first row to have ID {id}, but got {row[0]}"
- assert row[1] != original_name, f"Expected first row to have a name other than {original_name}"
- assert not bool(row[2]), "Expected points to be NULL in first row"
-
- def find_xsv_in_dump(dump, sep=','):
- """
- Expecting to find a CSV (for pg_dump_anon) or TSV (for pg_dump) structure, looking like
-
- COPY public.player ...
- 1,Shields,
- 2,Salazar,
- \.
-
- in the given dump (the commas are tabs in case of pg_dump).
- Extract the CSV lines and split by `sep`.
- """
-
- try:
- from itertools import dropwhile, takewhile
- return [x.split(sep) for x in list(takewhile(
- lambda x: x != "\\.",
- dropwhile(
- lambda x: not x.startswith("COPY public.player"),
- dump.splitlines()
- )
- ))[1:]]
- except:
- print(f"Dump to process: {dump}")
- raise
-
- def check_original_data(output):
- assert output[0] == ['1','Foo','23'], f"Expected first row from player table to be 1,Foo,23; got {output[0]}"
- assert output[1] == ['2','Bar','42'], f"Expected first row from player table to be 2,Bar,42; got {output[1]}"
-
- def check_anonymized_rows(output):
- check_anonymized_row(output[0], '1', 'Foo')
- check_anonymized_row(output[1], '2', 'Bar')
-
- with subtest("Check initial state"):
- check_original_data(get_player_table_contents())
-
- with subtest("Anonymous dumps"):
- check_original_data(find_xsv_in_dump(
- machine.succeed("sudo -u postgres pg_dump demo"),
- sep='\t'
- ))
- check_anonymized_rows(find_xsv_in_dump(
- machine.succeed("sudo -u postgres pg_dump_anon -U postgres -h /run/postgresql -d demo"),
- sep=','
- ))
-
- with subtest("Anonymize"):
- machine.succeed("sudo -u postgres psql -d demo --command 'select anon.anonymize_database();'")
- check_anonymized_rows(get_player_table_contents())
- '';
-})
diff --git a/third_party/nixpkgs/nixos/tests/pgjwt.nix b/third_party/nixpkgs/nixos/tests/pgjwt.nix
deleted file mode 100644
index 3ab905cea9..0000000000
--- a/third_party/nixpkgs/nixos/tests/pgjwt.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-import ./make-test-python.nix ({ pkgs, lib, ...}:
-
-with pkgs; {
- name = "pgjwt";
- meta = with lib.maintainers; {
- maintainers = [ spinus willibutz ];
- };
-
- nodes = {
- master = { ... }:
- {
- services.postgresql = {
- enable = true;
- extraPlugins = ps: with ps; [ pgjwt pgtap ];
- };
- };
- };
-
- testScript = { nodes, ... }:
- let
- sqlSU = "${nodes.master.services.postgresql.superUser}";
- pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}";
- inherit (nodes.master.services.postgresql.package.pkgs) pgjwt;
- in
- ''
- start_all()
- master.wait_for_unit("postgresql")
- master.succeed(
- "${pkgs.gnused}/bin/sed -e '12 i CREATE EXTENSION pgcrypto;\\nCREATE EXTENSION pgtap;\\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql"
- )
- master.succeed(
- "${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql"
- )
- '';
-})
diff --git a/third_party/nixpkgs/nixos/tests/pgvecto-rs.nix b/third_party/nixpkgs/nixos/tests/pgvecto-rs.nix
deleted file mode 100644
index 8d9d6c0b88..0000000000
--- a/third_party/nixpkgs/nixos/tests/pgvecto-rs.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-# mostly copied from ./timescaledb.nix which was copied from ./postgresql.nix
-# as it seemed unapproriate to test additional extensions for postgresql there.
-
-{ system ? builtins.currentSystem
-, config ? { }
-, pkgs ? import ../.. { inherit system config; }
-}:
-
-with import ../lib/testing-python.nix { inherit system pkgs; };
-with pkgs.lib;
-
-let
- postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs;
- # Test cases from https://docs.pgvecto.rs/use-cases/hybrid-search.html
- test-sql = pkgs.writeText "postgresql-test" ''
- CREATE EXTENSION vectors;
-
- CREATE TABLE items (
- id bigserial PRIMARY KEY,
- content text NOT NULL,
- embedding vectors.vector(3) NOT NULL -- 3 dimensions
- );
-
- INSERT INTO items (content, embedding) VALUES
- ('a fat cat sat on a mat and ate a fat rat', '[1, 2, 3]'),
- ('a fat dog sat on a mat and ate a fat rat', '[4, 5, 6]'),
- ('a thin cat sat on a mat and ate a thin rat', '[7, 8, 9]'),
- ('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]');
- '';
- make-postgresql-test = postgresql-name: postgresql-package: makeTest {
- name = postgresql-name;
- meta = with pkgs.lib.maintainers; {
- maintainers = [ diogotcorreia ];
- };
-
- nodes.machine = { ... }:
- {
- services.postgresql = {
- enable = true;
- package = postgresql-package;
- extraPlugins = ps: with ps; [
- pgvecto-rs
- ];
- settings.shared_preload_libraries = "vectors";
- };
- };
-
- testScript = ''
- def check_count(statement, lines):
- return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format(
- statement, lines
- )
-
-
- machine.start()
- machine.wait_for_unit("postgresql")
-
- with subtest("Postgresql with extension vectors is available just after unit start"):
- machine.succeed(check_count("SELECT * FROM pg_available_extensions WHERE name = 'vectors' AND default_version = '${postgresql-package.pkgs.pgvecto-rs.version}';", 1))
-
- machine.succeed("sudo -u postgres psql -f ${test-sql}")
-
- machine.succeed(check_count("SELECT content, embedding FROM items WHERE to_tsvector('english', content) @@ 'cat & rat'::tsquery;", 2))
-
- machine.shutdown()
- '';
-
- };
- applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "14") postgresql-versions;
-in
-mapAttrs'
- (name: package: {
- inherit name;
- value = make-postgresql-test name package;
- })
- applicablePostgresqlVersions
diff --git a/third_party/nixpkgs/nixos/tests/postgis.nix b/third_party/nixpkgs/nixos/tests/postgis.nix
deleted file mode 100644
index 5b63e2ba73..0000000000
--- a/third_party/nixpkgs/nixos/tests/postgis.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
- name = "postgis";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ lsix ];
- };
-
- nodes = {
- master =
- { pkgs, ... }:
-
- {
- services.postgresql = {
- enable = true;
- package = pkgs.postgresql;
- extraPlugins = ps: with ps; [
- postgis
- ];
- };
- };
- };
-
- testScript = ''
- start_all()
- master.wait_for_unit("postgresql")
- master.sleep(10) # Hopefully this is long enough!!
- master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'")
- master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_raster;'")
- master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'")
- master.succeed("sudo -u postgres psql -c 'select postgis_version();'")
- master.succeed("[ \"$(sudo -u postgres psql --no-psqlrc --tuples-only -c 'select postgis_version();')\" = \" ${
- pkgs.lib.versions.major pkgs.postgis.version
- }.${
- pkgs.lib.versions.minor pkgs.postgis.version
- } USE_GEOS=1 USE_PROJ=1 USE_STATS=1\" ]")
- # st_makepoint goes through c code
- master.succeed("sudo -u postgres psql --no-psqlrc --tuples-only -c 'select st_makepoint(1, 1)'")
- '';
-})
diff --git a/third_party/nixpkgs/nixos/tests/postgresql-jit.nix b/third_party/nixpkgs/nixos/tests/postgresql-jit.nix
deleted file mode 100644
index f4b1d07a7f..0000000000
--- a/third_party/nixpkgs/nixos/tests/postgresql-jit.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ system ? builtins.currentSystem
-, config ? {}
-, pkgs ? import ../.. { inherit system config; }
-, package ? null
-}:
-
-with import ../lib/testing-python.nix { inherit system pkgs; };
-
-let
- inherit (pkgs) lib;
- packages = builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs);
-
- mkJitTestFromName = name:
- mkJitTest pkgs.${name};
-
- mkJitTest = package: makeTest {
- name = package.name;
- meta.maintainers = with lib.maintainers; [ ma27 ];
- nodes.machine = { pkgs, lib, ... }: {
- services.postgresql = {
- inherit package;
- enable = true;
- enableJIT = true;
- initialScript = pkgs.writeText "init.sql" ''
- create table demo (id int);
- insert into demo (id) select generate_series(1, 5);
- '';
- };
- };
- testScript = ''
- machine.start()
- machine.wait_for_unit("postgresql.service")
-
- with subtest("JIT is enabled"):
- machine.succeed("sudo -u postgres psql <<<'show jit;' | grep 'on'")
-
- with subtest("Test JIT works fine"):
- output = machine.succeed(
- "cat ${pkgs.writeText "test.sql" ''
- set jit_above_cost = 1;
- EXPLAIN ANALYZE SELECT CONCAT('jit result = ', SUM(id)) FROM demo;
- SELECT CONCAT('jit result = ', SUM(id)) from demo;
- ''} | sudo -u postgres psql"
- )
- assert "JIT:" in output
- assert "jit result = 15" in output
-
- machine.shutdown()
- '';
- };
-in
-if package == null then
- lib.genAttrs packages mkJitTestFromName
-else
- mkJitTest package
diff --git a/third_party/nixpkgs/nixos/tests/postgresql-tls-client-cert.nix b/third_party/nixpkgs/nixos/tests/postgresql-tls-client-cert.nix
deleted file mode 100644
index c1678ed733..0000000000
--- a/third_party/nixpkgs/nixos/tests/postgresql-tls-client-cert.nix
+++ /dev/null
@@ -1,141 +0,0 @@
-{ system ? builtins.currentSystem
-, config ? { }
-, pkgs ? import ../.. { inherit system config; }
-, package ? null
-}:
-
-with import ../lib/testing-python.nix { inherit system pkgs; };
-
-let
- lib = pkgs.lib;
-
- # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`.
- makeTestAttribute = name:
- {
- inherit name;
- value = makePostgresqlTlsClientCertTest pkgs."${name}";
- };
-
- makePostgresqlTlsClientCertTest = pkg:
- let
- runWithOpenSSL = file: cmd: pkgs.runCommand file
- {
- buildInputs = [ pkgs.openssl ];
- }
- cmd;
- caKey = runWithOpenSSL "ca.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
- caCert = runWithOpenSSL
- "ca.crt"
- ''
- openssl req -new -x509 -sha256 -key ${caKey} -out $out -subj "/CN=test.example" -days 36500
- '';
- serverKey =
- runWithOpenSSL "server.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
- serverKeyPath = "/var/lib/postgresql";
- serverCert =
- runWithOpenSSL "server.crt" ''
- openssl req -new -sha256 -key ${serverKey} -out server.csr -subj "/CN=db.test.example"
- openssl x509 -req -in server.csr -CA ${caCert} -CAkey ${caKey} \
- -CAcreateserial -out $out -days 36500 -sha256
- '';
- clientKey =
- runWithOpenSSL "client.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
- clientCert =
- runWithOpenSSL "client.crt" ''
- openssl req -new -sha256 -key ${clientKey} -out client.csr -subj "/CN=test"
- openssl x509 -req -in client.csr -CA ${caCert} -CAkey ${caKey} \
- -CAcreateserial -out $out -days 36500 -sha256
- '';
- clientKeyPath = "/root";
-
- in
- makeTest {
- name = "postgresql-tls-client-cert-${pkg.name}";
- meta.maintainers = with lib.maintainers; [ erictapen ];
-
- nodes.server = { ... }: {
- system.activationScripts = {
- keyPlacement.text = ''
- mkdir -p '${serverKeyPath}'
- cp '${serverKey}' '${serverKeyPath}/server.key'
- chown postgres:postgres '${serverKeyPath}/server.key'
- chmod 600 '${serverKeyPath}/server.key'
- '';
- };
- services.postgresql = {
- package = pkg;
- enable = true;
- enableTCPIP = true;
- ensureUsers = [
- {
- name = "test";
- ensureDBOwnership = true;
- }
- ];
- ensureDatabases = [ "test" ];
- settings = {
- ssl = "on";
- ssl_ca_file = toString caCert;
- ssl_cert_file = toString serverCert;
- ssl_key_file = "${serverKeyPath}/server.key";
- };
- authentication = ''
- hostssl test test ::/0 cert clientcert=verify-full
- '';
- };
- networking = {
- interfaces.eth1 = {
- ipv6.addresses = [
- { address = "fc00::1"; prefixLength = 120; }
- ];
- };
- firewall.allowedTCPPorts = [ 5432 ];
- };
- };
-
- nodes.client = { ... }: {
- system.activationScripts = {
- keyPlacement.text = ''
- mkdir -p '${clientKeyPath}'
- cp '${clientKey}' '${clientKeyPath}/client.key'
- chown root:root '${clientKeyPath}/client.key'
- chmod 600 '${clientKeyPath}/client.key'
- '';
- };
- environment = {
- variables = {
- PGHOST = "db.test.example";
- PGPORT = "5432";
- PGDATABASE = "test";
- PGUSER = "test";
- PGSSLMODE = "verify-full";
- PGSSLCERT = clientCert;
- PGSSLKEY = "${clientKeyPath}/client.key";
- PGSSLROOTCERT = caCert;
- };
- systemPackages = [ pkg ];
- };
- networking = {
- interfaces.eth1 = {
- ipv6.addresses = [
- { address = "fc00::2"; prefixLength = 120; }
- ];
- };
- hosts = { "fc00::1" = [ "db.test.example" ]; };
- };
- };
-
- testScript = ''
- server.wait_for_unit("multi-user.target")
- client.wait_for_unit("multi-user.target")
- client.succeed("psql -c \"SELECT 1;\"")
- '';
- };
-
-in
-if package == null then
-# all-tests.nix: Maps the generic function over all attributes of PostgreSQL packages
- builtins.listToAttrs (map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs)))
-else
-# Called directly from .tests
- makePostgresqlTlsClientCertTest package
diff --git a/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix b/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix
deleted file mode 100644
index a984f73c2b..0000000000
--- a/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{ system ? builtins.currentSystem,
- config ? {},
- pkgs ? import ../.. { inherit system config; },
- package ? null
-}:
-
-with import ../lib/testing-python.nix { inherit system pkgs; };
-
-let
- lib = pkgs.lib;
-
- # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`.
- makeTestAttribute = name:
- {
- inherit name;
- value = makePostgresqlWalReceiverTest pkgs."${name}";
- };
-
- makePostgresqlWalReceiverTest = pkg:
- let
- postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}";
- replicationUser = "wal_receiver_user";
- replicationSlot = "wal_receiver_slot";
- replicationConn = "postgresql://${replicationUser}@localhost";
- baseBackupDir = "/var/cache/wals/pg_basebackup";
- walBackupDir = "/var/cache/wals/pg_wal";
-
- recoveryFile = pkgs.writeTextDir "recovery.signal" "";
-
- in makeTest {
- name = "postgresql-wal-receiver-${pkg.name}";
- meta.maintainers = with lib.maintainers; [ pacien ];
-
- nodes.machine = { ... }: {
- systemd.tmpfiles.rules = [
- "d /var/cache/wals 0750 postgres postgres - -"
- ];
-
- services.postgresql = {
- package = pkg;
- enable = true;
- settings = {
- max_replication_slots = 10;
- max_wal_senders = 10;
- recovery_end_command = "touch recovery.done";
- restore_command = "cp ${walBackupDir}/%f %p";
- wal_level = "archive"; # alias for replica on pg >= 9.6
- };
- authentication = ''
- host replication ${replicationUser} all trust
- '';
- initialScript = pkgs.writeText "init.sql" ''
- create user ${replicationUser} replication;
- select * from pg_create_physical_replication_slot('${replicationSlot}');
- '';
- };
-
- services.postgresqlWalReceiver.receivers.main = {
- postgresqlPackage = pkg;
- connection = replicationConn;
- slot = replicationSlot;
- directory = walBackupDir;
- };
- # This is only to speedup test, it isn't time racing. Service is set to autorestart always,
- # default 60sec is fine for real system, but is too much for a test
- systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5;
- systemd.services.postgresql.serviceConfig.ReadWritePaths = [ "/var/cache/wals" ];
- };
-
- testScript = ''
- # make an initial base backup
- machine.wait_for_unit("postgresql")
- machine.wait_for_unit("postgresql-wal-receiver-main")
- # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other
- # required only for 9.4
- machine.sleep(5)
- machine.succeed(
- "${pkg}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}"
- )
-
- # create a dummy table with 100 records
- machine.succeed(
- "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'"
- )
-
- # stop postgres and destroy data
- machine.systemctl("stop postgresql")
- machine.systemctl("stop postgresql-wal-receiver-main")
- machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}")
-
- # restore the base backup
- machine.succeed(
- "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}"
- )
-
- # prepare WAL and recovery
- machine.succeed("chmod a+rX -R ${walBackupDir}")
- machine.execute(
- "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done"
- ) # make use of partial segments too
- machine.succeed(
- "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*"
- )
-
- # replay WAL
- machine.systemctl("start postgresql")
- machine.wait_for_file("${postgresqlDataDir}/recovery.done")
- machine.systemctl("restart postgresql")
- machine.wait_for_unit("postgresql")
-
- # check that our records have been restored
- machine.succeed(
- "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100"
- )
- '';
- };
-
-in
-if package == null then
- # all-tests.nix: Maps the generic function over all attributes of PostgreSQL packages
- builtins.listToAttrs (map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs)))
-else
- # Called directly from .tests
- makePostgresqlWalReceiverTest package
diff --git a/third_party/nixpkgs/nixos/tests/postgresql-wal2json.nix b/third_party/nixpkgs/nixos/tests/postgresql-wal2json.nix
deleted file mode 100644
index 043ad48cbc..0000000000
--- a/third_party/nixpkgs/nixos/tests/postgresql-wal2json.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- system ? builtins.currentSystem,
- config ? { },
- pkgs ? import ../.. { inherit system config; },
- postgresql ? null,
-}:
-
-let
- makeTest = import ./make-test-python.nix;
- # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`.
- makeTestAttribute = name: {
- inherit name;
- value = makePostgresqlWal2jsonTest pkgs."${name}";
- };
-
- makePostgresqlWal2jsonTest =
- postgresqlPackage:
- makeTest {
- name = "postgresql-wal2json-${postgresqlPackage.name}";
- meta.maintainers = with pkgs.lib.maintainers; [ euank ];
-
- nodes.machine = {
- services.postgresql = {
- package = postgresqlPackage;
- enable = true;
- extraPlugins = with postgresqlPackage.pkgs; [ wal2json ];
- settings = {
- wal_level = "logical";
- max_replication_slots = "10";
- max_wal_senders = "10";
- };
- };
- };
-
- testScript = ''
- machine.wait_for_unit("postgresql")
- machine.succeed(
- "sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example2.sql} postgres > /tmp/example2.out"
- )
- machine.succeed(
- "diff ${./postgresql/wal2json/example2.out} /tmp/example2.out"
- )
- machine.succeed(
- "sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example3.sql} postgres > /tmp/example3.out"
- )
- machine.succeed(
- "diff ${./postgresql/wal2json/example3.out} /tmp/example3.out"
- )
- '';
- };
-
-in
-# By default, create one test per postgresql version
-if postgresql == null then
- builtins.listToAttrs (
- map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs))
- )
-# but if postgresql is set, we're being made as a passthru test for a specific postgres + wal2json version, just run one
-else
- makePostgresqlWal2jsonTest postgresql
diff --git a/third_party/nixpkgs/nixos/tests/postgresql.nix b/third_party/nixpkgs/nixos/tests/postgresql.nix
deleted file mode 100644
index ce16e54edf..0000000000
--- a/third_party/nixpkgs/nixos/tests/postgresql.nix
+++ /dev/null
@@ -1,226 +0,0 @@
-{ system ? builtins.currentSystem,
- config ? {},
- pkgs ? import ../.. { inherit system config; }
-}:
-
-with import ../lib/testing-python.nix { inherit system pkgs; };
-with pkgs.lib;
-
-let
- postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs;
- test-sql = pkgs.writeText "postgresql-test" ''
- CREATE EXTENSION pgcrypto; -- just to check if lib loading works
- CREATE TABLE sth (
- id int
- );
- INSERT INTO sth (id) VALUES (1);
- INSERT INTO sth (id) VALUES (1);
- INSERT INTO sth (id) VALUES (1);
- INSERT INTO sth (id) VALUES (1);
- INSERT INTO sth (id) VALUES (1);
- CREATE TABLE xmltest ( doc xml );
- INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled
- '';
- make-postgresql-test = postgresql-name: postgresql-package: backup-all: makeTest {
- name = postgresql-name;
- meta = with pkgs.lib.maintainers; {
- maintainers = [ zagy ];
- };
-
- nodes.machine = {...}:
- {
- services.postgresql = {
- enable = true;
- package = postgresql-package;
- };
-
- services.postgresqlBackup = {
- enable = true;
- databases = optional (!backup-all) "postgres";
- };
- };
-
- testScript = let
- backupName = if backup-all then "all" else "postgres";
- backupService = if backup-all then "postgresqlBackup" else "postgresqlBackup-postgres";
- backupFileBase = "/var/backup/postgresql/${backupName}";
- in ''
- def check_count(statement, lines):
- return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format(
- statement, lines
- )
-
-
- machine.start()
- machine.wait_for_unit("postgresql")
-
- with subtest("Postgresql is available just after unit start"):
- machine.succeed(
- "cat ${test-sql} | sudo -u postgres psql"
- )
-
- with subtest("Postgresql survives restart (bug #1735)"):
- machine.shutdown()
- import time
- time.sleep(2)
- machine.start()
- machine.wait_for_unit("postgresql")
-
- machine.fail(check_count("SELECT * FROM sth;", 3))
- machine.succeed(check_count("SELECT * FROM sth;", 5))
- machine.fail(check_count("SELECT * FROM sth;", 4))
- machine.succeed(check_count("SELECT xpath('/test/text()', doc) FROM xmltest;", 1))
-
- with subtest("Backup service works"):
- machine.succeed(
- "systemctl start ${backupService}.service",
- "zcat ${backupFileBase}.sql.gz | grep 'ok'",
- "ls -hal /var/backup/postgresql/ >/dev/console",
- "stat -c '%a' ${backupFileBase}.sql.gz | grep 600",
- )
- with subtest("Backup service removes prev files"):
- machine.succeed(
- # Create dummy prev files.
- "touch ${backupFileBase}.prev.sql{,.gz,.zstd}",
- "chown postgres:postgres ${backupFileBase}.prev.sql{,.gz,.zstd}",
-
- # Run backup.
- "systemctl start ${backupService}.service",
- "ls -hal /var/backup/postgresql/ >/dev/console",
-
- # Since nothing has changed in the database, the cur and prev files
- # should match.
- "zcat ${backupFileBase}.sql.gz | grep 'ok'",
- "cmp ${backupFileBase}.sql.gz ${backupFileBase}.prev.sql.gz",
-
- # The prev files with unused suffix should be removed.
- "[ ! -f '${backupFileBase}.prev.sql' ]",
- "[ ! -f '${backupFileBase}.prev.sql.zstd' ]",
-
- # Both cur and prev file should only be accessible by the postgres user.
- "stat -c '%a' ${backupFileBase}.sql.gz | grep 600",
- "stat -c '%a' '${backupFileBase}.prev.sql.gz' | grep 600",
- )
- with subtest("Backup service fails gracefully"):
- # Sabotage the backup process
- machine.succeed("rm /run/postgresql/.s.PGSQL.5432")
- machine.fail(
- "systemctl start ${backupService}.service",
- )
- machine.succeed(
- "ls -hal /var/backup/postgresql/ >/dev/console",
- "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'",
- "stat ${backupFileBase}.in-progress.sql.gz",
- )
- # In a previous version, the second run would overwrite prev.sql.gz,
- # so we test a second run as well.
- machine.fail(
- "systemctl start ${backupService}.service",
- )
- machine.succeed(
- "stat ${backupFileBase}.in-progress.sql.gz",
- "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'",
- )
-
-
- with subtest("Initdb works"):
- machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2")
-
- machine.log(machine.execute("systemd-analyze security postgresql.service | grep -v ✓")[1])
-
- machine.shutdown()
- '';
-
- };
-
- mk-ensure-clauses-test = postgresql-name: postgresql-package: makeTest {
- name = postgresql-name;
- meta = with pkgs.lib.maintainers; {
- maintainers = [ zagy ];
- };
-
- nodes.machine = {...}:
- {
- services.postgresql = {
- enable = true;
- package = postgresql-package;
- ensureUsers = [
- {
- name = "all-clauses";
- ensureClauses = {
- superuser = true;
- createdb = true;
- createrole = true;
- "inherit" = true;
- login = true;
- replication = true;
- bypassrls = true;
- };
- }
- {
- name = "default-clauses";
- }
- ];
- };
- };
-
- testScript = let
- getClausesQuery = user: pkgs.lib.concatStringsSep " "
- [
- "SELECT row_to_json(row)"
- "FROM ("
- "SELECT"
- "rolsuper,"
- "rolinherit,"
- "rolcreaterole,"
- "rolcreatedb,"
- "rolcanlogin,"
- "rolreplication,"
- "rolbypassrls"
- "FROM pg_roles"
- "WHERE rolname = '${user}'"
- ") row;"
- ];
- in ''
- import json
- machine.start()
- machine.wait_for_unit("postgresql")
-
- with subtest("All user permissions are set according to the ensureClauses attr"):
- clauses = json.loads(
- machine.succeed(
- "sudo -u postgres psql -tc \"${getClausesQuery "all-clauses"}\""
- )
- )
- print(clauses)
- assert clauses['rolsuper'], 'expected user with clauses to have superuser clause'
- assert clauses['rolinherit'], 'expected user with clauses to have inherit clause'
- assert clauses['rolcreaterole'], 'expected user with clauses to have create role clause'
- assert clauses['rolcreatedb'], 'expected user with clauses to have create db clause'
- assert clauses['rolcanlogin'], 'expected user with clauses to have login clause'
- assert clauses['rolreplication'], 'expected user with clauses to have replication clause'
- assert clauses['rolbypassrls'], 'expected user with clauses to have bypassrls clause'
-
- with subtest("All user permissions default when ensureClauses is not provided"):
- clauses = json.loads(
- machine.succeed(
- "sudo -u postgres psql -tc \"${getClausesQuery "default-clauses"}\""
- )
- )
- assert not clauses['rolsuper'], 'expected user with no clauses set to have default superuser clause'
- assert clauses['rolinherit'], 'expected user with no clauses set to have default inherit clause'
- assert not clauses['rolcreaterole'], 'expected user with no clauses set to have default create role clause'
- assert not clauses['rolcreatedb'], 'expected user with no clauses set to have default create db clause'
- assert clauses['rolcanlogin'], 'expected user with no clauses set to have default login clause'
- assert not clauses['rolreplication'], 'expected user with no clauses set to have default replication clause'
- assert not clauses['rolbypassrls'], 'expected user with no clauses set to have default bypassrls clause'
-
- machine.shutdown()
- '';
- };
-in
- concatMapAttrs (name: package: {
- ${name} = make-postgresql-test name package false;
- ${name + "-backup-all"} = make-postgresql-test "${name + "-backup-all"}" package true;
- ${name + "-clauses"} = mk-ensure-clauses-test name package;
- }) postgresql-versions
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/anonymizer.nix b/third_party/nixpkgs/nixos/tests/postgresql/anonymizer.nix
new file mode 100644
index 0000000000..3a5f69086e
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/anonymizer.nix
@@ -0,0 +1,116 @@
+{
+ pkgs,
+ makeTest,
+}:
+
+let
+ inherit (pkgs) lib;
+
+ makeTestFor =
+ package:
+ makeTest {
+ name = "postgresql_anonymizer-${package.name}";
+ meta.maintainers = lib.teams.flyingcircus.members;
+
+ nodes.machine =
+ { pkgs, ... }:
+ {
+ environment.systemPackages = [ pkgs.pg-dump-anon ];
+ services.postgresql = {
+ inherit package;
+ enable = true;
+ extraPlugins = ps: [ ps.anonymizer ];
+ settings.shared_preload_libraries = [ "anon" ];
+ };
+ };
+
+ testScript = ''
+ start_all()
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_unit("postgresql.service")
+
+ with subtest("Setup"):
+ machine.succeed("sudo -u postgres psql --command 'create database demo'")
+ machine.succeed(
+ "sudo -u postgres psql -d demo -f ${pkgs.writeText "init.sql" ''
+ create extension anon cascade;
+ select anon.init();
+ create table player(id serial, name text, points int);
+ insert into player(id,name,points) values (1,'Foo', 23);
+ insert into player(id,name,points) values (2,'Bar',42);
+ security label for anon on column player.name is 'MASKED WITH FUNCTION anon.fake_last_name();';
+ security label for anon on column player.points is 'MASKED WITH VALUE NULL';
+ ''}"
+ )
+
+ def get_player_table_contents():
+ return [
+ x.split(',') for x in machine.succeed("sudo -u postgres psql -d demo --csv --command 'select * from player'").splitlines()[1:]
+ ]
+
+ def check_anonymized_row(row, id, original_name):
+ assert row[0] == id, f"Expected first row to have ID {id}, but got {row[0]}"
+ assert row[1] != original_name, f"Expected first row to have a name other than {original_name}"
+ assert not bool(row[2]), "Expected points to be NULL in first row"
+
+ def find_xsv_in_dump(dump, sep=','):
+ """
+ Expecting to find a CSV (for pg_dump_anon) or TSV (for pg_dump) structure, looking like
+
+ COPY public.player ...
+ 1,Shields,
+ 2,Salazar,
+ \.
+
+ in the given dump (the commas are tabs in case of pg_dump).
+ Extract the CSV lines and split by `sep`.
+ """
+
+ try:
+ from itertools import dropwhile, takewhile
+ return [x.split(sep) for x in list(takewhile(
+ lambda x: x != "\\.",
+ dropwhile(
+ lambda x: not x.startswith("COPY public.player"),
+ dump.splitlines()
+ )
+ ))[1:]]
+ except:
+ print(f"Dump to process: {dump}")
+ raise
+
+ def check_original_data(output):
+ assert output[0] == ['1','Foo','23'], f"Expected first row from player table to be 1,Foo,23; got {output[0]}"
+ assert output[1] == ['2','Bar','42'], f"Expected first row from player table to be 2,Bar,42; got {output[1]}"
+
+ def check_anonymized_rows(output):
+ check_anonymized_row(output[0], '1', 'Foo')
+ check_anonymized_row(output[1], '2', 'Bar')
+
+ with subtest("Check initial state"):
+ check_original_data(get_player_table_contents())
+
+ with subtest("Anonymous dumps"):
+ check_original_data(find_xsv_in_dump(
+ machine.succeed("sudo -u postgres pg_dump demo"),
+ sep='\t'
+ ))
+ check_anonymized_rows(find_xsv_in_dump(
+ machine.succeed("sudo -u postgres pg_dump_anon -U postgres -h /run/postgresql -d demo"),
+ sep=','
+ ))
+
+ with subtest("Anonymize"):
+ machine.succeed("sudo -u postgres psql -d demo --command 'select anon.anonymize_database();'")
+ check_anonymized_rows(get_player_table_contents())
+ '';
+ };
+in
+lib.recurseIntoAttrs (
+ lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
+ lib.filterAttrs (_: p: !p.pkgs.anonymizer.meta.broken) pkgs.postgresqlVersions
+ )
+ // {
+ passthru.override = p: makeTestFor p;
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/default.nix b/third_party/nixpkgs/nixos/tests/postgresql/default.nix
new file mode 100644
index 0000000000..4fe7e7a37e
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/default.nix
@@ -0,0 +1,26 @@
+{
+ system ? builtins.currentSystem,
+ config ? { },
+ pkgs ? import ../../.. { inherit system config; },
+}:
+
+with import ../../lib/testing-python.nix { inherit system pkgs; };
+
+let
+ importWithArgs = path: import path { inherit pkgs makeTest; };
+in
+{
+ # postgresql
+ postgresql = importWithArgs ./postgresql.nix;
+ postgresql-jit = importWithArgs ./postgresql-jit.nix;
+ postgresql-wal-receiver = importWithArgs ./postgresql-wal-receiver.nix;
+ postgresql-tls-client-cert = importWithArgs ./postgresql-tls-client-cert.nix;
+
+ # extensions
+ anonymizer = importWithArgs ./anonymizer.nix;
+ pgjwt = importWithArgs ./pgjwt.nix;
+ pgvecto-rs = importWithArgs ./pgvecto-rs.nix;
+ timescaledb = importWithArgs ./timescaledb.nix;
+ tsja = importWithArgs ./tsja.nix;
+ wal2json = importWithArgs ./wal2json.nix;
+}
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/pgjwt.nix b/third_party/nixpkgs/nixos/tests/postgresql/pgjwt.nix
new file mode 100644
index 0000000000..81e5dac41a
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/pgjwt.nix
@@ -0,0 +1,57 @@
+{
+ pkgs,
+ makeTest,
+}:
+
+let
+ inherit (pkgs) lib;
+
+ makeTestFor =
+ package:
+ makeTest {
+ name = "pgjwt-${package.name}";
+ meta = with lib.maintainers; {
+ maintainers = [
+ spinus
+ willibutz
+ ];
+ };
+
+ nodes.master =
+ { ... }:
+ {
+ services.postgresql = {
+ inherit package;
+ enable = true;
+ extraPlugins =
+ ps: with ps; [
+ pgjwt
+ pgtap
+ ];
+ };
+ };
+
+ testScript =
+ { nodes, ... }:
+ let
+ sqlSU = "${nodes.master.services.postgresql.superUser}";
+ pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}";
+ inherit (nodes.master.services.postgresql.package.pkgs) pgjwt;
+ in
+ ''
+ start_all()
+ master.wait_for_unit("postgresql")
+ master.succeed(
+ "${pkgs.sudo}/bin/sudo -u ${sqlSU} ${pgProve}/bin/pg_prove -d postgres -v -f ${pgjwt.src}/test.sql"
+ )
+ '';
+ };
+in
+lib.recurseIntoAttrs (
+ lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
+ lib.filterAttrs (_: p: !p.pkgs.pgjwt.meta.broken) pkgs.postgresqlVersions
+ )
+ // {
+ passthru.override = p: makeTestFor p;
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/pgvecto-rs.nix b/third_party/nixpkgs/nixos/tests/postgresql/pgvecto-rs.nix
new file mode 100644
index 0000000000..9d8389eecf
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/pgvecto-rs.nix
@@ -0,0 +1,81 @@
+{
+ pkgs,
+ makeTest,
+}:
+
+let
+ inherit (pkgs) lib;
+
+ # Test cases from https://docs.pgvecto.rs/use-cases/hybrid-search.html
+ test-sql = pkgs.writeText "postgresql-test" ''
+ CREATE EXTENSION vectors;
+
+ CREATE TABLE items (
+ id bigserial PRIMARY KEY,
+ content text NOT NULL,
+ embedding vectors.vector(3) NOT NULL -- 3 dimensions
+ );
+
+ INSERT INTO items (content, embedding) VALUES
+ ('a fat cat sat on a mat and ate a fat rat', '[1, 2, 3]'),
+ ('a fat dog sat on a mat and ate a fat rat', '[4, 5, 6]'),
+ ('a thin cat sat on a mat and ate a thin rat', '[7, 8, 9]'),
+ ('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]');
+ '';
+
+ makeTestFor =
+ postgresqlPackage:
+ makeTest {
+ name = "pgvecto-rs-${postgresqlPackage.name}";
+ meta = with lib.maintainers; {
+ maintainers = [ diogotcorreia ];
+ };
+
+ nodes.machine =
+ { ... }:
+ {
+ services.postgresql = {
+ enable = true;
+ package = postgresqlPackage;
+ extraPlugins =
+ ps: with ps; [
+ pgvecto-rs
+ ];
+ settings.shared_preload_libraries = "vectors";
+ };
+ };
+
+ testScript =
+ { nodes, ... }:
+ let
+ inherit (nodes.machine.services.postgresql.package.pkgs) pgvecto-rs;
+ in
+ ''
+ def check_count(statement, lines):
+ return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format(
+ statement, lines
+ )
+
+
+ machine.start()
+ machine.wait_for_unit("postgresql")
+
+ with subtest("Postgresql with extension vectors is available just after unit start"):
+ machine.succeed(check_count("SELECT * FROM pg_available_extensions WHERE name = 'vectors' AND default_version = '${pgvecto-rs.version}';", 1))
+
+ machine.succeed("sudo -u postgres psql -f ${test-sql}")
+
+ machine.succeed(check_count("SELECT content, embedding FROM items WHERE to_tsvector('english', content) @@ 'cat & rat'::tsquery;", 2))
+
+ machine.shutdown()
+ '';
+ };
+in
+lib.recurseIntoAttrs (
+ lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
+ lib.filterAttrs (_: p: !p.pkgs.pgvecto-rs.meta.broken) pkgs.postgresqlVersions
+ )
+ // {
+ passthru.override = p: makeTestFor p;
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/postgresql-jit.nix b/third_party/nixpkgs/nixos/tests/postgresql/postgresql-jit.nix
new file mode 100644
index 0000000000..5d0406062e
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/postgresql-jit.nix
@@ -0,0 +1,58 @@
+{
+ pkgs,
+ makeTest,
+}:
+
+let
+ inherit (pkgs) lib;
+
+ makeTestFor =
+ package:
+ makeTest {
+ name = "postgresql-jit-${package.name}";
+ meta.maintainers = with lib.maintainers; [ ma27 ];
+
+ nodes.machine =
+ { pkgs, ... }:
+ {
+ services.postgresql = {
+ inherit package;
+ enable = true;
+ enableJIT = true;
+ initialScript = pkgs.writeText "init.sql" ''
+ create table demo (id int);
+ insert into demo (id) select generate_series(1, 5);
+ '';
+ };
+ };
+
+ testScript = ''
+ machine.start()
+ machine.wait_for_unit("postgresql.service")
+
+ with subtest("JIT is enabled"):
+ machine.succeed("sudo -u postgres psql <<<'show jit;' | grep 'on'")
+
+ with subtest("Test JIT works fine"):
+ output = machine.succeed(
+ "cat ${pkgs.writeText "test.sql" ''
+ set jit_above_cost = 1;
+ EXPLAIN ANALYZE SELECT CONCAT('jit result = ', SUM(id)) FROM demo;
+ SELECT CONCAT('jit result = ', SUM(id)) from demo;
+ ''} | sudo -u postgres psql"
+ )
+ assert "JIT:" in output
+ assert "jit result = 15" in output
+
+ machine.shutdown()
+ '';
+ };
+in
+lib.recurseIntoAttrs (
+ lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
+ lib.filterAttrs (n: _: lib.hasSuffix "_jit" n) pkgs.postgresqlVersions
+ )
+ // {
+ passthru.override = p: makeTestFor p;
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/third_party/nixpkgs/nixos/tests/postgresql/postgresql-tls-client-cert.nix
new file mode 100644
index 0000000000..d7cddb6252
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/postgresql-tls-client-cert.nix
@@ -0,0 +1,135 @@
+{
+ pkgs,
+ makeTest,
+}:
+
+let
+ inherit (pkgs) lib;
+
+ runWithOpenSSL =
+ file: cmd:
+ pkgs.runCommand file {
+ buildInputs = [ pkgs.openssl ];
+ } cmd;
+ caKey = runWithOpenSSL "ca.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
+ caCert = runWithOpenSSL "ca.crt" ''
+ openssl req -new -x509 -sha256 -key ${caKey} -out $out -subj "/CN=test.example" -days 36500
+ '';
+ serverKey = runWithOpenSSL "server.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
+ serverKeyPath = "/var/lib/postgresql";
+ serverCert = runWithOpenSSL "server.crt" ''
+ openssl req -new -sha256 -key ${serverKey} -out server.csr -subj "/CN=db.test.example"
+ openssl x509 -req -in server.csr -CA ${caCert} -CAkey ${caKey} \
+ -CAcreateserial -out $out -days 36500 -sha256
+ '';
+ clientKey = runWithOpenSSL "client.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
+ clientCert = runWithOpenSSL "client.crt" ''
+ openssl req -new -sha256 -key ${clientKey} -out client.csr -subj "/CN=test"
+ openssl x509 -req -in client.csr -CA ${caCert} -CAkey ${caKey} \
+ -CAcreateserial -out $out -days 36500 -sha256
+ '';
+ clientKeyPath = "/root";
+
+ makeTestFor =
+ package:
+ makeTest {
+ name = "postgresql-tls-client-cert-${package.name}";
+ meta.maintainers = with lib.maintainers; [ erictapen ];
+
+ nodes.server =
+ { ... }:
+ {
+ system.activationScripts = {
+ keyPlacement.text = ''
+ mkdir -p '${serverKeyPath}'
+ cp '${serverKey}' '${serverKeyPath}/server.key'
+ chown postgres:postgres '${serverKeyPath}/server.key'
+ chmod 600 '${serverKeyPath}/server.key'
+ '';
+ };
+ services.postgresql = {
+ inherit package;
+ enable = true;
+ enableTCPIP = true;
+ ensureUsers = [
+ {
+ name = "test";
+ ensureDBOwnership = true;
+ }
+ ];
+ ensureDatabases = [ "test" ];
+ settings = {
+ ssl = "on";
+ ssl_ca_file = toString caCert;
+ ssl_cert_file = toString serverCert;
+ ssl_key_file = "${serverKeyPath}/server.key";
+ };
+ authentication = ''
+ hostssl test test ::/0 cert clientcert=verify-full
+ '';
+ };
+ networking = {
+ interfaces.eth1 = {
+ ipv6.addresses = [
+ {
+ address = "fc00::1";
+ prefixLength = 120;
+ }
+ ];
+ };
+ firewall.allowedTCPPorts = [ 5432 ];
+ };
+ };
+
+ nodes.client =
+ { ... }:
+ {
+ system.activationScripts = {
+ keyPlacement.text = ''
+ mkdir -p '${clientKeyPath}'
+ cp '${clientKey}' '${clientKeyPath}/client.key'
+ chown root:root '${clientKeyPath}/client.key'
+ chmod 600 '${clientKeyPath}/client.key'
+ '';
+ };
+ environment = {
+ variables = {
+ PGHOST = "db.test.example";
+ PGPORT = "5432";
+ PGDATABASE = "test";
+ PGUSER = "test";
+ PGSSLMODE = "verify-full";
+ PGSSLCERT = clientCert;
+ PGSSLKEY = "${clientKeyPath}/client.key";
+ PGSSLROOTCERT = caCert;
+ };
+ systemPackages = [ package ];
+ };
+ networking = {
+ interfaces.eth1 = {
+ ipv6.addresses = [
+ {
+ address = "fc00::2";
+ prefixLength = 120;
+ }
+ ];
+ };
+ hosts = {
+ "fc00::1" = [ "db.test.example" ];
+ };
+ };
+ };
+
+ testScript = ''
+ server.wait_for_unit("multi-user.target")
+ client.wait_for_unit("multi-user.target")
+ client.succeed("psql -c \"SELECT 1;\"")
+ '';
+ };
+in
+lib.recurseIntoAttrs (
+ lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions
+ // {
+ passthru.override = p: makeTestFor p;
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/postgresql-wal-receiver.nix b/third_party/nixpkgs/nixos/tests/postgresql/postgresql-wal-receiver.nix
new file mode 100644
index 0000000000..5c1551c5f2
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/postgresql-wal-receiver.nix
@@ -0,0 +1,115 @@
+{
+ pkgs,
+ makeTest,
+}:
+
+let
+ inherit (pkgs) lib;
+
+ makeTestFor =
+ package:
+ let
+ postgresqlDataDir = "/var/lib/postgresql/${package.psqlSchema}";
+ replicationUser = "wal_receiver_user";
+ replicationSlot = "wal_receiver_slot";
+ replicationConn = "postgresql://${replicationUser}@localhost";
+ baseBackupDir = "/var/cache/wals/pg_basebackup";
+ walBackupDir = "/var/cache/wals/pg_wal";
+ recoveryFile = pkgs.writeTextDir "recovery.signal" "";
+ in
+ makeTest {
+ name = "postgresql-wal-receiver-${package.name}";
+ meta.maintainers = with lib.maintainers; [ pacien ];
+
+ nodes.machine =
+ { ... }:
+ {
+ systemd.tmpfiles.rules = [
+ "d /var/cache/wals 0750 postgres postgres - -"
+ ];
+
+ services.postgresql = {
+ inherit package;
+ enable = true;
+ settings = {
+ max_replication_slots = 10;
+ max_wal_senders = 10;
+ recovery_end_command = "touch recovery.done";
+ restore_command = "cp ${walBackupDir}/%f %p";
+ wal_level = "archive"; # alias for replica on pg >= 9.6
+ };
+ authentication = ''
+ host replication ${replicationUser} all trust
+ '';
+ initialScript = pkgs.writeText "init.sql" ''
+ create user ${replicationUser} replication;
+ select * from pg_create_physical_replication_slot('${replicationSlot}');
+ '';
+ };
+
+ services.postgresqlWalReceiver.receivers.main = {
+ postgresqlPackage = package;
+ connection = replicationConn;
+ slot = replicationSlot;
+ directory = walBackupDir;
+ };
+ # This is only to speedup test, it isn't time racing. Service is set to autorestart always,
+ # default 60sec is fine for real system, but is too much for a test
+ systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5;
+ systemd.services.postgresql.serviceConfig.ReadWritePaths = [ "/var/cache/wals" ];
+ };
+
+ testScript = ''
+ # make an initial base backup
+ machine.wait_for_unit("postgresql")
+ machine.wait_for_unit("postgresql-wal-receiver-main")
+ # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other
+ # required only for 9.4
+ machine.sleep(5)
+ machine.succeed(
+ "${package}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}"
+ )
+
+ # create a dummy table with 100 records
+ machine.succeed(
+ "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'"
+ )
+
+ # stop postgres and destroy data
+ machine.systemctl("stop postgresql")
+ machine.systemctl("stop postgresql-wal-receiver-main")
+ machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}")
+
+ # restore the base backup
+ machine.succeed(
+ "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}"
+ )
+
+ # prepare WAL and recovery
+ machine.succeed("chmod a+rX -R ${walBackupDir}")
+ machine.execute(
+ "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done"
+ ) # make use of partial segments too
+ machine.succeed(
+ "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*"
+ )
+
+ # replay WAL
+ machine.systemctl("start postgresql")
+ machine.wait_for_file("${postgresqlDataDir}/recovery.done")
+ machine.systemctl("restart postgresql")
+ machine.wait_for_unit("postgresql")
+
+ # check that our records have been restored
+ machine.succeed(
+ "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100"
+ )
+ '';
+ };
+in
+lib.recurseIntoAttrs (
+ lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions
+ // {
+ passthru.override = p: makeTestFor p;
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/postgresql.nix b/third_party/nixpkgs/nixos/tests/postgresql/postgresql.nix
new file mode 100644
index 0000000000..509a14411d
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/postgresql.nix
@@ -0,0 +1,244 @@
+{
+ pkgs,
+ makeTest,
+}:
+
+let
+ inherit (pkgs) lib;
+
+ makeTestFor =
+ package:
+ lib.recurseIntoAttrs {
+ postgresql = makeTestForWithBackupAll package false;
+ postgresql-backup-all = makeTestForWithBackupAll package true;
+ postgresql-clauses = makeEnsureTestFor package;
+ };
+
+ test-sql = pkgs.writeText "postgresql-test" ''
+ CREATE EXTENSION pgcrypto; -- just to check if lib loading works
+ CREATE TABLE sth (
+ id int
+ );
+ INSERT INTO sth (id) VALUES (1);
+ INSERT INTO sth (id) VALUES (1);
+ INSERT INTO sth (id) VALUES (1);
+ INSERT INTO sth (id) VALUES (1);
+ INSERT INTO sth (id) VALUES (1);
+ CREATE TABLE xmltest ( doc xml );
+ INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled
+ '';
+
+ makeTestForWithBackupAll =
+ package: backupAll:
+ makeTest {
+ name = "postgresql${lib.optionalString backupAll "-backup-all"}-${package.name}";
+ meta = with lib.maintainers; {
+ maintainers = [ zagy ];
+ };
+
+ nodes.machine =
+ { ... }:
+ {
+ services.postgresql = {
+ inherit (package) ;
+ enable = true;
+ };
+
+ services.postgresqlBackup = {
+ enable = true;
+ databases = lib.optional (!backupAll) "postgres";
+ };
+ };
+
+ testScript =
+ let
+ backupName = if backupAll then "all" else "postgres";
+ backupService = if backupAll then "postgresqlBackup" else "postgresqlBackup-postgres";
+ backupFileBase = "/var/backup/postgresql/${backupName}";
+ in
+ ''
+ def check_count(statement, lines):
+ return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format(
+ statement, lines
+ )
+
+
+ machine.start()
+ machine.wait_for_unit("postgresql")
+
+ with subtest("Postgresql is available just after unit start"):
+ machine.succeed(
+ "cat ${test-sql} | sudo -u postgres psql"
+ )
+
+ with subtest("Postgresql survives restart (bug #1735)"):
+ machine.shutdown()
+ import time
+ time.sleep(2)
+ machine.start()
+ machine.wait_for_unit("postgresql")
+
+ machine.fail(check_count("SELECT * FROM sth;", 3))
+ machine.succeed(check_count("SELECT * FROM sth;", 5))
+ machine.fail(check_count("SELECT * FROM sth;", 4))
+ machine.succeed(check_count("SELECT xpath('/test/text()', doc) FROM xmltest;", 1))
+
+ with subtest("Backup service works"):
+ machine.succeed(
+ "systemctl start ${backupService}.service",
+ "zcat ${backupFileBase}.sql.gz | grep 'ok'",
+ "ls -hal /var/backup/postgresql/ >/dev/console",
+ "stat -c '%a' ${backupFileBase}.sql.gz | grep 600",
+ )
+ with subtest("Backup service removes prev files"):
+ machine.succeed(
+ # Create dummy prev files.
+ "touch ${backupFileBase}.prev.sql{,.gz,.zstd}",
+ "chown postgres:postgres ${backupFileBase}.prev.sql{,.gz,.zstd}",
+
+ # Run backup.
+ "systemctl start ${backupService}.service",
+ "ls -hal /var/backup/postgresql/ >/dev/console",
+
+ # Since nothing has changed in the database, the cur and prev files
+ # should match.
+ "zcat ${backupFileBase}.sql.gz | grep 'ok'",
+ "cmp ${backupFileBase}.sql.gz ${backupFileBase}.prev.sql.gz",
+
+ # The prev files with unused suffix should be removed.
+ "[ ! -f '${backupFileBase}.prev.sql' ]",
+ "[ ! -f '${backupFileBase}.prev.sql.zstd' ]",
+
+ # Both cur and prev file should only be accessible by the postgres user.
+ "stat -c '%a' ${backupFileBase}.sql.gz | grep 600",
+ "stat -c '%a' '${backupFileBase}.prev.sql.gz' | grep 600",
+ )
+ with subtest("Backup service fails gracefully"):
+ # Sabotage the backup process
+ machine.succeed("rm /run/postgresql/.s.PGSQL.5432")
+ machine.fail(
+ "systemctl start ${backupService}.service",
+ )
+ machine.succeed(
+ "ls -hal /var/backup/postgresql/ >/dev/console",
+ "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'",
+ "stat ${backupFileBase}.in-progress.sql.gz",
+ )
+ # In a previous version, the second run would overwrite prev.sql.gz,
+ # so we test a second run as well.
+ machine.fail(
+ "systemctl start ${backupService}.service",
+ )
+ machine.succeed(
+ "stat ${backupFileBase}.in-progress.sql.gz",
+ "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'",
+ )
+
+
+ with subtest("Initdb works"):
+ machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2")
+
+ machine.log(machine.execute("systemd-analyze security postgresql.service | grep -v ✓")[1])
+
+ machine.shutdown()
+ '';
+ };
+
+ makeEnsureTestFor =
+ package:
+ makeTest {
+ name = "postgresql-clauses-${package.name}";
+ meta = with lib.maintainers; {
+ maintainers = [ zagy ];
+ };
+
+ nodes.machine =
+ { ... }:
+ {
+ services.postgresql = {
+ inherit package;
+ enable = true;
+ ensureUsers = [
+ {
+ name = "all-clauses";
+ ensureClauses = {
+ superuser = true;
+ createdb = true;
+ createrole = true;
+ "inherit" = true;
+ login = true;
+ replication = true;
+ bypassrls = true;
+ };
+ }
+ {
+ name = "default-clauses";
+ }
+ ];
+ };
+ };
+
+ testScript =
+ let
+ getClausesQuery =
+ user:
+ lib.concatStringsSep " " [
+ "SELECT row_to_json(row)"
+ "FROM ("
+ "SELECT"
+ "rolsuper,"
+ "rolinherit,"
+ "rolcreaterole,"
+ "rolcreatedb,"
+ "rolcanlogin,"
+ "rolreplication,"
+ "rolbypassrls"
+ "FROM pg_roles"
+ "WHERE rolname = '${user}'"
+ ") row;"
+ ];
+ in
+ ''
+ import json
+ machine.start()
+ machine.wait_for_unit("postgresql")
+
+ with subtest("All user permissions are set according to the ensureClauses attr"):
+ clauses = json.loads(
+ machine.succeed(
+ "sudo -u postgres psql -tc \"${getClausesQuery "all-clauses"}\""
+ )
+ )
+ print(clauses)
+ assert clauses['rolsuper'], 'expected user with clauses to have superuser clause'
+ assert clauses['rolinherit'], 'expected user with clauses to have inherit clause'
+ assert clauses['rolcreaterole'], 'expected user with clauses to have create role clause'
+ assert clauses['rolcreatedb'], 'expected user with clauses to have create db clause'
+ assert clauses['rolcanlogin'], 'expected user with clauses to have login clause'
+ assert clauses['rolreplication'], 'expected user with clauses to have replication clause'
+ assert clauses['rolbypassrls'], 'expected user with clauses to have bypassrls clause'
+
+ with subtest("All user permissions default when ensureClauses is not provided"):
+ clauses = json.loads(
+ machine.succeed(
+ "sudo -u postgres psql -tc \"${getClausesQuery "default-clauses"}\""
+ )
+ )
+ assert not clauses['rolsuper'], 'expected user with no clauses set to have default superuser clause'
+ assert clauses['rolinherit'], 'expected user with no clauses set to have default inherit clause'
+ assert not clauses['rolcreaterole'], 'expected user with no clauses set to have default create role clause'
+ assert not clauses['rolcreatedb'], 'expected user with no clauses set to have default create db clause'
+ assert clauses['rolcanlogin'], 'expected user with no clauses set to have default login clause'
+ assert not clauses['rolreplication'], 'expected user with no clauses set to have default replication clause'
+ assert not clauses['rolbypassrls'], 'expected user with no clauses set to have default bypassrls clause'
+
+ machine.shutdown()
+ '';
+ };
+in
+lib.recurseIntoAttrs (
+ lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions
+ // {
+ passthru.override = p: makeTestFor p;
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/timescaledb.nix b/third_party/nixpkgs/nixos/tests/postgresql/timescaledb.nix
new file mode 100644
index 0000000000..b29d59c744
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/timescaledb.nix
@@ -0,0 +1,100 @@
+{
+ pkgs,
+ makeTest,
+}:
+
+let
+ inherit (pkgs) lib;
+
+ test-sql = pkgs.writeText "postgresql-test" ''
+ CREATE EXTENSION timescaledb;
+ CREATE EXTENSION timescaledb_toolkit;
+
+ CREATE TABLE sth (
+ time TIMESTAMPTZ NOT NULL,
+ value DOUBLE PRECISION
+ );
+
+ SELECT create_hypertable('sth', 'time');
+
+ INSERT INTO sth (time, value) VALUES
+ ('2003-04-12 04:05:06 America/New_York', 1.0),
+ ('2003-04-12 04:05:07 America/New_York', 2.0),
+ ('2003-04-12 04:05:08 America/New_York', 3.0),
+ ('2003-04-12 04:05:09 America/New_York', 4.0),
+ ('2003-04-12 04:05:10 America/New_York', 5.0)
+ ;
+
+ WITH t AS (
+ SELECT
+ time_bucket('1 day'::interval, time) AS dt,
+ stats_agg(value) AS stats
+ FROM sth
+ GROUP BY time_bucket('1 day'::interval, time)
+ )
+ SELECT
+ average(stats)
+ FROM t;
+
+ SELECT * FROM sth;
+ '';
+
+ makeTestFor =
+ package:
+ makeTest {
+ name = "timescaledb-${package.name}";
+ meta = with lib.maintainers; {
+ maintainers = [ typetetris ];
+ };
+
+ nodes.machine =
+ { ... }:
+ {
+ services.postgresql = {
+ inherit package;
+ enable = true;
+ extraPlugins =
+ ps: with ps; [
+ timescaledb
+ timescaledb_toolkit
+ ];
+ settings = {
+ shared_preload_libraries = "timescaledb, timescaledb_toolkit";
+ };
+ };
+ };
+
+ testScript = ''
+ def check_count(statement, lines):
+ return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format(
+ statement, lines
+ )
+
+
+ machine.start()
+ machine.wait_for_unit("postgresql")
+
+ with subtest("Postgresql with extensions timescaledb and timescaledb_toolkit is available just after unit start"):
+ machine.succeed(
+ "sudo -u postgres psql -f ${test-sql}"
+ )
+
+ machine.fail(check_count("SELECT * FROM sth;", 3))
+ machine.succeed(check_count("SELECT * FROM sth;", 5))
+ machine.fail(check_count("SELECT * FROM sth;", 4))
+
+ machine.shutdown()
+ '';
+ };
+in
+# Not run by default, because this requires allowUnfree.
+# To run these tests:
+# NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.postgresql.timescaledb
+lib.dontRecurseIntoAttrs (
+ lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
+ lib.filterAttrs (_: p: !p.pkgs.timescaledb.meta.broken) pkgs.postgresqlVersions
+ )
+ // {
+ passthru.override = p: makeTestFor p;
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/tsja.nix b/third_party/nixpkgs/nixos/tests/postgresql/tsja.nix
new file mode 100644
index 0000000000..7c976da21b
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/tsja.nix
@@ -0,0 +1,50 @@
+{
+ pkgs,
+ makeTest,
+}:
+
+let
+ inherit (pkgs) lib;
+
+ makeTestFor =
+ package:
+ makeTest {
+ name = "tsja-${package.name}";
+ meta = {
+ maintainers = with lib.maintainers; [ chayleaf ];
+ };
+
+ nodes.master =
+ { ... }:
+ {
+ services.postgresql = {
+ inherit package;
+ enable = true;
+ extraPlugins =
+ ps: with ps; [
+ tsja
+ ];
+ };
+ };
+
+ testScript = ''
+ start_all()
+ master.wait_for_unit("postgresql")
+ master.succeed("sudo -u postgres psql -f /run/current-system/sw/share/postgresql/extension/libtsja_dbinit.sql")
+ # make sure "日本語" is parsed as a separate lexeme
+ master.succeed("""
+ sudo -u postgres \\
+ psql -c "SELECT * FROM ts_debug('japanese', 'PostgreSQLで日本語のテキスト検索ができます。')" \\
+ | grep "{日本語}"
+ """)
+ '';
+ };
+in
+lib.recurseIntoAttrs (
+ lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
+ lib.filterAttrs (_: p: !p.pkgs.tsja.meta.broken) pkgs.postgresqlVersions
+ )
+ // {
+ passthru.override = p: makeTestFor p;
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/postgresql/wal2json.nix b/third_party/nixpkgs/nixos/tests/postgresql/wal2json.nix
new file mode 100644
index 0000000000..551254a68e
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/postgresql/wal2json.nix
@@ -0,0 +1,52 @@
+{
+ pkgs,
+ makeTest,
+}:
+
+let
+ inherit (pkgs) lib;
+
+ makeTestFor =
+ package:
+ makeTest {
+ name = "wal2json-${package.name}";
+ meta.maintainers = with pkgs.lib.maintainers; [ euank ];
+
+ nodes.machine = {
+ services.postgresql = {
+ inherit package;
+ enable = true;
+ extraPlugins = with package.pkgs; [ wal2json ];
+ settings = {
+ wal_level = "logical";
+ max_replication_slots = "10";
+ max_wal_senders = "10";
+ };
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("postgresql")
+ machine.succeed(
+ "sudo -u postgres psql -qAt -f ${./wal2json/example2.sql} postgres > /tmp/example2.out"
+ )
+ machine.succeed(
+ "diff ${./wal2json/example2.out} /tmp/example2.out"
+ )
+ machine.succeed(
+ "sudo -u postgres psql -qAt -f ${./wal2json/example3.sql} postgres > /tmp/example3.out"
+ )
+ machine.succeed(
+ "diff ${./wal2json/example3.out} /tmp/example3.out"
+ )
+ '';
+ };
+in
+lib.recurseIntoAttrs (
+ lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
+ lib.filterAttrs (_: p: !p.pkgs.wal2json.meta.broken) pkgs.postgresqlVersions
+ )
+ // {
+ passthru.override = p: makeTestFor p;
+ }
+)
diff --git a/third_party/nixpkgs/nixos/tests/timescaledb.nix b/third_party/nixpkgs/nixos/tests/timescaledb.nix
deleted file mode 100644
index 8ee788daea..0000000000
--- a/third_party/nixpkgs/nixos/tests/timescaledb.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-# mostly copied from ./postgresql.nix as it seemed unapproriate to
-# test additional extensions for postgresql there.
-
-{ system ? builtins.currentSystem
-, config ? { }
-, pkgs ? import ../.. { inherit system config; }
-}:
-
-with import ../lib/testing-python.nix { inherit system pkgs; };
-with pkgs.lib;
-
-let
- postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs;
- test-sql = pkgs.writeText "postgresql-test" ''
- CREATE EXTENSION timescaledb;
- CREATE EXTENSION timescaledb_toolkit;
-
- CREATE TABLE sth (
- time TIMESTAMPTZ NOT NULL,
- value DOUBLE PRECISION
- );
-
- SELECT create_hypertable('sth', 'time');
-
- INSERT INTO sth (time, value) VALUES
- ('2003-04-12 04:05:06 America/New_York', 1.0),
- ('2003-04-12 04:05:07 America/New_York', 2.0),
- ('2003-04-12 04:05:08 America/New_York', 3.0),
- ('2003-04-12 04:05:09 America/New_York', 4.0),
- ('2003-04-12 04:05:10 America/New_York', 5.0)
- ;
-
- WITH t AS (
- SELECT
- time_bucket('1 day'::interval, time) AS dt,
- stats_agg(value) AS stats
- FROM sth
- GROUP BY time_bucket('1 day'::interval, time)
- )
- SELECT
- average(stats)
- FROM t;
- '';
- make-postgresql-test = postgresql-name: postgresql-package: makeTest {
- name = postgresql-name;
- meta = with pkgs.lib.maintainers; {
- maintainers = [ typetetris ];
- };
-
- nodes.machine = { ... }:
- {
- services.postgresql = {
- enable = true;
- package = postgresql-package;
- extraPlugins = ps: with ps; [
- timescaledb
- timescaledb_toolkit
- ];
- settings = { shared_preload_libraries = "timescaledb, timescaledb_toolkit"; };
- };
- };
-
- testScript = ''
- def check_count(statement, lines):
- return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format(
- statement, lines
- )
-
-
- machine.start()
- machine.wait_for_unit("postgresql")
-
- with subtest("Postgresql with extensions timescaledb and timescaledb_toolkit is available just after unit start"):
- machine.succeed(
- "sudo -u postgres psql -f ${test-sql}"
- )
-
- machine.fail(check_count("SELECT * FROM sth;", 3))
- machine.succeed(check_count("SELECT * FROM sth;", 5))
- machine.fail(check_count("SELECT * FROM sth;", 4))
-
- machine.shutdown()
- '';
-
- };
- applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "14") postgresql-versions;
-in
-mapAttrs'
- (name: package: {
- inherit name;
- value = make-postgresql-test name package;
- })
- applicablePostgresqlVersions
diff --git a/third_party/nixpkgs/nixos/tests/tsja.nix b/third_party/nixpkgs/nixos/tests/tsja.nix
deleted file mode 100644
index f34358ff3f..0000000000
--- a/third_party/nixpkgs/nixos/tests/tsja.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-import ./make-test-python.nix ({ pkgs, lib, ...} : {
- name = "tsja";
- meta = {
- maintainers = with lib.maintainers; [ chayleaf ];
- };
-
- nodes = {
- master =
- { config, ... }:
-
- {
- services.postgresql = {
- enable = true;
- extraPlugins = ps: with ps; [
- tsja
- ];
- };
- };
- };
-
- testScript = ''
- start_all()
- master.wait_for_unit("postgresql")
- master.succeed("sudo -u postgres psql -f /run/current-system/sw/share/postgresql/extension/libtsja_dbinit.sql")
- # make sure "日本語" is parsed as a separate lexeme
- master.succeed("""
- sudo -u postgres \\
- psql -c "SELECT * FROM ts_debug('japanese', 'PostgreSQLで日本語のテキスト検索ができます。')" \\
- | grep "{日本語}"
- """)
- '';
-})
diff --git a/third_party/nixpkgs/nixos/tests/web-apps/immich.nix b/third_party/nixpkgs/nixos/tests/web-apps/immich.nix
index 8004afd93c..94a63fbfb9 100644
--- a/third_party/nixpkgs/nixos/tests/web-apps/immich.nix
+++ b/third_party/nixpkgs/nixos/tests/web-apps/immich.nix
@@ -31,21 +31,30 @@ import ../make-test-python.nix (
machine.succeed("curl --fail http://localhost:2283/")
machine.succeed("""
- curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' -X POST http://localhost:2283/api/auth/admin-sign-up
+ curl -f --json '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' http://localhost:2283/api/auth/admin-sign-up
""")
res = machine.succeed("""
- curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "password": "admin" }' -X POST http://localhost:2283/api/auth/login
+ curl -f --json '{ "email": "test@example.com", "password": "admin" }' http://localhost:2283/api/auth/login
""")
token = json.loads(res)['accessToken']
res = machine.succeed("""
- curl -H 'Content-Type: application/json' -H 'Cookie: immich_access_token=%s' --data '{ "name": "API Key", "permissions": ["all"] }' -X POST http://localhost:2283/api/api-keys
+ curl -f -H 'Cookie: immich_access_token=%s' --json '{ "name": "API Key", "permissions": ["all"] }' http://localhost:2283/api/api-keys
""" % token)
key = json.loads(res)['secret']
machine.succeed(f"immich login http://localhost:2283/api {key}")
res = machine.succeed("immich server-info")
print(res)
+
+ machine.succeed("""
+ curl -f -X PUT -H 'Cookie: immich_access_token=%s' --json '{ "command": "start" }' http://localhost:2283/api/jobs/backupDatabase
+ """ % token)
+ res = machine.succeed("""
+ curl -f -H 'Cookie: immich_access_token=%s' http://localhost:2283/api/jobs
+ """ % token)
+ assert json.loads(res)["backupDatabase"]["jobCounts"]["active"] == 1
+ machine.wait_until_succeeds("ls /var/lib/immich/backups/*.sql.gz")
'';
}
)
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix
index 35a3bdb91e..f2c3cc7a06 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix
@@ -39,9 +39,9 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
# Use the stdenv default phases (./configure; make) instead of the
# ones from buildRustPackage.
configurePhase = "configurePhase";
- buildPhase = "buildPhase";
- checkPhase = "checkPhase";
- installPhase = "installPhase";
+ dontCargoBuild = true;
+ dontCargoCheck = true;
+ dontCargoInstall = true;
postPatch = ''
# Have to do this here instead of in preConfigure because
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py
index 5e0ca51727..333c96807d 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py
+++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py
@@ -2,49 +2,63 @@
#!nix-shell update-shell.nix -i python3
# format:
-# $ nix run nixpkgs.python3Packages.black -c black update.py
+# $ nix run nixpkgs#python3Packages.ruff -- update.py
# type-check:
-# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py
+# $ nix run nixpkgs#python3Packages.mypy -- update.py
# linted:
-# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py
+# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py
import inspect
import os
import sys
-from typing import List, Tuple
from pathlib import Path
+from typing import List, Tuple
# Import plugin update library from maintainers/scripts/pluginupdate.py
-ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore
+ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore
sys.path.insert(
0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")
)
import pluginupdate
-GET_PLUGINS = f"""(with import {{}};
+GET_PLUGINS = f"""(
+with import {{ }};
let
- inherit (kakouneUtils.override {{}}) buildKakounePluginFrom2Nix;
+ inherit (kakouneUtils.override {{ }}) buildKakounePluginFrom2Nix;
generated = callPackage {ROOT}/generated.nix {{
inherit buildKakounePluginFrom2Nix;
}};
- hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
- getChecksum = name: value:
- if hasChecksum value then {{
- submodules = value.src.fetchSubmodules or false;
- sha256 = value.src.outputHash;
- rev = value.src.rev;
- }} else null;
+ hasChecksum =
+ value:
+ lib.isAttrs value
+ && lib.hasAttrByPath [
+ "src"
+ "outputHash"
+ ] value;
+ getChecksum =
+ name: value:
+ if hasChecksum value then
+ {{
+ submodules = value.src.fetchSubmodules or false;
+ sha256 = value.src.outputHash;
+ rev = value.src.rev;
+ }}
+ else
+ null;
checksums = lib.mapAttrs getChecksum generated;
-in lib.filterAttrs (n: v: v != null) checksums)"""
+in
+lib.filterAttrs (n: v: v != null) checksums
+)"""
+
+HEADER = "# This file has been @generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!"
-HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!"
class KakouneEditor(pluginupdate.Editor):
-
-
- def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str):
- sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower())
-
+ def generate_nix(
+ self,
+ plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]],
+ outfile: str,
+ ):
with open(outfile, "w+") as f:
f.write(HEADER)
f.write(
@@ -54,7 +68,7 @@ let
packages = ( self:
{"""
)
- for pluginDesc, plugin in sorted_plugins:
+ for pluginDesc, plugin in plugins:
f.write(
f"""
{plugin.normalized_name} = buildKakounePluginFrom2Nix {{
diff --git a/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix
index 68ff13a021..ea649595d6 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix
@@ -1,28 +1,25 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, nix-update-script
-, rustPlatform
-, cmake
-, pkg-config
-, perl
-, python3
-, fontconfig
-, glib
-, gtk3
-, openssl
-, libGL
-, libobjc
-, libxkbcommon
-, Security
-, CoreServices
-, ApplicationServices
-, Carbon
-, AppKit
-, wrapGAppsHook3
-, wayland
-, gobject-introspection
-, xorg
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ nix-update-script,
+ rustPlatform,
+ cmake,
+ pkg-config,
+ perl,
+ python3,
+ fontconfig,
+ glib,
+ gtk3,
+ openssl,
+ libGL,
+ libobjc,
+ libxkbcommon,
+ wrapGAppsHook3,
+ wayland,
+ gobject-introspection,
+ xorg,
+ apple-sdk_11,
}:
let
rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [
@@ -85,33 +82,37 @@ rustPlatform.buildRustPackage rec {
gobject-introspection
];
- buildInputs = rpathLibs ++ [
- glib
- gtk3
- openssl
- ] ++ lib.optionals stdenv.hostPlatform.isLinux [
- fontconfig
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- libobjc
- Security
- CoreServices
- ApplicationServices
- Carbon
- AppKit
- ];
+ buildInputs =
+ rpathLibs
+ ++ [
+ glib
+ gtk3
+ openssl
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ fontconfig
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ libobjc
+ apple-sdk_11
+ ];
- postInstall = if stdenv.hostPlatform.isLinux then ''
- install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg
- install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop
+ postInstall =
+ if stdenv.hostPlatform.isLinux then
+ ''
+ install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg
+ install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop
- $STRIP -S $out/bin/lapce
+ $STRIP -S $out/bin/lapce
- patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/lapce
- '' else ''
- mkdir $out/Applications
- cp -r extra/macos/Lapce.app $out/Applications
- ln -s $out/bin $out/Applications/Lapce.app/Contents/MacOS
- '';
+ patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/lapce
+ ''
+ else
+ ''
+ mkdir $out/Applications
+ cp -r extra/macos/Lapce.app $out/Applications
+ ln -s $out/bin $out/Applications/Lapce.app/Contents/MacOS
+ '';
dontPatchELF = true;
@@ -124,7 +125,5 @@ rustPlatform.buildRustPackage rec {
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ elliot ];
mainProgram = "lapce";
- # Undefined symbols for architecture x86_64: "_NSPasteboardTypeFileURL"
- broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix
index de4cd6e26d..d4f7a59fd6 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "leo-editor";
- version = "6.8.1";
+ version = "6.8.2";
src = fetchFromGitHub {
owner = "leo-editor";
repo = "leo-editor";
rev = version;
- sha256 = "sha256-YhZSmk2n/Tg0zx1xuy0LtABNiBB3LmXYlhXoK7/b2tQ=";
+ sha256 = "sha256-LfeqQjzrWzqJ/iTuMOWLnxEZ+SNPVcutNPI+T3WEKnM=";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
index 109fec6702..9deb0dcec6 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1434,6 +1434,30 @@ final: prev:
meta.homepage = "https://github.com/bkad/camelcasemotion/";
};
+ catppuccin-nvim = buildVimPlugin {
+ pname = "catppuccin-nvim";
+ version = "2024-11-03";
+ src = fetchFromGitHub {
+ owner = "catppuccin";
+ repo = "nvim";
+ rev = "35d8057137af463c9f41f169539e9b190d57d269";
+ sha256 = "1lra18arndkpd8k9pyh3qgykihqnvm8h6v0w0kjpf36ys9xgpz3r";
+ };
+ meta.homepage = "https://github.com/catppuccin/nvim/";
+ };
+
+ catppuccin-vim = buildVimPlugin {
+ pname = "catppuccin-vim";
+ version = "2024-08-14";
+ src = fetchFromGitHub {
+ owner = "catppuccin";
+ repo = "vim";
+ rev = "060000804cf50315ac6dd986bc4d84fbc40cbc9c";
+ sha256 = "1faxniddq6zcsb93bsm93lkf01mc4jfzxls5vyxmac6rc5v2k1n4";
+ };
+ meta.homepage = "https://github.com/catppuccin/vim/";
+ };
+
caw-vim = buildVimPlugin {
pname = "caw.vim";
version = "2023-03-16";
@@ -2057,18 +2081,6 @@ final: prev:
meta.homepage = "https://github.com/hrsh7th/cmp-omni/";
};
- cmp-pandoc-references = buildVimPlugin {
- pname = "cmp-pandoc-references";
- version = "2022-04-20";
- src = fetchFromGitHub {
- owner = "jc-doyle";
- repo = "cmp-pandoc-references";
- rev = "2c808dff631a783ddd2c554c4c6033907589baf6";
- sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw";
- };
- meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/";
- };
-
cmp-pandoc-nvim = buildVimPlugin {
pname = "cmp-pandoc.nvim";
version = "2023-03-03";
@@ -2081,6 +2093,18 @@ final: prev:
meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/";
};
+ cmp-pandoc-references = buildVimPlugin {
+ pname = "cmp-pandoc-references";
+ version = "2022-04-20";
+ src = fetchFromGitHub {
+ owner = "jc-doyle";
+ repo = "cmp-pandoc-references";
+ rev = "2c808dff631a783ddd2c554c4c6033907589baf6";
+ sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw";
+ };
+ meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/";
+ };
+
cmp-path = buildVimPlugin {
pname = "cmp-path";
version = "2022-10-03";
@@ -2345,6 +2369,18 @@ final: prev:
meta.homepage = "https://github.com/neoclide/coc-neco/";
};
+ coc-nvim = buildVimPlugin {
+ pname = "coc.nvim";
+ version = "2024-10-12";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc.nvim";
+ rev = "57d488a06bdb34de89acef3c2f3e9ce609d632ed";
+ sha256 = "106w4kgrqlgnszpkzlxrlzsvca880qagv07h93dxsl2ggbdkm91l";
+ };
+ meta.homepage = "https://github.com/neoclide/coc.nvim/";
+ };
+
coc-svelte = buildVimPlugin {
pname = "coc-svelte";
version = "2023-10-08";
@@ -2369,18 +2405,6 @@ final: prev:
meta.homepage = "https://github.com/iamcco/coc-tailwindcss/";
};
- coc-nvim = buildVimPlugin {
- pname = "coc.nvim";
- version = "2024-10-12";
- src = fetchFromGitHub {
- owner = "neoclide";
- repo = "coc.nvim";
- rev = "57d488a06bdb34de89acef3c2f3e9ce609d632ed";
- sha256 = "106w4kgrqlgnszpkzlxrlzsvca880qagv07h93dxsl2ggbdkm91l";
- };
- meta.homepage = "https://github.com/neoclide/coc.nvim/";
- };
-
coconut-vim = buildVimPlugin {
pname = "coconut.vim";
version = "2017-10-10";
@@ -2754,18 +2778,6 @@ final: prev:
meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/";
};
- copilot-lualine = buildVimPlugin {
- pname = "copilot-lualine";
- version = "2024-09-03";
- src = fetchFromGitHub {
- owner = "AndreM222";
- repo = "copilot-lualine";
- rev = "f40450c3e138766026327e7807877ea860618258";
- sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x";
- };
- meta.homepage = "https://github.com/AndreM222/copilot-lualine/";
- };
-
copilot-lua = buildVimPlugin {
pname = "copilot.lua";
version = "2024-10-18";
@@ -2778,6 +2790,18 @@ final: prev:
meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
};
+ copilot-lualine = buildVimPlugin {
+ pname = "copilot-lualine";
+ version = "2024-09-03";
+ src = fetchFromGitHub {
+ owner = "AndreM222";
+ repo = "copilot-lualine";
+ rev = "f40450c3e138766026327e7807877ea860618258";
+ sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x";
+ };
+ meta.homepage = "https://github.com/AndreM222/copilot-lualine/";
+ };
+
copilot-vim = buildVimPlugin {
pname = "copilot.vim";
version = "2024-10-08";
@@ -2946,18 +2970,6 @@ final: prev:
meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/";
};
- ctrlp-z = buildVimPlugin {
- pname = "ctrlp-z";
- version = "2015-10-17";
- src = fetchFromGitHub {
- owner = "amiorin";
- repo = "ctrlp-z";
- rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026";
- sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl";
- };
- meta.homepage = "https://github.com/amiorin/ctrlp-z/";
- };
-
ctrlp-vim = buildVimPlugin {
pname = "ctrlp.vim";
version = "2024-10-21";
@@ -2970,6 +2982,18 @@ final: prev:
meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";
};
+ ctrlp-z = buildVimPlugin {
+ pname = "ctrlp-z";
+ version = "2015-10-17";
+ src = fetchFromGitHub {
+ owner = "amiorin";
+ repo = "ctrlp-z";
+ rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026";
+ sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl";
+ };
+ meta.homepage = "https://github.com/amiorin/ctrlp-z/";
+ };
+
cyberdream-nvim = buildVimPlugin {
pname = "cyberdream.nvim";
version = "2024-10-19";
@@ -3368,6 +3392,18 @@ final: prev:
meta.homepage = "https://github.com/Valodim/deoplete-notmuch/";
};
+ deoplete-nvim = buildVimPlugin {
+ pname = "deoplete.nvim";
+ version = "2024-06-05";
+ src = fetchFromGitHub {
+ owner = "Shougo";
+ repo = "deoplete.nvim";
+ rev = "e5a47d4a2f0b2b6f568e708163e2354097e611c6";
+ sha256 = "1cj5y29gkm2l1c7g7bp50k522dn4yk67sywc19lcyizpwxvqq0a2";
+ };
+ meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
+ };
+
deoplete-phpactor = buildVimPlugin {
pname = "deoplete-phpactor";
version = "2020-09-12";
@@ -3440,18 +3476,6 @@ final: prev:
meta.homepage = "https://github.com/deoplete-plugins/deoplete-zsh/";
};
- deoplete-nvim = buildVimPlugin {
- pname = "deoplete.nvim";
- version = "2024-06-05";
- src = fetchFromGitHub {
- owner = "Shougo";
- repo = "deoplete.nvim";
- rev = "e5a47d4a2f0b2b6f568e708163e2354097e611c6";
- sha256 = "1cj5y29gkm2l1c7g7bp50k522dn4yk67sywc19lcyizpwxvqq0a2";
- };
- meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
- };
-
devdocs-vim = buildVimPlugin {
pname = "devdocs.vim";
version = "2018-08-27";
@@ -3608,6 +3632,18 @@ final: prev:
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
};
+ dracula-vim = buildVimPlugin {
+ pname = "dracula-vim";
+ version = "2024-07-26";
+ src = fetchFromGitHub {
+ owner = "dracula";
+ repo = "vim";
+ rev = "65f4225e0526516a67d56c8ac09925a209138e53";
+ sha256 = "0jp54l8k40mij0mkavsxzv2kipvzzvy211d6hyvq6ry9liqkl7b8";
+ };
+ meta.homepage = "https://github.com/dracula/vim/";
+ };
+
dressing-nvim = buildVimPlugin {
pname = "dressing.nvim";
version = "2024-11-04";
@@ -3692,6 +3728,18 @@ final: prev:
meta.homepage = "https://github.com/folke/edgy.nvim/";
};
+ editorconfig-nvim = buildVimPlugin {
+ pname = "editorconfig.nvim";
+ version = "2023-01-10";
+ src = fetchFromGitHub {
+ owner = "gpanders";
+ repo = "editorconfig.nvim";
+ rev = "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf";
+ sha256 = "1rkkq11qwql4h7f3fa1pj7gmnwgx5wb9j9p1jrw62m6xhjs7n7m5";
+ };
+ meta.homepage = "https://github.com/gpanders/editorconfig.nvim/";
+ };
+
editorconfig-vim = buildVimPlugin {
pname = "editorconfig-vim";
version = "2024-10-14";
@@ -3705,18 +3753,6 @@ final: prev:
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
};
- editorconfig-nvim = buildVimPlugin {
- pname = "editorconfig.nvim";
- version = "2023-01-10";
- src = fetchFromGitHub {
- owner = "gpanders";
- repo = "editorconfig.nvim";
- rev = "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf";
- sha256 = "1rkkq11qwql4h7f3fa1pj7gmnwgx5wb9j9p1jrw62m6xhjs7n7m5";
- };
- meta.homepage = "https://github.com/gpanders/editorconfig.nvim/";
- };
-
efmls-configs-nvim = buildVimPlugin {
pname = "efmls-configs-nvim";
version = "2024-10-15";
@@ -3765,6 +3801,18 @@ final: prev:
meta.homepage = "https://github.com/dmix/elvish.vim/";
};
+ embark-vim = buildVimPlugin {
+ pname = "embark-vim";
+ version = "2024-09-21";
+ src = fetchFromGitHub {
+ owner = "embark-theme";
+ repo = "vim";
+ rev = "530e361aa81a8665c3a909a787b918aaf7d702e2";
+ sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph";
+ };
+ meta.homepage = "https://github.com/embark-theme/vim/";
+ };
+
emmet-vim = buildVimPlugin {
pname = "emmet-vim";
version = "2024-08-10";
@@ -4343,6 +4391,18 @@ final: prev:
meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/";
};
+ gbprod-nord = buildVimPlugin {
+ pname = "gbprod-nord";
+ version = "2024-10-10";
+ src = fetchFromGitHub {
+ owner = "gbprod";
+ repo = "nord.nvim";
+ rev = "4cc19936b1b57ba08eb461c5f450b3976cbb8e0c";
+ sha256 = "1k09fv0cb8xaa6z1fz6l58cdzgz4wfnfhv32dw3y395gr69a9sra";
+ };
+ meta.homepage = "https://github.com/gbprod/nord.nvim/";
+ };
+
gen_tags-vim = buildVimPlugin {
pname = "gen_tags.vim";
version = "2023-03-06";
@@ -4703,6 +4763,18 @@ final: prev:
meta.homepage = "https://github.com/luisiacc/gruvbox-baby/";
};
+ gruvbox-community = buildVimPlugin {
+ pname = "gruvbox-community";
+ version = "2024-01-21";
+ src = fetchFromGitHub {
+ owner = "gruvbox-community";
+ repo = "gruvbox";
+ rev = "143a3b8babcfd2bce6c99d6ba496942647c3e30b";
+ sha256 = "00wg2m2591fw3d9almwdg39xvwxzz2xid86n536ygai81cirw351";
+ };
+ meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
+ };
+
gruvbox-flat-nvim = buildVimPlugin {
pname = "gruvbox-flat.nvim";
version = "2023-05-27";
@@ -4858,6 +4930,18 @@ final: prev:
meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
};
+ harpoon2 = buildVimPlugin {
+ pname = "harpoon2";
+ version = "2024-04-09";
+ src = fetchFromGitHub {
+ owner = "ThePrimeagen";
+ repo = "harpoon";
+ rev = "0378a6c428a0bed6a2781d459d7943843f374bce";
+ sha256 = "129d51cp89dir809yakiw0b7kkjqww7s5h437j8ppn1lq7ghg50m";
+ };
+ meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
+ };
+
haskell-scope-highlighting-nvim = buildVimPlugin {
pname = "haskell-scope-highlighting.nvim";
version = "2024-07-02";
@@ -6026,18 +6110,6 @@ final: prev:
meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/";
};
- litee-symboltree-nvim = buildVimPlugin {
- pname = "litee-symboltree.nvim";
- version = "2022-09-28";
- src = fetchFromGitHub {
- owner = "ldelossa";
- repo = "litee-symboltree.nvim";
- rev = "488a660afcfd54644e6b755256907d3c7d8cf8d0";
- sha256 = "0mjjap47cz01qar0q87ssh45l4dkzizxcm986gksrmvhwwrii3ap";
- };
- meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/";
- };
-
litee-nvim = buildVimPlugin {
pname = "litee.nvim";
version = "2024-06-06";
@@ -6050,6 +6122,18 @@ final: prev:
meta.homepage = "https://github.com/ldelossa/litee.nvim/";
};
+ litee-symboltree-nvim = buildVimPlugin {
+ pname = "litee-symboltree.nvim";
+ version = "2022-09-28";
+ src = fetchFromGitHub {
+ owner = "ldelossa";
+ repo = "litee-symboltree.nvim";
+ rev = "488a660afcfd54644e6b755256907d3c7d8cf8d0";
+ sha256 = "0mjjap47cz01qar0q87ssh45l4dkzizxcm986gksrmvhwwrii3ap";
+ };
+ meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/";
+ };
+
live-command-nvim = buildVimPlugin {
pname = "live-command.nvim";
version = "2024-09-20";
@@ -6362,18 +6446,6 @@ final: prev:
meta.homepage = "https://github.com/winston0410/mark-radar.nvim/";
};
- markdown-preview-nvim = buildVimPlugin {
- pname = "markdown-preview.nvim";
- version = "2023-10-17";
- src = fetchFromGitHub {
- owner = "iamcco";
- repo = "markdown-preview.nvim";
- rev = "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee";
- sha256 = "06187wxcj2ramhimkrgwq1q8fnndzdywljc606n3pr11y8dxs5ac";
- };
- meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/";
- };
-
markdown-nvim = buildVimPlugin {
pname = "markdown.nvim";
version = "2024-06-25";
@@ -6386,6 +6458,18 @@ final: prev:
meta.homepage = "https://github.com/tadmccorkle/markdown.nvim/";
};
+ markdown-preview-nvim = buildVimPlugin {
+ pname = "markdown-preview.nvim";
+ version = "2023-10-17";
+ src = fetchFromGitHub {
+ owner = "iamcco";
+ repo = "markdown-preview.nvim";
+ rev = "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee";
+ sha256 = "06187wxcj2ramhimkrgwq1q8fnndzdywljc606n3pr11y8dxs5ac";
+ };
+ meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/";
+ };
+
markid = buildVimPlugin {
pname = "markid";
version = "2023-10-18";
@@ -6435,18 +6519,6 @@ final: prev:
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
};
- mason-tool-installer-nvim = buildVimPlugin {
- pname = "mason-tool-installer.nvim";
- version = "2024-06-03";
- src = fetchFromGitHub {
- owner = "WhoIsSethDaniel";
- repo = "mason-tool-installer.nvim";
- rev = "c5e07b8ff54187716334d585db34282e46fa2932";
- sha256 = "1zpf9v6abg482hbpi0mg0v2g67jvvnxd25aiclyh7bb24s8ljc0y";
- };
- meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
- };
-
mason-nvim = buildVimPlugin {
pname = "mason.nvim";
version = "2024-07-16";
@@ -6459,6 +6531,18 @@ final: prev:
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
+ mason-tool-installer-nvim = buildVimPlugin {
+ pname = "mason-tool-installer.nvim";
+ version = "2024-06-03";
+ src = fetchFromGitHub {
+ owner = "WhoIsSethDaniel";
+ repo = "mason-tool-installer.nvim";
+ rev = "c5e07b8ff54187716334d585db34282e46fa2932";
+ sha256 = "1zpf9v6abg482hbpi0mg0v2g67jvvnxd25aiclyh7bb24s8ljc0y";
+ };
+ meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
+ };
+
matchit-zip = buildVimPlugin {
pname = "matchit.zip";
version = "2010-10-18";
@@ -6495,6 +6579,18 @@ final: prev:
meta.homepage = "https://github.com/kaicataldo/material.vim/";
};
+ mattn-calendar-vim = buildVimPlugin {
+ pname = "mattn-calendar-vim";
+ version = "2022-02-10";
+ src = fetchFromGitHub {
+ owner = "mattn";
+ repo = "calendar-vim";
+ rev = "2083a41e2d310f9bbbbf644517f30e901f1fb04d";
+ sha256 = "13wakcprkh93i7afykkpavxqvxssjh573pjjljsgip3y3778ms5q";
+ };
+ meta.homepage = "https://github.com/mattn/calendar-vim/";
+ };
+
mayansmoke = buildVimPlugin {
pname = "mayansmoke";
version = "2010-10-18";
@@ -6579,18 +6675,6 @@ final: prev:
meta.homepage = "https://github.com/hadronized/mind.nvim/";
};
- mini-git = buildVimPlugin {
- pname = "mini-git";
- version = "2024-09-07";
- src = fetchFromGitHub {
- owner = "echasnovski";
- repo = "mini-git";
- rev = "f75ae3855f595e55e1a8a96521ffa01012632b28";
- sha256 = "1d7yy9lbz5ysk5519j25y1gciyq1a2kidzppn7vg0bzwcf6302qg";
- };
- meta.homepage = "https://github.com/echasnovski/mini-git/";
- };
-
mini-ai = buildVimPlugin {
pname = "mini.ai";
version = "2024-09-28";
@@ -6807,6 +6891,18 @@ final: prev:
meta.homepage = "https://github.com/echasnovski/mini.fuzzy/";
};
+ mini-git = buildVimPlugin {
+ pname = "mini-git";
+ version = "2024-09-07";
+ src = fetchFromGitHub {
+ owner = "echasnovski";
+ repo = "mini-git";
+ rev = "f75ae3855f595e55e1a8a96521ffa01012632b28";
+ sha256 = "1d7yy9lbz5ysk5519j25y1gciyq1a2kidzppn7vg0bzwcf6302qg";
+ };
+ meta.homepage = "https://github.com/echasnovski/mini-git/";
+ };
+
mini-hipatterns = buildVimPlugin {
pname = "mini.hipatterns";
version = "2024-09-27";
@@ -8202,6 +8298,18 @@ final: prev:
meta.homepage = "https://github.com/oxfist/night-owl.nvim/";
};
+ nightfly = buildVimPlugin {
+ pname = "nightfly";
+ version = "2024-11-02";
+ src = fetchFromGitHub {
+ owner = "bluz71";
+ repo = "vim-nightfly-colors";
+ rev = "fe3aaa329692e7a0820a65d32406ede3e3ab3c91";
+ sha256 = "10rwsvzbagwrj39jzjg70wzsd21igcjvvsna4jzif5s1gc5jwbhb";
+ };
+ meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
+ };
+
nightfox-nvim = buildVimPlugin {
pname = "nightfox.nvim";
version = "2024-09-08";
@@ -8346,6 +8454,18 @@ final: prev:
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
};
+ nord-vim = buildVimPlugin {
+ pname = "nord-vim";
+ version = "2023-05-03";
+ src = fetchFromGitHub {
+ owner = "nordtheme";
+ repo = "vim";
+ rev = "f13f5dfbb784deddbc1d8195f34dfd9ec73e2295";
+ sha256 = "1f3k8hxf21fij776xw830f71wvl6v5qmv5h806l773c9sx2dp1rz";
+ };
+ meta.homepage = "https://github.com/nordtheme/vim/";
+ };
+
nordic-nvim = buildVimPlugin {
pname = "nordic.nvim";
version = "2024-06-16";
@@ -8430,6 +8550,18 @@ final: prev:
meta.homepage = "https://github.com/nvchad/nvchad/";
};
+ nvchad-ui = buildVimPlugin {
+ pname = "nvchad-ui";
+ version = "2024-11-04";
+ src = fetchFromGitHub {
+ owner = "nvchad";
+ repo = "ui";
+ rev = "f2d4f351187439df6ba8637e06f60c308e3c12cf";
+ sha256 = "1m4z6h4rk43h8yxd6qk9h6gifbk3mhhnb3qfkqpdx9c631vvrqf7";
+ };
+ meta.homepage = "https://github.com/nvchad/ui/";
+ };
+
nvcode-color-schemes-vim = buildVimPlugin {
pname = "nvcode-color-schemes.vim";
version = "2021-07-03";
@@ -9822,6 +9954,18 @@ final: prev:
meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
};
+ one-small-step-for-vimkind = buildVimPlugin {
+ pname = "one-small-step-for-vimkind";
+ version = "2024-10-15";
+ src = fetchFromGitHub {
+ owner = "jbyuki";
+ repo = "one-small-step-for-vimkind";
+ rev = "ad065ad2c814249cfb9e344ce5b2b35d36fbc09f";
+ sha256 = "sha256-KIxEjUutHkPRUubZQO3ZaFUm9Lm3mUJ6p6HB6hLuJEM=";
+ };
+ meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/";
+ };
+
onedark-nvim = buildVimPlugin {
pname = "onedark.nvim";
version = "2024-07-05";
@@ -9930,18 +10074,6 @@ final: prev:
meta.homepage = "https://github.com/Almo7aya/openingh.nvim/";
};
- one-small-step-for-vimkind = buildVimPlugin {
- pname = "one-small-step-for-vimkind";
- version = "2024-10-15";
- src = fetchFromGitHub {
- owner = "jbyuki";
- repo = "one-small-step-for-vimkind";
- rev = "ad065ad2c814249cfb9e344ce5b2b35d36fbc09f";
- sha256 = "sha256-KIxEjUutHkPRUubZQO3ZaFUm9Lm3mUJ6p6HB6hLuJEM=";
- };
- meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/";
- };
-
openscad-nvim = buildVimPlugin {
pname = "openscad.nvim";
version = "2024-04-13";
@@ -10183,6 +10315,18 @@ final: prev:
meta.homepage = "https://github.com/lifepillar/pgsql.vim/";
};
+ phha-zenburn = buildVimPlugin {
+ pname = "phha-zenburn";
+ version = "2024-01-31";
+ src = fetchFromGitHub {
+ owner = "phha";
+ repo = "zenburn.nvim";
+ rev = "f5ee12b30119499c7fa7f95719cd7c5aab9f9f29";
+ sha256 = "10wn4b1awk4bzb7isfqbp3pqzi2ifnmcs7zyrwhna1dpwwdpgvbr";
+ };
+ meta.homepage = "https://github.com/phha/zenburn.nvim/";
+ };
+
pig-vim = buildVimPlugin {
pname = "pig.vim";
version = "2017-06-08";
@@ -10412,6 +10556,18 @@ final: prev:
meta.homepage = "https://github.com/Shougo/pum.vim/";
};
+ pure-lua = buildVimPlugin {
+ pname = "pure-lua";
+ version = "2021-05-16";
+ src = fetchFromGitHub {
+ owner = "shaunsingh";
+ repo = "moonlight.nvim";
+ rev = "e24e4218ec680b6396532808abf57ca0ada82e66";
+ sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3";
+ };
+ meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/";
+ };
+
purescript-vim = buildVimPlugin {
pname = "purescript-vim";
version = "2023-02-06";
@@ -10737,6 +10893,18 @@ final: prev:
meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
};
+ restore-view-vim = buildVimPlugin {
+ pname = "restore-view-vim";
+ version = "2014-11-21";
+ src = fetchFromGitHub {
+ owner = "vim-scripts";
+ repo = "restore_view.vim";
+ rev = "8b933436e3ab8dec120841027183f0d72a4e2096";
+ sha256 = "1kmhsbgscbij3rd2f8ahv9qmhw8jppgvfnqb45f81awmmqd9l4bn";
+ };
+ meta.homepage = "https://github.com/vim-scripts/restore_view.vim/";
+ };
+
riv-vim = buildVimPlugin {
pname = "riv.vim";
version = "2024-03-19";
@@ -10785,6 +10953,18 @@ final: prev:
meta.homepage = "https://github.com/ron-rs/ron.vim/";
};
+ rose-pine = buildVimPlugin {
+ pname = "rose-pine";
+ version = "2024-10-23";
+ src = fetchFromGitHub {
+ owner = "rose-pine";
+ repo = "neovim";
+ rev = "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e";
+ sha256 = "00gyn9s5c76fk1sqyg48aldbq2d8m33xia48vik8grj9wp12kbpx";
+ };
+ meta.homepage = "https://github.com/rose-pine/neovim/";
+ };
+
roslyn-nvim = buildVimPlugin {
pname = "roslyn.nvim";
version = "2024-10-13";
@@ -10869,6 +11049,18 @@ final: prev:
meta.homepage = "https://github.com/vmware-archive/salt-vim/";
};
+ samodostal-image-nvim = buildVimPlugin {
+ pname = "samodostal-image-nvim";
+ version = "2024-01-07";
+ src = fetchFromGitHub {
+ owner = "samodostal";
+ repo = "image.nvim";
+ rev = "acbd1d7d64ac0643021a6146eb0557e7c2e793d0";
+ sha256 = "0s5fxlc7igmvgpmpry1vkrl4xav37cx94ay1sg246y7y2j4j5l56";
+ };
+ meta.homepage = "https://github.com/samodostal/image.nvim/";
+ };
+
satellite-nvim = buildVimPlugin {
pname = "satellite.nvim";
version = "2024-09-30";
@@ -11146,18 +11338,6 @@ final: prev:
meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/";
};
- snap = buildVimPlugin {
- pname = "snap";
- version = "2024-06-05";
- src = fetchFromGitHub {
- owner = "camspiers";
- repo = "snap";
- rev = "486a2ab714eee79c392abfb45bdb94398409ed34";
- sha256 = "1ghca3fjdd0v3s4jldilki7kzhz891qxkf1l0dzx4h4p420kc42d";
- };
- meta.homepage = "https://github.com/camspiers/snap/";
- };
-
snacks-nvim = buildVimPlugin {
pname = "snacks.nvim";
version = "2024-11-07";
@@ -11170,6 +11350,18 @@ final: prev:
meta.homepage = "https://github.com/folke/snacks.nvim/";
};
+ snap = buildVimPlugin {
+ pname = "snap";
+ version = "2024-06-05";
+ src = fetchFromGitHub {
+ owner = "camspiers";
+ repo = "snap";
+ rev = "486a2ab714eee79c392abfb45bdb94398409ed34";
+ sha256 = "1ghca3fjdd0v3s4jldilki7kzhz891qxkf1l0dzx4h4p420kc42d";
+ };
+ meta.homepage = "https://github.com/camspiers/snap/";
+ };
+
snippets-nvim = buildVimPlugin {
pname = "snippets.nvim";
version = "2020-09-09";
@@ -12039,6 +12231,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/";
};
+ telescope-nvim = buildNeovimPlugin {
+ pname = "telescope.nvim";
+ version = "2024-10-29";
+ src = fetchFromGitHub {
+ owner = "nvim-telescope";
+ repo = "telescope.nvim";
+ rev = "85922dde3767e01d42a08e750a773effbffaea3e";
+ sha256 = "0yv3v4nlh42s96r0xa4fvlil4rh4p0q6l50jk8yg0hmc8vxxzbs1";
+ };
+ meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
+ };
+
telescope-project-nvim = buildVimPlugin {
pname = "telescope-project.nvim";
version = "2024-09-09";
@@ -12172,18 +12376,6 @@ final: prev:
meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/";
};
- telescope-nvim = buildNeovimPlugin {
- pname = "telescope.nvim";
- version = "2024-10-29";
- src = fetchFromGitHub {
- owner = "nvim-telescope";
- repo = "telescope.nvim";
- rev = "85922dde3767e01d42a08e750a773effbffaea3e";
- sha256 = "0yv3v4nlh42s96r0xa4fvlil4rh4p0q6l50jk8yg0hmc8vxxzbs1";
- };
- meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
- };
-
telescope_hoogle = buildVimPlugin {
pname = "telescope_hoogle";
version = "2023-09-20";
@@ -12388,6 +12580,18 @@ final: prev:
meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
};
+ tinykeymap = buildVimPlugin {
+ pname = "tinykeymap";
+ version = "2024-02-17";
+ src = fetchFromGitHub {
+ owner = "tomtom";
+ repo = "tinykeymap_vim";
+ rev = "7217ce656069d82cd71872ede09152b232ecaf1b";
+ sha256 = "1y0snmb402k1f5r54192d7jpg3fbam4ry92hn063y92110j9580w";
+ };
+ meta.homepage = "https://github.com/tomtom/tinykeymap_vim/";
+ };
+
tlib_vim = buildVimPlugin {
pname = "tlib_vim";
version = "2022-07-22";
@@ -12666,6 +12870,18 @@ final: prev:
meta.homepage = "https://github.com/folke/twilight.nvim/";
};
+ typescript-nvim = buildVimPlugin {
+ pname = "typescript.nvim";
+ version = "2023-08-12";
+ src = fetchFromGitHub {
+ owner = "jose-elias-alvarez";
+ repo = "typescript.nvim";
+ rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467";
+ sha256 = "0rx29i3hmzh2knxx098fvfc0iafx3j08bs1zbv4dxadq56dnhaxm";
+ };
+ meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
+ };
+
typescript-tools-nvim = buildVimPlugin {
pname = "typescript-tools.nvim";
version = "2024-07-18";
@@ -12690,18 +12906,6 @@ final: prev:
meta.homepage = "https://github.com/leafgarland/typescript-vim/";
};
- typescript-nvim = buildVimPlugin {
- pname = "typescript.nvim";
- version = "2023-08-12";
- src = fetchFromGitHub {
- owner = "jose-elias-alvarez";
- repo = "typescript.nvim";
- rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467";
- sha256 = "0rx29i3hmzh2knxx098fvfc0iafx3j08bs1zbv4dxadq56dnhaxm";
- };
- meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
- };
-
typst-conceal-vim = buildVimPlugin {
pname = "typst-conceal.vim";
version = "2023-10-13";
@@ -13230,6 +13434,18 @@ final: prev:
meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/";
};
+ vim-advanced-sorters = buildVimPlugin {
+ pname = "vim-advanced-sorters";
+ version = "2024-08-16";
+ src = fetchFromGitHub {
+ owner = "inkarkat";
+ repo = "vim-AdvancedSorters";
+ rev = "f6d29af8a2291895973bf98c2630cc68a8115068";
+ sha256 = "09p0qmwvswz3hxca6nakqszplpb1mffv5y9bwnlxab1xm17id6df";
+ };
+ meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/";
+ };
+
vim-after-object = buildVimPlugin {
pname = "vim-after-object";
version = "2018-09-17";
@@ -14142,6 +14358,18 @@ final: prev:
meta.homepage = "https://github.com/jhradilek/vim-docbk/";
};
+ vim-docbk-snippets = buildVimPlugin {
+ pname = "vim-docbk-snippets";
+ version = "2023-09-29";
+ src = fetchFromGitHub {
+ owner = "jhradilek";
+ repo = "vim-snippets";
+ rev = "73aa6c7a3dcd9ac452271fbd4f8a2bdf66a7513e";
+ sha256 = "1wpn6gfw1r89232d779lz8wy19asrribindlcsaikrsqvml3a0hr";
+ };
+ meta.homepage = "https://github.com/jhradilek/vim-snippets/";
+ };
+
vim-dotenv = buildVimPlugin {
pname = "vim-dotenv";
version = "2022-05-15";
@@ -18672,231 +18900,5 @@ final: prev:
meta.homepage = "https://github.com/nanotee/zoxide.vim/";
};
- catppuccin-nvim = buildVimPlugin {
- pname = "catppuccin-nvim";
- version = "2024-11-03";
- src = fetchFromGitHub {
- owner = "catppuccin";
- repo = "nvim";
- rev = "35d8057137af463c9f41f169539e9b190d57d269";
- sha256 = "1lra18arndkpd8k9pyh3qgykihqnvm8h6v0w0kjpf36ys9xgpz3r";
- };
- meta.homepage = "https://github.com/catppuccin/nvim/";
- };
- catppuccin-vim = buildVimPlugin {
- pname = "catppuccin-vim";
- version = "2024-08-14";
- src = fetchFromGitHub {
- owner = "catppuccin";
- repo = "vim";
- rev = "060000804cf50315ac6dd986bc4d84fbc40cbc9c";
- sha256 = "1faxniddq6zcsb93bsm93lkf01mc4jfzxls5vyxmac6rc5v2k1n4";
- };
- meta.homepage = "https://github.com/catppuccin/vim/";
- };
-
- dracula-vim = buildVimPlugin {
- pname = "dracula-vim";
- version = "2024-07-26";
- src = fetchFromGitHub {
- owner = "dracula";
- repo = "vim";
- rev = "65f4225e0526516a67d56c8ac09925a209138e53";
- sha256 = "0jp54l8k40mij0mkavsxzv2kipvzzvy211d6hyvq6ry9liqkl7b8";
- };
- meta.homepage = "https://github.com/dracula/vim/";
- };
-
- embark-vim = buildVimPlugin {
- pname = "embark-vim";
- version = "2024-09-21";
- src = fetchFromGitHub {
- owner = "embark-theme";
- repo = "vim";
- rev = "530e361aa81a8665c3a909a787b918aaf7d702e2";
- sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph";
- };
- meta.homepage = "https://github.com/embark-theme/vim/";
- };
-
- gbprod-nord = buildVimPlugin {
- pname = "gbprod-nord";
- version = "2024-10-10";
- src = fetchFromGitHub {
- owner = "gbprod";
- repo = "nord.nvim";
- rev = "4cc19936b1b57ba08eb461c5f450b3976cbb8e0c";
- sha256 = "1k09fv0cb8xaa6z1fz6l58cdzgz4wfnfhv32dw3y395gr69a9sra";
- };
- meta.homepage = "https://github.com/gbprod/nord.nvim/";
- };
-
- gruvbox-community = buildVimPlugin {
- pname = "gruvbox-community";
- version = "2024-01-21";
- src = fetchFromGitHub {
- owner = "gruvbox-community";
- repo = "gruvbox";
- rev = "143a3b8babcfd2bce6c99d6ba496942647c3e30b";
- sha256 = "00wg2m2591fw3d9almwdg39xvwxzz2xid86n536ygai81cirw351";
- };
- meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
- };
-
- harpoon2 = buildVimPlugin {
- pname = "harpoon2";
- version = "2024-04-09";
- src = fetchFromGitHub {
- owner = "ThePrimeagen";
- repo = "harpoon";
- rev = "0378a6c428a0bed6a2781d459d7943843f374bce";
- sha256 = "129d51cp89dir809yakiw0b7kkjqww7s5h437j8ppn1lq7ghg50m";
- };
- meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
- };
-
- mattn-calendar-vim = buildVimPlugin {
- pname = "mattn-calendar-vim";
- version = "2022-02-10";
- src = fetchFromGitHub {
- owner = "mattn";
- repo = "calendar-vim";
- rev = "2083a41e2d310f9bbbbf644517f30e901f1fb04d";
- sha256 = "13wakcprkh93i7afykkpavxqvxssjh573pjjljsgip3y3778ms5q";
- };
- meta.homepage = "https://github.com/mattn/calendar-vim/";
- };
-
- nightfly = buildVimPlugin {
- pname = "nightfly";
- version = "2024-11-02";
- src = fetchFromGitHub {
- owner = "bluz71";
- repo = "vim-nightfly-colors";
- rev = "fe3aaa329692e7a0820a65d32406ede3e3ab3c91";
- sha256 = "10rwsvzbagwrj39jzjg70wzsd21igcjvvsna4jzif5s1gc5jwbhb";
- };
- meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
- };
-
- nord-vim = buildVimPlugin {
- pname = "nord-vim";
- version = "2023-05-03";
- src = fetchFromGitHub {
- owner = "nordtheme";
- repo = "vim";
- rev = "f13f5dfbb784deddbc1d8195f34dfd9ec73e2295";
- sha256 = "1f3k8hxf21fij776xw830f71wvl6v5qmv5h806l773c9sx2dp1rz";
- };
- meta.homepage = "https://github.com/nordtheme/vim/";
- };
-
- nvchad-ui = buildVimPlugin {
- pname = "nvchad-ui";
- version = "2024-11-04";
- src = fetchFromGitHub {
- owner = "nvchad";
- repo = "ui";
- rev = "f2d4f351187439df6ba8637e06f60c308e3c12cf";
- sha256 = "1m4z6h4rk43h8yxd6qk9h6gifbk3mhhnb3qfkqpdx9c631vvrqf7";
- };
- meta.homepage = "https://github.com/nvchad/ui/";
- };
-
- phha-zenburn = buildVimPlugin {
- pname = "phha-zenburn";
- version = "2024-01-31";
- src = fetchFromGitHub {
- owner = "phha";
- repo = "zenburn.nvim";
- rev = "f5ee12b30119499c7fa7f95719cd7c5aab9f9f29";
- sha256 = "10wn4b1awk4bzb7isfqbp3pqzi2ifnmcs7zyrwhna1dpwwdpgvbr";
- };
- meta.homepage = "https://github.com/phha/zenburn.nvim/";
- };
-
- pure-lua = buildVimPlugin {
- pname = "pure-lua";
- version = "2021-05-16";
- src = fetchFromGitHub {
- owner = "shaunsingh";
- repo = "moonlight.nvim";
- rev = "e24e4218ec680b6396532808abf57ca0ada82e66";
- sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3";
- };
- meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/";
- };
-
- restore-view-vim = buildVimPlugin {
- pname = "restore-view-vim";
- version = "2014-11-21";
- src = fetchFromGitHub {
- owner = "vim-scripts";
- repo = "restore_view.vim";
- rev = "8b933436e3ab8dec120841027183f0d72a4e2096";
- sha256 = "1kmhsbgscbij3rd2f8ahv9qmhw8jppgvfnqb45f81awmmqd9l4bn";
- };
- meta.homepage = "https://github.com/vim-scripts/restore_view.vim/";
- };
-
- rose-pine = buildVimPlugin {
- pname = "rose-pine";
- version = "2024-10-23";
- src = fetchFromGitHub {
- owner = "rose-pine";
- repo = "neovim";
- rev = "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e";
- sha256 = "00gyn9s5c76fk1sqyg48aldbq2d8m33xia48vik8grj9wp12kbpx";
- };
- meta.homepage = "https://github.com/rose-pine/neovim/";
- };
-
- samodostal-image-nvim = buildVimPlugin {
- pname = "samodostal-image-nvim";
- version = "2024-01-07";
- src = fetchFromGitHub {
- owner = "samodostal";
- repo = "image.nvim";
- rev = "acbd1d7d64ac0643021a6146eb0557e7c2e793d0";
- sha256 = "0s5fxlc7igmvgpmpry1vkrl4xav37cx94ay1sg246y7y2j4j5l56";
- };
- meta.homepage = "https://github.com/samodostal/image.nvim/";
- };
-
- tinykeymap = buildVimPlugin {
- pname = "tinykeymap";
- version = "2024-02-17";
- src = fetchFromGitHub {
- owner = "tomtom";
- repo = "tinykeymap_vim";
- rev = "7217ce656069d82cd71872ede09152b232ecaf1b";
- sha256 = "1y0snmb402k1f5r54192d7jpg3fbam4ry92hn063y92110j9580w";
- };
- meta.homepage = "https://github.com/tomtom/tinykeymap_vim/";
- };
-
- vim-advanced-sorters = buildVimPlugin {
- pname = "vim-advanced-sorters";
- version = "2024-08-16";
- src = fetchFromGitHub {
- owner = "inkarkat";
- repo = "vim-AdvancedSorters";
- rev = "f6d29af8a2291895973bf98c2630cc68a8115068";
- sha256 = "09p0qmwvswz3hxca6nakqszplpb1mffv5y9bwnlxab1xm17id6df";
- };
- meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/";
- };
-
- vim-docbk-snippets = buildVimPlugin {
- pname = "vim-docbk-snippets";
- version = "2023-09-29";
- src = fetchFromGitHub {
- owner = "jhradilek";
- repo = "vim-snippets";
- rev = "73aa6c7a3dcd9ac452271fbd4f8a2bdf66a7513e";
- sha256 = "1wpn6gfw1r89232d779lz8wy19asrribindlcsaikrsqvml3a0hr";
- };
- meta.homepage = "https://github.com/jhradilek/vim-snippets/";
- };
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
index 2c677d1c25..817103d35a 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1532,6 +1532,13 @@ in
dependencies = with self; [ ultisnips ];
};
+ neoconf-nvim = super.neoconf-nvim.overrideAttrs {
+ dependencies = with self; [ nvim-lspconfig ];
+
+ doInstallCheck = true;
+ nvimRequireCheck = "neoconf";
+ };
+
neogit = super.neogit.overrideAttrs {
dependencies = with self; [ plenary-nvim ];
nvimRequireCheck = "neogit";
@@ -2261,6 +2268,16 @@ in
dependencies = with self; [ telescope-nvim ];
};
+ quarto-nvim = super.quarto-nvim.overrideAttrs {
+ dependencies = with self; [
+ nvim-lspconfig
+ otter-nvim
+ ];
+
+ nvimRequireCheck = "quarto";
+ doInstallCheck = true;
+ };
+
telescope-zoxide = super.telescope-zoxide.overrideAttrs {
dependencies = with self; [ telescope-nvim ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py
index a8525b9018..37c0adb6bb 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py
@@ -3,7 +3,7 @@
# run with:
# $ nix run .\#vimPluginsUpdater
# format:
-# $ nix run nixpkgs#python3Packages.black -- update.py
+# $ nix run nixpkgs#python3Packages.ruff -- update.py
# type-check:
# $ nix run nixpkgs#python3Packages.mypy -- update.py
# linted:
@@ -19,30 +19,24 @@
#
import inspect
-import os
-import logging
-import textwrap
import json
+import logging
+import os
import subprocess
-from typing import List, Tuple
+import textwrap
from pathlib import Path
-
+from typing import List, Tuple
log = logging.getLogger("vim-updater")
-sh = logging.StreamHandler()
-formatter = logging.Formatter("%(name)s:%(levelname)s: %(message)s")
-sh.setFormatter(formatter)
-log.addHandler(sh)
-
# Import plugin update library from maintainers/scripts/pluginupdate.py
ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-import pluginupdate
import importlib
-from pluginupdate import run_nix_expr, PluginDesc
-treesitter = importlib.import_module('nvim-treesitter.update')
+import pluginupdate
+from pluginupdate import PluginDesc, run_nix_expr
+treesitter = importlib.import_module("nvim-treesitter.update")
HEADER = (
@@ -56,17 +50,14 @@ class VimEditor(pluginupdate.Editor):
nvim_treesitter_updated = False
def generate_nix(
- self,
- plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]],
- outfile: str
+ self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str
):
log.info("Generating nix code")
- sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower())
log.debug("Loading nvim-treesitter revision from nix...")
nvim_treesitter_rev = pluginupdate.run_nix_expr(
"(import { }).vimPlugins.nvim-treesitter.src.rev",
self.nixpkgs,
- timeout=10
+ timeout=10,
)
GET_PLUGINS_LUA = """
@@ -98,7 +89,7 @@ class VimEditor(pluginupdate.Editor):
"""
)
)
- for pdesc, plugin in sorted_plugins:
+ for pdesc, plugin in plugins:
content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin))
f.write(content)
if (
@@ -109,8 +100,9 @@ class VimEditor(pluginupdate.Editor):
f.write("\n}\n")
print(f"updated {outfile}")
- def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool) -> str:
-
+ def plugin2nix(
+ self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool
+ ) -> str:
repo = pdesc.repo
content = f" {plugin.normalized_name} = "
@@ -138,19 +130,25 @@ class VimEditor(pluginupdate.Editor):
if self.nvim_treesitter_updated:
print("updating nvim-treesitter grammars")
cmd = [
- "nix", "build",
- "vimPlugins.nvim-treesitter.src", "-f", self.nixpkgs
- , "--print-out-paths"
+ "nix",
+ "build",
+ "vimPlugins.nvim-treesitter.src",
+ "-f",
+ self.nixpkgs,
+ "--print-out-paths",
]
log.debug("Running command: %s", " ".join(cmd))
- nvim_treesitter_dir = subprocess.check_output(cmd, text=True, timeout=90).strip()
+ nvim_treesitter_dir = subprocess.check_output(
+ cmd, text=True, timeout=90
+ ).strip()
generated = treesitter.update_grammars(nvim_treesitter_dir)
treesitter_generated_nix_path = os.path.join(
- NIXPKGS_NVIMTREESITTER_FOLDER,
- "generated.nix"
+ NIXPKGS_NVIMTREESITTER_FOLDER, "generated.nix"
+ )
+ open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write(
+ generated
)
- open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write(generated)
if self.nixpkgs_repo:
index = self.nixpkgs_repo.index
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
index aad3a46eca..bc13c7b68e 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -116,9 +116,10 @@ https://github.com/AndrewRadev/bufferize.vim/,HEAD,
https://github.com/akinsho/bufferline.nvim/,,
https://github.com/kwkarlwang/bufjump.nvim/,HEAD,
https://github.com/bullets-vim/bullets.vim/,,
-https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
https://github.com/itchyny/calendar.vim/,,
https://github.com/bkad/camelcasemotion/,,
+https://github.com/catppuccin/nvim/,,catppuccin-nvim
+https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
https://github.com/tyru/caw.vim/,,
https://github.com/uga-rosa/ccc.nvim/,HEAD,
https://github.com/Eandrju/cellular-automaton.nvim/,HEAD,
@@ -299,6 +300,7 @@ https://github.com/direnv/direnv.vim/,,
https://github.com/chipsenkbeil/distant.nvim/,HEAD,
https://github.com/doki-theme/doki-theme-vim/,,
https://github.com/NTBBloodbath/doom-one.nvim/,,
+https://github.com/dracula/vim/,,dracula-vim
https://github.com/Mofiqul/dracula.nvim/,HEAD,
https://github.com/stevearc/dressing.nvim/,,
https://github.com/Bekaboo/dropbar.nvim/,HEAD,
@@ -313,6 +315,7 @@ https://github.com/creativenull/efmls-configs-nvim/,,
https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,
https://github.com/elmcast/elm-vim/,,
https://github.com/dmix/elvish.vim/,,
+https://github.com/embark-theme/vim/,,embark-vim
https://github.com/mattn/emmet-vim/,,
https://github.com/vim-scripts/emodeline/,,
https://github.com/vim-scripts/errormarker.vim/,,
@@ -361,6 +364,7 @@ https://github.com/gfanto/fzf-lsp.nvim/,,
https://github.com/ibhagwan/fzf-lua/,HEAD,
https://github.com/junegunn/fzf.vim/,,
https://github.com/NTBBloodbath/galaxyline.nvim/,,
+https://github.com/gbprod/nord.nvim/,,gbprod-nord
https://github.com/jsfaint/gen_tags.vim/,,
https://github.com/gentoo/gentoo-syntax/,,
https://github.com/ndmitchell/ghcid/,,
@@ -389,9 +393,9 @@ https://github.com/liuchengxu/graphviz.vim/,,
https://github.com/cbochs/grapple.nvim/,HEAD,
https://github.com/blazkowolf/gruber-darker.nvim/,,
https://github.com/MagicDuck/grug-far.nvim/,,
-https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
https://github.com/morhetz/gruvbox/,,
https://github.com/luisiacc/gruvbox-baby/,HEAD,
+https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
https://github.com/eddyekofo94/gruvbox-flat.nvim/,,
https://github.com/sainnhe/gruvbox-material/,,
https://github.com/f4z3r/gruvbox-material.nvim/,HEAD,
@@ -404,8 +408,8 @@ https://github.com/junegunn/gv.vim/,,
https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD,
https://github.com/m4xshen/hardtime.nvim/,HEAD,
https://git.sr.ht/~sircmpwn/hare.vim,HEAD,
-https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
https://github.com/ThePrimeagen/harpoon/,master,
+https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD,
https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD,
https://github.com/neovimhaskell/haskell-vim/,,
@@ -434,7 +438,6 @@ https://github.com/idris-hackers/idris-vim/,,
https://github.com/ShinKage/idris2-nvim/,,
https://github.com/edwinb/idris2-vim/,,
https://github.com/3rd/image.nvim/,HEAD,
-https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim
https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
https://github.com/lewis6991/impatient.nvim/,,
https://github.com/backdround/improved-search.nvim/,HEAD,
@@ -447,7 +450,6 @@ https://github.com/Darazaki/indent-o-matic/,,
https://github.com/Yggdroot/indentLine/,,
https://github.com/ciaranm/inkpot/,,
https://github.com/jbyuki/instant.nvim/,HEAD,
-https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD,
https://github.com/pta2002/intellitab.nvim/,HEAD,
https://github.com/parsonsmatt/intero-neovim/,,
https://github.com/keith/investigate.vim/,,
@@ -544,6 +546,7 @@ https://github.com/williamboman/mason.nvim/,HEAD,
https://github.com/vim-scripts/matchit.zip/,,
https://github.com/marko-cerovac/material.nvim/,,
https://github.com/kaicataldo/material.vim/,HEAD,
+https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
https://github.com/vim-scripts/mayansmoke/,,
https://github.com/chikamichi/mediawiki.vim/,HEAD,
https://github.com/savq/melange-nvim/,,
@@ -602,7 +605,6 @@ https://github.com/miikanissi/modus-themes.nvim/,HEAD,
https://github.com/tomasr/molokai/,,
https://github.com/benlubas/molten-nvim/,HEAD,
https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
-https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
https://github.com/leafo/moonscript-vim/,HEAD,
https://github.com/yegappan/mru/,,
https://github.com/smoka7/multicursors.nvim/,HEAD,
@@ -673,7 +675,6 @@ https://github.com/stevanmilic/neotest-scala/,HEAD,
https://github.com/shunsambongi/neotest-testthat/,HEAD,
https://github.com/marilari88/neotest-vitest/,HEAD,
https://github.com/lawrence-laz/neotest-zig/,HEAD,
-https://github.com/rose-pine/neovim/,main,rose-pine
https://github.com/Shatur/neovim-ayu/,,
https://github.com/cloudhead/neovim-fuzzy/,,
https://github.com/jeffkreeftmeijer/neovim-sensible/,,
@@ -688,6 +689,7 @@ https://github.com/fiatjaf/neuron.vim/,,
https://github.com/Olical/nfnl/,main,
https://github.com/chr4/nginx.vim/,,
https://github.com/oxfist/night-owl.nvim/,,
+https://github.com/bluz71/vim-nightfly-colors/,,nightfly
https://github.com/EdenEast/nightfox.nvim/,,
https://github.com/Alexis12119/nightly.nvim/,,
https://github.com/zah/nim.vim/,,
@@ -699,7 +701,7 @@ https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
https://github.com/kartikp10/noctis.nvim/,,
https://github.com/folke/noice.nvim/,HEAD,
https://github.com/nvimtools/none-ls.nvim/,HEAD,
-https://github.com/gbprod/nord.nvim/,,gbprod-nord
+https://github.com/nordtheme/vim/,,nord-vim
https://github.com/shaunsingh/nord.nvim/,,
https://github.com/andersevenrud/nordic.nvim/,,
https://github.com/vigoux/notifier.nvim/,HEAD,
@@ -708,8 +710,8 @@ https://github.com/MunifTanjim/nui.nvim/,main,
https://github.com/jose-elias-alvarez/null-ls.nvim/,,
https://github.com/nacro90/numb.nvim/,,
https://github.com/nvchad/nvchad/,HEAD,
+https://github.com/nvchad/ui/,HEAD,nvchad-ui
https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,,
-https://github.com/catppuccin/nvim/,,catppuccin-nvim
https://github.com/AckslD/nvim-FeMaco.lua/,HEAD,
https://github.com/nathanmsmith/nvim-ale-diagnostic/,,
https://github.com/windwp/nvim-autopairs/,,
@@ -825,6 +827,7 @@ https://github.com/nomnivore/ollama.nvim/,HEAD,
https://github.com/yonlu/omni.vim/,,
https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,
https://github.com/Th3Whit3Wolf/one-nvim/,,
+https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD,
https://github.com/navarasu/onedark.nvim/,,
https://github.com/joshdick/onedark.vim/,,
https://github.com/LunarVim/onedarker.nvim/,,
@@ -854,6 +857,7 @@ https://github.com/olimorris/persisted.nvim/,HEAD,
https://github.com/folke/persistence.nvim/,,
https://github.com/pest-parser/pest.vim/,HEAD,
https://github.com/lifepillar/pgsql.vim/,,
+https://github.com/phha/zenburn.nvim/,,phha-zenburn
https://github.com/motus/pig.vim/,,
https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
https://github.com/aklt/plantuml-syntax/,,
@@ -873,6 +877,7 @@ https://github.com/ahmedkhalf/project.nvim/,,
https://github.com/kevinhwang91/promise-async/,HEAD,
https://github.com/frigoeu/psc-ide-vim/,,
https://github.com/Shougo/pum.vim/,HEAD,
+https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
https://github.com/purescript-contrib/purescript-vim/,,
https://github.com/python-mode/python-mode/,,
https://github.com/vim-python/python-syntax/,,
@@ -905,6 +910,7 @@ https://github.com/gu-fan/riv.vim/,,
https://github.com/kevinhwang91/rnvimr/,,
https://github.com/mfukar/robotframework-vim/,,
https://github.com/ron-rs/ron.vim/,,
+https://github.com/rose-pine/neovim/,main,rose-pine
https://github.com/jmederosalvarado/roslyn.nvim/,HEAD,
https://github.com/keith/rspec.vim/,,
https://github.com/ccarpita/rtorrent-syntax-file/,,
@@ -912,6 +918,7 @@ https://github.com/simrat39/rust-tools.nvim/,,
https://github.com/rust-lang/rust.vim/,,
https://github.com/hauleth/sad.vim/,,
https://github.com/vmware-archive/salt-vim/,,
+https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim
https://github.com/lewis6991/satellite.nvim/,HEAD,
https://github.com/davidgranstrom/scnvim/,HEAD,
https://github.com/tiagovla/scope.nvim/,HEAD,
@@ -935,8 +942,8 @@ https://github.com/mrjones2014/smart-splits.nvim/,,
https://github.com/m4xshen/smartcolumn.nvim/,,
https://github.com/gorkunov/smartpairs.vim/,,
https://github.com/ibhagwan/smartyank.nvim/,,
-https://github.com/camspiers/snap/,,
https://github.com/folke/snacks.nvim/,HEAD,
+https://github.com/camspiers/snap/,,
https://github.com/norcalli/snippets.nvim/,,
https://github.com/shaunsingh/solarized.nvim/,HEAD,
https://github.com/sainnhe/sonokai/,,
@@ -1068,7 +1075,6 @@ https://github.com/jose-elias-alvarez/typescript.nvim/,,
https://github.com/MrPicklePinosaur/typst-conceal.vim/,HEAD,
https://github.com/chomosuke/typst-preview.nvim/,HEAD,
https://github.com/kaarmu/typst.vim/,HEAD,
-https://github.com/nvchad/ui/,HEAD,nvchad-ui
https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
https://github.com/SirVer/ultisnips/,,
https://github.com/mbbill/undotree/,,
@@ -1084,11 +1090,6 @@ https://github.com/junegunn/vader.vim/,,
https://github.com/jbyuki/venn.nvim/,,
https://github.com/vhda/verilog_systemverilog.vim/,,
https://github.com/vifm/vifm.vim/,,
-https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
-https://github.com/dracula/vim/,,dracula-vim
-https://github.com/embark-theme/vim/,,embark-vim
-https://github.com/nordtheme/vim/,,nord-vim
-https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters
https://github.com/Konfekt/vim-CtrlXA/,,
https://github.com/konfekt/vim-DetectSpellLang/,,
https://github.com/dpelle/vim-LanguageTool/,,
@@ -1115,6 +1116,7 @@ https://github.com/MarcWeber/vim-addon-sql/,,
https://github.com/MarcWeber/vim-addon-syntax-checker/,,
https://github.com/MarcWeber/vim-addon-toggle-buffer/,,
https://github.com/MarcWeber/vim-addon-xdebug/,,
+https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters
https://github.com/junegunn/vim-after-object/,,
https://github.com/danilo-augusto/vim-afterglow/,HEAD,
https://github.com/msuperdock/vim-agda/,HEAD,
@@ -1191,6 +1193,7 @@ https://github.com/kristijanhusak/vim-dirvish-git/,,
https://github.com/tpope/vim-dispatch/,,
https://github.com/radenling/vim-dispatch-neovim/,,
https://github.com/jhradilek/vim-docbk/,,
+https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
https://github.com/tpope/vim-dotenv/,,
https://github.com/junegunn/vim-easy-align/,,
https://github.com/zhou13/vim-easyescape/,,
@@ -1344,7 +1347,6 @@ https://github.com/jistr/vim-nerdtree-tabs/,,
https://github.com/nfnty/vim-nftables/,,
https://github.com/kana/vim-niceblock/,,
https://github.com/nickel-lang/vim-nickel/,main,
-https://github.com/bluz71/vim-nightfly-colors/,,nightfly
https://github.com/tommcdo/vim-ninja-feet/,,
https://github.com/LnL7/vim-nix/,,
https://github.com/symphorien/vim-nixhash/,,
@@ -1436,7 +1438,6 @@ https://github.com/bohlender/vim-smt2/,,
https://github.com/justinmk/vim-sneak/,,
https://github.com/garbas/vim-snipmate/,,
https://github.com/honza/vim-snippets/,,
-https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
https://github.com/lifepillar/vim-solarized8/,HEAD,
https://github.com/tomlion/vim-solidity/,,
https://github.com/christoomey/vim-sort-motion/,,
@@ -1565,7 +1566,6 @@ https://github.com/Lilja/zellij.nvim/,HEAD,
https://github.com/folke/zen-mode.nvim/,,
https://github.com/zenbones-theme/zenbones.nvim/,HEAD,
https://github.com/jnurmine/zenburn/,,
-https://github.com/phha/zenburn.nvim/,,phha-zenburn
https://github.com/nvimdev/zephyr-nvim/,,
https://github.com/ziglang/zig.vim/,,
https://github.com/zk-org/zk-nvim/,HEAD,
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
index 0296d6d68b..d4a65be795 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1049,26 +1049,26 @@ let
sources = {
"x86_64-linux" = {
arch = "linux-x64";
- hash = "sha256-X6Oszc88F0ENABwX63uwxbJ4VPQOQzZbJA87znVg5d8=";
+ hash = "sha256-+/0ZQkRS6AD8u5+t2hiPwQxzwhEc+n2F0GVk1s0n74U=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
- hash = "sha256-NH3kGmNZpKofNplw+FRJFvV3m36HRuIqGR3zt6X5x60=";
+ hash = "sha256-FZbTBPn12pv9bQWqfWwPapFLTpp5nclp0RH/WZc6/r4=";
};
"aarch64-linux" = {
arch = "linux-arm64";
- hash = "sha256-hlFAMz17cl2/1CK7/dgrLktcPZYAcccIWIpkAVdwpkI=";
+ hash = "sha256-e6zfflFgxVuikWwQuU6ImEuVk8xgi2HyY8uZwBoQiLU=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
- hash = "sha256-oVkmdw0sHv5Y+ysT4zWW6qFDh/h4/TcgSAauh1KrE1c=";
+ hash = "sha256-SfA9wkvYT2Vb3GpJRjWE6lzZAXdFCnEKoKl0hjT0Llw=";
};
};
in
{
name = "continue";
publisher = "Continue";
- version = "0.8.44";
+ version = "0.8.54";
}
// sources.${stdenv.system};
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
@@ -1740,8 +1740,8 @@ let
mktplcRef = {
name = "prettier-vscode";
publisher = "esbenp";
- version = "10.4.0";
- hash = "sha256-8+90cZpqyH+wBgPFaX5GaU6E02yBWUoB+T9C2z2Ix8c=";
+ version = "11.0.0";
+ hash = "sha256-pNjkJhof19cuK0PsXJ/Q/Zb2H7eoIkfXJMLZJ4lDn7k=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
@@ -3627,8 +3627,14 @@ let
};
};
+ ms-vscode-remote.vscode-remote-extensionpack =
+ callPackage ./ms-vscode-remote.vscode-remote-extensionpack
+ { };
+
ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { };
+ ms-windows-ai-studio.windows-ai-studio = callPackage ./ms-windows-ai-studio.windows-ai-studio { };
+
mshr-h.veriloghdl = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "veriloghdl";
@@ -4151,6 +4157,23 @@ let
};
};
+ sainnhe.gruvbox-material = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "gruvbox-material";
+ publisher = "sainnhe";
+ version = "6.5.2";
+ hash = "sha256-D+SZEQQwjZeuyENOYBJGn8tqS3cJiWbEkmEqhNRY/i4=";
+ };
+ meta = {
+ changelog = "https://marketplace.visualstudio.com/items/sainnhe.gruvbox-material/changelog";
+ description = "Gruvbox Material theme VSCode extension with Material palette";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=sainnhe.gruvbox-material";
+ homepage = "https://github.com/sainnhe/gruvbox-material-vscode";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ thtrf ];
+ };
+ };
+
samuelcolvin.jinjahtml = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "jinjahtml";
@@ -4301,8 +4324,8 @@ let
mktplcRef = {
publisher = "shd101wyy";
name = "markdown-preview-enhanced";
- version = "0.8.14";
- hash = "sha256-vCuuPB/GTkM2xCBn1UF3CZwP49Ge/8eelHhg67EG7tQ=";
+ version = "0.8.15";
+ hash = "sha256-aW2Ri73xIl/1q/Yoi5qg25fjx7l55QfXAn+M+JuoN+A=";
};
meta = {
description = "Provides a live preview of markdown using either markdown-it or pandoc";
@@ -4531,8 +4554,8 @@ let
mktplcRef = {
name = "code-spell-checker";
publisher = "streetsidesoftware";
- version = "4.0.14";
- hash = "sha256-b87sBCprMMfxsP8lyMM3yI82YvKZd5Jc+Z/x7uflnL0=";
+ version = "4.0.15";
+ hash = "sha256-Zow0laXwORa3V5Hy40pWDa/+Xq7kQbgn/Ia6PrJxI6E=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix
new file mode 100644
index 0000000000..41222c7eeb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix
@@ -0,0 +1,20 @@
+{
+ lib,
+ vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-remote-extensionpack";
+ publisher = "ms-vscode-remote";
+ version = "0.26.0";
+ hash = "sha256-YUo0QbJILa9BzWub6Wi6cDD/Zsy/H8LZ8j+9H+5pVHY=";
+ };
+
+ meta = {
+ description = "A Visual Studio Code extension pack that lets you open any folder in a container, on a remote machine, or in WSL and take advantage of VS Code's full feature set";
+ homepage = "https://github.com/Microsoft/vscode-remote-release";
+ license = lib.licenses.unfree;
+ maintainers = with lib.maintainers; [ drupol ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
new file mode 100644
index 0000000000..cdb13b4c60
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
@@ -0,0 +1,20 @@
+{
+ lib,
+ vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "windows-ai-studio";
+ publisher = "ms-windows-ai-studio";
+ version = "0.6.1";
+ hash = "sha256-BAA7wSfyJ4y8how+NnaGdCf/BCU6aOmI8ew8qpcQCnY=";
+ };
+
+ meta = {
+ description = "A Visual Studio Code an extension to help developers and AI engineers to easily build AI apps through developing and testing with generative AI models locally or in the cloud";
+ homepage = "https://github.com/Microsoft/windows-ai-studio";
+ license = lib.licenses.unfree;
+ maintainers = with lib.maintainers; [ drupol ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
index cc1d7af92f..54179c2224 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "sourcery";
publisher = "sourcery";
- version = "1.23.0";
- hash = "sha256-wMky9whajltZYD3PUG+LCzuK9S5t55+3tRjTyA8kFcY=";
+ version = "1.24.0";
+ hash = "sha256-T2AbGxBytHXWP/ZKBhglRRbvPZ6px90XnSadwZTe/BM=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix
index c35700856b..9872a1bffd 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix
@@ -5,6 +5,7 @@
, cmake
, wrapQtAppsHook
, qtbase
+, qtsvg
, bluez
, ffmpeg
, libao
@@ -48,13 +49,13 @@
stdenv.mkDerivation rec {
pname = "dolphin-emu-primehack";
- version = "1.0.6a";
+ version = "1.0.7a";
src = fetchFromGitHub {
owner = "shiiion";
repo = "dolphin";
rev = version;
- hash = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk=";
+ hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc=";
fetchSubmodules = true;
};
@@ -93,6 +94,7 @@ stdenv.mkDerivation rec {
fmt
xz
qtbase
+ qtsvg
] ++ lib.optionals stdenv.hostPlatform.isLinux [
bluez
udev
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wibo/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/wibo/default.nix
index f34f8d6b2f..71ed31ff4b 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/wibo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/wibo/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "wibo";
- version = "0.4.2";
+ version = "0.6.14";
src = fetchFromGitHub {
owner = "decompals";
repo = "wibo";
rev = version;
- hash = "sha256-oq/i0Hb2y5pwDEvaqSyC4+6LH1oUbvDZ/62l+V3S7Uk=";
+ hash = "sha256-6YcraHBFWmm8TBfuFHbM9jGvUm9KvTOplJrFSTQkt70=";
};
nativeBuildInputs = [
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
gc = srcOnly {
name = "GC_WII_COMPILERS";
src = fetchzip {
- url = "https://cdn.discordapp.com/attachments/727918646525165659/917185027656286218/GC_WII_COMPILERS.zip";
- hash = "sha256-o+UrmIbCsa74LxtLofT0DKrTRgT0qDK5/V7GsG2Zprc=";
+ url = "https://files.decomp.dev/compilers_20230715.zip";
+ hash = "sha256-IX3byvEUVJB6Rmc+NqO9ZNt1jl95nQpEIqxbHI+uUio=";
stripRoot = false;
};
meta.license = lib.licenses.unfree;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/fix-include.patch b/third_party/nixpkgs/pkgs/applications/misc/blender/fix-include.patch
deleted file mode 100644
index 44e2147d07..0000000000
--- a/third_party/nixpkgs/pkgs/applications/misc/blender/fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h
-index fce901b..1f73c5e 100644
---- a/intern/smoke/intern/WAVELET_NOISE.h
-+++ b/intern/smoke/intern/WAVELET_NOISE.h
-@@ -43,6 +43,7 @@
- #ifndef WAVELET_NOISE_H
- #define WAVELET_NOISE_H
-
-+#include
- #include
-
- #ifdef WIN32
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix
index e2f5cffdfb..bc9503d0d1 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "cotp";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "replydev";
repo = "cotp";
rev = "v${version}";
- hash = "sha256-U5x8szvouoxJ+DZUlrn5wtXt+6vs62tzcWICQW3B21U=";
+ hash = "sha256-5wVIjh16AYwrzjbPgvjsQhihu/vwdQfzU2kZS6eSTWs=";
};
- cargoHash = "sha256-o9LRXbx77EXXO7rEmpBrx2nommJgG0ikw1YzdeB0Gug=";
+ cargoHash = "sha256-DMswC+Qp6w7Dcp5YYV4EGWUylv/ouG0ukAdCdDnOA/8=";
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix
index ecce3066ed..8d68045e94 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix
@@ -208,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "G-code generator for 3D printer";
homepage = "https://github.com/prusa3d/PrusaSlicer";
license = licenses.agpl3Plus;
- maintainers = with maintainers; [ moredread tweber tmarkus ];
+ maintainers = with maintainers; [ tweber tmarkus ];
platforms = platforms.unix;
} // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
mainProgram = "PrusaSlicer";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix
index d790982b77..5e3bc69ebe 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix
@@ -88,7 +88,7 @@ let
inherit description;
homepage = "https://github.com/supermerill/SuperSlicer";
license = licenses.agpl3Plus;
- maintainers = with maintainers; [ cab404 moredread tmarkus ];
+ maintainers = with maintainers; [ cab404 tmarkus ];
mainProgram = "superslicer";
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/rust-1.78.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/rust-1.78.patch
deleted file mode 100644
index 8484109d5b..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/rust-1.78.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 9dd8048e28b65da0b904dfbace482f70ae768fd8 Mon Sep 17 00:00:00 2001
-From: Jeff Muizelaar
-Date: Tue, 5 Mar 2024 04:12:28 +0100
-Subject: [PATCH] Bug 1882291. Switch to stdarch_arm_neon_intrinsics feature on
- rust >=1.78. r=glandium
-
-We only need this on ARM32 because the ARM64 intrinsics are stable.
-
-stdarch_arm_neon_intrinsics was split out from stdsimd here:
-https://github.com/rust-lang/stdarch/pull/1486
-
-Differential Revision: https://phabricator.services.mozilla.com/D203039
----
- Cargo.lock | 1 +
- gfx/qcms/Cargo.toml | 3 +++
- gfx/qcms/build.rs | 7 +++++++
- gfx/qcms/src/lib.rs | 6 ++++--
- 4 files changed, 15 insertions(+), 2 deletions(-)
- create mode 100644 gfx/qcms/build.rs
-
-diff --git a/Cargo.lock b/Cargo.lock
-index aba397832e..8f0a879a87 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -4276,6 +4276,7 @@ name = "qcms"
- version = "0.2.0"
- dependencies = [
- "libc",
-+ "version_check",
- ]
-
- [[package]]
-diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml
-index e976054a7b..f50d6623a1 100644
---- a/gfx/qcms/Cargo.toml
-+++ b/gfx/qcms/Cargo.toml
-@@ -20,3 +20,6 @@ cmyk = []
-
- [dependencies]
- libc = {version = "0.2", optional = true }
-+
-+[build-dependencies]
-+version_check = "0.9"
-diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs
-new file mode 100644
-index 0000000000..6810a8828e
---- /dev/null
-+++ b/gfx/qcms/build.rs
-@@ -0,0 +1,7 @@
-+extern crate version_check as rustc;
-+
-+fn main() {
-+ if rustc::is_min_version("1.78.0").unwrap_or(false) {
-+ println!("cargo:rustc-cfg=stdsimd_split");
-+ }
-+}
-diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs
-index c311964ee3..fc496816a8 100644
---- a/gfx/qcms/src/lib.rs
-+++ b/gfx/qcms/src/lib.rs
-@@ -7,9 +7,11 @@
- #![allow(non_upper_case_globals)]
- // These are needed for the neon SIMD code and can be removed once the MSRV supports the
- // instrinsics we use
--#![cfg_attr(feature = "neon", feature(stdsimd))]
-+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]
-+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]
-+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]
- #![cfg_attr(
-- feature = "neon",
-+ all(target_arch = "arm", feature = "neon"),
- feature(arm_target_feature, raw_ref_op)
-
- )]
---
-2.44.0
-
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix
index 2397145a21..760bd691df 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix
@@ -109,6 +109,8 @@ stdenv.mkDerivation (finalAttrs: {
env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
+ env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
+
patchPhase = lib.optionalString stdenv.cc.isClang ''
runHook prePatch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix
index a0998eb6fa..e8b9fe8df1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix
@@ -27,6 +27,12 @@ let
nativeBuildInputs = [ installShellFiles ];
+ ldflags = [
+ "-X github.com/hashicorp/nomad/version.Version=${version}"
+ "-X github.com/hashicorp/nomad/version.VersionPrerelease="
+ "-X github.com/hashicorp/nomad/version.BuildDate=1970-01-01T00:00:00Z"
+ ];
+
# ui:
# Nomad release commits include the compiled version of the UI, but the file
# is only included if we build with the ui tag.
@@ -89,9 +95,9 @@ rec {
nomad_1_9 = generic {
buildGoModule = buildGo123Module;
- version = "1.9.0";
- sha256 = "sha256-MJNPYSH3KsRmGQeOcWw4VvDeFGinfsyGSo4q3OdOZo8=";
- vendorHash = "sha256-Ss/qwQ14VUu40nXaIgTfNuj95ekTTVrY+zcStFDSCyI=";
+ version = "1.9.2";
+ sha256 = "sha256-HIyRzujAGwhB2anbxidhq5UpWYHkigyyHfxIUwMF5X8=";
+ vendorHash = "sha256-YIOTdD+oRDdEHkBzQCUuKCz7Wbj4mFjrZY0J3Cte400=";
license = lib.licenses.bsl11;
passthru.tests.nomad = nixosTests.nomad;
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
index 77754a0122..98b056bedd 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
@@ -175,7 +175,6 @@ stdenv.mkDerivation rec {
libnotify
libdbusmenu
pipewire
- stdenv.cc.cc
xdg-utils
wayland
];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
deleted file mode 100644
index 6aa7e45ac1..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ /dev/null
@@ -1,168 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- fetchzip,
- makeWrapper,
- makeDesktopItem,
- zlib,
- glib,
- libpng,
- freetype,
- openssl,
- xorg,
- fontconfig,
- qtbase,
- qtwebengine,
- qtwebchannel,
- qtsvg,
- qtwebsockets,
- xkeyboard_config,
- alsa-lib,
- libpulseaudio ? null,
- libredirect,
- quazip,
- which,
- perl,
- llvmPackages,
-}:
-
-let
-
- arch = "amd64";
-
- libDir = "lib64";
-
- deps = [
- zlib
- glib
- libpng
- freetype
- xorg.libSM
- xorg.libICE
- xorg.libXrender
- openssl
- xorg.libXrandr
- xorg.libXfixes
- xorg.libXcursor
- xorg.libXinerama
- xorg.libxcb
- fontconfig
- xorg.libXext
- xorg.libX11
- alsa-lib
- qtbase
- qtwebengine
- qtwebchannel
- qtsvg
- qtwebsockets
- libpulseaudio
- quazip
- llvmPackages.libcxx
- ];
-
- desktopItem = makeDesktopItem {
- name = "teamspeak";
- exec = "ts3client";
- icon = "teamspeak";
- comment = "The TeamSpeak voice communication tool";
- desktopName = "TeamSpeak";
- genericName = "TeamSpeak";
- categories = [ "Network" ];
- };
-in
-
-stdenv.mkDerivation rec {
- pname = "teamspeak-client";
-
- version = "3.6.2";
-
- src = fetchurl {
- url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run";
- hash = "sha256-WfEQQ4lxoj+QSnAOfdCoEc+Z1Oa5dbo6pFli1DsAZCI=";
- };
-
- # grab the plugin sdk for the desktop icon
- pluginsdk = fetchzip {
- url = "https://files.teamspeak-services.com/releases/sdk/3.3.1/ts_sdk_3.3.1.zip";
- hash = "sha256-wx4pBZHpFPoNvEe4xYE80KnXGVda9XcX35ho4R8QxrQ=";
- };
-
- nativeBuildInputs = [
- makeWrapper
- which
- perl # Installer script needs `shasum`
- ];
-
- # This just runs the installer script. If it gets stuck at something like
- # ++ exec
- # + PAGER_PATH=
- # it's looking for a dependency and didn't find it. Check the script and make sure the dep is in nativeBuildInputs.
- unpackPhase = ''
- echo -e '\ny' | PAGER=cat sh -xe $src
- cd TeamSpeak*
- '';
-
- buildPhase = ''
- mv ts3client_linux_${arch} ts3client
- echo "patching ts3client..."
- patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client
- patchelf \
- --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
- --force-rpath \
- ts3client
- '';
-
- installPhase =
- ''
- # Delete unecessary libraries - these are provided by nixos.
- rm *.so.* *.so
- rm QtWebEngineProcess
- rm qt.conf
- rm -r platforms # contains libqxcb.so
-
- # Install files.
- mkdir -p $out/lib/teamspeak
- mv * $out/lib/teamspeak/
-
- # Make a desktop item
- mkdir -p $out/share/applications/ $out/share/icons/hicolor/64x64/apps/
- cp ${pluginsdk}/doc/_static/logo.png $out/share/icons/hicolor/64x64/apps/teamspeak.png
- cp ${desktopItem}/share/applications/* $out/share/applications/
-
- # Make a symlink to the binary from bin.
- mkdir -p $out/bin/
- ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client
-
- wrapProgram $out/bin/ts3client \
- --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
- --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \
- '' # wayland is currently broken, remove when TS3 fixes that
- + ''
- --set QT_QPA_PLATFORM xcb \
- --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
- '';
-
- dontStrip = true;
- dontPatchELF = true;
-
- meta = with lib; {
- description = "TeamSpeak voice communication tool";
- homepage = "https://teamspeak.com/";
- sourceProvenance = with sourceTypes; [ binaryNativeCode ];
- license = {
- # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak.
- fullName = "Teamspeak client license";
- url = "https://www.teamspeak.com/en/privacy-and-terms/";
- free = false;
- };
- maintainers = with maintainers; [
- lhvwb
- lukegb
- atemu
- ];
- mainProgram = "ts3client";
- platforms = [ "x86_64-linux" ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/Cargo.lock.patch b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/Cargo.lock.patch
deleted file mode 100644
index 775a7b7178..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/Cargo.lock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1535,7 +1535,7 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
-
- [[package]]
- name = "tiny"
--version = "0.10.0"
-+version = "0.11.0"
- dependencies = [
- "clap",
- "dirs",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 4e781672d8..6a4ef2badb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -69,8 +69,8 @@ in rec {
thunderbird-esr = thunderbird-128;
thunderbird-128 = common {
- version = "128.4.0esr";
- sha512 = "ad031b3a9b738598358cead23cf8438435016222cd9a474c31892dc1b3db43d2d5d3a10c9639df770dc76eb3c0bc9db8be8beab84828d54ee50fc1e03f0da0a5";
+ version = "128.4.2esr";
+ sha512 = "4e37b77eb4652bc36585656bd3fe5416053f6a1a96ed1ca64c17d8d73031c746cb3832fd275d25f1283d20e18aa3e7b1df6d67864ced21b5f73042a42767cb45";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-128";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix
index b14b63d8f7..0bcd4020da 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix
@@ -21,14 +21,14 @@
buildPythonApplication rec {
pname = "protonvpn-gui";
- version = "4.6.0";
+ version = "4.7.3";
pyproject = true;
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "proton-vpn-gtk-app";
rev = "refs/tags/v${version}";
- hash = "sha256-GCfr6x0KbIJr2r4UcFtMjuyHZVyDLKPvgtjdpTCb5Ro=";
+ hash = "sha256-LcHloc4iHDgP6RCwFvJM6GfzTRd3RqYo0medjEhmj6M=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
index 2a72a50603..e9a9702545 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
@@ -548,7 +548,9 @@ in stdenv.mkDerivation (finalAttrs: {
buildTargets = [ "build-nocheck" ];
- doCheck = true;
+ # Disable tests for the Qt5 build, as they seem even more flaky
+ # than usual, and we will drop the Qt5 build after 24.11 anyway.
+ doCheck = !(kdeIntegration && qtMajor == "5");
preCheck = ''
export HOME=$(pwd)
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/deps.nix
index 38354245ba..a2876c9cd2 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/deps.nix
@@ -105,11 +105,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
- name = "curl-8.9.0.tar.xz";
- url = "https://dev-www.libreoffice.org/src/curl-8.9.0.tar.xz";
- sha256 = "ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412";
+ name = "curl-8.10.1.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/curl-8.10.1.tar.xz";
+ sha256 = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee";
md5 = "";
- md5name = "ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412-curl-8.9.0.tar.xz";
+ md5name = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee-curl-8.10.1.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@@ -147,11 +147,11 @@
md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
}
{
- name = "expat-2.6.2.tar.xz";
- url = "https://dev-www.libreoffice.org/src/expat-2.6.2.tar.xz";
- sha256 = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364";
+ name = "expat-2.6.3.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/expat-2.6.3.tar.xz";
+ sha256 = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc";
md5 = "";
- md5name = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364-expat-2.6.2.tar.xz";
+ md5name = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc-expat-2.6.3.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@@ -658,11 +658,11 @@
md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz";
}
{
- name = "mariadb-connector-c-3.3.8-src.tar.gz";
- url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.8-src.tar.gz";
- sha256 = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8";
+ name = "mariadb-connector-c-3.3.11-src.tar.gz";
+ url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz";
+ sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a";
md5 = "";
- md5name = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8-mariadb-connector-c-3.3.8-src.tar.gz";
+ md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz";
}
{
name = "mdds-2.1.1.tar.xz";
@@ -742,11 +742,11 @@
md5name = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e-openldap-2.6.8.tgz";
}
{
- name = "openssl-3.0.14.tar.gz";
- url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz";
- sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca";
+ name = "openssl-3.0.15.tar.gz";
+ url = "https://dev-www.libreoffice.org/src/openssl-3.0.15.tar.gz";
+ sha256 = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533";
md5 = "";
- md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz";
+ md5name = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533-openssl-3.0.15.tar.gz";
}
{
name = "liborcus-0.19.2.tar.xz";
@@ -777,25 +777,25 @@
md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
}
{
- name = "libpng-1.6.43.tar.xz";
- url = "https://dev-www.libreoffice.org/src/libpng-1.6.43.tar.xz";
- sha256 = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c";
+ name = "libpng-1.6.44.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz";
+ sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e";
md5 = "";
- md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz";
+ md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz";
}
{
- name = "tiff-4.6.0t.tar.xz";
- url = "https://dev-www.libreoffice.org/src/tiff-4.6.0t.tar.xz";
- sha256 = "d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b";
+ name = "tiff-4.7.0.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz";
+ sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017";
md5 = "";
- md5name = "d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b-tiff-4.6.0t.tar.xz";
+ md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
}
{
- name = "poppler-24.06.0.tar.xz";
- url = "https://dev-www.libreoffice.org/src/poppler-24.06.0.tar.xz";
- sha256 = "0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76";
+ name = "poppler-24.08.0.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/poppler-24.08.0.tar.xz";
+ sha256 = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174";
md5 = "";
- md5name = "0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76-poppler-24.06.0.tar.xz";
+ md5name = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174-poppler-24.08.0.tar.xz";
}
{
name = "poppler-data-0.4.12.tar.gz";
@@ -805,18 +805,18 @@
md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
}
{
- name = "postgresql-13.15.tar.bz2";
- url = "https://dev-www.libreoffice.org/src/postgresql-13.15.tar.bz2";
- sha256 = "42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925";
+ name = "postgresql-13.16.tar.bz2";
+ url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2";
+ sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865";
md5 = "";
- md5name = "42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925-postgresql-13.15.tar.bz2";
+ md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2";
}
{
- name = "Python-3.9.19.tar.xz";
- url = "https://dev-www.libreoffice.org/src/Python-3.9.19.tar.xz";
- sha256 = "d4892cd1618f6458cb851208c030df1482779609d0f3939991bd38184f8c679e";
+ name = "Python-3.9.20.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/Python-3.9.20.tar.xz";
+ sha256 = "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c";
md5 = "";
- md5name = "d4892cd1618f6458cb851208c030df1482779609d0f3939991bd38184f8c679e-Python-3.9.19.tar.xz";
+ md5name = "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c-Python-3.9.20.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix
index 2a807c3615..2544928cdd 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
- sha256 = "1vbi2qbap3ccychc0sfn32z46klyzjh0hhk4in0sd7qkl97y6lvn";
- url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-help-24.8.0.3.tar.xz";
+ sha256 = "1xlfs1380h9axqx37kp9nwq4bwlg08rm136ayzglaz57vx87vxsg";
+ url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-help-24.8.2.1.tar.xz";
}
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/main.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/main.nix
index 2bbbb6b3b0..6bda045c57 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/main.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/main.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
- sha256 = "1hbqgpgih3j9ic1dljxz3mz0rsjf0iyws7qm7g1hb35ns664c4av";
- url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-24.8.0.3.tar.xz";
+ sha256 = "1ky4ph9g7x9k68px6x4dgfnf5wqbxqabkp75pjhsj521nsp1nc5b";
+ url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-24.8.2.1.tar.xz";
}
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix
index d5890a86e2..488ee5acfe 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
- sha256 = "0p75xijrmp44kcda33xg5dr06xl1fcxwhxgvlcj396rkn2k0c9sy";
- url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-translations-24.8.0.3.tar.xz";
+ sha256 = "1yvfcwj9dr2216b9fyi89849jy4lw3jg2yqrx4dm30qdn07jqf3j";
+ url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-translations-24.8.2.1.tar.xz";
}
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/version.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/version.nix
index e6bf645f80..7e7df1e016 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/version.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/version.nix
@@ -1 +1 @@
-"24.8.0.3"
+"24.8.2.1"
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/deps.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/deps.nix
index d9ef29364f..5f40673381 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/deps.nix
@@ -105,11 +105,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
- name = "curl-8.7.1.tar.xz";
- url = "https://dev-www.libreoffice.org/src/curl-8.7.1.tar.xz";
- sha256 = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd";
+ name = "curl-8.10.1.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/curl-8.10.1.tar.xz";
+ sha256 = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee";
md5 = "";
- md5name = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd-curl-8.7.1.tar.xz";
+ md5name = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee-curl-8.10.1.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@@ -147,11 +147,11 @@
md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
}
{
- name = "expat-2.6.2.tar.xz";
- url = "https://dev-www.libreoffice.org/src/expat-2.6.2.tar.xz";
- sha256 = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364";
+ name = "expat-2.6.3.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/expat-2.6.3.tar.xz";
+ sha256 = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc";
md5 = "";
- md5name = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364-expat-2.6.2.tar.xz";
+ md5name = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc-expat-2.6.3.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@@ -630,11 +630,11 @@
md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz";
}
{
- name = "libxml2-2.12.8.tar.xz";
- url = "https://dev-www.libreoffice.org/src/libxml2-2.12.8.tar.xz";
- sha256 = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93";
+ name = "libxml2-2.12.9.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz";
+ sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590";
md5 = "";
- md5name = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93-libxml2-2.12.8.tar.xz";
+ md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz";
}
{
name = "libxslt-1.1.39.tar.xz";
@@ -658,11 +658,11 @@
md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz";
}
{
- name = "mariadb-connector-c-3.3.8-src.tar.gz";
- url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.8-src.tar.gz";
- sha256 = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8";
+ name = "mariadb-connector-c-3.3.11-src.tar.gz";
+ url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz";
+ sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a";
md5 = "";
- md5name = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8-mariadb-connector-c-3.3.8-src.tar.gz";
+ md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz";
}
{
name = "mdds-2.1.1.tar.xz";
@@ -700,11 +700,11 @@
md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
}
{
- name = "nss-3.99-with-nspr-4.35.tar.gz";
- url = "https://dev-www.libreoffice.org/src/nss-3.99-with-nspr-4.35.tar.gz";
- sha256 = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31";
+ name = "nss-3.101.2-with-nspr-4.35.tar.gz";
+ url = "https://dev-www.libreoffice.org/src/nss-3.101.2-with-nspr-4.35.tar.gz";
+ sha256 = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa";
md5 = "";
- md5name = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31-nss-3.99-with-nspr-4.35.tar.gz";
+ md5name = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa-nss-3.101.2-with-nspr-4.35.tar.gz";
}
{
name = "libodfgen-0.1.8.tar.xz";
@@ -742,11 +742,11 @@
md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz";
}
{
- name = "openssl-3.0.14.tar.gz";
- url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz";
- sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca";
+ name = "openssl-3.0.15.tar.gz";
+ url = "https://dev-www.libreoffice.org/src/openssl-3.0.15.tar.gz";
+ sha256 = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533";
md5 = "";
- md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz";
+ md5name = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533-openssl-3.0.15.tar.gz";
}
{
name = "liborcus-0.19.2.tar.xz";
@@ -777,25 +777,25 @@
md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
}
{
- name = "libpng-1.6.43.tar.xz";
- url = "https://dev-www.libreoffice.org/src/libpng-1.6.43.tar.xz";
- sha256 = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c";
+ name = "libpng-1.6.44.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz";
+ sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e";
md5 = "";
- md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz";
+ md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz";
}
{
- name = "tiff-4.6.0.tar.xz";
- url = "https://dev-www.libreoffice.org/src/tiff-4.6.0.tar.xz";
- sha256 = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2";
+ name = "tiff-4.7.0.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz";
+ sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017";
md5 = "";
- md5name = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2-tiff-4.6.0.tar.xz";
+ md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
}
{
- name = "poppler-23.09.0.tar.xz";
- url = "https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz";
- sha256 = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55";
+ name = "poppler-24.08.0.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/poppler-24.08.0.tar.xz";
+ sha256 = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174";
md5 = "";
- md5name = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55-poppler-23.09.0.tar.xz";
+ md5name = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174-poppler-24.08.0.tar.xz";
}
{
name = "poppler-data-0.4.12.tar.gz";
@@ -805,18 +805,18 @@
md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
}
{
- name = "postgresql-13.14.tar.bz2";
- url = "https://dev-www.libreoffice.org/src/postgresql-13.14.tar.bz2";
- sha256 = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed";
+ name = "postgresql-13.16.tar.bz2";
+ url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2";
+ sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865";
md5 = "";
- md5name = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed-postgresql-13.14.tar.bz2";
+ md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2";
}
{
- name = "Python-3.8.19.tar.xz";
- url = "https://dev-www.libreoffice.org/src/Python-3.8.19.tar.xz";
- sha256 = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076";
+ name = "Python-3.8.20.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/Python-3.8.20.tar.xz";
+ sha256 = "6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4";
md5 = "";
- md5name = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076-Python-3.8.19.tar.xz";
+ md5name = "6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4-Python-3.8.20.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix
index 0f9f549052..b61ff5be0e 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
- sha256 = "090pi8dnj5izpvng94hgmjid14n7xvy3rlqqvang3pqdn35xnpsl";
- url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-help-24.2.5.2.tar.xz";
+ sha256 = "0g31xfmmxjd5c1xg203gflzvq2d2jlgfi9gmg1wxl18l9gjk4hds";
+ url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-help-24.2.7.2.tar.xz";
}
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/main.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/main.nix
index 69376e497a..2bb8d53a4d 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/main.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/main.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
- sha256 = "03halzc9w4z8pfs8krpswp2qzrqq9rhnmms8v8ny88am87vy85lw";
- url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-24.2.5.2.tar.xz";
+ sha256 = "1r8h8g5fs7z0fvf7f6fq44rw90q4v2z23kkwzdh1s8gaxlnb3sgm";
+ url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-24.2.7.2.tar.xz";
}
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix
index b969430601..fd248167fb 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
- sha256 = "0fri41y59zhm8lq0kh6hvf5rpdjdqx0lg1sl40mhh1d6lf1izc1w";
- url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-translations-24.2.5.2.tar.xz";
+ sha256 = "0g2wp8s3gxhy3l685jv3h63gzaljfclgcah437922dl60kpm9yjq";
+ url = "https://download.documentfoundation.org/libreoffice/src/24.2.7/libreoffice-translations-24.2.7.2.tar.xz";
}
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/version.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/version.nix
index ede95eca68..351ceee22b 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/version.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/version.nix
@@ -1 +1 @@
-"24.2.5.2"
+"24.2.7.2"
diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
index 7757357ec8..d2f38c8f83 100644
--- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
@@ -20,14 +20,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
- version = "24.9.8";
+ version = "24.11.1";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
- hash = "sha256-G5PLz1GzjfPM5tj3rtwJt4hR3v+oSq2bVr/llTSFbNk=";
+ hash = "sha256-OQ6p5VCdQZ2P1UFiCPtK+HogIgaoBQKdKO1tEDCA/5I=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/caneda/gcc6.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/caneda/gcc6.patch
deleted file mode 100644
index 04c8f4502b..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/caneda/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git c/src/cgraphicsscene.cpp i/src/cgraphicsscene.cpp
-index ac2929a..c399706 100644
---- c/src/cgraphicsscene.cpp
-+++ i/src/cgraphicsscene.cpp
-@@ -1436,7 +1436,7 @@ namespace Caneda
- QPointF newPos = m_currentWiringWire->mapFromScene(pos);
- QPointF refPos = m_currentWiringWire->port1()->pos();
-
-- if( abs(refPos.x()-newPos.x()) > abs(refPos.y()-newPos.y()) ) {
-+ if( (refPos.x()-newPos.x()) > (refPos.y()-newPos.y()) ) {
- m_currentWiringWire->movePort2(QPointF(newPos.x(), refPos.y()));
- }
- else {
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix
index 713238cc3f..747231e738 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix
@@ -1,6 +1,20 @@
-{ lib, stdenv, fetchurl, libxml2, freetype, libGLU, libGL, glew
-, qtbase, wrapQtAppsHook, autoPatchelfHook, python3
-, cmake, libjpeg, llvmPackages }:
+{
+ lib,
+ stdenv,
+ fetchurl,
+ libxml2,
+ freetype,
+ libGLU,
+ libGL,
+ glew,
+ qtbase,
+ wrapQtAppsHook,
+ autoPatchelfHook,
+ python3,
+ cmake,
+ libjpeg,
+ llvmPackages,
+}:
stdenv.mkDerivation rec {
pname = "tulip";
@@ -11,21 +25,37 @@ stdenv.mkDerivation rec {
hash = "sha256-7z21WkPi1v2AGishDmXZPAedMjgXPRnpUiHTzEnc5LY=";
};
- nativeBuildInputs = [ cmake wrapQtAppsHook ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+ nativeBuildInputs = [
+ cmake
+ wrapQtAppsHook
+ ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
- buildInputs = [ libxml2 freetype glew libjpeg qtbase python3 ]
+ buildInputs =
+ [
+ libxml2
+ freetype
+ glew
+ libjpeg
+ qtbase
+ python3
+ ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ];
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ libGLU
+ libGL
+ ];
qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ];
- env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
- # fatal error: 'Python.h' file not found
- "-I${python3}/include/${python3.libPrefix}"
- # error: format string is not a string literal (potentially insecure)
- "-Wno-format-security"
- ]);
+ env.NIX_CFLAGS_COMPILE =
+ # error: invalid conversion from 'unsigned char*' to 'char*'
+ "-fpermissive "
+ + (lib.optionalString stdenv.hostPlatform.isDarwin (toString [
+ # fatal error: 'Python.h' file not found
+ "-I${python3}/include/${python3.libPrefix}"
+ # error: format string is not a string literal (potentially insecure)
+ "-Wno-format-security"
+ ]));
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-hyperion/check-state-changed.patch b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-hyperion/check-state-changed.patch
new file mode 100644
index 0000000000..59bf7b4724
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-hyperion/check-state-changed.patch
@@ -0,0 +1,13 @@
+diff --git a/src/HyperionProperties.cpp b/src/HyperionProperties.cpp
+index b585702..3fd308c 100644
+--- a/src/HyperionProperties.cpp
++++ b/src/HyperionProperties.cpp
+@@ -59,7 +59,7 @@ HyperionProperties::HyperionProperties(QWidget *parent)
+ signal_handler_connect(handler, "log", logger_message, this);
+
+ connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::saveSettings);
+- connect(ui->AutoStart, &QCheckBox::stateChanged, this, &HyperionProperties::saveSettings);
++ connect(ui->AutoStart, &QCheckBox::checkStateChanged, this, &HyperionProperties::saveSettings);
+
+ connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::onStart);
+ connect(ui->ButtonStop, &QPushButton::clicked, this, &HyperionProperties::onStop);
diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
index 85606e05f0..6fcd7744fe 100644
--- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
+ patches = [ ./check-state-changed.patch ];
+
cmakeFlags = [
"-DOBS_SOURCE=${obs-studio.src}"
"-DGLOBAL_INSTALLATION=ON"
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix
index 8546f64a55..d7e07ed311 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix
@@ -97,6 +97,7 @@ python3.pkgs.buildPythonApplication rec {
"test_misc_nonpredicatble_generate"
"test_disk_dir_searchable" # does something strange with permissions
"testCLI0001virt_install_many_devices" # expects /var to exist
+ "testCLI0263virt_xml" # depends on a specific libvirt version
];
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
index eaa86ba624..f8fc3c4e55 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
@@ -4,22 +4,25 @@
fetchFromGitHub,
hyprland,
mkHyprlandPlugin,
+ nix-update-script,
}:
mkHyprlandPlugin hyprland rec {
pluginName = "hy3";
- version = "0.44.0";
+ version = "0.45.0";
src = fetchFromGitHub {
owner = "outfoxxed";
repo = "hy3";
rev = "refs/tags/hl${version}";
- hash = "sha256-6TVaB+nWVanqZWqievg+m7tVNrSpQ9CQcwXJQeyU/Q0=";
+ hash = "sha256-b3PuEtRHTSxV809RLUiZVQhDQZ8NxxpWUjboTe9QAAY=";
};
nativeBuildInputs = [ cmake ];
dontStrip = true;
+ passthru.updateScript = nix-update-script { };
+
meta = {
homepage = "https://github.com/outfoxxed/hy3";
description = "Hyprland plugin for an i3 / sway like manual tiling layout";
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
index d0770b439f..e21eb2560b 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
@@ -8,13 +8,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hypr-dynamic-cursors";
- version = "0-unstable-2024-10-10";
+ version = "0-unstable-2024-11-10";
src = fetchFromGitHub {
owner = "VirtCode";
repo = "hypr-dynamic-cursors";
- rev = "3ff4c2a053f7673b3b8cd45ada0886cbda13ebcc";
- hash = "sha256-XMR9wDNXmY3pPp3imT5vA4Gc6yC3R2Fatp4B53uLHzI=";
+ rev = "a3427f2a7f1dc70236dbaa870eadead03d9807a6";
+ hash = "sha256-7nznQzeq0rzvTos2axd4LvzLJ64n0erP3WxMIpCE5Ew=";
};
dontUseCmakeConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix
index f58cc54a8e..63a219f317 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix
@@ -7,13 +7,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprfocus";
- version = "0-unstable-2024-05-30";
+ version = "0-unstable-2024-10-09";
src = fetchFromGitHub {
owner = "pyt0xic";
repo = "hyprfocus";
- rev = "aa7262d3a4564062f97b9cfdad47fd914cfb80f2";
- hash = "sha256-R1ZgNhQkoS6ZHRRKB+j5vYgRANfYO//sHbrD7moUTx0=";
+ rev = "bead5b77d80f222c006d1a6c6f44ee8b02021d73";
+ hash = "sha256-qIl7opF7fA1ZmC91TGQ7D12tB7kHc6Sn9DrfUN6sbBY=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
index 00db238707..cc088d87f2 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
@@ -11,15 +11,15 @@
nix-update-script,
}:
-mkHyprlandPlugin hyprland rec {
+mkHyprlandPlugin hyprland {
pluginName = "hyprgrass";
- version = "0.8.2";
+ version = "0.8.2-unstable-2024-10-30";
src = fetchFromGitHub {
owner = "horriblename";
repo = "hyprgrass";
- rev = "v${version}";
- hash = "sha256-0dYMlNYuevQvsd6+imOkic3c6RSssM8WSx1hAepJ/wU=";
+ rev = "f97b6ac2b7de3bae194b776c388467db2604929f";
+ hash = "sha256-Jg5Q/v8tcNjopTMbra82y5n9QQdCnrbEFNgT1kA7pQE=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
index 99ea4f860c..55d2be9340 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
@@ -14,13 +14,13 @@ let
mkHyprlandPlugin,
}:
let
- version = "0.44.0";
+ version = "0.45.0";
hyprland-plugins-src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprland-plugins";
rev = "refs/tags/v${version}";
- hash = "sha256-/SeOrMuPEOjngI+MBlzqxQ/sJxkJFIYoef+wJ/PmX2w=";
+ hash = "sha256-hOljwsXpY4Y6guvcr51tWCnXo6c56yaBknnLXk1m3Vk=";
};
in
mkHyprlandPlugin hyprland {
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix
index 53618795c7..d530a46206 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix
@@ -9,13 +9,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprscroller";
- version = "0-unstable-2024-10-10";
+ version = "0-unstable-2024-11-09";
src = fetchFromGitHub {
owner = "dawsers";
repo = "hyprscroller";
- rev = "1a907fd38594ec58a8fe5d68be0dcf2f9e76b0f8";
- hash = "sha256-cgwHl2YtqrnS0ThUyycFGYoYozpq7zT9POARrQAoahY=";
+ rev = "556e01458ba26aa63253ae590a6aa8b2601ecf03";
+ hash = "sha256-lILkkTNwPxMvfYNpusbakl2BW4lvNUZcIputwAfHHAE=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix
index e667f55d9c..79d88bc4e4 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix
@@ -8,13 +8,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprspace";
- version = "0-unstable-2024-09-16";
+ version = "0-unstable-2024-11-02";
src = fetchFromGitHub {
owner = "KZDKM";
repo = "hyprspace";
- rev = "8f14fa2e10d24742d713f04c278bc7651037b74b";
- hash = "sha256-lMIFDORuyMYHtUPrRWU5WjGcS+ZMrR4/wBSO+sgUVSY=";
+ rev = "260f386075c7f6818033b05466a368d8821cde2d";
+ hash = "sha256-cwbcYg+rPmvHFFtAEie7nw5IaBidrTYe5XsTlhOyoyQ=";
};
dontUseCmakeConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
index 4d8182af5e..f2ef35f0ed 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
@@ -8,13 +8,13 @@
}:
mkHyprlandPlugin hyprland rec {
pluginName = "hyprsplit";
- version = "0.44.1";
+ version = "0.45.0";
src = fetchFromGitHub {
owner = "shezdy";
repo = "hyprsplit";
rev = "refs/tags/v${version}";
- hash = "sha256-l+DQHWPMyUCXbKhbIFVooTKKnCRQ97Ic5smw4VzUcTc=";
+ hash = "sha256-otDIivy4sMZBN2t9eHVI5PaFacg2Je4U9gBPPcH/Vpo=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
index 291af512a4..dc8ee68e87 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
@@ -87,7 +87,7 @@ let
destination = "/etc/profile";
text = ''
export PS1='${name}-fhsenv:\u@\h:\w\$ '
- export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
+ export LOCALE_ARCHIVE="''${LOCALE_ARCHIVE:-/usr/lib/locale/locale-archive}"
export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH"
export TZDIR='/etc/zoneinfo'
diff --git a/third_party/nixpkgs/pkgs/data/fonts/0xproto/default.nix b/third_party/nixpkgs/pkgs/by-name/_0/_0xproto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/0xproto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_0/_0xproto/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/2048-in-terminal/default.nix b/third_party/nixpkgs/pkgs/by-name/_2/_2048-in-terminal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/2048-in-terminal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_2/_2048-in-terminal/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/20kly/default.nix b/third_party/nixpkgs/pkgs/by-name/_2/_20kly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/20kly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_2/_20kly/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix b/third_party/nixpkgs/pkgs/by-name/_3/_3270font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_3/_3270font/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix b/third_party/nixpkgs/pkgs/by-name/_3/_3mux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_3/_3mux/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/3proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/_3/_3proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/3proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_3/_3proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/5etools/default.nix b/third_party/nixpkgs/pkgs/by-name/_5/_5etools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/5etools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_5/_5etools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/6tunnel/default.nix b/third_party/nixpkgs/pkgs/by-name/_6/_6tunnel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/6tunnel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_6/_6tunnel/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/7kaa/default.nix b/third_party/nixpkgs/pkgs/by-name/_7/_7kaa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/7kaa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_7/_7kaa/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/915resolution/default.nix b/third_party/nixpkgs/pkgs/by-name/_9/_915resolution/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/915resolution/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_9/_915resolution/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix b/third_party/nixpkgs/pkgs/by-name/_9/_9pfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_9/_9pfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/9ptls/default.nix b/third_party/nixpkgs/pkgs/by-name/_9/_9ptls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/9ptls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/_9/_9ptls/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix b/third_party/nixpkgs/pkgs/by-name/a2/a2jmidid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/a2/a2jmidid/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/a2ps/default.nix b/third_party/nixpkgs/pkgs/by-name/a2/a2ps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/a2ps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/a2/a2ps/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/aaa/default.nix b/third_party/nixpkgs/pkgs/by-name/aa/aaa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/aaa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aa/aaa/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/aacgain/default.nix b/third_party/nixpkgs/pkgs/by-name/aa/aacgain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/aacgain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aa/aacgain/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aalib/clang.patch b/third_party/nixpkgs/pkgs/by-name/aa/aalib/clang.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aalib/clang.patch
rename to third_party/nixpkgs/pkgs/by-name/aa/aalib/clang.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aalib/darwin.patch b/third_party/nixpkgs/pkgs/by-name/aa/aalib/darwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aalib/darwin.patch
rename to third_party/nixpkgs/pkgs/by-name/aa/aalib/darwin.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix b/third_party/nixpkgs/pkgs/by-name/aa/aalib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aa/aalib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/aapt/default.nix b/third_party/nixpkgs/pkgs/by-name/aa/aapt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/aapt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aa/aapt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix b/third_party/nixpkgs/pkgs/by-name/aa/aardvark-dns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aa/aardvark-dns/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/aaxtomp3/default.nix b/third_party/nixpkgs/pkgs/by-name/aa/aaxtomp3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/aaxtomp3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aa/aaxtomp3/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ab/ab-av1/package.nix b/third_party/nixpkgs/pkgs/by-name/ab/ab-av1/package.nix
index 5c2a5f8f43..d31a67f364 100644
--- a/third_party/nixpkgs/pkgs/by-name/ab/ab-av1/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ab/ab-av1/package.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "ab-av1";
- version = "0.7.18";
+ version = "0.7.19";
src = fetchFromGitHub {
owner = "alexheretic";
repo = "ab-av1";
rev = "v${version}";
- hash = "sha256-n8yclhjeEkkge9xHuM4ZW+7aubIiLWwxCmmGTI1bE9I=";
+ hash = "sha256-5gDPbljvy5Kp3s+oo5LkI0rUR2zSVK2wDh4k2HrsLFc=";
};
- cargoHash = "sha256-Rn+y1W2Cimt5JrD2dLmvLmZshxyLO7N+oIALwGjxhvM=";
+ cargoHash = "sha256-MIZGAlcBeQ03ScleOcM0WxgQEfjpFbRq1dK1/PjZbCQ=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abaddon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abaddon/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/abbaye-des-morts/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abbaye-des-morts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/abbaye-des-morts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abbaye-des-morts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/abbreviate/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abbreviate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/abbreviate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abbreviate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abc-verifier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abc-verifier/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abcm2ps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abcm2ps/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/abduco/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abduco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/abduco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abduco/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abi-compliance-checker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abi-compliance-checker/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abi-dumper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abi-dumper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abiword/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/abiword/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abiword/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/abook/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/abook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abook/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/mobile/abootimg/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abootimg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/mobile/abootimg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abootimg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/abuild/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abuild/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/abuild/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abuild/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/abuse/abuse.sh b/third_party/nixpkgs/pkgs/by-name/ab/abuse/abuse.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/abuse/abuse.sh
rename to third_party/nixpkgs/pkgs/by-name/ab/abuse/abuse.sh
diff --git a/third_party/nixpkgs/pkgs/games/abuse/default.nix b/third_party/nixpkgs/pkgs/by-name/ab/abuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/abuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ab/abuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/computer-architecture/accelergy/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/accelergy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/computer-architecture/accelergy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/accelergy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch b/third_party/nixpkgs/pkgs/by-name/ac/accountsservice/Disable-methods-that-change-files-in-etc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch
rename to third_party/nixpkgs/pkgs/by-name/ac/accountsservice/Disable-methods-that-change-files-in-etc.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch b/third_party/nixpkgs/pkgs/by-name/ac/accountsservice/drop-prefix-check-extensions.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch
rename to third_party/nixpkgs/pkgs/by-name/ac/accountsservice/drop-prefix-check-extensions.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/ac/accountsservice/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/ac/accountsservice/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch b/third_party/nixpkgs/pkgs/by-name/ac/accountsservice/get-dm-type-from-config.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch
rename to third_party/nixpkgs/pkgs/by-name/ac/accountsservice/get-dm-type-from-config.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/third_party/nixpkgs/pkgs/by-name/ac/accountsservice/no-create-dirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch
rename to third_party/nixpkgs/pkgs/by-name/ac/accountsservice/no-create-dirs.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/accountsservice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/accountsservice/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/acct/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/acct/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/acct/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/acct/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/accuraterip-checksum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/accuraterip-checksum/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/ace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/ace/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/acgtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/acgtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/acltoolkit/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/acltoolkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/acltoolkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/acltoolkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/acme-sh/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/acme-sh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/acme-sh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/acme-sh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/acme/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/acme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/acme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/acme/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/acpi/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/acpi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/acpi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/acpi/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/acpid/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/acpid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/acpid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/acpid/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/acpilight/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/acpilight/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/acpilight/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/acpilight/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/acpitool/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/acpitool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/acpitool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/acpitool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/acsccid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/acsccid/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/activate-linux/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/activate-linux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/activate-linux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/activate-linux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/actkbd/default.nix b/third_party/nixpkgs/pkgs/by-name/ac/actkbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/actkbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ac/actkbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adafruit-ampy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adafruit-ampy/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adapta-backgrounds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adapta-backgrounds/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/adapta/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adapta-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/adapta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adapta-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/adapta-kde/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adapta-kde-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/adapta-kde/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adapta-kde-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adbfs-rootless/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adbfs-rootless/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/add-driver-runpath/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/addDriverRunpath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/add-driver-runpath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/addDriverRunpath/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/add-driver-runpath/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/ad/addDriverRunpath/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/add-driver-runpath/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/ad/addDriverRunpath/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/tools/misc/addic7ed-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/addic7ed-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/addic7ed-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/addic7ed-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/addlicense/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/addlicense/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/addlicense/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/addlicense/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/adementary/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adementary-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/adementary/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adementary-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/adenum/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adenum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/adenum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adenum/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/adguardian/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adguardian/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/adguardian/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adguardian/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix b/third_party/nixpkgs/pkgs/by-name/ad/adi1090x-plymouth-themes/shas.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adi1090x-plymouth-themes/shas.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/update.sh b/third_party/nixpkgs/pkgs/by-name/ad/adi1090x-plymouth-themes/update.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/update.sh
rename to third_party/nixpkgs/pkgs/by-name/ad/adi1090x-plymouth-themes/update.sh
diff --git a/third_party/nixpkgs/pkgs/applications/video/adl/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/adl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adl/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/adminer/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adminer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/adminer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adminer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/adms/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/adms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adms/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/adns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adns/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/adolc/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adolc/package.nix
similarity index 57%
rename from third_party/nixpkgs/pkgs/applications/science/math/adolc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adolc/package.nix
index 636c3ea177..31955562a7 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/adolc/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ad/adolc/package.nix
@@ -1,23 +1,29 @@
-{ lib, stdenv, fetchFromGitHub }:
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ llvmPackages,
+}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "adolc";
version = "2.7.2";
src = fetchFromGitHub {
owner = "coin-or";
repo = "ADOL-C";
- sha256 = "1w0x0p32r1amfmh2lyx33j4cb5bpkwjr5z0ll43zi5wf5gsvckd1";
- rev = "releases/${version}";
+ rev = "refs/tags/releases/${finalAttrs.version}";
+ hash = "sha256-oU229SuOl/gHoRT8kiWfd5XFiByjeypgdVWFLMYFHfA=";
};
configureFlags = [ "--with-openmp-flag=-fopenmp" ];
+ buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp;
+
meta = with lib; {
description = "Automatic Differentiation of C/C++";
homepage = "https://github.com/coin-or/ADOL-C";
maintainers = [ maintainers.bzizou ];
license = licenses.gpl2Plus;
};
-}
-
+})
diff --git a/third_party/nixpkgs/pkgs/tools/security/adreaper/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adreaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/adreaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adreaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/adrgen/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adrgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/adrgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adrgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/adriconf/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adriconf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/adriconf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adriconf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/adslib/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/adslib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/adslib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/adslib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/advancecomp/default.nix b/third_party/nixpkgs/pkgs/by-name/ad/advancecomp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/advancecomp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ad/advancecomp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix b/third_party/nixpkgs/pkgs/by-name/ae/aefs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ae/aefs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aemu/LFS64.patch b/third_party/nixpkgs/pkgs/by-name/ae/aemu/LFS64.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aemu/LFS64.patch
rename to third_party/nixpkgs/pkgs/by-name/ae/aemu/LFS64.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aemu/default.nix b/third_party/nixpkgs/pkgs/by-name/ae/aemu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aemu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ae/aemu/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/aeron/default.nix b/third_party/nixpkgs/pkgs/by-name/ae/aeron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/aeron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ae/aeron/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/aerospike/default.nix b/third_party/nixpkgs/pkgs/by-name/ae/aerospike/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/aerospike/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ae/aerospike/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/aescrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/ae/aescrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/aescrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ae/aescrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/aesfix/default.nix b/third_party/nixpkgs/pkgs/by-name/ae/aesfix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/aesfix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ae/aesfix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/aeskeyfind/default.nix b/third_party/nixpkgs/pkgs/by-name/ae/aeskeyfind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/aeskeyfind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ae/aeskeyfind/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/aespipe/default.nix b/third_party/nixpkgs/pkgs/by-name/ae/aespipe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/aespipe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ae/aespipe/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/aether-lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/ae/aether-lv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/aether-lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ae/aether-lv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/aewan/default.nix b/third_party/nixpkgs/pkgs/by-name/ae/aewan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/aewan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ae/aewan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/afetch/default.nix b/third_party/nixpkgs/pkgs/by-name/af/afetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/afetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/af/afetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix b/third_party/nixpkgs/pkgs/by-name/af/afew/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix
rename to third_party/nixpkgs/pkgs/by-name/af/afew/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix b/third_party/nixpkgs/pkgs/by-name/af/afflib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/af/afflib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch b/third_party/nixpkgs/pkgs/by-name/af/afio/0001-makefile-fix-installation.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch
rename to third_party/nixpkgs/pkgs/by-name/af/afio/0001-makefile-fix-installation.patch
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/afio/default.nix b/third_party/nixpkgs/pkgs/by-name/af/afio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/afio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/af/afio/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/af/afpfs-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/af/afpfs-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aften/default.nix b/third_party/nixpkgs/pkgs/by-name/af/aften/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aften/default.nix
rename to third_party/nixpkgs/pkgs/by-name/af/aften/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aften/simd-fallback.patch b/third_party/nixpkgs/pkgs/by-name/af/aften/simd-fallback.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aften/simd-fallback.patch
rename to third_party/nixpkgs/pkgs/by-name/af/aften/simd-fallback.patch
diff --git a/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix b/third_party/nixpkgs/pkgs/by-name/af/afterburn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/af/afterburn/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch b/third_party/nixpkgs/pkgs/by-name/af/afuse/001-darwin-fdatasync.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch
rename to third_party/nixpkgs/pkgs/by-name/af/afuse/001-darwin-fdatasync.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/afuse/default.nix b/third_party/nixpkgs/pkgs/by-name/af/afuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/afuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/af/afuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix b/third_party/nixpkgs/pkgs/by-name/ag/agave/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/agave/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ag/agave/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/agdsn-zsh-config/default.nix b/third_party/nixpkgs/pkgs/by-name/ag/agdsn-zsh-config/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/agdsn-zsh-config/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ag/agdsn-zsh-config/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/age-plugin-tpm/default.nix b/third_party/nixpkgs/pkgs/by-name/ag/age-plugin-tpm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/age-plugin-tpm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ag/age-plugin-tpm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/age/default.nix b/third_party/nixpkgs/pkgs/by-name/ag/age/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/age/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ag/age/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix b/third_party/nixpkgs/pkgs/by-name/ag/agedu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ag/agedu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/agenda/default.nix b/third_party/nixpkgs/pkgs/by-name/ag/agenda/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/agenda/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ag/agenda/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/by-name/ag/agi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ag/agi/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/third_party/nixpkgs/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/agola/default.nix b/third_party/nixpkgs/pkgs/by-name/ag/agola/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/agola/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ag/agola/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/agrep/default.nix b/third_party/nixpkgs/pkgs/by-name/ag/agrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/agrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ag/agrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/aha/default.nix b/third_party/nixpkgs/pkgs/by-name/ah/aha/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/aha/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ah/aha/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ahcpd/default.nix b/third_party/nixpkgs/pkgs/by-name/ah/ahcpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ahcpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ah/ahcpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix b/third_party/nixpkgs/pkgs/by-name/ah/ahoviewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ah/ahoviewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/aiac/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/aiac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/aiac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/aiac/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/aichat/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/aichat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/aichat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/aichat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/aide/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/aide/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/aide/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/aide/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix b/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix
index 0218dcd083..ab55239d81 100644
--- a/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix
@@ -13,166 +13,176 @@ let
packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
};
version = "0.62.0";
-in
-python3.pkgs.buildPythonApplication {
- pname = "aider-chat";
- inherit version;
- pyproject = true;
+ aider-chat = python3.pkgs.buildPythonApplication {
+ pname = "aider-chat";
+ inherit version;
+ pyproject = true;
- src = fetchFromGitHub {
- owner = "Aider-AI";
- repo = "aider";
- rev = "refs/tags/v${version}";
- hash = "sha256-o5vyOaJSUcdwuHBbzgpo5RDpZLnIur5dM+b7Y7PVBXA=";
- };
+ src = fetchFromGitHub {
+ owner = "Aider-AI";
+ repo = "aider";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-o5vyOaJSUcdwuHBbzgpo5RDpZLnIur5dM+b7Y7PVBXA=";
+ };
- pythonRelaxDeps = true;
+ pythonRelaxDeps = true;
- build-system = with python3.pkgs; [ setuptools-scm ];
+ build-system = with python3.pkgs; [ setuptools-scm ];
- dependencies = with python3.pkgs; [
- aiohappyeyeballs
- aiohttp
- aiosignal
- annotated-types
- anyio
- attrs
- backoff
- beautifulsoup4
- certifi
- cffi
- charset-normalizer
- click
- configargparse
- diff-match-patch
- diskcache
- distro
- filelock
- flake8
- frozenlist
- fsspec
- gitdb
- gitpython
- grep-ast
- h11
- httpcore
- httpx
- huggingface-hub
- idna
- importlib-resources
- jinja2
- jiter
- json5
- jsonschema
- jsonschema-specifications
- litellm
- markdown-it-py
- markupsafe
- mccabe
- mdurl
- multidict
- networkx
- numpy
- openai
- packaging
- pathspec
- pexpect
- pillow
- prompt-toolkit
- psutil
- ptyprocess
- pycodestyle
- pycparser
- pydantic
- pydantic-core
- pydub
- pyflakes
- pygments
- pypandoc
- pyperclip
- python-dotenv
- pyyaml
- referencing
- regex
- requests
- rich
- rpds-py
- scipy
- smmap
- sniffio
- sounddevice
- soundfile
- soupsieve
- tiktoken
- tokenizers
- tqdm
- tree-sitter
- tree-sitter-languages
- typing-extensions
- urllib3
- wcwidth
- yarl
- zipp
-
- # Not listed in requirements
- mixpanel
- monotonic
- posthog
- propcache
- python-dateutil
- ];
-
- buildInputs = [ portaudio ];
-
- nativeCheckInputs = (with python3.pkgs; [ pytestCheckHook ]) ++ [ gitMinimal ];
-
- disabledTestPaths = [
- # Tests require network access
- "tests/scrape/test_scrape.py"
- # Expected 'mock' to have been called once
- "tests/help/test_help.py"
- ];
-
- disabledTests =
- [
- # Tests require network
- "test_urls"
- "test_get_commit_message_with_custom_prompt"
- # FileNotFoundError
- "test_get_commit_message"
- # Expected 'launch_gui' to have been called once
- "test_browser_flag_imports_streamlit"
- # AttributeError
- "test_simple_send_with_retries"
- # Expected 'check_version' to have been called once
- "test_main_exit_calls_version_check"
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- # Tests fails on darwin
- "test_dark_mode_sets_code_theme"
- "test_default_env_file_sets_automatic_variable"
- ];
-
- preCheck = ''
- export HOME=$(mktemp -d)
- export AIDER_CHECK_UPDATE=false
- '';
-
- optional-dependencies = with python3.pkgs; {
- playwright = [
- greenlet
- playwright
- pyee
+ dependencies = with python3.pkgs; [
+ aiohappyeyeballs
+ aiohttp
+ aiosignal
+ annotated-types
+ anyio
+ attrs
+ backoff
+ beautifulsoup4
+ certifi
+ cffi
+ charset-normalizer
+ click
+ configargparse
+ diff-match-patch
+ diskcache
+ distro
+ filelock
+ flake8
+ frozenlist
+ fsspec
+ gitdb
+ gitpython
+ grep-ast
+ h11
+ httpcore
+ httpx
+ huggingface-hub
+ idna
+ importlib-resources
+ jinja2
+ jiter
+ json5
+ jsonschema
+ jsonschema-specifications
+ litellm
+ markdown-it-py
+ markupsafe
+ mccabe
+ mdurl
+ multidict
+ networkx
+ numpy
+ openai
+ packaging
+ pathspec
+ pexpect
+ pillow
+ prompt-toolkit
+ psutil
+ ptyprocess
+ pycodestyle
+ pycparser
+ pydantic
+ pydantic-core
+ pydub
+ pyflakes
+ pygments
+ pypandoc
+ pyperclip
+ python-dotenv
+ pyyaml
+ referencing
+ regex
+ requests
+ rich
+ rpds-py
+ scipy
+ smmap
+ sniffio
+ sounddevice
+ soundfile
+ soupsieve
+ tiktoken
+ tokenizers
+ tqdm
+ tree-sitter
+ tree-sitter-languages
typing-extensions
- ];
- };
+ urllib3
+ wcwidth
+ yarl
+ zipp
- meta = {
- description = "AI pair programming in your terminal";
- homepage = "https://github.com/paul-gauthier/aider";
- changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md";
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ taha-yassine ];
- mainProgram = "aider";
+ # Not listed in requirements
+ mixpanel
+ monotonic
+ posthog
+ propcache
+ python-dateutil
+ ];
+
+ buildInputs = [ portaudio ];
+
+ nativeCheckInputs = (with python3.pkgs; [ pytestCheckHook ]) ++ [ gitMinimal ];
+
+ disabledTestPaths = [
+ # Tests require network access
+ "tests/scrape/test_scrape.py"
+ # Expected 'mock' to have been called once
+ "tests/help/test_help.py"
+ ];
+
+ disabledTests =
+ [
+ # Tests require network
+ "test_urls"
+ "test_get_commit_message_with_custom_prompt"
+ # FileNotFoundError
+ "test_get_commit_message"
+ # Expected 'launch_gui' to have been called once
+ "test_browser_flag_imports_streamlit"
+ # AttributeError
+ "test_simple_send_with_retries"
+ # Expected 'check_version' to have been called once
+ "test_main_exit_calls_version_check"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # Tests fails on darwin
+ "test_dark_mode_sets_code_theme"
+ "test_default_env_file_sets_automatic_variable"
+ ];
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ export AIDER_CHECK_UPDATE=false
+ '';
+
+ optional-dependencies = with python3.pkgs; {
+ playwright = [
+ greenlet
+ playwright
+ pyee
+ typing-extensions
+ ];
+ };
+
+ passthru = {
+ withPlaywright = aider-chat.overridePythonAttrs (
+ { dependencies, ... }:
+ {
+ dependencies = dependencies ++ aider-chat.optional-dependencies.playwright;
+ }
+ );
+ };
+
+ meta = {
+ description = "AI pair programming in your terminal";
+ homepage = "https://github.com/paul-gauthier/aider";
+ changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ taha-yassine ];
+ mainProgram = "aider";
+ };
};
-}
+in
+aider-chat
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/aiger/fix-missing-header.patch b/third_party/nixpkgs/pkgs/by-name/ai/aiger/fix-missing-header.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/aiger/fix-missing-header.patch
rename to third_party/nixpkgs/pkgs/by-name/ai/aiger/fix-missing-header.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/aiger/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/aiger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/aiger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/aiger/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/aileron/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/aileron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/aileron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/aileron/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ain/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/ain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/ain/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/aiodnsbrute/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/aiodnsbrute/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/aiodnsbrute/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/aiodnsbrute/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/air/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/air/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/air/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/air/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/airbuddy/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/airbuddy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/airbuddy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/airbuddy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/aircrack-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/aircrack-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/airgeddon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/airgeddon/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/airshipper/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/airshipper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/airshipper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/airshipper/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/misc/airsonic/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/airsonic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/airsonic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/airsonic/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/airspy/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/airspy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/airspy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/airspy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/airspyhf/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/airspyhf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/airspyhf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/airspyhf/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/airstrike/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/airstrike/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/airstrike/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/airstrike/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/airwindows-lv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/airwindows-lv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aixlog/default.nix b/third_party/nixpkgs/pkgs/by-name/ai/aixlog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aixlog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ai/aixlog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/aj-snapshot/default.nix b/third_party/nixpkgs/pkgs/by-name/aj/aj-snapshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/aj-snapshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aj/aj-snapshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix b/third_party/nixpkgs/pkgs/by-name/ak/akira-unstable/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ak/akira-unstable/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alacritty-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alacritty-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alacritty/package.nix
similarity index 99%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alacritty/package.nix
index c511619c27..ff9e28c27b 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/al/alacritty/package.nix
@@ -33,7 +33,6 @@ let
xorg.libX11
xorg.libXcursor
xorg.libXi
- xorg.libXrandr
xorg.libXxf86vm
xorg.libxcb
libxkbcommon
diff --git a/third_party/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alarm-clock-applet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alarm-clock-applet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/alass/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/alass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alass/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/albatross/default.nix b/third_party/nixpkgs/pkgs/by-name/al/albatross/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/albatross/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/albatross/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/alchemy/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alchemy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/alchemy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alchemy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/alda/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alda/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/alda/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alda/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/aldo/default.nix b/third_party/nixpkgs/pkgs/by-name/al/aldo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/aldo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/aldo/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/alegreya-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alegreya-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/alegreya-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alegreya-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/alegreya/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alegreya/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/alegreya/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alegreya/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alejandra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alejandra/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alertmanager-irc-relay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alertmanager-irc-relay/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alfaview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alfaview/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alglib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alglib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch b/third_party/nixpkgs/pkgs/by-name/al/alglib/patch-alglib-CMakeLists.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch
rename to third_party/nixpkgs/pkgs/by-name/al/alglib/patch-alglib-CMakeLists.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ali/default.nix b/third_party/nixpkgs/pkgs/by-name/al/ali/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ali/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/ali/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/alice/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/alice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alice/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/alienarena/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alienarena/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/alienarena/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alienarena/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/align/default.nix b/third_party/nixpkgs/pkgs/by-name/al/align/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/align/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/align/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alire/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alire/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/al/aliyun-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/aliyun-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/alkalami/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alkalami/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/alkalami/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alkalami/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alliance/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alliance/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/allure/default.nix b/third_party/nixpkgs/pkgs/by-name/al/allure/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/allure/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/allure/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix b/third_party/nixpkgs/pkgs/by-name/al/almanah/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/almanah/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/almonds/default.nix b/third_party/nixpkgs/pkgs/by-name/al/almonds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/almonds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/almonds/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/alock/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/alock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alock/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alpine-make-vm-image/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alpine-make-vm-image/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alpine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alpine/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/alpnpass/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alpnpass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/alpnpass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alpnpass/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/alps/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/alps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alps/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-scarlett-gui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alsa-scarlett-gui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/alsaequal/makefile.patch b/third_party/nixpkgs/pkgs/by-name/al/alsaequal/makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/alsaequal/makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/al/alsaequal/makefile.patch
diff --git a/third_party/nixpkgs/pkgs/tools/audio/alsaequal/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alsaequal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/alsaequal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alsaequal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alt-ergo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alt-ergo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix b/third_party/nixpkgs/pkgs/by-name/al/altair/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/altair/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/altermime/default.nix b/third_party/nixpkgs/pkgs/by-name/al/altermime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/altermime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/altermime/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/alterx/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alterx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/alterx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alterx/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/althttpd/default.nix b/third_party/nixpkgs/pkgs/by-name/al/althttpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/althttpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/althttpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/altserver-linux/default.nix b/third_party/nixpkgs/pkgs/by-name/al/altserver-linux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/altserver-linux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/altserver-linux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alttab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alttab/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/opentracker/deps.nix b/third_party/nixpkgs/pkgs/by-name/al/alttpr-opentracker/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/opentracker/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alttpr-opentracker/deps.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/opentracker/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alttpr-opentracker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/opentracker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alttpr-opentracker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/opentracker/remove-project.patch b/third_party/nixpkgs/pkgs/by-name/al/alttpr-opentracker/remove-project.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/opentracker/remove-project.patch
rename to third_party/nixpkgs/pkgs/by-name/al/alttpr-opentracker/remove-project.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/alure/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alure/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/alure/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alure/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/alure2/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alure2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/alure2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/al/alure2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/AMB-plugins/default.nix b/third_party/nixpkgs/pkgs/by-name/am/AMB-plugins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/AMB-plugins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/AMB-plugins/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/amass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amass/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amazon-ecs-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amazon-ecs-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/amber/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amber-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/amber/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amber-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amd-blis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amd-blis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amd-libflame/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amd-libflame/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/amdctl/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amdctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/amdctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amdctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix b/third_party/nixpkgs/pkgs/by-name/am/ameba/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ameba/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/ameba/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/amf-headers/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amf-headers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/amf-headers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amf-headers/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/minecraft/amidst/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amidst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/minecraft/amidst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amidst/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/amiri/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amiri/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/amiri/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amiri/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aml/default.nix b/third_party/nixpkgs/pkgs/by-name/am/aml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/aml/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/amoco/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amoco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/amoco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amoco/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/among-sus/default.nix b/third_party/nixpkgs/pkgs/by-name/am/among-sus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/among-sus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/among-sus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/amrnb/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amrnb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/amrnb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amrnb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/amrwb/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amrwb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/amrwb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amrwb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/am/ams-lv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/ams-lv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ams/default.nix b/third_party/nixpkgs/pkgs/by-name/am/ams/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ams/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/ams/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/amtterm/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amtterm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/amtterm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amtterm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amule/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix
rename to third_party/nixpkgs/pkgs/by-name/am/amule/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/analog/default.nix b/third_party/nixpkgs/pkgs/by-name/an/analog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/analog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/analog/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/ananicy/default.nix b/third_party/nixpkgs/pkgs/by-name/an/ananicy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/ananicy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/ananicy/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/documentation/anarchism/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anarchism/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/anarchism/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anarchism/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/andagii/default.nix b/third_party/nixpkgs/pkgs/by-name/an/andagii/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/andagii/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/andagii/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/anders/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anders/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/anders/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anders/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/andika/default.nix b/third_party/nixpkgs/pkgs/by-name/an/andika/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/andika/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/andika/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/android-backup-extractor/default.nix b/third_party/nixpkgs/pkgs/by-name/an/android-backup-extractor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/android-backup-extractor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/android-backup-extractor/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/an/android-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/android-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/andyetitmoves/default.nix b/third_party/nixpkgs/pkgs/by-name/an/andyetitmoves/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/andyetitmoves/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/andyetitmoves/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/anew/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anew/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/anew/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anew/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/anewer/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/anewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/angband/default.nix b/third_party/nixpkgs/pkgs/by-name/an/angband/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/angband/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/angband/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix b/third_party/nixpkgs/pkgs/by-name/an/angelscript/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/angelscript/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/angle-grinder/default.nix b/third_party/nixpkgs/pkgs/by-name/an/angle-grinder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/angle-grinder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/angle-grinder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/angsd/default.nix b/third_party/nixpkgs/pkgs/by-name/an/angsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/angsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/angsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/ani-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/an/ani-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/ani-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/ani-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/animatch/default.nix b/third_party/nixpkgs/pkgs/by-name/an/animatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/animatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/animatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/anko/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anko/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/anko/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anko/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/annapurna-sil/default.nix b/third_party/nixpkgs/pkgs/by-name/an/annapurna-sil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/annapurna-sil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/annapurna-sil/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/anonymous-pro/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anonymousPro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/anonymous-pro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anonymousPro/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ansi/default.nix b/third_party/nixpkgs/pkgs/by-name/an/ansi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ansi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/ansi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/an/ansible-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/ansible-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/ansible-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/ansifilter/default.nix b/third_party/nixpkgs/pkgs/by-name/an/ansifilter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/ansifilter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/ansifilter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ante/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/an/ante/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/ante/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/an/ante/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ante/default.nix b/third_party/nixpkgs/pkgs/by-name/an/ante/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/ante/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/ante/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/an/antfs-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/antfs-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anthy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anthy/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/third_party/nixpkgs/pkgs/by-name/an/antibody/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/antibody/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/antic/default.nix b/third_party/nixpkgs/pkgs/by-name/an/antic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/antic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/antic/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antidote/default.nix b/third_party/nixpkgs/pkgs/by-name/an/antidote/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/antidote/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/antidote/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antigen/default.nix b/third_party/nixpkgs/pkgs/by-name/an/antigen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/antigen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/antigen/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch b/third_party/nixpkgs/pkgs/by-name/an/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch
rename to third_party/nixpkgs/pkgs/by-name/an/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch
diff --git a/third_party/nixpkgs/pkgs/applications/office/antiword/default.nix b/third_party/nixpkgs/pkgs/by-name/an/antiword/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/antiword/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/antiword/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/antsimulator/default.nix b/third_party/nixpkgs/pkgs/by-name/an/antsimulator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/antsimulator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/antsimulator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anttweakbar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anttweakbar/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/anuko-time-tracker/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anuko-time-tracker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/anuko-time-tracker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anuko-time-tracker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anydesk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anydesk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/anytone-emu/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/an/anytone-emu/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/anytone-emu/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/an/anytone-emu/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/radio/anytone-emu/default.nix b/third_party/nixpkgs/pkgs/by-name/an/anytone-emu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/anytone-emu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/an/anytone-emu/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/apache-airflow/package.json b/third_party/nixpkgs/pkgs/by-name/ap/apache-airflow/package.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/apache-airflow/package.json
rename to third_party/nixpkgs/pkgs/by-name/ap/apache-airflow/package.json
diff --git a/third_party/nixpkgs/pkgs/servers/apache-airflow/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apache-airflow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/apache-airflow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apache-airflow/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/apache-airflow/providers.nix b/third_party/nixpkgs/pkgs/by-name/ap/apache-airflow/providers.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/apache-airflow/providers.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apache-airflow/providers.nix
diff --git a/third_party/nixpkgs/pkgs/servers/apache-airflow/python-package.nix b/third_party/nixpkgs/pkgs/by-name/ap/apache-airflow/python-package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/apache-airflow/python-package.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apache-airflow/python-package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/apache-airflow/update-providers.py b/third_party/nixpkgs/pkgs/by-name/ap/apache-airflow/update-providers.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/apache-airflow/update-providers.py
rename to third_party/nixpkgs/pkgs/by-name/ap/apache-airflow/update-providers.py
diff --git a/third_party/nixpkgs/pkgs/servers/ldap/apache-directory-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apache-directory-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ldap/apache-directory-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apache-directory-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apache-directory-studio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apache-directory-studio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apache-flex-sdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apache-flex-sdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apacheAnt/package.nix
similarity index 98%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apacheAnt/package.nix
index 5e00d302ac..883163d00c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ap/apacheAnt/package.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.asl20;
- maintainers = [ ];
+ maintainers = [ ] ++ lib.teams.java.members;
platforms = lib.platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/security/apachetomcatscanner/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apachetomcatscanner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/apachetomcatscanner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apachetomcatscanner/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/apbs/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apbs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/apbs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apbs/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/apcupsd/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apcupsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/apcupsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apcupsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/aperture/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/aperture/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/aperture/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/aperture/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/apfel/cmake.patch b/third_party/nixpkgs/pkgs/by-name/ap/apfel/cmake.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/apfel/cmake.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/apfel/cmake.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apfel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apfel/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apfelgrid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apfelgrid/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apfs-fuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apfs-fuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/apg/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/apg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/apgdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apgdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/apgdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apgdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apkg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apkg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/apkid/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apkid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/apkid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apkid/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/apkleaks/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apkleaks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/apkleaks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apkleaks/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/apksigcopier/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apksigcopier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/apksigcopier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apksigcopier/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/apksigner/deps.json b/third_party/nixpkgs/pkgs/by-name/ap/apksigner/deps.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/apksigner/deps.json
rename to third_party/nixpkgs/pkgs/by-name/ap/apksigner/deps.json
diff --git a/third_party/nixpkgs/pkgs/development/tools/apksigner/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apksigner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/apksigner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apksigner/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/apktool/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apktool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/apktool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apktool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/apng2gif/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apng2gif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/apng2gif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apng2gif/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/apngopt/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apngopt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/apngopt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apngopt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/apngopt/remove-7z.patch b/third_party/nixpkgs/pkgs/by-name/ap/apngopt/remove-7z.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/apngopt/remove-7z.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/apngopt/remove-7z.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apparency/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apparency/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/apparency/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apparency/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apparix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apparix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/appcleaner/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/appcleaner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/appcleaner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/appcleaner/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/appeditor/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/appeditor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/appeditor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/appeditor/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/appflowy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/appflowy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/appgate-sdp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/appgate-sdp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/appimagekit/nix.patch b/third_party/nixpkgs/pkgs/by-name/ap/appimagekit/nix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/appimagekit/nix.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/appimagekit/nix.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/appimagekit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/appimagekit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/appindicator-sharp/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/appindicator-sharp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/appindicator-sharp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/appindicator-sharp/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/apple-cursor/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apple-cursor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/apple-cursor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apple-cursor/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/appstream-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/appstream-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/paths.patch b/third_party/nixpkgs/pkgs/by-name/ap/appstream-glib/paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/appstream-glib/paths.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/appstream-glib/paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch b/third_party/nixpkgs/pkgs/by-name/ap/appvm/0001-Remove-menu-bar.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/appvm/0001-Remove-menu-bar.patch
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch b/third_party/nixpkgs/pkgs/by-name/ap/appvm/0002-Do-not-grab-keyboard-mouse.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/appvm/0002-Do-not-grab-keyboard-mouse.patch
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch b/third_party/nixpkgs/pkgs/by-name/ap/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch b/third_party/nixpkgs/pkgs/by-name/ap/appvm/0004-Use-title-application-name-as-subtitle.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/appvm/0004-Use-title-application-name-as-subtitle.patch
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/appvm/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/appvm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/appvm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/appvm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/apr-util/clang-bdb.patch b/third_party/nixpkgs/pkgs/by-name/ap/aprutil/clang-bdb.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/apr-util/clang-bdb.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/aprutil/clang-bdb.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch b/third_party/nixpkgs/pkgs/by-name/ap/aprutil/fix-libxcrypt-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/aprutil/fix-libxcrypt-build.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/apr-util/include-static-dependencies.patch b/third_party/nixpkgs/pkgs/by-name/ap/aprutil/include-static-dependencies.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/apr-util/include-static-dependencies.patch
rename to third_party/nixpkgs/pkgs/by-name/ap/aprutil/include-static-dependencies.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/aprutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/aprutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/apt-cacher-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/apt-cacher-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aptdec/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/aptdec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aptdec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/aptdec/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/aptly/default.nix b/third_party/nixpkgs/pkgs/by-name/ap/aptly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/aptly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ap/aptly/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/aq/aquamarine/package.nix b/third_party/nixpkgs/pkgs/by-name/aq/aquamarine/package.nix
index e5452579a5..758f1e96a7 100644
--- a/third_party/nixpkgs/pkgs/by-name/aq/aquamarine/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/aq/aquamarine/package.nix
@@ -23,13 +23,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "aquamarine";
- version = "0.4.3";
+ version = "0.4.4";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "aquamarine";
rev = "v${finalAttrs.version}";
- hash = "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=";
+ hash = "sha256-6DQM7jT2CzfxYceyrtcBQSL9BOEGfuin8GAyMjCpAzc=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/aquosctl/default.nix b/third_party/nixpkgs/pkgs/by-name/aq/aquosctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/aquosctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aq/aquosctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arachne-pnr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arachne-pnr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/aragorn/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/aragorn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/aragorn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/aragorn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arandr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arandr/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/arangodb/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arangodb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/arangodb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arangodb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/aravis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/aravis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/arb/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/arb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arb/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arc-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arc-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/arc-kde/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arc-kde-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/arc-kde/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arc-kde-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/arc/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arc-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/arc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arc-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arc_unpacker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arc_unpacker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arch-install-scripts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arch-install-scripts/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/archimedes/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/archimedes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/archimedes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/archimedes/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivebox/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/archivebox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/archivebox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/archivebox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/archiver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/archiver/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/archivy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/archivy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-ci/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arduino-ci/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-ci/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arduino-ci/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arduino-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arduino-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-mk/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arduino-mk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-mk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arduino-mk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduinoOTA/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arduinoOTA/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/arduino/arduinoOTA/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arduinoOTA/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/arena/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arena/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/arena/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arena/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ares-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/ares-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ares-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/ares-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argo-rollouts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argo-rollouts/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/staticfiles.go.mod b/third_party/nixpkgs/pkgs/by-name/ar/argo/staticfiles.go.mod
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/argo/staticfiles.go.mod
rename to third_party/nixpkgs/pkgs/by-name/ar/argo/staticfiles.go.mod
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argocd-autopilot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argocd-autopilot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/argocd-vault-plugin/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argocd-vault-plugin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/argocd-vault-plugin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argocd-vault-plugin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argocd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argocd/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch b/third_party/nixpkgs/pkgs/by-name/ar/argononed/fix-hardcoded-reboot-poweroff-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/ar/argononed/fix-hardcoded-reboot-poweroff-paths.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/argononed/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argononed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/argononed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argononed/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argp-standalone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argp-standalone/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argparse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argparse/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/arguments/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arguments/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/arguments/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arguments/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/argus-clients/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argus-clients/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/argus-clients/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argus-clients/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/argus/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/argus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/jam-cross.patch b/third_party/nixpkgs/pkgs/by-name/ar/argyllcms/jam-cross.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/argyllcms/jam-cross.patch
rename to third_party/nixpkgs/pkgs/by-name/ar/argyllcms/jam-cross.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argyllcms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/argyllcms/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ariang/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/ariang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ariang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/ariang/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/ario/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ario/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/ario/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/arion/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/arion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arion/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arkade/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arkade/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/arkpandora/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arkpandora_ttf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/arkpandora/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arkpandora_ttf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/armadillo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/armadillo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch b/third_party/nixpkgs/pkgs/by-name/ar/armadillo/use-unix-config-on-OS-X.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch
rename to third_party/nixpkgs/pkgs/by-name/ar/armadillo/use-unix-config-on-OS-X.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/arp-scan/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arp-scan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/arp-scan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arp-scan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/arp-scan/remove-install-exec-hook.patch b/third_party/nixpkgs/pkgs/by-name/ar/arp-scan/remove-install-exec-hook.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/arp-scan/remove-install-exec-hook.patch
rename to third_party/nixpkgs/pkgs/by-name/ar/arp-scan/remove-install-exec-hook.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arpa2cm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arpa2cm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/arpa2common/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arpa2common/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/arpa2common/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arpa2common/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arpack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arpack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/arping/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/arping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arping/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/arpoison/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arpoison/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/arpoison/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arpoison/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/arsenal/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arsenal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/arsenal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arsenal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/artem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/artem/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/artha/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/artha/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/artha/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/artha/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/artim-dark/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/artim-dark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/artim-dark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/artim-dark/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/artyFX/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/artyFX/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/artyFX/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/artyFX/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/arubaotp-seed-extractor/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/arubaotp-seed-extractor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/as-tree/default.nix b/third_party/nixpkgs/pkgs/by-name/as/as-tree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/as-tree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/as-tree/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/asap/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/asap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/asar/package.json b/third_party/nixpkgs/pkgs/by-name/as/asar/package.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/asar/package.json
rename to third_party/nixpkgs/pkgs/by-name/as/asar/package.json
diff --git a/third_party/nixpkgs/pkgs/tools/compression/asar/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/asar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asar/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ascii-image-converter/default.nix b/third_party/nixpkgs/pkgs/by-name/as/ascii-image-converter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/ascii-image-converter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/ascii-image-converter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/ascii/default.nix b/third_party/nixpkgs/pkgs/by-name/as/ascii/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/ascii/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/ascii/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/asciicam/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asciicam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/asciicam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asciicam/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asciidoctorj/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asciidoctorj/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asciigraph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asciigraph/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asciinema-scenario/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asciinema-scenario/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/asciinema/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asciinema/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/asciinema/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asciinema/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asciiquarium/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asciiquarium/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/asdf-vm/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asdf-vm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/asdf-vm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asdf-vm/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix b/third_party/nixpkgs/pkgs/by-name/as/aseq2json/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/aseq2json/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix b/third_party/nixpkgs/pkgs/by-name/as/ashpd-demo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/ashpd-demo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix b/third_party/nixpkgs/pkgs/by-name/as/ashuffle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/ashuffle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/askalono/default.nix b/third_party/nixpkgs/pkgs/by-name/as/askalono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/askalono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/askalono/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asmfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asmfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/asmjit/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asmjit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/asmjit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asmjit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/asn1c/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asn1c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/asn1c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asn1c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/asnmap/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asnmap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/asnmap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asnmap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/aspcud/default.nix b/third_party/nixpkgs/pkgs/by-name/as/aspcud/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/aspcud/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/aspcud/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/aspectj/default.nix b/third_party/nixpkgs/pkgs/by-name/as/aspectj/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/aspectj/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/aspectj/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/aspino/default.nix b/third_party/nixpkgs/pkgs/by-name/as/aspino/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/aspino/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/aspino/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/assaultcube/default.nix b/third_party/nixpkgs/pkgs/by-name/as/assaultcube/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/assaultcube/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/assaultcube/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix b/third_party/nixpkgs/pkgs/by-name/as/assh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/assh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/assh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/assign-lb-ip/default.nix b/third_party/nixpkgs/pkgs/by-name/as/assign-lb-ip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/assign-lb-ip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/assign-lb-ip/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/assimp/default.nix b/third_party/nixpkgs/pkgs/by-name/as/assimp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/assimp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/assimp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix b/third_party/nixpkgs/pkgs/by-name/as/astc-encoder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/astc-encoder/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/asterisk/sccp/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asterisk-module-sccp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/asterisk/sccp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asterisk-module-sccp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/astral/make-deterministic.patch b/third_party/nixpkgs/pkgs/by-name/as/astral/make-deterministic.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/astral/make-deterministic.patch
rename to third_party/nixpkgs/pkgs/by-name/as/astral/make-deterministic.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/astral/default.nix b/third_party/nixpkgs/pkgs/by-name/as/astral/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/astral/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/astral/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/third_party/nixpkgs/pkgs/by-name/as/astrolabe-generator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/astrolabe-generator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/astrolog/default.nix b/third_party/nixpkgs/pkgs/by-name/as/astrolog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/astrolog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/astrolog/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/astromenace/default.nix b/third_party/nixpkgs/pkgs/by-name/as/astromenace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/astromenace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/astromenace/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/astronomer/default.nix b/third_party/nixpkgs/pkgs/by-name/as/astronomer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/astronomer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/astronomer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix b/third_party/nixpkgs/pkgs/by-name/as/astyle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/astyle/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/asunder/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asunder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/asunder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asunder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/as/asusctl/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/as/asusctl/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/system/asusctl/default.nix b/third_party/nixpkgs/pkgs/by-name/as/asusctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/system/asusctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/asusctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/async/default.nix b/third_party/nixpkgs/pkgs/by-name/as/async/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/async/default.nix
rename to third_party/nixpkgs/pkgs/by-name/as/async/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/third_party/nixpkgs/pkgs/by-name/at/at-spi2-core/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/at-spi2-core/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/at/default.nix b/third_party/nixpkgs/pkgs/by-name/at/at/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/at/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/at/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/atanks/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atanks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/atanks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atanks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/atftp/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atftp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/atftp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atftp/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/irc/atheme/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atheme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/irc/atheme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atheme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/atinout/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atinout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/atinout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atinout/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/atkinson-hyperlegible/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atkinson-hyperlegible/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/atkinson-hyperlegible/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atkinson-hyperlegible/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atlantis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atlantis/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atlassian-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atlassian-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/atlassian-cli/wrapper.sh b/third_party/nixpkgs/pkgs/by-name/at/atlassian-cli/wrapper.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/atlassian-cli/wrapper.sh
rename to third_party/nixpkgs/pkgs/by-name/at/atlassian-cli/wrapper.sh
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atmos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atmos/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/atomic-operator/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atomic-operator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/atomic-operator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atomic-operator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/atomic-swap/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atomic-swap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/atomic-swap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atomic-swap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/atool/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/atool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atool/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/atop/atop.service.patch b/third_party/nixpkgs/pkgs/by-name/at/atop/atop.service.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/atop/atop.service.patch
rename to third_party/nixpkgs/pkgs/by-name/at/atop/atop.service.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/atop/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/at/atop/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/atop/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/at/atop/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix b/third_party/nixpkgs/pkgs/by-name/at/atop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/atop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ats-acc/default.nix b/third_party/nixpkgs/pkgs/by-name/at/ats-acc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ats-acc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/ats-acc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch b/third_party/nixpkgs/pkgs/by-name/at/ats/install-atsdoc-hats-files.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch
rename to third_party/nixpkgs/pkgs/by-name/at/ats/install-atsdoc-hats-files.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ats/default.nix b/third_party/nixpkgs/pkgs/by-name/at/ats/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/ats/default.nix
rename to third_party/nixpkgs/pkgs/by-name/at/ats/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix b/third_party/nixpkgs/pkgs/by-name/au/aubio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/aubio/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/aucatctl/default.nix b/third_party/nixpkgs/pkgs/by-name/au/aucatctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/aucatctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/aucatctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix b/third_party/nixpkgs/pkgs/by-name/au/auctex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/auctex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audiality2/default.nix b/third_party/nixpkgs/pkgs/by-name/au/audiality2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audiality2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/audiality2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix b/third_party/nixpkgs/pkgs/by-name/au/audio-recorder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/audio-recorder/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix b/third_party/nixpkgs/pkgs/by-name/au/audiowaveform/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/audiowaveform/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/augeas/bootstrap.diff b/third_party/nixpkgs/pkgs/by-name/au/augeas/bootstrap.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/augeas/bootstrap.diff
rename to third_party/nixpkgs/pkgs/by-name/au/augeas/bootstrap.diff
diff --git a/third_party/nixpkgs/pkgs/tools/system/augeas/default.nix b/third_party/nixpkgs/pkgs/by-name/au/augeas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/augeas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/augeas/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/august/default.nix b/third_party/nixpkgs/pkgs/by-name/au/august/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/august/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/august/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/augustus/darwin-fixes.patch b/third_party/nixpkgs/pkgs/by-name/au/augustus/darwin-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/augustus/darwin-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/au/augustus/darwin-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/games/augustus/default.nix b/third_party/nixpkgs/pkgs/by-name/au/augustus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/augustus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/augustus/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/aurulent-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/au/aurulent-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/aurulent-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/aurulent-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/auth0-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/au/auth0-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/auth0-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/auth0-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/authenticator/default.nix b/third_party/nixpkgs/pkgs/by-name/au/authenticator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/authenticator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/authenticator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/authz0/default.nix b/third_party/nixpkgs/pkgs/by-name/au/authz0/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/authz0/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/authz0/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix b/third_party/nixpkgs/pkgs/by-name/au/auto-multiple-choice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/auto-multiple-choice/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/autoadb/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autoadb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/autoadb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autoadb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autobuild/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autobuild/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autoconf-archive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autoconf-archive/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/autocutsel/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autocutsel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/autocutsel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autocutsel/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/autofs/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autofs5/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/autofs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autofs5/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autogen/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autogen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/autogen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autogen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/autojump/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autojump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/autojump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autojump/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/autokey/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autokey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/autokey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autokey/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix b/third_party/nixpkgs/pkgs/by-name/au/automatic-timezoned/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/automatic-timezoned/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix b/third_party/nixpkgs/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/automirror/default.nix b/third_party/nixpkgs/pkgs/by-name/au/automirror/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/automirror/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/automirror/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix b/third_party/nixpkgs/pkgs/by-name/au/automysqlbackup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/automysqlbackup/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/autopanosiftc/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autopanosiftc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/autopanosiftc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autopanosiftc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch b/third_party/nixpkgs/pkgs/by-name/au/autorandr/0001-don-t-use-sys.executable.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch
rename to third_party/nixpkgs/pkgs/by-name/au/autorandr/0001-don-t-use-sys.executable.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autorandr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autorandr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/autorestic/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autorestic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/autorestic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autorestic/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/autorevision/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autorevision/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/autorevision/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autorevision/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/autospotting/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autospotting/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/autospotting/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autospotting/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/autossh/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autossh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/autossh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autossh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/autotalent/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autotalent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/autotalent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autotalent/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/autotiling-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autotiling-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/autotiling-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autotiling-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix b/third_party/nixpkgs/pkgs/by-name/au/autotrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/au/autotrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/third_party/nixpkgs/pkgs/by-name/av/avfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/av/avfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch b/third_party/nixpkgs/pkgs/by-name/av/aviator/bump-golang-x-sys.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch
rename to third_party/nixpkgs/pkgs/by-name/av/aviator/bump-golang-x-sys.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/aviator/default.nix b/third_party/nixpkgs/pkgs/by-name/av/aviator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/aviator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/av/aviator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix b/third_party/nixpkgs/pkgs/by-name/av/avizo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/av/avizo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/third_party/nixpkgs/pkgs/by-name/av/avocode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/av/avocode/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix b/third_party/nixpkgs/pkgs/by-name/av/avr8burnomat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/av/avr8burnomat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/avra/default.nix b/third_party/nixpkgs/pkgs/by-name/av/avra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/avra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/av/avra/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/avrdude/libelf.nix b/third_party/nixpkgs/pkgs/by-name/av/avrdude/libelf.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/avrdude/libelf.nix
rename to third_party/nixpkgs/pkgs/by-name/av/avrdude/libelf.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix b/third_party/nixpkgs/pkgs/by-name/av/avrdude/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix
rename to third_party/nixpkgs/pkgs/by-name/av/avrdude/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/avrdudess/default.nix b/third_party/nixpkgs/pkgs/by-name/av/avrdudess/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/avrdudess/default.nix
rename to third_party/nixpkgs/pkgs/by-name/av/avrdudess/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/third_party/nixpkgs/pkgs/by-name/av/avro-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/av/avro-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix b/third_party/nixpkgs/pkgs/by-name/av/avro-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix
rename to third_party/nixpkgs/pkgs/by-name/av/avro-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/aw-watcher-window-wayland/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/aw/aw-watcher-window-wayland/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/aw-watcher-window-wayland/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/aw/aw-watcher-window-wayland/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hmm/rustc-serialize-fix.patch b/third_party/nixpkgs/pkgs/by-name/aw/aw-watcher-window-wayland/rustc-serialize-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hmm/rustc-serialize-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/aw/aw-watcher-window-wayland/rustc-serialize-fix.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/awf/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/awf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/awf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/awf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-c-auth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-c-auth/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-c-common/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-c-common/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/aw/aws-c-common/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-c-common/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-c-common/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-c-compression/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-c-compression/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-c-event-stream/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-c-event-stream/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-c-http/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-c-http/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-c-mqtt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-c-mqtt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-c-s3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-c-s3/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-c-sdkutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-c-sdkutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-checksums/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-checksums/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/third_party/nixpkgs/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-crt-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-crt-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-iam-authenticator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-iam-authenticator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-lambda-rie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-lambda-rie/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-nuke/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-nuke/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-rotate-key/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-rotate-key/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-sam-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-sam-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-sso-creds/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-sso-creds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/aws-sso-creds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-sso-creds/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws_mturk_clt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws_mturk_clt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/awscli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/awscli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awslimitchecker/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/awslimitchecker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/awslimitchecker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/awslimitchecker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awslimitchecker/version.patch b/third_party/nixpkgs/pkgs/by-name/aw/awslimitchecker/version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/awslimitchecker/version.patch
rename to third_party/nixpkgs/pkgs/by-name/aw/awslimitchecker/version.patch
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awslogs/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/awslogs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/awslogs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/awslogs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awsls/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/awsls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/awsls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/awsls/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awsrm/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/awsrm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/awsrm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/awsrm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/awstats/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/awstats/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/awstats/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/awstats/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/awsweeper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/awsweeper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/ax25-apps/default.nix b/third_party/nixpkgs/pkgs/by-name/ax/ax25-apps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/ax25-apps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ax/ax25-apps/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/ax25-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ax/ax25-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/ax25-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ax/ax25-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-webmail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ay/ayatana-webmail/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/ayu-theme-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/ay/ayu-theme-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/ayu-theme-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ay/ayu-theme-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/azeret-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/az/azeret-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/azeret-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/az/azeret-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/azimuth/default.nix b/third_party/nixpkgs/pkgs/by-name/az/azimuth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/azimuth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/az/azimuth/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/azmq/default.nix b/third_party/nixpkgs/pkgs/by-name/az/azmq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/azmq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/az/azmq/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/deps.nix b/third_party/nixpkgs/pkgs/by-name/az/azure-functions-core-tools/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/az/azure-functions-core-tools/deps.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/az/azure-functions-core-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/az/azure-functions-core-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix b/third_party/nixpkgs/pkgs/by-name/az/azure-storage-azcopy/package.nix
similarity index 81%
rename from third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/az/azure-storage-azcopy/package.nix
index 1ca6c587c9..84c8fffc15 100644
--- a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/az/azure-storage-azcopy/package.nix
@@ -5,18 +5,18 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
- version = "10.26.0";
+ version = "10.27.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "refs/tags/v${version}";
- hash = "sha256-u6ngYEHqNVjz0YYkWhFnoQGCBRMHLdOzFTee8plwoDo=";
+ hash = "sha256-TF0vChuM3OF/YbCsP8Vg4x609Q1QgqwBNmKUdWCHHUc=";
};
subPackages = [ "." ];
- vendorHash = "sha256-C8UopiCSp6qFeaDNE+w2QUKbSHALSSeV5WVo4lkLDrs=";
+ vendorHash = "sha256-dYIZb8sSh1Y8yllWOSsWEpiaIwcwZL2wCet3Terl0Ro=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix b/third_party/nixpkgs/pkgs/by-name/az/azuredatastudio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/az/azuredatastudio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/b4/default.nix b/third_party/nixpkgs/pkgs/by-name/b4/b4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/b4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/b4/b4/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch b/third_party/nixpkgs/pkgs/by-name/b4/b43FirmwareCutter/no-root-install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch
rename to third_party/nixpkgs/pkgs/by-name/b4/b43FirmwareCutter/no-root-install.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/third_party/nixpkgs/pkgs/by-name/b4/b43FirmwareCutter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/b4/b43FirmwareCutter/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/b612/default.nix b/third_party/nixpkgs/pkgs/by-name/b6/b612/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/b612/default.nix
rename to third_party/nixpkgs/pkgs/by-name/b6/b612/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/babeld/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/babeld/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/babelstone-han/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/babelstone-han/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/babelstone-han/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/babelstone-han/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/babl/dev-prefix.patch b/third_party/nixpkgs/pkgs/by-name/ba/babl/dev-prefix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/babl/dev-prefix.patch
rename to third_party/nixpkgs/pkgs/by-name/ba/babl/dev-prefix.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/babl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/babl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/babl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/baboossh/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/baboossh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/baboossh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/baboossh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/backblaze-b2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/backblaze-b2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/backdown/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/backdown/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/backdown/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/backdown/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/backward-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/backward-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bacnet-stack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bacnet-stack/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bada-bib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bada-bib/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/badlion-client/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/badlion-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/badlion-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/badlion-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/badrobot/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/badrobot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/badrobot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/badrobot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/badvpn/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/badvpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/badvpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/badvpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/badwolf/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/badwolf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/badwolf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/badwolf/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/baekmuk-ttf/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/baekmuk-ttf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/baekmuk-ttf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/baekmuk-ttf/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/bakoma-ttf/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bakoma_ttf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/bakoma-ttf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bakoma_ttf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/balanceofsatoshis/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/balanceofsatoshis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/balanceofsatoshis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/balanceofsatoshis/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/balena-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/balena-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/ballerburg/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/ballerburg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/ballerburg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/ballerburg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/balsa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/balsa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bam/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bamf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bamf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bamtools/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bamtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bamtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bamtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/banana-accounting/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/banana-accounting/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/banana-accounting/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/banana-accounting/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/banana-vera/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/banana-vera/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/banana-vera/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/banana-vera/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bandwidth/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bandwidth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bandwidth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bandwidth/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/banking/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/banking/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/banking/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/banking/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/banner/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/banner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/banner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/banner/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/bao/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bao/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/bao/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bao/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/bao/test-exe.patch b/third_party/nixpkgs/pkgs/by-name/ba/bao/test-exe.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/bao/test-exe.patch
rename to third_party/nixpkgs/pkgs/by-name/ba/bao/test-exe.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/bar/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/bar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bar/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/barcode/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/barcode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/barcode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/barcode/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/bark/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/bark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bark/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/barlow/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/barlow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/barlow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/barlow/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/barman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/barman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/barman/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/barman/unwrap-subprocess.patch b/third_party/nixpkgs/pkgs/by-name/ba/barman/unwrap-subprocess.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/barman/unwrap-subprocess.patch
rename to third_party/nixpkgs/pkgs/by-name/ba/barman/unwrap-subprocess.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/bartender/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bartender/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/bartender/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bartender/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bartib/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bartib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bartib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bartib/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/base16-schemes/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/base16-schemes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/base16-schemes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/base16-schemes/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/base16-universal-manager/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/base16-universal-manager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/base16-universal-manager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/base16-universal-manager/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/base16384/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/base16384/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/base16384/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/base16384/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package-lock.json b/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package-lock.json
deleted file mode 100644
index 8c8593a7ab..0000000000
--- a/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package-lock.json
+++ /dev/null
@@ -1,12120 +0,0 @@
-{
- "name": "pyright-root",
- "lockfileVersion": 3,
- "requires": true,
- "packages": {
- "": {
- "name": "pyright-root",
- "hasInstallScript": true,
- "devDependencies": {
- "@detachhead/ts-helpers": "^16.2.0",
- "@types/glob": "^7.2.0",
- "@types/node": "^20",
- "@types/yargs": "^16.0.9",
- "@typescript-eslint/eslint-plugin": "^6.21.0",
- "@typescript-eslint/parser": "^6.21.0",
- "cross-env": "^7.0.3",
- "eslint": "^8.56.0",
- "eslint-config-prettier": "^8.10.0",
- "eslint-plugin-simple-import-sort": "^10.0.0",
- "glob": "^7.2.3",
- "jsonc-parser": "^3.2.1",
- "lerna": "^7.4.2",
- "npm-check-updates": "^16.14.14",
- "p-queue": "^6.6.2",
- "prettier": "2.8.8",
- "syncpack": "~10.9.3",
- "throw-expression": "^2.0.1",
- "typescript": "~5.5.4",
- "word-wrap": "1.2.5",
- "yargs": "^16.2.0"
- }
- },
- "node_modules/@babel/code-frame": {
- "version": "7.24.7",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
- "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@babel/highlight": "^7.24.7",
- "picocolors": "^1.0.0"
- },
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@babel/helper-validator-identifier": {
- "version": "7.24.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
- "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@babel/highlight": {
- "version": "7.24.7",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
- "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@babel/helper-validator-identifier": "^7.24.7",
- "chalk": "^2.4.2",
- "js-tokens": "^4.0.0",
- "picocolors": "^1.0.0"
- },
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@babel/highlight/node_modules/ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "color-convert": "^1.9.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/highlight/node_modules/chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/highlight/node_modules/color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "color-name": "1.1.3"
- }
- },
- "node_modules/@babel/highlight/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.8.0"
- }
- },
- "node_modules/@babel/highlight/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/highlight/node_modules/supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "has-flag": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@colors/colors": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
- "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
- "dev": true,
- "license": "MIT",
- "optional": true,
- "engines": {
- "node": ">=0.1.90"
- }
- },
- "node_modules/@detachhead/ts-helpers": {
- "version": "16.2.0",
- "resolved": "https://registry.npmjs.org/@detachhead/ts-helpers/-/ts-helpers-16.2.0.tgz",
- "integrity": "sha512-1kwJ1AgXWK9goECjtyRh6SMVf7YYkMt0yvUccxqo7qpDRYs3uDC0ot5MhIbDTbhyoQQio3wTTmA2m5ijdUehdA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@types/lodash": "4.14.195",
- "date-fns": "2.21.1",
- "is-ci": "2.0.0",
- "lodash": "^4.17.21",
- "ordinal": "1.0.3",
- "throw-expression": "1.0.2",
- "ts-is-present": "1.2.1",
- "ts-toolbelt": "9.6.0",
- "tsdef": "0.0.14",
- "utility-types": "3.10.0"
- },
- "engines": {
- "node": ">=16.6.0"
- }
- },
- "node_modules/@detachhead/ts-helpers/node_modules/throw-expression": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/throw-expression/-/throw-expression-1.0.2.tgz",
- "integrity": "sha512-y8cHYZgp0Vj8bRMQSWAA7pfHj1JPift81tZM9i/rHQuJoYEv9kewjEpRu2wRRuXRaClFWWzWQFTG3Q9rDysyNQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@effect/data": {
- "version": "0.17.1",
- "resolved": "https://registry.npmjs.org/@effect/data/-/data-0.17.1.tgz",
- "integrity": "sha512-QCYkLE5Y5Dm5Yax5R3GmW4ZIgTx7W+kSZ7yq5eqQ/mFWa8i4yxbLuu8cudqzdeZtRtTGZKlhDxfFfgVtMywXJg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@effect/io": {
- "version": "0.37.1",
- "resolved": "https://registry.npmjs.org/@effect/io/-/io-0.37.1.tgz",
- "integrity": "sha512-Ez3GfcG+gDDfAiBXtSjJpSrPU5Guiyw69LsYkMtIukFwyNwpHWLhYaVgfVbVjoQasil8KiFSQJSd5DbJL6nqPg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@effect/data": "^0.17.0"
- }
- },
- "node_modules/@effect/match": {
- "version": "0.31.0",
- "resolved": "https://registry.npmjs.org/@effect/match/-/match-0.31.0.tgz",
- "integrity": "sha512-QT0HSh19Y6iHAghc51Yt/rYDU9/jhs7O+2kSEQiJqj4xqCLjfJONWsK19xBCNbuV5bt3ZO1NGFqvsWeNR7ZhDg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@effect/data": "^0.17.1",
- "@effect/schema": "^0.32.0"
- }
- },
- "node_modules/@effect/schema": {
- "version": "0.32.0",
- "resolved": "https://registry.npmjs.org/@effect/schema/-/schema-0.32.0.tgz",
- "integrity": "sha512-4HJK/cFkVPdIjYICy0eRsL7JuuLJ6mE3aJC5rX9OuUIei/qfctFEEX2NaARjtGX7hACBrRcuJCNwiq+54TTjFw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@effect/data": "^0.17.1",
- "@effect/io": "^0.37.0",
- "fast-check": "^3.12.0"
- }
- },
- "node_modules/@eslint-community/eslint-utils": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
- "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "eslint-visitor-keys": "^3.3.0"
- },
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "peerDependencies": {
- "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
- }
- },
- "node_modules/@eslint-community/regexpp": {
- "version": "4.11.1",
- "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
- "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
- }
- },
- "node_modules/@eslint/eslintrc": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
- "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ajv": "^6.12.4",
- "debug": "^4.3.2",
- "espree": "^9.6.0",
- "globals": "^13.19.0",
- "ignore": "^5.2.0",
- "import-fresh": "^3.2.1",
- "js-yaml": "^4.1.0",
- "minimatch": "^3.1.2",
- "strip-json-comments": "^3.1.1"
- },
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "url": "https://opencollective.com/eslint"
- }
- },
- "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/@eslint/eslintrc/node_modules/minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/@eslint/js": {
- "version": "8.57.1",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
- "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- }
- },
- "node_modules/@gar/promisify": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
- "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@humanwhocodes/config-array": {
- "version": "0.13.0",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
- "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
- "deprecated": "Use @eslint/config-array instead",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "@humanwhocodes/object-schema": "^2.0.3",
- "debug": "^4.3.1",
- "minimatch": "^3.0.5"
- },
- "engines": {
- "node": ">=10.10.0"
- }
- },
- "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/@humanwhocodes/module-importer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
- "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
- "dev": true,
- "license": "Apache-2.0",
- "engines": {
- "node": ">=12.22"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/nzakas"
- }
- },
- "node_modules/@humanwhocodes/object-schema": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
- "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
- "deprecated": "Use @eslint/object-schema instead",
- "dev": true,
- "license": "BSD-3-Clause"
- },
- "node_modules/@hutson/parse-repository-url": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz",
- "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==",
- "dev": true,
- "license": "Apache-2.0",
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@isaacs/cliui": {
- "version": "8.0.2",
- "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
- "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "string-width": "^5.1.2",
- "string-width-cjs": "npm:string-width@^4.2.0",
- "strip-ansi": "^7.0.1",
- "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
- "wrap-ansi": "^8.1.0",
- "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
- "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-regex?sponsor=1"
- }
- },
- "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
- "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
- "version": "9.2.2",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
- "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@isaacs/cliui/node_modules/string-width": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
- "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "eastasianwidth": "^0.2.0",
- "emoji-regex": "^9.2.2",
- "strip-ansi": "^7.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
- "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-regex": "^6.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/strip-ansi?sponsor=1"
- }
- },
- "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
- "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^6.1.0",
- "string-width": "^5.0.1",
- "strip-ansi": "^7.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
- }
- },
- "node_modules/@jest/schemas": {
- "version": "29.6.3",
- "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
- "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@sinclair/typebox": "^0.27.8"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/@lerna/child-process": {
- "version": "7.4.2",
- "resolved": "https://registry.npmjs.org/@lerna/child-process/-/child-process-7.4.2.tgz",
- "integrity": "sha512-je+kkrfcvPcwL5Tg8JRENRqlbzjdlZXyaR88UcnCdNW0AJ1jX9IfHRys1X7AwSroU2ug8ESNC+suoBw1vX833Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "chalk": "^4.1.0",
- "execa": "^5.0.0",
- "strong-log-transformer": "^2.1.0"
- },
- "engines": {
- "node": ">=16.0.0"
- }
- },
- "node_modules/@lerna/create": {
- "version": "7.4.2",
- "resolved": "https://registry.npmjs.org/@lerna/create/-/create-7.4.2.tgz",
- "integrity": "sha512-1wplFbQ52K8E/unnqB0Tq39Z4e+NEoNrpovEnl6GpsTUrC6WDp8+w0Le2uCBV0hXyemxChduCkLz4/y1H1wTeg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@lerna/child-process": "7.4.2",
- "@npmcli/run-script": "6.0.2",
- "@nx/devkit": ">=16.5.1 < 17",
- "@octokit/plugin-enterprise-rest": "6.0.1",
- "@octokit/rest": "19.0.11",
- "byte-size": "8.1.1",
- "chalk": "4.1.0",
- "clone-deep": "4.0.1",
- "cmd-shim": "6.0.1",
- "columnify": "1.6.0",
- "conventional-changelog-core": "5.0.1",
- "conventional-recommended-bump": "7.0.1",
- "cosmiconfig": "^8.2.0",
- "dedent": "0.7.0",
- "execa": "5.0.0",
- "fs-extra": "^11.1.1",
- "get-stream": "6.0.0",
- "git-url-parse": "13.1.0",
- "glob-parent": "5.1.2",
- "globby": "11.1.0",
- "graceful-fs": "4.2.11",
- "has-unicode": "2.0.1",
- "ini": "^1.3.8",
- "init-package-json": "5.0.0",
- "inquirer": "^8.2.4",
- "is-ci": "3.0.1",
- "is-stream": "2.0.0",
- "js-yaml": "4.1.0",
- "libnpmpublish": "7.3.0",
- "load-json-file": "6.2.0",
- "lodash": "^4.17.21",
- "make-dir": "4.0.0",
- "minimatch": "3.0.5",
- "multimatch": "5.0.0",
- "node-fetch": "2.6.7",
- "npm-package-arg": "8.1.1",
- "npm-packlist": "5.1.1",
- "npm-registry-fetch": "^14.0.5",
- "npmlog": "^6.0.2",
- "nx": ">=16.5.1 < 17",
- "p-map": "4.0.0",
- "p-map-series": "2.1.0",
- "p-queue": "6.6.2",
- "p-reduce": "^2.1.0",
- "pacote": "^15.2.0",
- "pify": "5.0.0",
- "read-cmd-shim": "4.0.0",
- "read-package-json": "6.0.4",
- "resolve-from": "5.0.0",
- "rimraf": "^4.4.1",
- "semver": "^7.3.4",
- "signal-exit": "3.0.7",
- "slash": "^3.0.0",
- "ssri": "^9.0.1",
- "strong-log-transformer": "2.1.0",
- "tar": "6.1.11",
- "temp-dir": "1.0.0",
- "upath": "2.0.1",
- "uuid": "^9.0.0",
- "validate-npm-package-license": "^3.0.4",
- "validate-npm-package-name": "5.0.0",
- "write-file-atomic": "5.0.1",
- "write-pkg": "4.0.0",
- "yargs": "16.2.0",
- "yargs-parser": "20.2.4"
- },
- "engines": {
- "node": ">=16.0.0"
- }
- },
- "node_modules/@lerna/create/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/@lerna/create/node_modules/chalk": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
- "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/@lerna/create/node_modules/ci-info": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
- "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/sibiraj-s"
- }
- ],
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@lerna/create/node_modules/glob": {
- "version": "9.3.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
- "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "minimatch": "^8.0.2",
- "minipass": "^4.2.4",
- "path-scurry": "^1.6.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/@lerna/create/node_modules/glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "is-glob": "^4.0.1"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/@lerna/create/node_modules/glob/node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0"
- }
- },
- "node_modules/@lerna/create/node_modules/glob/node_modules/minimatch": {
- "version": "8.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz",
- "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/@lerna/create/node_modules/is-ci": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
- "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ci-info": "^3.2.0"
- },
- "bin": {
- "is-ci": "bin.js"
- }
- },
- "node_modules/@lerna/create/node_modules/minimatch": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
- "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/@lerna/create/node_modules/minipass": {
- "version": "4.2.8",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
- "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@lerna/create/node_modules/resolve-from": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
- "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@lerna/create/node_modules/rimraf": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz",
- "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "glob": "^9.2.0"
- },
- "bin": {
- "rimraf": "dist/cjs/src/bin.js"
- },
- "engines": {
- "node": ">=14"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/@nodelib/fs.scandir": {
- "version": "2.1.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
- "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@nodelib/fs.stat": "2.0.5",
- "run-parallel": "^1.1.9"
- },
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/@nodelib/fs.stat": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
- "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/@nodelib/fs.walk": {
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
- "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@nodelib/fs.scandir": "2.1.5",
- "fastq": "^1.6.0"
- },
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/@npmcli/fs": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz",
- "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@gar/promisify": "^1.1.3",
- "semver": "^7.3.5"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/@npmcli/git": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz",
- "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@npmcli/promise-spawn": "^6.0.0",
- "lru-cache": "^7.4.4",
- "npm-pick-manifest": "^8.0.0",
- "proc-log": "^3.0.0",
- "promise-inflight": "^1.0.1",
- "promise-retry": "^2.0.1",
- "semver": "^7.3.5",
- "which": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@npmcli/git/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@npmcli/git/node_modules/which": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
- "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "isexe": "^2.0.0"
- },
- "bin": {
- "node-which": "bin/which.js"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@npmcli/installed-package-contents": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz",
- "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "npm-bundled": "^3.0.0",
- "npm-normalize-package-bin": "^3.0.0"
- },
- "bin": {
- "installed-package-contents": "bin/index.js"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@npmcli/installed-package-contents/node_modules/npm-bundled": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz",
- "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "npm-normalize-package-bin": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
- "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@npmcli/move-file": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz",
- "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==",
- "deprecated": "This functionality has been moved to @npmcli/fs",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "mkdirp": "^1.0.4",
- "rimraf": "^3.0.2"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/@npmcli/node-gyp": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz",
- "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@npmcli/promise-spawn": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz",
- "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "which": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@npmcli/promise-spawn/node_modules/which": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
- "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "isexe": "^2.0.0"
- },
- "bin": {
- "node-which": "bin/which.js"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@npmcli/run-script": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz",
- "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@npmcli/node-gyp": "^3.0.0",
- "@npmcli/promise-spawn": "^6.0.0",
- "node-gyp": "^9.0.0",
- "read-package-json-fast": "^3.0.0",
- "which": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@npmcli/run-script/node_modules/which": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
- "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "isexe": "^2.0.0"
- },
- "bin": {
- "node-which": "bin/which.js"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@nrwl/devkit": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.10.0.tgz",
- "integrity": "sha512-fRloARtsDQoQgQ7HKEy0RJiusg/HSygnmg4gX/0n/Z+SUS+4KoZzvHjXc6T5ZdEiSjvLypJ+HBM8dQzIcVACPQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@nx/devkit": "16.10.0"
- }
- },
- "node_modules/@nrwl/tao": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-16.10.0.tgz",
- "integrity": "sha512-QNAanpINbr+Pod6e1xNgFbzK1x5wmZl+jMocgiEFXZ67KHvmbD6MAQQr0MMz+GPhIu7EE4QCTLTyCEMlAG+K5Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "nx": "16.10.0",
- "tslib": "^2.3.0"
- },
- "bin": {
- "tao": "index.js"
- }
- },
- "node_modules/@nx/devkit": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-16.10.0.tgz",
- "integrity": "sha512-IvKQqRJFDDiaj33SPfGd3ckNHhHi6ceEoqCbAP4UuMXOPPVOX6H0KVk+9tknkPb48B7jWIw6/AgOeWkBxPRO5w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@nrwl/devkit": "16.10.0",
- "ejs": "^3.1.7",
- "enquirer": "~2.3.6",
- "ignore": "^5.0.4",
- "semver": "7.5.3",
- "tmp": "~0.2.1",
- "tslib": "^2.3.0"
- },
- "peerDependencies": {
- "nx": ">= 15 <= 17"
- }
- },
- "node_modules/@nx/devkit/node_modules/semver": {
- "version": "7.5.3",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
- "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
- "bin": {
- "semver": "bin/semver.js"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/@nx/nx-darwin-arm64": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.10.0.tgz",
- "integrity": "sha512-YF+MIpeuwFkyvM5OwgY/rTNRpgVAI/YiR0yTYCZR+X3AAvP775IVlusNgQ3oedTBRUzyRnI4Tknj1WniENFsvQ==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "darwin"
- ],
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@nx/nx-darwin-x64": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.10.0.tgz",
- "integrity": "sha512-ypi6YxwXgb0kg2ixKXE3pwf5myVNUgWf1CsV5OzVccCM8NzheMO51KDXTDmEpXdzUsfT0AkO1sk5GZeCjhVONg==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "darwin"
- ],
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@nx/nx-freebsd-x64": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.10.0.tgz",
- "integrity": "sha512-UeEYFDmdbbDkTQamqvtU8ibgu5jQLgFF1ruNb/U4Ywvwutw2d4ruOMl2e0u9hiNja9NFFAnDbvzrDcMo7jYqYw==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "freebsd"
- ],
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@nx/nx-linux-arm-gnueabihf": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.10.0.tgz",
- "integrity": "sha512-WV3XUC2DB6/+bz1sx+d1Ai9q2Cdr+kTZRN50SOkfmZUQyEBaF6DRYpx/a4ahhxH3ktpNfyY8Maa9OEYxGCBkQA==",
- "cpu": [
- "arm"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@nx/nx-linux-arm64-gnu": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.10.0.tgz",
- "integrity": "sha512-aWIkOUw995V3ItfpAi5FuxQ+1e9EWLS1cjWM1jmeuo+5WtaKToJn5itgQOkvSlPz+HSLgM3VfXMvOFALNk125g==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@nx/nx-linux-arm64-musl": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.10.0.tgz",
- "integrity": "sha512-uO6Gg+irqpVcCKMcEPIQcTFZ+tDI02AZkqkP7koQAjniLEappd8DnUBSQdcn53T086pHpdc264X/ZEpXFfrKWQ==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@nx/nx-linux-x64-gnu": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.10.0.tgz",
- "integrity": "sha512-134PW/u/arNFAQKpqMJniC7irbChMPz+W+qtyKPAUXE0XFKPa7c1GtlI/wK2dvP9qJDZ6bKf0KtA0U/m2HMUOA==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@nx/nx-linux-x64-musl": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.10.0.tgz",
- "integrity": "sha512-q8sINYLdIJxK/iUx9vRk5jWAWb/2O0PAbOJFwv4qkxBv4rLoN7y+otgCZ5v0xfx/zztFgk/oNY4lg5xYjIso2Q==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@nx/nx-win32-arm64-msvc": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.10.0.tgz",
- "integrity": "sha512-moJkL9kcqxUdJSRpG7dET3UeLIciwrfP08mzBQ12ewo8K8FzxU8ZUsTIVVdNrwt01CXOdXoweGfdQLjJ4qTURA==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@nx/nx-win32-x64-msvc": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.10.0.tgz",
- "integrity": "sha512-5iV2NKZnzxJwZZ4DM5JVbRG/nkhAbzEskKaLBB82PmYGKzaDHuMHP1lcPoD/rtYMlowZgNA/RQndfKvPBPwmXA==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "license": "MIT",
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@octokit/auth-token": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz",
- "integrity": "sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 14"
- }
- },
- "node_modules/@octokit/core": {
- "version": "4.2.4",
- "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz",
- "integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@octokit/auth-token": "^3.0.0",
- "@octokit/graphql": "^5.0.0",
- "@octokit/request": "^6.0.0",
- "@octokit/request-error": "^3.0.0",
- "@octokit/types": "^9.0.0",
- "before-after-hook": "^2.2.0",
- "universal-user-agent": "^6.0.0"
- },
- "engines": {
- "node": ">= 14"
- }
- },
- "node_modules/@octokit/endpoint": {
- "version": "7.0.6",
- "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.6.tgz",
- "integrity": "sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@octokit/types": "^9.0.0",
- "is-plain-object": "^5.0.0",
- "universal-user-agent": "^6.0.0"
- },
- "engines": {
- "node": ">= 14"
- }
- },
- "node_modules/@octokit/graphql": {
- "version": "5.0.6",
- "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.6.tgz",
- "integrity": "sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@octokit/request": "^6.0.0",
- "@octokit/types": "^9.0.0",
- "universal-user-agent": "^6.0.0"
- },
- "engines": {
- "node": ">= 14"
- }
- },
- "node_modules/@octokit/openapi-types": {
- "version": "18.1.1",
- "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.1.1.tgz",
- "integrity": "sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@octokit/plugin-enterprise-rest": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz",
- "integrity": "sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@octokit/plugin-paginate-rest": {
- "version": "6.1.2",
- "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.2.tgz",
- "integrity": "sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@octokit/tsconfig": "^1.0.2",
- "@octokit/types": "^9.2.3"
- },
- "engines": {
- "node": ">= 14"
- },
- "peerDependencies": {
- "@octokit/core": ">=4"
- }
- },
- "node_modules/@octokit/plugin-request-log": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
- "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
- "dev": true,
- "license": "MIT",
- "peerDependencies": {
- "@octokit/core": ">=3"
- }
- },
- "node_modules/@octokit/plugin-rest-endpoint-methods": {
- "version": "7.2.3",
- "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.2.3.tgz",
- "integrity": "sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@octokit/types": "^10.0.0"
- },
- "engines": {
- "node": ">= 14"
- },
- "peerDependencies": {
- "@octokit/core": ">=3"
- }
- },
- "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/@octokit/types/-/types-10.0.0.tgz",
- "integrity": "sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@octokit/openapi-types": "^18.0.0"
- }
- },
- "node_modules/@octokit/request": {
- "version": "6.2.8",
- "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.8.tgz",
- "integrity": "sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@octokit/endpoint": "^7.0.0",
- "@octokit/request-error": "^3.0.0",
- "@octokit/types": "^9.0.0",
- "is-plain-object": "^5.0.0",
- "node-fetch": "^2.6.7",
- "universal-user-agent": "^6.0.0"
- },
- "engines": {
- "node": ">= 14"
- }
- },
- "node_modules/@octokit/request-error": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz",
- "integrity": "sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@octokit/types": "^9.0.0",
- "deprecation": "^2.0.0",
- "once": "^1.4.0"
- },
- "engines": {
- "node": ">= 14"
- }
- },
- "node_modules/@octokit/rest": {
- "version": "19.0.11",
- "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.11.tgz",
- "integrity": "sha512-m2a9VhaP5/tUw8FwfnW2ICXlXpLPIqxtg3XcAiGMLj/Xhw3RSBfZ8le/466ktO1Gcjr8oXudGnHhxV1TXJgFxw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@octokit/core": "^4.2.1",
- "@octokit/plugin-paginate-rest": "^6.1.2",
- "@octokit/plugin-request-log": "^1.0.4",
- "@octokit/plugin-rest-endpoint-methods": "^7.1.2"
- },
- "engines": {
- "node": ">= 14"
- }
- },
- "node_modules/@octokit/tsconfig": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@octokit/tsconfig/-/tsconfig-1.0.2.tgz",
- "integrity": "sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@octokit/types": {
- "version": "9.3.2",
- "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz",
- "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@octokit/openapi-types": "^18.0.0"
- }
- },
- "node_modules/@parcel/watcher": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz",
- "integrity": "sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==",
- "dev": true,
- "hasInstallScript": true,
- "license": "MIT",
- "dependencies": {
- "node-addon-api": "^3.2.1",
- "node-gyp-build": "^4.3.0"
- },
- "engines": {
- "node": ">= 10.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/parcel"
- }
- },
- "node_modules/@pkgjs/parseargs": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
- "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
- "dev": true,
- "license": "MIT",
- "optional": true,
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/@pnpm/config.env-replace": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz",
- "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12.22.0"
- }
- },
- "node_modules/@pnpm/network.ca-file": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz",
- "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "graceful-fs": "4.2.10"
- },
- "engines": {
- "node": ">=12.22.0"
- }
- },
- "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": {
- "version": "4.2.10",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
- "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/@pnpm/npm-conf": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz",
- "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@pnpm/config.env-replace": "^1.1.0",
- "@pnpm/network.ca-file": "^1.0.1",
- "config-chain": "^1.1.11"
- },
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@sigstore/bundle": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz",
- "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "@sigstore/protobuf-specs": "^0.2.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sigstore/protobuf-specs": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz",
- "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==",
- "dev": true,
- "license": "Apache-2.0",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sigstore/sign": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz",
- "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "@sigstore/bundle": "^1.1.0",
- "@sigstore/protobuf-specs": "^0.2.0",
- "make-fetch-happen": "^11.0.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sigstore/sign/node_modules/@npmcli/fs": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
- "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "semver": "^7.3.5"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sigstore/sign/node_modules/cacache": {
- "version": "17.1.4",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
- "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@npmcli/fs": "^3.1.0",
- "fs-minipass": "^3.0.0",
- "glob": "^10.2.2",
- "lru-cache": "^7.7.1",
- "minipass": "^7.0.3",
- "minipass-collect": "^1.0.2",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "p-map": "^4.0.0",
- "ssri": "^10.0.0",
- "tar": "^6.1.11",
- "unique-filename": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sigstore/sign/node_modules/cacache/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/@sigstore/sign/node_modules/fs-minipass": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
- "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sigstore/sign/node_modules/fs-minipass/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/@sigstore/sign/node_modules/glob": {
- "version": "10.4.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
- "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "foreground-child": "^3.1.0",
- "jackspeak": "^3.1.2",
- "minimatch": "^9.0.4",
- "minipass": "^7.1.2",
- "package-json-from-dist": "^1.0.0",
- "path-scurry": "^1.11.1"
- },
- "bin": {
- "glob": "dist/esm/bin.mjs"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/@sigstore/sign/node_modules/glob/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/@sigstore/sign/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@sigstore/sign/node_modules/make-fetch-happen": {
- "version": "11.1.1",
- "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
- "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "agentkeepalive": "^4.2.1",
- "cacache": "^17.0.0",
- "http-cache-semantics": "^4.1.1",
- "http-proxy-agent": "^5.0.0",
- "https-proxy-agent": "^5.0.0",
- "is-lambda": "^1.0.1",
- "lru-cache": "^7.7.1",
- "minipass": "^5.0.0",
- "minipass-fetch": "^3.0.0",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "negotiator": "^0.6.3",
- "promise-retry": "^2.0.1",
- "socks-proxy-agent": "^7.0.0",
- "ssri": "^10.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sigstore/sign/node_modules/minimatch": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
- "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/@sigstore/sign/node_modules/minipass": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
- "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@sigstore/sign/node_modules/minipass-fetch": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
- "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "minipass": "^7.0.3",
- "minipass-sized": "^1.0.3",
- "minizlib": "^2.1.2"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "encoding": "^0.1.13"
- }
- },
- "node_modules/@sigstore/sign/node_modules/minipass-fetch/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/@sigstore/sign/node_modules/ssri": {
- "version": "10.0.6",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
- "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sigstore/sign/node_modules/ssri/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/@sigstore/sign/node_modules/unique-filename": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
- "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "unique-slug": "^4.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sigstore/sign/node_modules/unique-slug": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
- "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "imurmurhash": "^0.1.4"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sigstore/tuf": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz",
- "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "@sigstore/protobuf-specs": "^0.2.0",
- "tuf-js": "^1.1.7"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@sinclair/typebox": {
- "version": "0.27.8",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
- "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@sindresorhus/is": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
- "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sindresorhus/is?sponsor=1"
- }
- },
- "node_modules/@szmarczak/http-timer": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
- "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "defer-to-connect": "^2.0.1"
- },
- "engines": {
- "node": ">=14.16"
- }
- },
- "node_modules/@tootallnate/once": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
- "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@tufjs/canonical-json": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz",
- "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@tufjs/models": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz",
- "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@tufjs/canonical-json": "1.0.0",
- "minimatch": "^9.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/@types/glob": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
- "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/minimatch": "*",
- "@types/node": "*"
- }
- },
- "node_modules/@types/http-cache-semantics": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
- "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@types/json-schema": {
- "version": "7.0.15",
- "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
- "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@types/lodash": {
- "version": "4.14.195",
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz",
- "integrity": "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@types/minimatch": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
- "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@types/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@types/node": {
- "version": "20.16.8",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.8.tgz",
- "integrity": "sha512-sbo5JmfbZNkyDv+2HCccr9Y9ZkKJBMTru7UdAsCojMGjKNjdaOV73bqEW242QrHEZL8R4LbHMrW+FHB5lZ5/bw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "undici-types": "~6.19.2"
- }
- },
- "node_modules/@types/normalize-package-data": {
- "version": "2.4.4",
- "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
- "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@types/semver": {
- "version": "7.5.8",
- "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
- "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@types/semver-utils": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/@types/semver-utils/-/semver-utils-1.1.3.tgz",
- "integrity": "sha512-T+YwkslhsM+CeuhYUxyAjWm7mJ5am/K10UX40RuA6k6Lc7eGtq8iY2xOzy7Vq0GOqhl/xZl5l2FwURZMTPTUww==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@types/yargs": {
- "version": "16.0.9",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
- "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/yargs-parser": "*"
- }
- },
- "node_modules/@types/yargs-parser": {
- "version": "21.0.3",
- "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
- "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@typescript-eslint/eslint-plugin": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
- "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@eslint-community/regexpp": "^4.5.1",
- "@typescript-eslint/scope-manager": "6.21.0",
- "@typescript-eslint/type-utils": "6.21.0",
- "@typescript-eslint/utils": "6.21.0",
- "@typescript-eslint/visitor-keys": "6.21.0",
- "debug": "^4.3.4",
- "graphemer": "^1.4.0",
- "ignore": "^5.2.4",
- "natural-compare": "^1.4.0",
- "semver": "^7.5.4",
- "ts-api-utils": "^1.0.1"
- },
- "engines": {
- "node": "^16.0.0 || >=18.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependencies": {
- "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
- "eslint": "^7.0.0 || ^8.0.0"
- },
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- }
- }
- },
- "node_modules/@typescript-eslint/parser": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz",
- "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "@typescript-eslint/scope-manager": "6.21.0",
- "@typescript-eslint/types": "6.21.0",
- "@typescript-eslint/typescript-estree": "6.21.0",
- "@typescript-eslint/visitor-keys": "6.21.0",
- "debug": "^4.3.4"
- },
- "engines": {
- "node": "^16.0.0 || >=18.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependencies": {
- "eslint": "^7.0.0 || ^8.0.0"
- },
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- }
- }
- },
- "node_modules/@typescript-eslint/scope-manager": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
- "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@typescript-eslint/types": "6.21.0",
- "@typescript-eslint/visitor-keys": "6.21.0"
- },
- "engines": {
- "node": "^16.0.0 || >=18.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- }
- },
- "node_modules/@typescript-eslint/type-utils": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
- "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@typescript-eslint/typescript-estree": "6.21.0",
- "@typescript-eslint/utils": "6.21.0",
- "debug": "^4.3.4",
- "ts-api-utils": "^1.0.1"
- },
- "engines": {
- "node": "^16.0.0 || >=18.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependencies": {
- "eslint": "^7.0.0 || ^8.0.0"
- },
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- }
- }
- },
- "node_modules/@typescript-eslint/types": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz",
- "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^16.0.0 || >=18.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- }
- },
- "node_modules/@typescript-eslint/typescript-estree": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
- "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "@typescript-eslint/types": "6.21.0",
- "@typescript-eslint/visitor-keys": "6.21.0",
- "debug": "^4.3.4",
- "globby": "^11.1.0",
- "is-glob": "^4.0.3",
- "minimatch": "9.0.3",
- "semver": "^7.5.4",
- "ts-api-utils": "^1.0.1"
- },
- "engines": {
- "node": "^16.0.0 || >=18.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- }
- }
- },
- "node_modules/@typescript-eslint/utils": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz",
- "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@eslint-community/eslint-utils": "^4.4.0",
- "@types/json-schema": "^7.0.12",
- "@types/semver": "^7.5.0",
- "@typescript-eslint/scope-manager": "6.21.0",
- "@typescript-eslint/types": "6.21.0",
- "@typescript-eslint/typescript-estree": "6.21.0",
- "semver": "^7.5.4"
- },
- "engines": {
- "node": "^16.0.0 || >=18.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependencies": {
- "eslint": "^7.0.0 || ^8.0.0"
- }
- },
- "node_modules/@typescript-eslint/visitor-keys": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
- "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@typescript-eslint/types": "6.21.0",
- "eslint-visitor-keys": "^3.4.1"
- },
- "engines": {
- "node": "^16.0.0 || >=18.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- }
- },
- "node_modules/@ungap/structured-clone": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
- "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/@yarnpkg/lockfile": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
- "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
- "dev": true,
- "license": "BSD-2-Clause"
- },
- "node_modules/@yarnpkg/parsers": {
- "version": "3.0.0-rc.46",
- "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz",
- "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "js-yaml": "^3.10.0",
- "tslib": "^2.4.0"
- },
- "engines": {
- "node": ">=14.15.0"
- }
- },
- "node_modules/@yarnpkg/parsers/node_modules/argparse": {
- "version": "1.0.10",
- "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
- "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "sprintf-js": "~1.0.2"
- }
- },
- "node_modules/@yarnpkg/parsers/node_modules/js-yaml": {
- "version": "3.14.1",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
- "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
- },
- "bin": {
- "js-yaml": "bin/js-yaml.js"
- }
- },
- "node_modules/@yarnpkg/parsers/node_modules/sprintf-js": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
- "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
- "dev": true,
- "license": "BSD-3-Clause"
- },
- "node_modules/@zkochan/js-yaml": {
- "version": "0.0.6",
- "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz",
- "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "argparse": "^2.0.1"
- },
- "bin": {
- "js-yaml": "bin/js-yaml.js"
- }
- },
- "node_modules/abbrev": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
- "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/acorn": {
- "version": "8.12.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
- "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "acorn": "bin/acorn"
- },
- "engines": {
- "node": ">=0.4.0"
- }
- },
- "node_modules/acorn-jsx": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
- "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
- "dev": true,
- "license": "MIT",
- "peerDependencies": {
- "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
- }
- },
- "node_modules/add-stream": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
- "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/agent-base": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
- "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "debug": "4"
- },
- "engines": {
- "node": ">= 6.0.0"
- }
- },
- "node_modules/agentkeepalive": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
- "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "humanize-ms": "^1.2.1"
- },
- "engines": {
- "node": ">= 8.0.0"
- }
- },
- "node_modules/aggregate-error": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
- "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "clean-stack": "^2.0.0",
- "indent-string": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/ajv": {
- "version": "6.12.6",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
- "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "fast-deep-equal": "^3.1.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
- "uri-js": "^4.2.2"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/epoberezkin"
- }
- },
- "node_modules/ansi-align": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
- "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "string-width": "^4.1.0"
- }
- },
- "node_modules/ansi-colors": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
- "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/ansi-escapes": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
- "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "type-fest": "^0.21.3"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/ansi-escapes/node_modules/type-fest": {
- "version": "0.21.3",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
- "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
- "dev": true,
- "license": "(MIT OR CC0-1.0)",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/ansi-regex": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
- "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "color-convert": "^2.0.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/aproba": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
- "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/are-we-there-yet": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
- "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
- "deprecated": "This package is no longer supported.",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "delegates": "^1.0.0",
- "readable-stream": "^3.6.0"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/argparse": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
- "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
- "dev": true,
- "license": "Python-2.0"
- },
- "node_modules/array-differ": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
- "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/array-ify": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
- "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/array-union": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
- "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/arrify": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
- "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/async": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
- "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/asynckit": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
- "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/axios": {
- "version": "1.7.7",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
- "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "follow-redirects": "^1.15.6",
- "form-data": "^4.0.0",
- "proxy-from-env": "^1.1.0"
- }
- },
- "node_modules/balanced-match": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
- "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/base64-js": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
- "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ],
- "license": "MIT"
- },
- "node_modules/before-after-hook": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
- "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
- "dev": true,
- "license": "Apache-2.0"
- },
- "node_modules/bl": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
- "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "buffer": "^5.5.0",
- "inherits": "^2.0.4",
- "readable-stream": "^3.4.0"
- }
- },
- "node_modules/boxen": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.1.tgz",
- "integrity": "sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-align": "^3.0.1",
- "camelcase": "^7.0.1",
- "chalk": "^5.2.0",
- "cli-boxes": "^3.0.0",
- "string-width": "^5.1.2",
- "type-fest": "^2.13.0",
- "widest-line": "^4.0.1",
- "wrap-ansi": "^8.1.0"
- },
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/boxen/node_modules/ansi-regex": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
- "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-regex?sponsor=1"
- }
- },
- "node_modules/boxen/node_modules/ansi-styles": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
- "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/boxen/node_modules/camelcase": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz",
- "integrity": "sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/boxen/node_modules/chalk": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
- "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^12.17.0 || ^14.13 || >=16.0.0"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/boxen/node_modules/emoji-regex": {
- "version": "9.2.2",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
- "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/boxen/node_modules/string-width": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
- "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "eastasianwidth": "^0.2.0",
- "emoji-regex": "^9.2.2",
- "strip-ansi": "^7.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/boxen/node_modules/strip-ansi": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
- "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-regex": "^6.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/strip-ansi?sponsor=1"
- }
- },
- "node_modules/boxen/node_modules/type-fest": {
- "version": "2.19.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
- "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
- "dev": true,
- "license": "(MIT OR CC0-1.0)",
- "engines": {
- "node": ">=12.20"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/boxen/node_modules/wrap-ansi": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
- "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^6.1.0",
- "string-width": "^5.0.1",
- "strip-ansi": "^7.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
- }
- },
- "node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0"
- }
- },
- "node_modules/braces": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
- "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "fill-range": "^7.1.1"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/buffer": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
- "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ],
- "license": "MIT",
- "dependencies": {
- "base64-js": "^1.3.1",
- "ieee754": "^1.1.13"
- }
- },
- "node_modules/buffer-from": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
- "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/builtins": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
- "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "semver": "^7.0.0"
- }
- },
- "node_modules/byte-size": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-8.1.1.tgz",
- "integrity": "sha512-tUkzZWK0M/qdoLEqikxBWe4kumyuwjl3HO6zHTr4yEI23EojPtLYXdG1+AQY7MN0cGyNDvEaJ8wiYQm6P2bPxg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12.17"
- }
- },
- "node_modules/cacache": {
- "version": "16.1.3",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz",
- "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@npmcli/fs": "^2.1.0",
- "@npmcli/move-file": "^2.0.0",
- "chownr": "^2.0.0",
- "fs-minipass": "^2.1.0",
- "glob": "^8.0.1",
- "infer-owner": "^1.0.4",
- "lru-cache": "^7.7.1",
- "minipass": "^3.1.6",
- "minipass-collect": "^1.0.2",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "mkdirp": "^1.0.4",
- "p-map": "^4.0.0",
- "promise-inflight": "^1.0.1",
- "rimraf": "^3.0.2",
- "ssri": "^9.0.0",
- "tar": "^6.1.11",
- "unique-filename": "^2.0.0"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/cacache/node_modules/glob": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
- "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
- "deprecated": "Glob versions prior to v9 are no longer supported",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^5.0.1",
- "once": "^1.3.0"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/cacache/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/cacache/node_modules/minimatch": {
- "version": "5.1.6",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
- "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/cacheable-lookup": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
- "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=14.16"
- }
- },
- "node_modules/cacheable-request": {
- "version": "10.2.14",
- "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
- "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/http-cache-semantics": "^4.0.2",
- "get-stream": "^6.0.1",
- "http-cache-semantics": "^4.1.1",
- "keyv": "^4.5.3",
- "mimic-response": "^4.0.0",
- "normalize-url": "^8.0.0",
- "responselike": "^3.0.0"
- },
- "engines": {
- "node": ">=14.16"
- }
- },
- "node_modules/cacheable-request/node_modules/get-stream": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
- "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/callsites": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/camelcase-keys": {
- "version": "6.2.2",
- "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
- "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "camelcase": "^5.3.1",
- "map-obj": "^4.0.0",
- "quick-lru": "^4.0.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/chardet": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
- "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/chownr": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
- "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/ci-info": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
- "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/clean-stack": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
- "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/cli-boxes": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz",
- "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/cli-cursor": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
- "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "restore-cursor": "^3.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/cli-spinners": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
- "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/cli-table3": {
- "version": "0.6.5",
- "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
- "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "string-width": "^4.2.0"
- },
- "engines": {
- "node": "10.* || >= 12.*"
- },
- "optionalDependencies": {
- "@colors/colors": "1.5.0"
- }
- },
- "node_modules/cli-width": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
- "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/cliui": {
- "version": "8.0.1",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
- "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "string-width": "^4.2.0",
- "strip-ansi": "^6.0.1",
- "wrap-ansi": "^7.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/cliui/node_modules/wrap-ansi": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
- "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^4.0.0",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
- }
- },
- "node_modules/clone": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
- "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.8"
- }
- },
- "node_modules/clone-deep": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
- "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-plain-object": "^2.0.4",
- "kind-of": "^6.0.2",
- "shallow-clone": "^3.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/clone-deep/node_modules/is-plain-object": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
- "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "isobject": "^3.0.1"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/cmd-shim": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz",
- "integrity": "sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "color-name": "~1.1.4"
- },
- "engines": {
- "node": ">=7.0.0"
- }
- },
- "node_modules/color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/color-support": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
- "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
- "dev": true,
- "license": "ISC",
- "bin": {
- "color-support": "bin.js"
- }
- },
- "node_modules/columnify": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz",
- "integrity": "sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "strip-ansi": "^6.0.1",
- "wcwidth": "^1.0.0"
- },
- "engines": {
- "node": ">=8.0.0"
- }
- },
- "node_modules/combined-stream": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
- "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "delayed-stream": "~1.0.0"
- },
- "engines": {
- "node": ">= 0.8"
- }
- },
- "node_modules/commander": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
- "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/compare-func": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
- "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "array-ify": "^1.0.0",
- "dot-prop": "^5.1.0"
- }
- },
- "node_modules/concat-map": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
- "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/concat-stream": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
- "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
- "dev": true,
- "engines": [
- "node >= 6.0"
- ],
- "license": "MIT",
- "dependencies": {
- "buffer-from": "^1.0.0",
- "inherits": "^2.0.3",
- "readable-stream": "^3.0.2",
- "typedarray": "^0.0.6"
- }
- },
- "node_modules/config-chain": {
- "version": "1.1.13",
- "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
- "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ini": "^1.3.4",
- "proto-list": "~1.2.1"
- }
- },
- "node_modules/configstore": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz",
- "integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "dot-prop": "^6.0.1",
- "graceful-fs": "^4.2.6",
- "unique-string": "^3.0.0",
- "write-file-atomic": "^3.0.3",
- "xdg-basedir": "^5.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/yeoman/configstore?sponsor=1"
- }
- },
- "node_modules/configstore/node_modules/dot-prop": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
- "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-obj": "^2.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/configstore/node_modules/write-file-atomic": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
- "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "imurmurhash": "^0.1.4",
- "is-typedarray": "^1.0.0",
- "signal-exit": "^3.0.2",
- "typedarray-to-buffer": "^3.1.5"
- }
- },
- "node_modules/console-control-strings": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
- "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/conventional-changelog-angular": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz",
- "integrity": "sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "compare-func": "^2.0.0"
- },
- "engines": {
- "node": ">=16"
- }
- },
- "node_modules/conventional-changelog-core": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-5.0.1.tgz",
- "integrity": "sha512-Rvi5pH+LvgsqGwZPZ3Cq/tz4ty7mjijhr3qR4m9IBXNbxGGYgTVVO+duXzz9aArmHxFtwZ+LRkrNIMDQzgoY4A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "add-stream": "^1.0.0",
- "conventional-changelog-writer": "^6.0.0",
- "conventional-commits-parser": "^4.0.0",
- "dateformat": "^3.0.3",
- "get-pkg-repo": "^4.2.1",
- "git-raw-commits": "^3.0.0",
- "git-remote-origin-url": "^2.0.0",
- "git-semver-tags": "^5.0.0",
- "normalize-package-data": "^3.0.3",
- "read-pkg": "^3.0.0",
- "read-pkg-up": "^3.0.0"
- },
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/conventional-changelog-preset-loader": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-3.0.0.tgz",
- "integrity": "sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/conventional-changelog-writer": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-6.0.1.tgz",
- "integrity": "sha512-359t9aHorPw+U+nHzUXHS5ZnPBOizRxfQsWT5ZDHBfvfxQOAik+yfuhKXG66CN5LEWPpMNnIMHUTCKeYNprvHQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "conventional-commits-filter": "^3.0.0",
- "dateformat": "^3.0.3",
- "handlebars": "^4.7.7",
- "json-stringify-safe": "^5.0.1",
- "meow": "^8.1.2",
- "semver": "^7.0.0",
- "split": "^1.0.1"
- },
- "bin": {
- "conventional-changelog-writer": "cli.js"
- },
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/conventional-commits-filter": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-3.0.0.tgz",
- "integrity": "sha512-1ymej8b5LouPx9Ox0Dw/qAO2dVdfpRFq28e5Y0jJEU8ZrLdy0vOSkkIInwmxErFGhg6SALro60ZrwYFVTUDo4Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "lodash.ismatch": "^4.4.0",
- "modify-values": "^1.0.1"
- },
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/conventional-commits-parser": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz",
- "integrity": "sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-text-path": "^1.0.1",
- "JSONStream": "^1.3.5",
- "meow": "^8.1.2",
- "split2": "^3.2.2"
- },
- "bin": {
- "conventional-commits-parser": "cli.js"
- },
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/conventional-recommended-bump": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-7.0.1.tgz",
- "integrity": "sha512-Ft79FF4SlOFvX4PkwFDRnaNiIVX7YbmqGU0RwccUaiGvgp3S0a8ipR2/Qxk31vclDNM+GSdJOVs2KrsUCjblVA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "concat-stream": "^2.0.0",
- "conventional-changelog-preset-loader": "^3.0.0",
- "conventional-commits-filter": "^3.0.0",
- "conventional-commits-parser": "^4.0.0",
- "git-raw-commits": "^3.0.0",
- "git-semver-tags": "^5.0.0",
- "meow": "^8.1.2"
- },
- "bin": {
- "conventional-recommended-bump": "cli.js"
- },
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/core-util-is": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
- "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/cosmiconfig": {
- "version": "8.3.6",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
- "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "import-fresh": "^3.3.0",
- "js-yaml": "^4.1.0",
- "parse-json": "^5.2.0",
- "path-type": "^4.0.0"
- },
- "engines": {
- "node": ">=14"
- },
- "funding": {
- "url": "https://github.com/sponsors/d-fischer"
- },
- "peerDependencies": {
- "typescript": ">=4.9.5"
- },
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- }
- }
- },
- "node_modules/cross-env": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
- "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "cross-spawn": "^7.0.1"
- },
- "bin": {
- "cross-env": "src/bin/cross-env.js",
- "cross-env-shell": "src/bin/cross-env-shell.js"
- },
- "engines": {
- "node": ">=10.14",
- "npm": ">=6",
- "yarn": ">=1"
- }
- },
- "node_modules/cross-spawn": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
- "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "path-key": "^3.1.0",
- "shebang-command": "^2.0.0",
- "which": "^2.0.1"
- },
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/crypto-random-string": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz",
- "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "type-fest": "^1.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/crypto-random-string/node_modules/type-fest": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
- "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
- "dev": true,
- "license": "(MIT OR CC0-1.0)",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/dargs": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz",
- "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/date-fns": {
- "version": "2.21.1",
- "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.21.1.tgz",
- "integrity": "sha512-m1WR0xGiC6j6jNFAyW4Nvh4WxAi4JF4w9jRJwSI8nBmNcyZXPcP9VUQG+6gHQXAmqaGEKDKhOqAtENDC941UkA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.11"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/date-fns"
- }
- },
- "node_modules/dateformat": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
- "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "*"
- }
- },
- "node_modules/debug": {
- "version": "4.3.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
- "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
- },
- "node_modules/decamelize": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
- "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/decamelize-keys": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
- "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "decamelize": "^1.1.0",
- "map-obj": "^1.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/decamelize-keys/node_modules/map-obj": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
- "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/decompress-response": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
- "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "mimic-response": "^3.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/decompress-response/node_modules/mimic-response": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
- "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/dedent": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
- "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/deep-extend": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
- "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4.0.0"
- }
- },
- "node_modules/deep-is": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
- "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/defaults": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
- "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "clone": "^1.0.2"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/defer-to-connect": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
- "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/define-lazy-prop": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
- "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/delayed-stream": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
- "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.4.0"
- }
- },
- "node_modules/delegates": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
- "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/deprecation": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
- "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/detect-indent": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
- "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/diff-sequences": {
- "version": "29.6.3",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
- "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/dir-glob": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
- "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "path-type": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/doctrine": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
- "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "esutils": "^2.0.2"
- },
- "engines": {
- "node": ">=6.0.0"
- }
- },
- "node_modules/dot-prop": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
- "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-obj": "^2.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/dotenv": {
- "version": "16.3.2",
- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz",
- "integrity": "sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==",
- "dev": true,
- "license": "BSD-2-Clause",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/motdotla/dotenv?sponsor=1"
- }
- },
- "node_modules/dotenv-expand": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
- "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
- "dev": true,
- "license": "BSD-2-Clause",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/duplexer": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
- "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/eastasianwidth": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
- "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/ejs": {
- "version": "3.1.10",
- "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
- "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "jake": "^10.8.5"
- },
- "bin": {
- "ejs": "bin/cli.js"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/emoji-regex": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/encoding": {
- "version": "0.1.13",
- "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
- "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
- "dev": true,
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "iconv-lite": "^0.6.2"
- }
- },
- "node_modules/encoding/node_modules/iconv-lite": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
- "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
- "dev": true,
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "safer-buffer": ">= 2.1.2 < 3.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/end-of-stream": {
- "version": "1.4.4",
- "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
- "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "once": "^1.4.0"
- }
- },
- "node_modules/enquirer": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
- "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-colors": "^4.1.1"
- },
- "engines": {
- "node": ">=8.6"
- }
- },
- "node_modules/env-paths": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
- "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/envinfo": {
- "version": "7.8.1",
- "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
- "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "envinfo": "dist/cli.js"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/err-code": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
- "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/error-ex": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
- "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-arrayish": "^0.2.1"
- }
- },
- "node_modules/escalade": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
- "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/escape-goat": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz",
- "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/escape-string-regexp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/eslint": {
- "version": "8.57.1",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
- "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@eslint-community/eslint-utils": "^4.2.0",
- "@eslint-community/regexpp": "^4.6.1",
- "@eslint/eslintrc": "^2.1.4",
- "@eslint/js": "8.57.1",
- "@humanwhocodes/config-array": "^0.13.0",
- "@humanwhocodes/module-importer": "^1.0.1",
- "@nodelib/fs.walk": "^1.2.8",
- "@ungap/structured-clone": "^1.2.0",
- "ajv": "^6.12.4",
- "chalk": "^4.0.0",
- "cross-spawn": "^7.0.2",
- "debug": "^4.3.2",
- "doctrine": "^3.0.0",
- "escape-string-regexp": "^4.0.0",
- "eslint-scope": "^7.2.2",
- "eslint-visitor-keys": "^3.4.3",
- "espree": "^9.6.1",
- "esquery": "^1.4.2",
- "esutils": "^2.0.2",
- "fast-deep-equal": "^3.1.3",
- "file-entry-cache": "^6.0.1",
- "find-up": "^5.0.0",
- "glob-parent": "^6.0.2",
- "globals": "^13.19.0",
- "graphemer": "^1.4.0",
- "ignore": "^5.2.0",
- "imurmurhash": "^0.1.4",
- "is-glob": "^4.0.0",
- "is-path-inside": "^3.0.3",
- "js-yaml": "^4.1.0",
- "json-stable-stringify-without-jsonify": "^1.0.1",
- "levn": "^0.4.1",
- "lodash.merge": "^4.6.2",
- "minimatch": "^3.1.2",
- "natural-compare": "^1.4.0",
- "optionator": "^0.9.3",
- "strip-ansi": "^6.0.1",
- "text-table": "^0.2.0"
- },
- "bin": {
- "eslint": "bin/eslint.js"
- },
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "url": "https://opencollective.com/eslint"
- }
- },
- "node_modules/eslint-config-prettier": {
- "version": "8.10.0",
- "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
- "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "eslint-config-prettier": "bin/cli.js"
- },
- "peerDependencies": {
- "eslint": ">=7.0.0"
- }
- },
- "node_modules/eslint-plugin-simple-import-sort": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz",
- "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==",
- "dev": true,
- "license": "MIT",
- "peerDependencies": {
- "eslint": ">=5.0.0"
- }
- },
- "node_modules/eslint-scope": {
- "version": "7.2.2",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
- "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "esrecurse": "^4.3.0",
- "estraverse": "^5.2.0"
- },
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "url": "https://opencollective.com/eslint"
- }
- },
- "node_modules/eslint-visitor-keys": {
- "version": "3.4.3",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
- "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
- "dev": true,
- "license": "Apache-2.0",
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "url": "https://opencollective.com/eslint"
- }
- },
- "node_modules/eslint/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/eslint/node_modules/minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/espree": {
- "version": "9.6.1",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
- "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "acorn": "^8.9.0",
- "acorn-jsx": "^5.3.2",
- "eslint-visitor-keys": "^3.4.1"
- },
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "url": "https://opencollective.com/eslint"
- }
- },
- "node_modules/esprima": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
- "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
- "dev": true,
- "license": "BSD-2-Clause",
- "bin": {
- "esparse": "bin/esparse.js",
- "esvalidate": "bin/esvalidate.js"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/esquery": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
- "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
- "dev": true,
- "license": "BSD-3-Clause",
- "dependencies": {
- "estraverse": "^5.1.0"
- },
- "engines": {
- "node": ">=0.10"
- }
- },
- "node_modules/esrecurse": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
- "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "estraverse": "^5.2.0"
- },
- "engines": {
- "node": ">=4.0"
- }
- },
- "node_modules/estraverse": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
- "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
- "dev": true,
- "license": "BSD-2-Clause",
- "engines": {
- "node": ">=4.0"
- }
- },
- "node_modules/esutils": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
- "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
- "dev": true,
- "license": "BSD-2-Clause",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/eventemitter3": {
- "version": "4.0.7",
- "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
- "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/execa": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
- "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "cross-spawn": "^7.0.3",
- "get-stream": "^6.0.0",
- "human-signals": "^2.1.0",
- "is-stream": "^2.0.0",
- "merge-stream": "^2.0.0",
- "npm-run-path": "^4.0.1",
- "onetime": "^5.1.2",
- "signal-exit": "^3.0.3",
- "strip-final-newline": "^2.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sindresorhus/execa?sponsor=1"
- }
- },
- "node_modules/exponential-backoff": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
- "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
- "dev": true,
- "license": "Apache-2.0"
- },
- "node_modules/external-editor": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
- "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "chardet": "^0.7.0",
- "iconv-lite": "^0.4.24",
- "tmp": "^0.0.33"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/external-editor/node_modules/tmp": {
- "version": "0.0.33",
- "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
- "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "os-tmpdir": "~1.0.2"
- },
- "engines": {
- "node": ">=0.6.0"
- }
- },
- "node_modules/fast-check": {
- "version": "3.22.0",
- "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-3.22.0.tgz",
- "integrity": "sha512-8HKz3qXqnHYp/VCNn2qfjHdAdcI8zcSqOyX64GOMukp7SL2bfzfeDKjSd+UyECtejccaZv3LcvZTm9YDD22iCQ==",
- "dev": true,
- "funding": [
- {
- "type": "individual",
- "url": "https://github.com/sponsors/dubzzz"
- },
- {
- "type": "opencollective",
- "url": "https://opencollective.com/fast-check"
- }
- ],
- "license": "MIT",
- "dependencies": {
- "pure-rand": "^6.1.0"
- },
- "engines": {
- "node": ">=8.0.0"
- }
- },
- "node_modules/fast-deep-equal": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
- "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/fast-glob": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
- "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@nodelib/fs.stat": "^2.0.2",
- "@nodelib/fs.walk": "^1.2.3",
- "glob-parent": "^5.1.2",
- "merge2": "^1.3.0",
- "micromatch": "^4.0.4"
- },
- "engines": {
- "node": ">=8.6.0"
- }
- },
- "node_modules/fast-glob/node_modules/glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "is-glob": "^4.0.1"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/fast-json-stable-stringify": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
- "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/fast-levenshtein": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
- "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/fast-memoize": {
- "version": "2.5.2",
- "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz",
- "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/fastq": {
- "version": "1.17.1",
- "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
- "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "reusify": "^1.0.4"
- }
- },
- "node_modules/figures": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
- "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "escape-string-regexp": "^1.0.5"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/figures/node_modules/escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.8.0"
- }
- },
- "node_modules/file-entry-cache": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
- "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "flat-cache": "^3.0.4"
- },
- "engines": {
- "node": "^10.12.0 || >=12.0.0"
- }
- },
- "node_modules/filelist": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
- "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "minimatch": "^5.0.1"
- }
- },
- "node_modules/filelist/node_modules/minimatch": {
- "version": "5.1.6",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
- "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/fill-range": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
- "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "to-regex-range": "^5.0.1"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/find-up": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
- "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "locate-path": "^6.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/flat": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
- "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
- "dev": true,
- "license": "BSD-3-Clause",
- "bin": {
- "flat": "cli.js"
- }
- },
- "node_modules/flat-cache": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
- "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "flatted": "^3.2.9",
- "keyv": "^4.5.3",
- "rimraf": "^3.0.2"
- },
- "engines": {
- "node": "^10.12.0 || >=12.0.0"
- }
- },
- "node_modules/flatted": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
- "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/follow-redirects": {
- "version": "1.15.9",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
- "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
- "dev": true,
- "funding": [
- {
- "type": "individual",
- "url": "https://github.com/sponsors/RubenVerborgh"
- }
- ],
- "license": "MIT",
- "engines": {
- "node": ">=4.0"
- },
- "peerDependenciesMeta": {
- "debug": {
- "optional": true
- }
- }
- },
- "node_modules/foreground-child": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
- "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "cross-spawn": "^7.0.0",
- "signal-exit": "^4.0.1"
- },
- "engines": {
- "node": ">=14"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/foreground-child/node_modules/signal-exit": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
- "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=14"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/form-data": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
- "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "asynckit": "^0.4.0",
- "combined-stream": "^1.0.8",
- "mime-types": "^2.1.12"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/form-data-encoder": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
- "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 14.17"
- }
- },
- "node_modules/fp-and-or": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.4.tgz",
- "integrity": "sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/fs-constants": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
- "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/fs-extra": {
- "version": "11.2.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
- "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=14.14"
- }
- },
- "node_modules/fs-minipass": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
- "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^3.0.0"
- },
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/fs.realpath": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
- "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/function-bind": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
- "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
- "dev": true,
- "license": "MIT",
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/gauge": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
- "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
- "deprecated": "This package is no longer supported.",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "aproba": "^1.0.3 || ^2.0.0",
- "color-support": "^1.1.3",
- "console-control-strings": "^1.1.0",
- "has-unicode": "^2.0.1",
- "signal-exit": "^3.0.7",
- "string-width": "^4.2.3",
- "strip-ansi": "^6.0.1",
- "wide-align": "^1.1.5"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/get-caller-file": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
- "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "6.* || 8.* || >= 10.*"
- }
- },
- "node_modules/get-pkg-repo": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz",
- "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@hutson/parse-repository-url": "^3.0.0",
- "hosted-git-info": "^4.0.0",
- "through2": "^2.0.0",
- "yargs": "^16.2.0"
- },
- "bin": {
- "get-pkg-repo": "src/cli.js"
- },
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/get-port": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
- "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/get-stdin": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
- "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/get-stream": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
- "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/git-raw-commits": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-3.0.0.tgz",
- "integrity": "sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "dargs": "^7.0.0",
- "meow": "^8.1.2",
- "split2": "^3.2.2"
- },
- "bin": {
- "git-raw-commits": "cli.js"
- },
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/git-remote-origin-url": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
- "integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "gitconfiglocal": "^1.0.0",
- "pify": "^2.3.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/git-remote-origin-url/node_modules/pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/git-semver-tags": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-5.0.1.tgz",
- "integrity": "sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "meow": "^8.1.2",
- "semver": "^7.0.0"
- },
- "bin": {
- "git-semver-tags": "cli.js"
- },
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/git-up": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz",
- "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-ssh": "^1.4.0",
- "parse-url": "^8.1.0"
- }
- },
- "node_modules/git-url-parse": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz",
- "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "git-up": "^7.0.0"
- }
- },
- "node_modules/gitconfiglocal": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
- "integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==",
- "dev": true,
- "license": "BSD",
- "dependencies": {
- "ini": "^1.3.2"
- }
- },
- "node_modules/glob": {
- "version": "7.2.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
- "deprecated": "Glob versions prior to v9 are no longer supported",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.1.1",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- },
- "engines": {
- "node": "*"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/glob-parent": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
- "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "is-glob": "^4.0.3"
- },
- "engines": {
- "node": ">=10.13.0"
- }
- },
- "node_modules/glob/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/glob/node_modules/minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/global-dirs": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
- "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ini": "2.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/global-dirs/node_modules/ini": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
- "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/globals": {
- "version": "13.24.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
- "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "type-fest": "^0.20.2"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/globby": {
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
- "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "array-union": "^2.1.0",
- "dir-glob": "^3.0.1",
- "fast-glob": "^3.2.9",
- "ignore": "^5.2.0",
- "merge2": "^1.4.1",
- "slash": "^3.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/got": {
- "version": "12.6.1",
- "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
- "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@sindresorhus/is": "^5.2.0",
- "@szmarczak/http-timer": "^5.0.1",
- "cacheable-lookup": "^7.0.0",
- "cacheable-request": "^10.2.8",
- "decompress-response": "^6.0.0",
- "form-data-encoder": "^2.1.2",
- "get-stream": "^6.0.1",
- "http2-wrapper": "^2.1.10",
- "lowercase-keys": "^3.0.0",
- "p-cancelable": "^3.0.0",
- "responselike": "^3.0.0"
- },
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sindresorhus/got?sponsor=1"
- }
- },
- "node_modules/got/node_modules/get-stream": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
- "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/graceful-fs": {
- "version": "4.2.11",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
- "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/graphemer": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
- "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/handlebars": {
- "version": "4.7.8",
- "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
- "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "minimist": "^1.2.5",
- "neo-async": "^2.6.2",
- "source-map": "^0.6.1",
- "wordwrap": "^1.0.0"
- },
- "bin": {
- "handlebars": "bin/handlebars"
- },
- "engines": {
- "node": ">=0.4.7"
- },
- "optionalDependencies": {
- "uglify-js": "^3.1.4"
- }
- },
- "node_modules/hard-rejection": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
- "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/has-unicode": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
- "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/has-yarn": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz",
- "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/hasown": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
- "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "function-bind": "^1.1.2"
- },
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/hosted-git-info": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
- "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/http-cache-semantics": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
- "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
- "dev": true,
- "license": "BSD-2-Clause"
- },
- "node_modules/http-proxy-agent": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
- "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@tootallnate/once": "2",
- "agent-base": "6",
- "debug": "4"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/http2-wrapper": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
- "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "quick-lru": "^5.1.1",
- "resolve-alpn": "^1.2.0"
- },
- "engines": {
- "node": ">=10.19.0"
- }
- },
- "node_modules/http2-wrapper/node_modules/quick-lru": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
- "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/https-proxy-agent": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
- "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "agent-base": "6",
- "debug": "4"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/human-signals": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
- "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
- "dev": true,
- "license": "Apache-2.0",
- "engines": {
- "node": ">=10.17.0"
- }
- },
- "node_modules/humanize-ms": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
- "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ms": "^2.0.0"
- }
- },
- "node_modules/iconv-lite": {
- "version": "0.4.24",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "safer-buffer": ">= 2.1.2 < 3"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/ieee754": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
- "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ],
- "license": "BSD-3-Clause"
- },
- "node_modules/ignore": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
- "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 4"
- }
- },
- "node_modules/ignore-walk": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz",
- "integrity": "sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minimatch": "^5.0.1"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/ignore-walk/node_modules/minimatch": {
- "version": "5.1.6",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
- "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/import-fresh": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
- "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "parent-module": "^1.0.0",
- "resolve-from": "^4.0.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/import-lazy": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
- "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/import-local": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
- "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "pkg-dir": "^4.2.0",
- "resolve-cwd": "^3.0.0"
- },
- "bin": {
- "import-local-fixture": "fixtures/cli.js"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/imurmurhash": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
- "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.8.19"
- }
- },
- "node_modules/indent-string": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
- "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/infer-owner": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
- "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/inflight": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
- "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
- "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "once": "^1.3.0",
- "wrappy": "1"
- }
- },
- "node_modules/inherits": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
- "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/ini": {
- "version": "1.3.8",
- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
- "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/init-package-json": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-5.0.0.tgz",
- "integrity": "sha512-kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "npm-package-arg": "^10.0.0",
- "promzard": "^1.0.0",
- "read": "^2.0.0",
- "read-package-json": "^6.0.0",
- "semver": "^7.3.5",
- "validate-npm-package-license": "^3.0.4",
- "validate-npm-package-name": "^5.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/init-package-json/node_modules/hosted-git-info": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
- "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^7.5.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/init-package-json/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/init-package-json/node_modules/npm-package-arg": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
- "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "hosted-git-info": "^6.0.0",
- "proc-log": "^3.0.0",
- "semver": "^7.3.5",
- "validate-npm-package-name": "^5.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/inquirer": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz",
- "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.1.1",
- "cli-cursor": "^3.1.0",
- "cli-width": "^3.0.0",
- "external-editor": "^3.0.3",
- "figures": "^3.0.0",
- "lodash": "^4.17.21",
- "mute-stream": "0.0.8",
- "ora": "^5.4.1",
- "run-async": "^2.4.0",
- "rxjs": "^7.5.5",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0",
- "through": "^2.3.6",
- "wrap-ansi": "^6.0.1"
- },
- "engines": {
- "node": ">=12.0.0"
- }
- },
- "node_modules/ip-address": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
- "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "jsbn": "1.1.0",
- "sprintf-js": "^1.1.3"
- },
- "engines": {
- "node": ">= 12"
- }
- },
- "node_modules/is-arrayish": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
- "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/is-ci": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
- "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ci-info": "^2.0.0"
- },
- "bin": {
- "is-ci": "bin.js"
- }
- },
- "node_modules/is-core-module": {
- "version": "2.15.1",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
- "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "hasown": "^2.0.2"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/is-docker": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
- "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "is-docker": "cli.js"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/is-extglob": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
- "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/is-fullwidth-code-point": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/is-glob": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
- "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-extglob": "^2.1.1"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/is-installed-globally": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
- "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "global-dirs": "^3.0.0",
- "is-path-inside": "^3.0.2"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/is-interactive": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
- "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/is-lambda": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
- "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/is-npm": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz",
- "integrity": "sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/is-number": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
- "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.12.0"
- }
- },
- "node_modules/is-obj": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
- "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/is-path-inside": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
- "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/is-plain-obj": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
- "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/is-plain-object": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
- "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/is-ssh": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
- "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "protocols": "^2.0.1"
- }
- },
- "node_modules/is-stream": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
- "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/is-text-path": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
- "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "text-extensions": "^1.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/is-typedarray": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
- "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/is-unicode-supported": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
- "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/is-wsl": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
- "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-docker": "^2.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/is-yarn-global": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz",
- "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/isarray": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
- "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/isexe": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
- "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/isobject": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
- "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/jackspeak": {
- "version": "3.4.3",
- "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
- "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "@isaacs/cliui": "^8.0.2"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- },
- "optionalDependencies": {
- "@pkgjs/parseargs": "^0.11.0"
- }
- },
- "node_modules/jake": {
- "version": "10.9.2",
- "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
- "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "async": "^3.2.3",
- "chalk": "^4.0.2",
- "filelist": "^1.0.4",
- "minimatch": "^3.1.2"
- },
- "bin": {
- "jake": "bin/cli.js"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/jake/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/jake/node_modules/minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/jest-diff": {
- "version": "29.7.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
- "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "chalk": "^4.0.0",
- "diff-sequences": "^29.6.3",
- "jest-get-type": "^29.6.3",
- "pretty-format": "^29.7.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jest-get-type": {
- "version": "29.6.3",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
- "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/jju": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
- "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/js-tokens": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
- "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/js-yaml": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
- "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "argparse": "^2.0.1"
- },
- "bin": {
- "js-yaml": "bin/js-yaml.js"
- }
- },
- "node_modules/jsbn": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
- "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/json-buffer": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
- "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/json-parse-better-errors": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
- "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/json-parse-even-better-errors": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
- "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/json-parse-helpfulerror": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
- "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "jju": "^1.1.0"
- }
- },
- "node_modules/json-schema-traverse": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/json-stable-stringify-without-jsonify": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
- "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/json-stringify-safe": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
- "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/json5": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
- "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "json5": "lib/cli.js"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/jsonc-parser": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
- "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/jsonfile": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
- "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "universalify": "^2.0.0"
- },
- "optionalDependencies": {
- "graceful-fs": "^4.1.6"
- }
- },
- "node_modules/jsonlines": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz",
- "integrity": "sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/jsonparse": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
- "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
- "dev": true,
- "engines": [
- "node >= 0.2.0"
- ],
- "license": "MIT"
- },
- "node_modules/JSONStream": {
- "version": "1.3.5",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
- "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
- "dev": true,
- "license": "(MIT OR Apache-2.0)",
- "dependencies": {
- "jsonparse": "^1.2.0",
- "through": ">=2.2.7 <3"
- },
- "bin": {
- "JSONStream": "bin.js"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/keyv": {
- "version": "4.5.4",
- "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
- "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "json-buffer": "3.0.1"
- }
- },
- "node_modules/kind-of": {
- "version": "6.0.3",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/kleur": {
- "version": "4.1.5",
- "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
- "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/latest-version": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz",
- "integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "package-json": "^8.1.0"
- },
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/lerna": {
- "version": "7.4.2",
- "resolved": "https://registry.npmjs.org/lerna/-/lerna-7.4.2.tgz",
- "integrity": "sha512-gxavfzHfJ4JL30OvMunmlm4Anw7d7Tq6tdVHzUukLdS9nWnxCN/QB21qR+VJYp5tcyXogHKbdUEGh6qmeyzxSA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@lerna/child-process": "7.4.2",
- "@lerna/create": "7.4.2",
- "@npmcli/run-script": "6.0.2",
- "@nx/devkit": ">=16.5.1 < 17",
- "@octokit/plugin-enterprise-rest": "6.0.1",
- "@octokit/rest": "19.0.11",
- "byte-size": "8.1.1",
- "chalk": "4.1.0",
- "clone-deep": "4.0.1",
- "cmd-shim": "6.0.1",
- "columnify": "1.6.0",
- "conventional-changelog-angular": "7.0.0",
- "conventional-changelog-core": "5.0.1",
- "conventional-recommended-bump": "7.0.1",
- "cosmiconfig": "^8.2.0",
- "dedent": "0.7.0",
- "envinfo": "7.8.1",
- "execa": "5.0.0",
- "fs-extra": "^11.1.1",
- "get-port": "5.1.1",
- "get-stream": "6.0.0",
- "git-url-parse": "13.1.0",
- "glob-parent": "5.1.2",
- "globby": "11.1.0",
- "graceful-fs": "4.2.11",
- "has-unicode": "2.0.1",
- "import-local": "3.1.0",
- "ini": "^1.3.8",
- "init-package-json": "5.0.0",
- "inquirer": "^8.2.4",
- "is-ci": "3.0.1",
- "is-stream": "2.0.0",
- "jest-diff": ">=29.4.3 < 30",
- "js-yaml": "4.1.0",
- "libnpmaccess": "7.0.2",
- "libnpmpublish": "7.3.0",
- "load-json-file": "6.2.0",
- "lodash": "^4.17.21",
- "make-dir": "4.0.0",
- "minimatch": "3.0.5",
- "multimatch": "5.0.0",
- "node-fetch": "2.6.7",
- "npm-package-arg": "8.1.1",
- "npm-packlist": "5.1.1",
- "npm-registry-fetch": "^14.0.5",
- "npmlog": "^6.0.2",
- "nx": ">=16.5.1 < 17",
- "p-map": "4.0.0",
- "p-map-series": "2.1.0",
- "p-pipe": "3.1.0",
- "p-queue": "6.6.2",
- "p-reduce": "2.1.0",
- "p-waterfall": "2.1.1",
- "pacote": "^15.2.0",
- "pify": "5.0.0",
- "read-cmd-shim": "4.0.0",
- "read-package-json": "6.0.4",
- "resolve-from": "5.0.0",
- "rimraf": "^4.4.1",
- "semver": "^7.3.8",
- "signal-exit": "3.0.7",
- "slash": "3.0.0",
- "ssri": "^9.0.1",
- "strong-log-transformer": "2.1.0",
- "tar": "6.1.11",
- "temp-dir": "1.0.0",
- "typescript": ">=3 < 6",
- "upath": "2.0.1",
- "uuid": "^9.0.0",
- "validate-npm-package-license": "3.0.4",
- "validate-npm-package-name": "5.0.0",
- "write-file-atomic": "5.0.1",
- "write-pkg": "4.0.0",
- "yargs": "16.2.0",
- "yargs-parser": "20.2.4"
- },
- "bin": {
- "lerna": "dist/cli.js"
- },
- "engines": {
- "node": ">=16.0.0"
- }
- },
- "node_modules/lerna/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/lerna/node_modules/chalk": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
- "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/lerna/node_modules/ci-info": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
- "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/sibiraj-s"
- }
- ],
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/lerna/node_modules/glob": {
- "version": "9.3.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
- "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "minimatch": "^8.0.2",
- "minipass": "^4.2.4",
- "path-scurry": "^1.6.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/lerna/node_modules/glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "is-glob": "^4.0.1"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/lerna/node_modules/glob/node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0"
- }
- },
- "node_modules/lerna/node_modules/glob/node_modules/minimatch": {
- "version": "8.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz",
- "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/lerna/node_modules/is-ci": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
- "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ci-info": "^3.2.0"
- },
- "bin": {
- "is-ci": "bin.js"
- }
- },
- "node_modules/lerna/node_modules/minimatch": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
- "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/lerna/node_modules/minipass": {
- "version": "4.2.8",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
- "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/lerna/node_modules/resolve-from": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
- "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/lerna/node_modules/rimraf": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz",
- "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "glob": "^9.2.0"
- },
- "bin": {
- "rimraf": "dist/cjs/src/bin.js"
- },
- "engines": {
- "node": ">=14"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/levn": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
- "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "prelude-ls": "^1.2.1",
- "type-check": "~0.4.0"
- },
- "engines": {
- "node": ">= 0.8.0"
- }
- },
- "node_modules/libnpmaccess": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-7.0.2.tgz",
- "integrity": "sha512-vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "npm-package-arg": "^10.1.0",
- "npm-registry-fetch": "^14.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/libnpmaccess/node_modules/hosted-git-info": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
- "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^7.5.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/libnpmaccess/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/libnpmaccess/node_modules/npm-package-arg": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
- "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "hosted-git-info": "^6.0.0",
- "proc-log": "^3.0.0",
- "semver": "^7.3.5",
- "validate-npm-package-name": "^5.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/libnpmpublish": {
- "version": "7.3.0",
- "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-7.3.0.tgz",
- "integrity": "sha512-fHUxw5VJhZCNSls0KLNEG0mCD2PN1i14gH5elGOgiVnU3VgTcRahagYP2LKI1m0tFCJ+XrAm0zVYyF5RCbXzcg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "ci-info": "^3.6.1",
- "normalize-package-data": "^5.0.0",
- "npm-package-arg": "^10.1.0",
- "npm-registry-fetch": "^14.0.3",
- "proc-log": "^3.0.0",
- "semver": "^7.3.7",
- "sigstore": "^1.4.0",
- "ssri": "^10.0.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/libnpmpublish/node_modules/ci-info": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
- "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/sibiraj-s"
- }
- ],
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/libnpmpublish/node_modules/hosted-git-info": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
- "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^7.5.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/libnpmpublish/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/libnpmpublish/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/libnpmpublish/node_modules/normalize-package-data": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz",
- "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "hosted-git-info": "^6.0.0",
- "is-core-module": "^2.8.1",
- "semver": "^7.3.5",
- "validate-npm-package-license": "^3.0.4"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/libnpmpublish/node_modules/npm-package-arg": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
- "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "hosted-git-info": "^6.0.0",
- "proc-log": "^3.0.0",
- "semver": "^7.3.5",
- "validate-npm-package-name": "^5.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/libnpmpublish/node_modules/ssri": {
- "version": "10.0.6",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
- "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/lines-and-columns": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz",
- "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
- }
- },
- "node_modules/load-json-file": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz",
- "integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "graceful-fs": "^4.1.15",
- "parse-json": "^5.0.0",
- "strip-bom": "^4.0.0",
- "type-fest": "^0.6.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/load-json-file/node_modules/type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
- "dev": true,
- "license": "(MIT OR CC0-1.0)",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/locate-path": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
- "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-locate": "^5.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/lodash": {
- "version": "4.17.21",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
- "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/lodash.ismatch": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz",
- "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/lodash.merge": {
- "version": "4.6.2",
- "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
- "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/log-symbols": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
- "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "chalk": "^4.1.0",
- "is-unicode-supported": "^0.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/lowercase-keys": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
- "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/make-dir": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
- "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "semver": "^7.5.3"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/make-fetch-happen": {
- "version": "10.2.1",
- "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz",
- "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "agentkeepalive": "^4.2.1",
- "cacache": "^16.1.0",
- "http-cache-semantics": "^4.1.0",
- "http-proxy-agent": "^5.0.0",
- "https-proxy-agent": "^5.0.0",
- "is-lambda": "^1.0.1",
- "lru-cache": "^7.7.1",
- "minipass": "^3.1.6",
- "minipass-collect": "^1.0.2",
- "minipass-fetch": "^2.0.3",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "negotiator": "^0.6.3",
- "promise-retry": "^2.0.1",
- "socks-proxy-agent": "^7.0.0",
- "ssri": "^9.0.0"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/make-fetch-happen/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/map-obj": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
- "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/meow": {
- "version": "8.1.2",
- "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
- "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/minimist": "^1.2.0",
- "camelcase-keys": "^6.2.2",
- "decamelize-keys": "^1.1.0",
- "hard-rejection": "^2.1.0",
- "minimist-options": "4.1.0",
- "normalize-package-data": "^3.0.0",
- "read-pkg-up": "^7.0.1",
- "redent": "^3.0.0",
- "trim-newlines": "^3.0.0",
- "type-fest": "^0.18.0",
- "yargs-parser": "^20.2.3"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/meow/node_modules/find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/meow/node_modules/hosted-git-info": {
- "version": "2.8.9",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
- "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/meow/node_modules/locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-locate": "^4.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/meow/node_modules/p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-try": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/meow/node_modules/p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-limit": "^2.2.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/meow/node_modules/read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/meow/node_modules/read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
- "dev": true,
- "license": "(MIT OR CC0-1.0)",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
- "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "hosted-git-info": "^2.1.4",
- "resolve": "^1.10.0",
- "semver": "2 || 3 || 4 || 5",
- "validate-npm-package-license": "^3.0.1"
- }
- },
- "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
- "dev": true,
- "license": "(MIT OR CC0-1.0)",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/meow/node_modules/semver": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
- "dev": true,
- "license": "ISC",
- "bin": {
- "semver": "bin/semver"
- }
- },
- "node_modules/meow/node_modules/type-fest": {
- "version": "0.18.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
- "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
- "dev": true,
- "license": "(MIT OR CC0-1.0)",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/merge-stream": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
- "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/merge2": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
- "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/micromatch": {
- "version": "4.0.8",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
- "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "braces": "^3.0.3",
- "picomatch": "^2.3.1"
- },
- "engines": {
- "node": ">=8.6"
- }
- },
- "node_modules/mime-db": {
- "version": "1.52.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
- "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/mime-types": {
- "version": "2.1.35",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
- "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "mime-db": "1.52.0"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/mimic-fn": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
- "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/mimic-response": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
- "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/min-indent": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
- "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/minimatch": {
- "version": "9.0.3",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
- "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/minimist": {
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
- "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
- "dev": true,
- "license": "MIT",
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/minimist-options": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
- "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "arrify": "^1.0.1",
- "is-plain-obj": "^1.1.0",
- "kind-of": "^6.0.3"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/minipass": {
- "version": "3.3.6",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
- "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/minipass-collect": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
- "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^3.0.0"
- },
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/minipass-fetch": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz",
- "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "minipass": "^3.1.6",
- "minipass-sized": "^1.0.3",
- "minizlib": "^2.1.2"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- },
- "optionalDependencies": {
- "encoding": "^0.1.13"
- }
- },
- "node_modules/minipass-flush": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
- "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^3.0.0"
- },
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/minipass-json-stream": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz",
- "integrity": "sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "jsonparse": "^1.3.1",
- "minipass": "^3.0.0"
- }
- },
- "node_modules/minipass-pipeline": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
- "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^3.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/minipass-sized": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
- "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^3.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/minizlib": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
- "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "minipass": "^3.0.0",
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/mkdirp": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
- "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "mkdirp": "bin/cmd.js"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/modify-values": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
- "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/ms": {
- "version": "2.1.3",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/multimatch": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
- "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/minimatch": "^3.0.3",
- "array-differ": "^3.0.0",
- "array-union": "^2.1.0",
- "arrify": "^2.0.1",
- "minimatch": "^3.0.4"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/multimatch/node_modules/@types/minimatch": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
- "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/multimatch/node_modules/arrify": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
- "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/multimatch/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/multimatch/node_modules/minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/mute-stream": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
- "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/natural-compare": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
- "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/negotiator": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
- "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/neo-async": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
- "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/node-addon-api": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
- "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/node-fetch": {
- "version": "2.6.7",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
- "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "whatwg-url": "^5.0.0"
- },
- "engines": {
- "node": "4.x || >=6.0.0"
- },
- "peerDependencies": {
- "encoding": "^0.1.0"
- },
- "peerDependenciesMeta": {
- "encoding": {
- "optional": true
- }
- }
- },
- "node_modules/node-gyp": {
- "version": "9.4.1",
- "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz",
- "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "env-paths": "^2.2.0",
- "exponential-backoff": "^3.1.1",
- "glob": "^7.1.4",
- "graceful-fs": "^4.2.6",
- "make-fetch-happen": "^10.0.3",
- "nopt": "^6.0.0",
- "npmlog": "^6.0.0",
- "rimraf": "^3.0.2",
- "semver": "^7.3.5",
- "tar": "^6.1.2",
- "which": "^2.0.2"
- },
- "bin": {
- "node-gyp": "bin/node-gyp.js"
- },
- "engines": {
- "node": "^12.13 || ^14.13 || >=16"
- }
- },
- "node_modules/node-gyp-build": {
- "version": "4.8.2",
- "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
- "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "node-gyp-build": "bin.js",
- "node-gyp-build-optional": "optional.js",
- "node-gyp-build-test": "build-test.js"
- }
- },
- "node_modules/node-machine-id": {
- "version": "1.1.12",
- "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
- "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/nopt": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
- "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "abbrev": "^1.0.0"
- },
- "bin": {
- "nopt": "bin/nopt.js"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/normalize-package-data": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
- "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "hosted-git-info": "^4.0.1",
- "is-core-module": "^2.5.0",
- "semver": "^7.3.4",
- "validate-npm-package-license": "^3.0.1"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/normalize-url": {
- "version": "8.0.1",
- "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
- "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/npm-bundled": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
- "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "npm-normalize-package-bin": "^1.0.1"
- }
- },
- "node_modules/npm-check-updates": {
- "version": "16.14.20",
- "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.20.tgz",
- "integrity": "sha512-sYbIhun4DrjO7NFOTdvs11nCar0etEhZTsEjL47eM0TuiGMhmYughRCxG2SpGRmGAQ7AkwN7bw2lWzoE7q6yOQ==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "@types/semver-utils": "^1.1.1",
- "chalk": "^5.3.0",
- "cli-table3": "^0.6.3",
- "commander": "^10.0.1",
- "fast-memoize": "^2.5.2",
- "find-up": "5.0.0",
- "fp-and-or": "^0.1.4",
- "get-stdin": "^8.0.0",
- "globby": "^11.0.4",
- "hosted-git-info": "^5.1.0",
- "ini": "^4.1.1",
- "js-yaml": "^4.1.0",
- "json-parse-helpfulerror": "^1.0.3",
- "jsonlines": "^0.1.1",
- "lodash": "^4.17.21",
- "make-fetch-happen": "^11.1.1",
- "minimatch": "^9.0.3",
- "p-map": "^4.0.0",
- "pacote": "15.2.0",
- "parse-github-url": "^1.0.2",
- "progress": "^2.0.3",
- "prompts-ncu": "^3.0.0",
- "rc-config-loader": "^4.1.3",
- "remote-git-tags": "^3.0.0",
- "rimraf": "^5.0.5",
- "semver": "^7.5.4",
- "semver-utils": "^1.1.4",
- "source-map-support": "^0.5.21",
- "spawn-please": "^2.0.2",
- "strip-ansi": "^7.1.0",
- "strip-json-comments": "^5.0.1",
- "untildify": "^4.0.0",
- "update-notifier": "^6.0.2"
- },
- "bin": {
- "ncu": "build/src/bin/cli.js",
- "npm-check-updates": "build/src/bin/cli.js"
- },
- "engines": {
- "node": ">=14.14"
- }
- },
- "node_modules/npm-check-updates/node_modules/@npmcli/fs": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
- "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "semver": "^7.3.5"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-check-updates/node_modules/ansi-regex": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
- "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-regex?sponsor=1"
- }
- },
- "node_modules/npm-check-updates/node_modules/cacache": {
- "version": "17.1.4",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
- "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@npmcli/fs": "^3.1.0",
- "fs-minipass": "^3.0.0",
- "glob": "^10.2.2",
- "lru-cache": "^7.7.1",
- "minipass": "^7.0.3",
- "minipass-collect": "^1.0.2",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "p-map": "^4.0.0",
- "ssri": "^10.0.0",
- "tar": "^6.1.11",
- "unique-filename": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-check-updates/node_modules/cacache/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/npm-check-updates/node_modules/chalk": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
- "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^12.17.0 || ^14.13 || >=16.0.0"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/npm-check-updates/node_modules/fs-minipass": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
- "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-check-updates/node_modules/fs-minipass/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/npm-check-updates/node_modules/glob": {
- "version": "10.4.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
- "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "foreground-child": "^3.1.0",
- "jackspeak": "^3.1.2",
- "minimatch": "^9.0.4",
- "minipass": "^7.1.2",
- "package-json-from-dist": "^1.0.0",
- "path-scurry": "^1.11.1"
- },
- "bin": {
- "glob": "dist/esm/bin.mjs"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/npm-check-updates/node_modules/glob/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/npm-check-updates/node_modules/hosted-git-info": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz",
- "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^7.5.1"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/npm-check-updates/node_modules/ini": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
- "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-check-updates/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/npm-check-updates/node_modules/make-fetch-happen": {
- "version": "11.1.1",
- "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
- "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "agentkeepalive": "^4.2.1",
- "cacache": "^17.0.0",
- "http-cache-semantics": "^4.1.1",
- "http-proxy-agent": "^5.0.0",
- "https-proxy-agent": "^5.0.0",
- "is-lambda": "^1.0.1",
- "lru-cache": "^7.7.1",
- "minipass": "^5.0.0",
- "minipass-fetch": "^3.0.0",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "negotiator": "^0.6.3",
- "promise-retry": "^2.0.1",
- "socks-proxy-agent": "^7.0.0",
- "ssri": "^10.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-check-updates/node_modules/minimatch": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
- "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/npm-check-updates/node_modules/minipass": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
- "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/npm-check-updates/node_modules/minipass-fetch": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
- "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "minipass": "^7.0.3",
- "minipass-sized": "^1.0.3",
- "minizlib": "^2.1.2"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "encoding": "^0.1.13"
- }
- },
- "node_modules/npm-check-updates/node_modules/minipass-fetch/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/npm-check-updates/node_modules/rimraf": {
- "version": "5.0.10",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
- "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "glob": "^10.3.7"
- },
- "bin": {
- "rimraf": "dist/esm/bin.mjs"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/npm-check-updates/node_modules/ssri": {
- "version": "10.0.6",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
- "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-check-updates/node_modules/ssri/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/npm-check-updates/node_modules/strip-ansi": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
- "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-regex": "^6.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/strip-ansi?sponsor=1"
- }
- },
- "node_modules/npm-check-updates/node_modules/strip-json-comments": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
- "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/npm-check-updates/node_modules/unique-filename": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
- "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "unique-slug": "^4.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-check-updates/node_modules/unique-slug": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
- "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "imurmurhash": "^0.1.4"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-install-checks": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
- "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "semver": "^7.1.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-normalize-package-bin": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
- "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/npm-package-arg": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz",
- "integrity": "sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "hosted-git-info": "^3.0.6",
- "semver": "^7.0.0",
- "validate-npm-package-name": "^3.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/npm-package-arg/node_modules/builtins": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
- "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/npm-package-arg/node_modules/hosted-git-info": {
- "version": "3.0.8",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
- "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/npm-package-arg/node_modules/validate-npm-package-name": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
- "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "builtins": "^1.0.3"
- }
- },
- "node_modules/npm-packlist": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz",
- "integrity": "sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "glob": "^8.0.1",
- "ignore-walk": "^5.0.1",
- "npm-bundled": "^1.1.2",
- "npm-normalize-package-bin": "^1.0.1"
- },
- "bin": {
- "npm-packlist": "bin/index.js"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/npm-packlist/node_modules/glob": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
- "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
- "deprecated": "Glob versions prior to v9 are no longer supported",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^5.0.1",
- "once": "^1.3.0"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/npm-packlist/node_modules/minimatch": {
- "version": "5.1.6",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
- "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/npm-pick-manifest": {
- "version": "8.0.2",
- "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz",
- "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "npm-install-checks": "^6.0.0",
- "npm-normalize-package-bin": "^3.0.0",
- "npm-package-arg": "^10.0.0",
- "semver": "^7.3.5"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-pick-manifest/node_modules/hosted-git-info": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
- "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^7.5.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-pick-manifest/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/npm-pick-manifest/node_modules/npm-normalize-package-bin": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
- "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-pick-manifest/node_modules/npm-package-arg": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
- "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "hosted-git-info": "^6.0.0",
- "proc-log": "^3.0.0",
- "semver": "^7.3.5",
- "validate-npm-package-name": "^5.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-registry-fetch": {
- "version": "14.0.5",
- "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz",
- "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "make-fetch-happen": "^11.0.0",
- "minipass": "^5.0.0",
- "minipass-fetch": "^3.0.0",
- "minipass-json-stream": "^1.0.1",
- "minizlib": "^2.1.2",
- "npm-package-arg": "^10.0.0",
- "proc-log": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/@npmcli/fs": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
- "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "semver": "^7.3.5"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/cacache": {
- "version": "17.1.4",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
- "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@npmcli/fs": "^3.1.0",
- "fs-minipass": "^3.0.0",
- "glob": "^10.2.2",
- "lru-cache": "^7.7.1",
- "minipass": "^7.0.3",
- "minipass-collect": "^1.0.2",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "p-map": "^4.0.0",
- "ssri": "^10.0.0",
- "tar": "^6.1.11",
- "unique-filename": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/cacache/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/fs-minipass": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
- "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/fs-minipass/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/glob": {
- "version": "10.4.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
- "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "foreground-child": "^3.1.0",
- "jackspeak": "^3.1.2",
- "minimatch": "^9.0.4",
- "minipass": "^7.1.2",
- "package-json-from-dist": "^1.0.0",
- "path-scurry": "^1.11.1"
- },
- "bin": {
- "glob": "dist/esm/bin.mjs"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/glob/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/hosted-git-info": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
- "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^7.5.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": {
- "version": "11.1.1",
- "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
- "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "agentkeepalive": "^4.2.1",
- "cacache": "^17.0.0",
- "http-cache-semantics": "^4.1.1",
- "http-proxy-agent": "^5.0.0",
- "https-proxy-agent": "^5.0.0",
- "is-lambda": "^1.0.1",
- "lru-cache": "^7.7.1",
- "minipass": "^5.0.0",
- "minipass-fetch": "^3.0.0",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "negotiator": "^0.6.3",
- "promise-retry": "^2.0.1",
- "socks-proxy-agent": "^7.0.0",
- "ssri": "^10.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/minimatch": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
- "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/minipass": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
- "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/minipass-fetch": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
- "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "minipass": "^7.0.3",
- "minipass-sized": "^1.0.3",
- "minizlib": "^2.1.2"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "encoding": "^0.1.13"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/minipass-fetch/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/npm-package-arg": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
- "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "hosted-git-info": "^6.0.0",
- "proc-log": "^3.0.0",
- "semver": "^7.3.5",
- "validate-npm-package-name": "^5.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/ssri": {
- "version": "10.0.6",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
- "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/ssri/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/unique-filename": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
- "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "unique-slug": "^4.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-registry-fetch/node_modules/unique-slug": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
- "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "imurmurhash": "^0.1.4"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/npm-run-path": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
- "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "path-key": "^3.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/npmlog": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
- "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
- "deprecated": "This package is no longer supported.",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "are-we-there-yet": "^3.0.0",
- "console-control-strings": "^1.1.0",
- "gauge": "^4.0.3",
- "set-blocking": "^2.0.0"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/nx": {
- "version": "16.10.0",
- "resolved": "https://registry.npmjs.org/nx/-/nx-16.10.0.tgz",
- "integrity": "sha512-gZl4iCC0Hx0Qe1VWmO4Bkeul2nttuXdPpfnlcDKSACGu3ZIo+uySqwOF8yBAxSTIf8xe2JRhgzJN1aFkuezEBg==",
- "dev": true,
- "hasInstallScript": true,
- "license": "MIT",
- "dependencies": {
- "@nrwl/tao": "16.10.0",
- "@parcel/watcher": "2.0.4",
- "@yarnpkg/lockfile": "^1.1.0",
- "@yarnpkg/parsers": "3.0.0-rc.46",
- "@zkochan/js-yaml": "0.0.6",
- "axios": "^1.0.0",
- "chalk": "^4.1.0",
- "cli-cursor": "3.1.0",
- "cli-spinners": "2.6.1",
- "cliui": "^8.0.1",
- "dotenv": "~16.3.1",
- "dotenv-expand": "~10.0.0",
- "enquirer": "~2.3.6",
- "figures": "3.2.0",
- "flat": "^5.0.2",
- "fs-extra": "^11.1.0",
- "glob": "7.1.4",
- "ignore": "^5.0.4",
- "jest-diff": "^29.4.1",
- "js-yaml": "4.1.0",
- "jsonc-parser": "3.2.0",
- "lines-and-columns": "~2.0.3",
- "minimatch": "3.0.5",
- "node-machine-id": "1.1.12",
- "npm-run-path": "^4.0.1",
- "open": "^8.4.0",
- "semver": "7.5.3",
- "string-width": "^4.2.3",
- "strong-log-transformer": "^2.1.0",
- "tar-stream": "~2.2.0",
- "tmp": "~0.2.1",
- "tsconfig-paths": "^4.1.2",
- "tslib": "^2.3.0",
- "v8-compile-cache": "2.3.0",
- "yargs": "^17.6.2",
- "yargs-parser": "21.1.1"
- },
- "bin": {
- "nx": "bin/nx.js"
- },
- "optionalDependencies": {
- "@nx/nx-darwin-arm64": "16.10.0",
- "@nx/nx-darwin-x64": "16.10.0",
- "@nx/nx-freebsd-x64": "16.10.0",
- "@nx/nx-linux-arm-gnueabihf": "16.10.0",
- "@nx/nx-linux-arm64-gnu": "16.10.0",
- "@nx/nx-linux-arm64-musl": "16.10.0",
- "@nx/nx-linux-x64-gnu": "16.10.0",
- "@nx/nx-linux-x64-musl": "16.10.0",
- "@nx/nx-win32-arm64-msvc": "16.10.0",
- "@nx/nx-win32-x64-msvc": "16.10.0"
- },
- "peerDependencies": {
- "@swc-node/register": "^1.6.7",
- "@swc/core": "^1.3.85"
- },
- "peerDependenciesMeta": {
- "@swc-node/register": {
- "optional": true
- },
- "@swc/core": {
- "optional": true
- }
- }
- },
- "node_modules/nx/node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
- }
- },
- "node_modules/nx/node_modules/glob": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
- "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
- "deprecated": "Glob versions prior to v9 are no longer supported",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/nx/node_modules/jsonc-parser": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
- "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/nx/node_modules/minimatch": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
- "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/nx/node_modules/semver": {
- "version": "7.5.3",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
- "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
- "bin": {
- "semver": "bin/semver.js"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/nx/node_modules/yargs": {
- "version": "17.7.2",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
- "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "cliui": "^8.0.1",
- "escalade": "^3.1.1",
- "get-caller-file": "^2.0.5",
- "require-directory": "^2.1.1",
- "string-width": "^4.2.3",
- "y18n": "^5.0.5",
- "yargs-parser": "^21.1.1"
- },
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/nx/node_modules/yargs-parser": {
- "version": "21.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
- "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/once": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
- "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "wrappy": "1"
- }
- },
- "node_modules/onetime": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
- "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "mimic-fn": "^2.1.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/open": {
- "version": "8.4.2",
- "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
- "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "define-lazy-prop": "^2.0.0",
- "is-docker": "^2.1.1",
- "is-wsl": "^2.2.0"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/optionator": {
- "version": "0.9.4",
- "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
- "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "deep-is": "^0.1.3",
- "fast-levenshtein": "^2.0.6",
- "levn": "^0.4.1",
- "prelude-ls": "^1.2.1",
- "type-check": "^0.4.0",
- "word-wrap": "^1.2.5"
- },
- "engines": {
- "node": ">= 0.8.0"
- }
- },
- "node_modules/ora": {
- "version": "5.4.1",
- "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
- "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "bl": "^4.1.0",
- "chalk": "^4.1.0",
- "cli-cursor": "^3.1.0",
- "cli-spinners": "^2.5.0",
- "is-interactive": "^1.0.0",
- "is-unicode-supported": "^0.1.0",
- "log-symbols": "^4.1.0",
- "strip-ansi": "^6.0.0",
- "wcwidth": "^1.0.1"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/ordinal": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/ordinal/-/ordinal-1.0.3.tgz",
- "integrity": "sha512-cMddMgb2QElm8G7vdaa02jhUNbTSrhsgAGUz1OokD83uJTwSUn+nKoNoKVVaRa08yF6sgfO7Maou1+bgLd9rdQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/os-tmpdir": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
- "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/p-cancelable": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
- "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12.20"
- }
- },
- "node_modules/p-finally": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
- "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/p-limit": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "yocto-queue": "^0.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/p-locate": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
- "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-limit": "^3.0.2"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/p-map": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
- "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "aggregate-error": "^3.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/p-map-series": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz",
- "integrity": "sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/p-pipe": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz",
- "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/p-queue": {
- "version": "6.6.2",
- "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
- "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "eventemitter3": "^4.0.4",
- "p-timeout": "^3.2.0"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/p-reduce": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz",
- "integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/p-timeout": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
- "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-finally": "^1.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/p-waterfall": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz",
- "integrity": "sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-reduce": "^2.0.0"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/package-json": {
- "version": "8.1.1",
- "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.1.tgz",
- "integrity": "sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "got": "^12.1.0",
- "registry-auth-token": "^5.0.1",
- "registry-url": "^6.0.0",
- "semver": "^7.3.7"
- },
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/package-json-from-dist": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
- "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
- "dev": true,
- "license": "BlueOak-1.0.0"
- },
- "node_modules/pacote": {
- "version": "15.2.0",
- "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz",
- "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@npmcli/git": "^4.0.0",
- "@npmcli/installed-package-contents": "^2.0.1",
- "@npmcli/promise-spawn": "^6.0.1",
- "@npmcli/run-script": "^6.0.0",
- "cacache": "^17.0.0",
- "fs-minipass": "^3.0.0",
- "minipass": "^5.0.0",
- "npm-package-arg": "^10.0.0",
- "npm-packlist": "^7.0.0",
- "npm-pick-manifest": "^8.0.0",
- "npm-registry-fetch": "^14.0.0",
- "proc-log": "^3.0.0",
- "promise-retry": "^2.0.1",
- "read-package-json": "^6.0.0",
- "read-package-json-fast": "^3.0.0",
- "sigstore": "^1.3.0",
- "ssri": "^10.0.0",
- "tar": "^6.1.11"
- },
- "bin": {
- "pacote": "lib/bin.js"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/pacote/node_modules/@npmcli/fs": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
- "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "semver": "^7.3.5"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/pacote/node_modules/cacache": {
- "version": "17.1.4",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
- "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@npmcli/fs": "^3.1.0",
- "fs-minipass": "^3.0.0",
- "glob": "^10.2.2",
- "lru-cache": "^7.7.1",
- "minipass": "^7.0.3",
- "minipass-collect": "^1.0.2",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "p-map": "^4.0.0",
- "ssri": "^10.0.0",
- "tar": "^6.1.11",
- "unique-filename": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/pacote/node_modules/cacache/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/pacote/node_modules/fs-minipass": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
- "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/pacote/node_modules/fs-minipass/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/pacote/node_modules/glob": {
- "version": "10.4.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
- "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "foreground-child": "^3.1.0",
- "jackspeak": "^3.1.2",
- "minimatch": "^9.0.4",
- "minipass": "^7.1.2",
- "package-json-from-dist": "^1.0.0",
- "path-scurry": "^1.11.1"
- },
- "bin": {
- "glob": "dist/esm/bin.mjs"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/pacote/node_modules/glob/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/pacote/node_modules/hosted-git-info": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
- "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^7.5.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/pacote/node_modules/ignore-walk": {
- "version": "6.0.5",
- "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz",
- "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minimatch": "^9.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/pacote/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/pacote/node_modules/minimatch": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
- "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/pacote/node_modules/minipass": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
- "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/pacote/node_modules/npm-package-arg": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
- "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "hosted-git-info": "^6.0.0",
- "proc-log": "^3.0.0",
- "semver": "^7.3.5",
- "validate-npm-package-name": "^5.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/pacote/node_modules/npm-packlist": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz",
- "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "ignore-walk": "^6.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/pacote/node_modules/ssri": {
- "version": "10.0.6",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
- "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/pacote/node_modules/ssri/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/pacote/node_modules/unique-filename": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
- "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "unique-slug": "^4.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/pacote/node_modules/unique-slug": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
- "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "imurmurhash": "^0.1.4"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/parent-module": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
- "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "callsites": "^3.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/parse-github-url": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.3.tgz",
- "integrity": "sha512-tfalY5/4SqGaV/GIGzWyHnFjlpTPTNpENR9Ea2lLldSJ8EWXMsvacWucqY3m3I4YPtas15IxTLQVQ5NSYXPrww==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "parse-github-url": "cli.js"
- },
- "engines": {
- "node": ">= 0.10"
- }
- },
- "node_modules/parse-json": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
- "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@babel/code-frame": "^7.0.0",
- "error-ex": "^1.3.1",
- "json-parse-even-better-errors": "^2.3.0",
- "lines-and-columns": "^1.1.6"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/parse-json/node_modules/lines-and-columns": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
- "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/parse-path": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz",
- "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "protocols": "^2.0.0"
- }
- },
- "node_modules/parse-url": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
- "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "parse-path": "^7.0.0"
- }
- },
- "node_modules/path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/path-is-absolute": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
- "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/path-key": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
- "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/path-parse": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
- "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/path-scurry": {
- "version": "1.11.1",
- "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
- "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "lru-cache": "^10.2.0",
- "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
- },
- "engines": {
- "node": ">=16 || 14 >=14.18"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/path-scurry/node_modules/lru-cache": {
- "version": "10.4.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
- "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/path-scurry/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/path-type": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
- "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/picocolors": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
- "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/picomatch": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8.6"
- },
- "funding": {
- "url": "https://github.com/sponsors/jonschlinkert"
- }
- },
- "node_modules/pify": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
- "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/pkg-dir": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
- "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "find-up": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/pkg-dir/node_modules/find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/pkg-dir/node_modules/locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-locate": "^4.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/pkg-dir/node_modules/p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-try": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/pkg-dir/node_modules/p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-limit": "^2.2.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/prelude-ls": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
- "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.8.0"
- }
- },
- "node_modules/prettier": {
- "version": "2.8.8",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
- "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
- "dev": true,
- "license": "MIT",
- "bin": {
- "prettier": "bin-prettier.js"
- },
- "engines": {
- "node": ">=10.13.0"
- },
- "funding": {
- "url": "https://github.com/prettier/prettier?sponsor=1"
- }
- },
- "node_modules/pretty-format": {
- "version": "29.7.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
- "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@jest/schemas": "^29.6.3",
- "ansi-styles": "^5.0.0",
- "react-is": "^18.0.0"
- },
- "engines": {
- "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
- }
- },
- "node_modules/pretty-format/node_modules/ansi-styles": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
- "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/proc-log": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
- "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/process-nextick-args": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
- "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/progress": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
- "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.4.0"
- }
- },
- "node_modules/promise-inflight": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
- "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/promise-retry": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
- "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "err-code": "^2.0.2",
- "retry": "^0.12.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/prompts": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
- "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "kleur": "^3.0.3",
- "sisteransi": "^1.0.5"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/prompts-ncu": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/prompts-ncu/-/prompts-ncu-3.0.0.tgz",
- "integrity": "sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "kleur": "^4.0.1",
- "sisteransi": "^1.0.5"
- },
- "engines": {
- "node": ">= 14"
- }
- },
- "node_modules/prompts/node_modules/kleur": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
- "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/promzard": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/promzard/-/promzard-1.0.2.tgz",
- "integrity": "sha512-2FPputGL+mP3jJ3UZg/Dl9YOkovB7DX0oOr+ck5QbZ5MtORtds8k/BZdn+02peDLI8/YWbmzx34k5fA+fHvCVQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "read": "^3.0.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/promzard/node_modules/mute-stream": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
- "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/promzard/node_modules/read": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/read/-/read-3.0.1.tgz",
- "integrity": "sha512-SLBrDU/Srs/9EoWhU5GdbAoxG1GzpQHo/6qiGItaoLJ1thmYpcNIM1qISEUvyHBzfGlWIyd6p2DNi1oV1VmAuw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "mute-stream": "^1.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/proto-list": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
- "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/protocols": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
- "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/proxy-from-env": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
- "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/punycode": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
- "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/pupa": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz",
- "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "escape-goat": "^4.0.0"
- },
- "engines": {
- "node": ">=12.20"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/pure-rand": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
- "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
- "dev": true,
- "funding": [
- {
- "type": "individual",
- "url": "https://github.com/sponsors/dubzzz"
- },
- {
- "type": "opencollective",
- "url": "https://opencollective.com/fast-check"
- }
- ],
- "license": "MIT"
- },
- "node_modules/queue-microtask": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
- "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ],
- "license": "MIT"
- },
- "node_modules/quick-lru": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
- "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/rc": {
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
- "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
- "dev": true,
- "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
- "dependencies": {
- "deep-extend": "^0.6.0",
- "ini": "~1.3.0",
- "minimist": "^1.2.0",
- "strip-json-comments": "~2.0.1"
- },
- "bin": {
- "rc": "cli.js"
- }
- },
- "node_modules/rc-config-loader": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.3.tgz",
- "integrity": "sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "debug": "^4.3.4",
- "js-yaml": "^4.1.0",
- "json5": "^2.2.2",
- "require-from-string": "^2.0.2"
- }
- },
- "node_modules/rc/node_modules/strip-json-comments": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
- "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/react-is": {
- "version": "18.3.1",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
- "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/read": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/read/-/read-2.1.0.tgz",
- "integrity": "sha512-bvxi1QLJHcaywCAEsAk4DG3nVoqiY2Csps3qzWalhj5hFqRn1d/OixkFXtLO1PrgHUcAP0FNaSY/5GYNfENFFQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "mute-stream": "~1.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/read-cmd-shim": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz",
- "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/read-package-json": {
- "version": "6.0.4",
- "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz",
- "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==",
- "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "glob": "^10.2.2",
- "json-parse-even-better-errors": "^3.0.0",
- "normalize-package-data": "^5.0.0",
- "npm-normalize-package-bin": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/read-package-json-fast": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz",
- "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "json-parse-even-better-errors": "^3.0.0",
- "npm-normalize-package-bin": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/read-package-json-fast/node_modules/json-parse-even-better-errors": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
- "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/read-package-json-fast/node_modules/npm-normalize-package-bin": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
- "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/read-package-json/node_modules/glob": {
- "version": "10.4.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
- "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "foreground-child": "^3.1.0",
- "jackspeak": "^3.1.2",
- "minimatch": "^9.0.4",
- "minipass": "^7.1.2",
- "package-json-from-dist": "^1.0.0",
- "path-scurry": "^1.11.1"
- },
- "bin": {
- "glob": "dist/esm/bin.mjs"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/read-package-json/node_modules/hosted-git-info": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
- "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^7.5.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/read-package-json/node_modules/json-parse-even-better-errors": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
- "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/read-package-json/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/read-package-json/node_modules/minimatch": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
- "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/read-package-json/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/read-package-json/node_modules/normalize-package-data": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz",
- "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "hosted-git-info": "^6.0.0",
- "is-core-module": "^2.8.1",
- "semver": "^7.3.5",
- "validate-npm-package-license": "^3.0.4"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/read-package-json/node_modules/npm-normalize-package-bin": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
- "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/read-pkg": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
- "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "load-json-file": "^4.0.0",
- "normalize-package-data": "^2.3.2",
- "path-type": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg-up": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
- "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "find-up": "^2.0.0",
- "read-pkg": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg-up/node_modules/find-up": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
- "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "locate-path": "^2.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg-up/node_modules/locate-path": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
- "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-locate": "^2.0.0",
- "path-exists": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg-up/node_modules/p-limit": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
- "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-try": "^1.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg-up/node_modules/p-locate": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
- "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "p-limit": "^1.1.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg-up/node_modules/p-try": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
- "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg-up/node_modules/path-exists": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
- "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg/node_modules/hosted-git-info": {
- "version": "2.8.9",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
- "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/read-pkg/node_modules/load-json-file": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
- "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "graceful-fs": "^4.1.2",
- "parse-json": "^4.0.0",
- "pify": "^3.0.0",
- "strip-bom": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg/node_modules/normalize-package-data": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
- "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "hosted-git-info": "^2.1.4",
- "resolve": "^1.10.0",
- "semver": "2 || 3 || 4 || 5",
- "validate-npm-package-license": "^3.0.1"
- }
- },
- "node_modules/read-pkg/node_modules/parse-json": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
- "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "error-ex": "^1.3.1",
- "json-parse-better-errors": "^1.0.1"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg/node_modules/path-type": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
- "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "pify": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg/node_modules/pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
- "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-pkg/node_modules/semver": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
- "dev": true,
- "license": "ISC",
- "bin": {
- "semver": "bin/semver"
- }
- },
- "node_modules/read-pkg/node_modules/strip-bom": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
- "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/read-yaml-file": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/read-yaml-file/-/read-yaml-file-2.1.0.tgz",
- "integrity": "sha512-UkRNRIwnhG+y7hpqnycCL/xbTk7+ia9VuVTC0S+zVbwd65DI9eUpRMfsWIGrCWxTU/mi+JW8cHQCrv+zfCbEPQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "js-yaml": "^4.0.0",
- "strip-bom": "^4.0.0"
- },
- "engines": {
- "node": ">=10.13"
- }
- },
- "node_modules/read/node_modules/mute-stream": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
- "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/readable-stream": {
- "version": "3.6.2",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
- "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "inherits": "^2.0.3",
- "string_decoder": "^1.1.1",
- "util-deprecate": "^1.0.1"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/redent": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
- "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "indent-string": "^4.0.0",
- "strip-indent": "^3.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/registry-auth-token": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz",
- "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@pnpm/npm-conf": "^2.1.0"
- },
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/registry-url": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz",
- "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "rc": "1.2.8"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/remote-git-tags": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz",
- "integrity": "sha512-C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/require-directory": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
- "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/require-from-string": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
- "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/resolve": {
- "version": "1.22.8",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
- "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-core-module": "^2.13.0",
- "path-parse": "^1.0.7",
- "supports-preserve-symlinks-flag": "^1.0.0"
- },
- "bin": {
- "resolve": "bin/resolve"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/resolve-alpn": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
- "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/resolve-cwd": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
- "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "resolve-from": "^5.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/resolve-cwd/node_modules/resolve-from": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
- "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/resolve-from": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
- "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/responselike": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
- "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "lowercase-keys": "^3.0.0"
- },
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/restore-cursor": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
- "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "onetime": "^5.1.0",
- "signal-exit": "^3.0.2"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/retry": {
- "version": "0.12.0",
- "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
- "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 4"
- }
- },
- "node_modules/reusify": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
- "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "iojs": ">=1.0.0",
- "node": ">=0.10.0"
- }
- },
- "node_modules/rimraf": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
- "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
- "deprecated": "Rimraf versions prior to v4 are no longer supported",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "glob": "^7.1.3"
- },
- "bin": {
- "rimraf": "bin.js"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/run-async": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
- "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.12.0"
- }
- },
- "node_modules/run-parallel": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
- "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ],
- "license": "MIT",
- "dependencies": {
- "queue-microtask": "^1.2.2"
- }
- },
- "node_modules/rxjs": {
- "version": "7.8.1",
- "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
- "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "tslib": "^2.1.0"
- }
- },
- "node_modules/safe-buffer": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ],
- "license": "MIT"
- },
- "node_modules/safer-buffer": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
- "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/semver": {
- "version": "7.6.3",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
- "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
- "dev": true,
- "license": "ISC",
- "bin": {
- "semver": "bin/semver.js"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/semver-diff": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz",
- "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "semver": "^7.3.5"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/semver-utils": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz",
- "integrity": "sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==",
- "dev": true,
- "license": "APACHEv2"
- },
- "node_modules/set-blocking": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
- "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/shallow-clone": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
- "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "kind-of": "^6.0.2"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/shebang-command": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
- "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "shebang-regex": "^3.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/shebang-regex": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
- "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/signal-exit": {
- "version": "3.0.7",
- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
- "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/sigstore": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz",
- "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "@sigstore/bundle": "^1.1.0",
- "@sigstore/protobuf-specs": "^0.2.0",
- "@sigstore/sign": "^1.0.0",
- "@sigstore/tuf": "^1.0.3",
- "make-fetch-happen": "^11.0.1"
- },
- "bin": {
- "sigstore": "bin/sigstore.js"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/sigstore/node_modules/@npmcli/fs": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
- "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "semver": "^7.3.5"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/sigstore/node_modules/cacache": {
- "version": "17.1.4",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
- "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@npmcli/fs": "^3.1.0",
- "fs-minipass": "^3.0.0",
- "glob": "^10.2.2",
- "lru-cache": "^7.7.1",
- "minipass": "^7.0.3",
- "minipass-collect": "^1.0.2",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "p-map": "^4.0.0",
- "ssri": "^10.0.0",
- "tar": "^6.1.11",
- "unique-filename": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/sigstore/node_modules/cacache/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/sigstore/node_modules/fs-minipass": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
- "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/sigstore/node_modules/fs-minipass/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/sigstore/node_modules/glob": {
- "version": "10.4.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
- "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "foreground-child": "^3.1.0",
- "jackspeak": "^3.1.2",
- "minimatch": "^9.0.4",
- "minipass": "^7.1.2",
- "package-json-from-dist": "^1.0.0",
- "path-scurry": "^1.11.1"
- },
- "bin": {
- "glob": "dist/esm/bin.mjs"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/sigstore/node_modules/glob/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/sigstore/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/sigstore/node_modules/make-fetch-happen": {
- "version": "11.1.1",
- "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
- "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "agentkeepalive": "^4.2.1",
- "cacache": "^17.0.0",
- "http-cache-semantics": "^4.1.1",
- "http-proxy-agent": "^5.0.0",
- "https-proxy-agent": "^5.0.0",
- "is-lambda": "^1.0.1",
- "lru-cache": "^7.7.1",
- "minipass": "^5.0.0",
- "minipass-fetch": "^3.0.0",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "negotiator": "^0.6.3",
- "promise-retry": "^2.0.1",
- "socks-proxy-agent": "^7.0.0",
- "ssri": "^10.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/sigstore/node_modules/minimatch": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
- "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/sigstore/node_modules/minipass": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
- "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/sigstore/node_modules/minipass-fetch": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
- "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "minipass": "^7.0.3",
- "minipass-sized": "^1.0.3",
- "minizlib": "^2.1.2"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "encoding": "^0.1.13"
- }
- },
- "node_modules/sigstore/node_modules/minipass-fetch/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/sigstore/node_modules/ssri": {
- "version": "10.0.6",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
- "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/sigstore/node_modules/ssri/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/sigstore/node_modules/unique-filename": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
- "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "unique-slug": "^4.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/sigstore/node_modules/unique-slug": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
- "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "imurmurhash": "^0.1.4"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/sisteransi": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
- "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/slash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
- "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/smart-buffer": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
- "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 6.0.0",
- "npm": ">= 3.0.0"
- }
- },
- "node_modules/socks": {
- "version": "2.8.3",
- "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
- "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ip-address": "^9.0.5",
- "smart-buffer": "^4.2.0"
- },
- "engines": {
- "node": ">= 10.0.0",
- "npm": ">= 3.0.0"
- }
- },
- "node_modules/socks-proxy-agent": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
- "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "agent-base": "^6.0.2",
- "debug": "^4.3.3",
- "socks": "^2.6.2"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/sort-keys": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
- "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-plain-obj": "^1.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true,
- "license": "BSD-3-Clause",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/source-map-support": {
- "version": "0.5.21",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
- "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "buffer-from": "^1.0.0",
- "source-map": "^0.6.0"
- }
- },
- "node_modules/spawn-please": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.2.tgz",
- "integrity": "sha512-KM8coezO6ISQ89c1BzyWNtcn2V2kAVtwIXd3cN/V5a0xPYc1F/vydrRc01wsKFEQ/p+V1a4sw4z2yMITIXrgGw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "cross-spawn": "^7.0.3"
- },
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/spdx-correct": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
- "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "spdx-expression-parse": "^3.0.0",
- "spdx-license-ids": "^3.0.0"
- }
- },
- "node_modules/spdx-exceptions": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
- "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
- "dev": true,
- "license": "CC-BY-3.0"
- },
- "node_modules/spdx-expression-parse": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
- "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "spdx-exceptions": "^2.1.0",
- "spdx-license-ids": "^3.0.0"
- }
- },
- "node_modules/spdx-license-ids": {
- "version": "3.0.20",
- "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
- "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
- "dev": true,
- "license": "CC0-1.0"
- },
- "node_modules/split": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
- "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "through": "2"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/split2": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
- "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "readable-stream": "^3.0.0"
- }
- },
- "node_modules/sprintf-js": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
- "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
- "dev": true,
- "license": "BSD-3-Clause"
- },
- "node_modules/ssri": {
- "version": "9.0.1",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz",
- "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^3.1.1"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/string_decoder": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
- "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "safe-buffer": "~5.2.0"
- }
- },
- "node_modules/string-width": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "emoji-regex": "^8.0.0",
- "is-fullwidth-code-point": "^3.0.0",
- "strip-ansi": "^6.0.1"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/string-width-cjs": {
- "name": "string-width",
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "emoji-regex": "^8.0.0",
- "is-fullwidth-code-point": "^3.0.0",
- "strip-ansi": "^6.0.1"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/strip-ansi": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
- "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-regex": "^5.0.1"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/strip-ansi-cjs": {
- "name": "strip-ansi",
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
- "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-regex": "^5.0.1"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/strip-bom": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
- "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/strip-final-newline": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
- "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/strip-indent": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
- "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "min-indent": "^1.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/strip-json-comments": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
- "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/strong-log-transformer": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz",
- "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "duplexer": "^0.1.1",
- "minimist": "^1.2.0",
- "through": "^2.3.4"
- },
- "bin": {
- "sl-log-transformer": "bin/sl-log-transformer.js"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/supports-preserve-symlinks-flag": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
- "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/syncpack": {
- "version": "10.9.3",
- "resolved": "https://registry.npmjs.org/syncpack/-/syncpack-10.9.3.tgz",
- "integrity": "sha512-urdxuqkvO2/4tB1GaZGbCTzOgdi1XJzHjpiG4DTunOMH4oChSg54hczzzybfFQhqUl0ZY8A6LJNziKsf3J6E7g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@effect/data": "0.17.1",
- "@effect/io": "0.37.1",
- "@effect/match": "0.31.0",
- "@effect/schema": "0.32.0",
- "chalk": "4.1.2",
- "commander": "11.0.0",
- "cosmiconfig": "8.2.0",
- "enquirer": "2.4.1",
- "fs-extra": "11.1.1",
- "globby": "11.1.0",
- "minimatch": "9.0.3",
- "npm-package-arg": "10.1.0",
- "ora": "5.4.1",
- "prompts": "2.4.2",
- "read-yaml-file": "2.1.0",
- "semver": "7.5.4",
- "tightrope": "0.1.0",
- "ts-toolbelt": "9.6.0"
- },
- "bin": {
- "syncpack": "dist/bin.js",
- "syncpack-fix-mismatches": "dist/bin-fix-mismatches/index.js",
- "syncpack-format": "dist/bin-format/index.js",
- "syncpack-lint": "dist/bin-lint/index.js",
- "syncpack-lint-semver-ranges": "dist/bin-lint-semver-ranges/index.js",
- "syncpack-list": "dist/bin-list/index.js",
- "syncpack-list-mismatches": "dist/bin-list-mismatches/index.js",
- "syncpack-prompt": "dist/bin-prompt/index.js",
- "syncpack-set-semver-ranges": "dist/bin-set-semver-ranges/index.js",
- "syncpack-update": "dist/bin-update/index.js"
- },
- "engines": {
- "node": ">=16"
- }
- },
- "node_modules/syncpack/node_modules/commander": {
- "version": "11.0.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
- "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=16"
- }
- },
- "node_modules/syncpack/node_modules/cosmiconfig": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
- "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "import-fresh": "^3.2.1",
- "js-yaml": "^4.1.0",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0"
- },
- "engines": {
- "node": ">=14"
- },
- "funding": {
- "url": "https://github.com/sponsors/d-fischer"
- }
- },
- "node_modules/syncpack/node_modules/enquirer": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
- "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-colors": "^4.1.1",
- "strip-ansi": "^6.0.1"
- },
- "engines": {
- "node": ">=8.6"
- }
- },
- "node_modules/syncpack/node_modules/fs-extra": {
- "version": "11.1.1",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
- "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=14.14"
- }
- },
- "node_modules/syncpack/node_modules/hosted-git-info": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
- "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^7.5.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/syncpack/node_modules/hosted-git-info/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/syncpack/node_modules/npm-package-arg": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
- "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "hosted-git-info": "^6.0.0",
- "proc-log": "^3.0.0",
- "semver": "^7.3.5",
- "validate-npm-package-name": "^5.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/syncpack/node_modules/semver": {
- "version": "7.5.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
- "bin": {
- "semver": "bin/semver.js"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/tar": {
- "version": "6.1.11",
- "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
- "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "chownr": "^2.0.0",
- "fs-minipass": "^2.0.0",
- "minipass": "^3.0.0",
- "minizlib": "^2.1.1",
- "mkdirp": "^1.0.3",
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/tar-stream": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
- "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "bl": "^4.0.3",
- "end-of-stream": "^1.4.1",
- "fs-constants": "^1.0.0",
- "inherits": "^2.0.3",
- "readable-stream": "^3.1.1"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/temp-dir": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
- "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/text-extensions": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
- "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10"
- }
- },
- "node_modules/text-table": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
- "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/through": {
- "version": "2.3.8",
- "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
- "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/through2": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
- "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "readable-stream": "~2.3.6",
- "xtend": "~4.0.1"
- }
- },
- "node_modules/through2/node_modules/readable-stream": {
- "version": "2.3.8",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
- "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.1",
- "util-deprecate": "~1.0.1"
- }
- },
- "node_modules/through2/node_modules/safe-buffer": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/through2/node_modules/string_decoder": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "safe-buffer": "~5.1.0"
- }
- },
- "node_modules/throw-expression": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/throw-expression/-/throw-expression-2.1.0.tgz",
- "integrity": "sha512-ZVP9rT4wC596AkWEyYprufvUV+ppfz0xK7H9Ka3WeTKufn5pnfESxicIDnaJyf88pGHaIx2GkwNC4Qjh0OdEwA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/tightrope": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/tightrope/-/tightrope-0.1.0.tgz",
- "integrity": "sha512-HHHNYdCAIYwl1jOslQBT455zQpdeSo8/A346xpIb/uuqhSg+tCvYNsP5f11QW+z9VZ3vSX8YIfzTApjjuGH63w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=14"
- }
- },
- "node_modules/tmp": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
- "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=14.14"
- }
- },
- "node_modules/to-regex-range": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
- "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-number": "^7.0.0"
- },
- "engines": {
- "node": ">=8.0"
- }
- },
- "node_modules/tr46": {
- "version": "0.0.3",
- "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
- "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/trim-newlines": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
- "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/ts-api-utils": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
- "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=16"
- },
- "peerDependencies": {
- "typescript": ">=4.2.0"
- }
- },
- "node_modules/ts-is-present": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/ts-is-present/-/ts-is-present-1.2.1.tgz",
- "integrity": "sha512-EYHn58qVRd/VHGkHSNGQJAxPXhF9wRiphYXl04VznngqqKjcT2jfHvAMPuzh8sRKdvifXw+dq6/Q3hG+nr3DRA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/ts-toolbelt": {
- "version": "9.6.0",
- "resolved": "https://registry.npmjs.org/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz",
- "integrity": "sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==",
- "dev": true,
- "license": "Apache-2.0"
- },
- "node_modules/tsconfig-paths": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
- "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "json5": "^2.2.2",
- "minimist": "^1.2.6",
- "strip-bom": "^3.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/tsconfig-paths/node_modules/strip-bom": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
- "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/tsdef": {
- "version": "0.0.14",
- "resolved": "https://registry.npmjs.org/tsdef/-/tsdef-0.0.14.tgz",
- "integrity": "sha512-UjMD4XKRWWFlFBfwKVQmGFT5YzW/ZaF8x6KpCDf92u9wgKeha/go3FU0e5WqDjXsCOdfiavCkfwfVHNDxRDGMA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/tslib": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
- "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
- "dev": true,
- "license": "0BSD"
- },
- "node_modules/tuf-js": {
- "version": "1.1.7",
- "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz",
- "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@tufjs/models": "1.0.4",
- "debug": "^4.3.4",
- "make-fetch-happen": "^11.1.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/tuf-js/node_modules/@npmcli/fs": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
- "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "semver": "^7.3.5"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/tuf-js/node_modules/cacache": {
- "version": "17.1.4",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
- "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "@npmcli/fs": "^3.1.0",
- "fs-minipass": "^3.0.0",
- "glob": "^10.2.2",
- "lru-cache": "^7.7.1",
- "minipass": "^7.0.3",
- "minipass-collect": "^1.0.2",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "p-map": "^4.0.0",
- "ssri": "^10.0.0",
- "tar": "^6.1.11",
- "unique-filename": "^3.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/tuf-js/node_modules/cacache/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/tuf-js/node_modules/fs-minipass": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
- "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/tuf-js/node_modules/fs-minipass/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/tuf-js/node_modules/glob": {
- "version": "10.4.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
- "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "foreground-child": "^3.1.0",
- "jackspeak": "^3.1.2",
- "minimatch": "^9.0.4",
- "minipass": "^7.1.2",
- "package-json-from-dist": "^1.0.0",
- "path-scurry": "^1.11.1"
- },
- "bin": {
- "glob": "dist/esm/bin.mjs"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/tuf-js/node_modules/glob/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/tuf-js/node_modules/lru-cache": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
- "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/tuf-js/node_modules/make-fetch-happen": {
- "version": "11.1.1",
- "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
- "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "agentkeepalive": "^4.2.1",
- "cacache": "^17.0.0",
- "http-cache-semantics": "^4.1.1",
- "http-proxy-agent": "^5.0.0",
- "https-proxy-agent": "^5.0.0",
- "is-lambda": "^1.0.1",
- "lru-cache": "^7.7.1",
- "minipass": "^5.0.0",
- "minipass-fetch": "^3.0.0",
- "minipass-flush": "^1.0.5",
- "minipass-pipeline": "^1.2.4",
- "negotiator": "^0.6.3",
- "promise-retry": "^2.0.1",
- "socks-proxy-agent": "^7.0.0",
- "ssri": "^10.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/tuf-js/node_modules/minimatch": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
- "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/tuf-js/node_modules/minipass": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
- "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/tuf-js/node_modules/minipass-fetch": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
- "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "minipass": "^7.0.3",
- "minipass-sized": "^1.0.3",
- "minizlib": "^2.1.2"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- },
- "optionalDependencies": {
- "encoding": "^0.1.13"
- }
- },
- "node_modules/tuf-js/node_modules/minipass-fetch/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/tuf-js/node_modules/ssri": {
- "version": "10.0.6",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
- "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "minipass": "^7.0.3"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/tuf-js/node_modules/ssri/node_modules/minipass": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
- "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=16 || 14 >=14.17"
- }
- },
- "node_modules/tuf-js/node_modules/unique-filename": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
- "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "unique-slug": "^4.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/tuf-js/node_modules/unique-slug": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
- "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "imurmurhash": "^0.1.4"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/type-check": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
- "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "prelude-ls": "^1.2.1"
- },
- "engines": {
- "node": ">= 0.8.0"
- }
- },
- "node_modules/type-fest": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
- "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
- "dev": true,
- "license": "(MIT OR CC0-1.0)",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/typedarray": {
- "version": "0.0.6",
- "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
- "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/typedarray-to-buffer": {
- "version": "3.1.5",
- "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
- "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "is-typedarray": "^1.0.0"
- }
- },
- "node_modules/typescript": {
- "version": "5.5.4",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
- "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
- "dev": true,
- "license": "Apache-2.0",
- "bin": {
- "tsc": "bin/tsc",
- "tsserver": "bin/tsserver"
- },
- "engines": {
- "node": ">=14.17"
- }
- },
- "node_modules/uglify-js": {
- "version": "3.19.3",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
- "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
- "dev": true,
- "license": "BSD-2-Clause",
- "optional": true,
- "bin": {
- "uglifyjs": "bin/uglifyjs"
- },
- "engines": {
- "node": ">=0.8.0"
- }
- },
- "node_modules/undici-types": {
- "version": "6.19.8",
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
- "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/unique-filename": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz",
- "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "unique-slug": "^3.0.0"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/unique-slug": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz",
- "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "imurmurhash": "^0.1.4"
- },
- "engines": {
- "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
- }
- },
- "node_modules/unique-string": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz",
- "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "crypto-random-string": "^4.0.0"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/universal-user-agent": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
- "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/universalify": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
- "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 10.0.0"
- }
- },
- "node_modules/untildify": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
- "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/upath": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz",
- "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=4",
- "yarn": "*"
- }
- },
- "node_modules/update-notifier": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz",
- "integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "boxen": "^7.0.0",
- "chalk": "^5.0.1",
- "configstore": "^6.0.0",
- "has-yarn": "^3.0.0",
- "import-lazy": "^4.0.0",
- "is-ci": "^3.0.1",
- "is-installed-globally": "^0.4.0",
- "is-npm": "^6.0.0",
- "is-yarn-global": "^0.4.0",
- "latest-version": "^7.0.0",
- "pupa": "^3.1.0",
- "semver": "^7.3.7",
- "semver-diff": "^4.0.0",
- "xdg-basedir": "^5.1.0"
- },
- "engines": {
- "node": ">=14.16"
- },
- "funding": {
- "url": "https://github.com/yeoman/update-notifier?sponsor=1"
- }
- },
- "node_modules/update-notifier/node_modules/chalk": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
- "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^12.17.0 || ^14.13 || >=16.0.0"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/update-notifier/node_modules/ci-info": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
- "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/sibiraj-s"
- }
- ],
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/update-notifier/node_modules/is-ci": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
- "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ci-info": "^3.2.0"
- },
- "bin": {
- "is-ci": "bin.js"
- }
- },
- "node_modules/uri-js": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
- "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "punycode": "^2.1.0"
- }
- },
- "node_modules/util-deprecate": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
- "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/utility-types": {
- "version": "3.10.0",
- "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz",
- "integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 4"
- }
- },
- "node_modules/uuid": {
- "version": "9.0.1",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
- "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
- "dev": true,
- "funding": [
- "https://github.com/sponsors/broofa",
- "https://github.com/sponsors/ctavan"
- ],
- "license": "MIT",
- "bin": {
- "uuid": "dist/bin/uuid"
- }
- },
- "node_modules/v8-compile-cache": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
- "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/validate-npm-package-license": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
- "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "spdx-correct": "^3.0.0",
- "spdx-expression-parse": "^3.0.0"
- }
- },
- "node_modules/validate-npm-package-name": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
- "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "builtins": "^5.0.0"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/wcwidth": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
- "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "defaults": "^1.0.3"
- }
- },
- "node_modules/webidl-conversions": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
- "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
- "dev": true,
- "license": "BSD-2-Clause"
- },
- "node_modules/whatwg-url": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
- "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "tr46": "~0.0.3",
- "webidl-conversions": "^3.0.0"
- }
- },
- "node_modules/which": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
- "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "isexe": "^2.0.0"
- },
- "bin": {
- "node-which": "bin/node-which"
- },
- "engines": {
- "node": ">= 8"
- }
- },
- "node_modules/wide-align": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
- "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "string-width": "^1.0.2 || 2 || 3 || 4"
- }
- },
- "node_modules/widest-line": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz",
- "integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "string-width": "^5.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/widest-line/node_modules/ansi-regex": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
- "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-regex?sponsor=1"
- }
- },
- "node_modules/widest-line/node_modules/emoji-regex": {
- "version": "9.2.2",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
- "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/widest-line/node_modules/string-width": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
- "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "eastasianwidth": "^0.2.0",
- "emoji-regex": "^9.2.2",
- "strip-ansi": "^7.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/widest-line/node_modules/strip-ansi": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
- "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-regex": "^6.0.1"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/chalk/strip-ansi?sponsor=1"
- }
- },
- "node_modules/word-wrap": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
- "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/wordwrap": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
- "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/wrap-ansi": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
- "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^4.0.0",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/wrap-ansi-cjs": {
- "name": "wrap-ansi",
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
- "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^4.0.0",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
- }
- },
- "node_modules/wrappy": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
- "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/write-file-atomic": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
- "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "imurmurhash": "^0.1.4",
- "signal-exit": "^4.0.1"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
- "node_modules/write-file-atomic/node_modules/signal-exit": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
- "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=14"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/write-json-file": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz",
- "integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "detect-indent": "^5.0.0",
- "graceful-fs": "^4.1.15",
- "make-dir": "^2.1.0",
- "pify": "^4.0.1",
- "sort-keys": "^2.0.0",
- "write-file-atomic": "^2.4.2"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/write-json-file/node_modules/make-dir": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
- "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "pify": "^4.0.1",
- "semver": "^5.6.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/write-json-file/node_modules/pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/write-json-file/node_modules/semver": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
- "dev": true,
- "license": "ISC",
- "bin": {
- "semver": "bin/semver"
- }
- },
- "node_modules/write-json-file/node_modules/write-file-atomic": {
- "version": "2.4.3",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
- "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "graceful-fs": "^4.1.11",
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.2"
- }
- },
- "node_modules/write-pkg": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz",
- "integrity": "sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "sort-keys": "^2.0.0",
- "type-fest": "^0.4.1",
- "write-json-file": "^3.2.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/write-pkg/node_modules/type-fest": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz",
- "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==",
- "dev": true,
- "license": "(MIT OR CC0-1.0)",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/xdg-basedir": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
- "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/xtend": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
- "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.4"
- }
- },
- "node_modules/y18n": {
- "version": "5.0.8",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
- "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/yargs": {
- "version": "16.2.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
- "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "cliui": "^7.0.2",
- "escalade": "^3.1.1",
- "get-caller-file": "^2.0.5",
- "require-directory": "^2.1.1",
- "string-width": "^4.2.0",
- "y18n": "^5.0.5",
- "yargs-parser": "^20.2.2"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/yargs-parser": {
- "version": "20.2.4",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
- "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
- "dev": true,
- "license": "ISC",
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/yargs/node_modules/cliui": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
- "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "string-width": "^4.2.0",
- "strip-ansi": "^6.0.0",
- "wrap-ansi": "^7.0.0"
- }
- },
- "node_modules/yargs/node_modules/wrap-ansi": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
- "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^4.0.0",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
- }
- },
- "node_modules/yocto-queue": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
- "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- }
- }
-}
diff --git a/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix
index 0c058fa737..6ebee6cfe4 100644
--- a/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix
@@ -3,112 +3,62 @@
fetchFromGitHub,
runCommand,
buildNpmPackage,
- stdenvNoCC,
docify,
testers,
writeText,
jq,
- python3,
basedpyright,
+ pkg-config,
+ libsecret,
+ nix-update-script,
+ versionCheckHook,
}:
-let
- version = "1.19.0";
+buildNpmPackage rec {
+ pname = "basedpyright";
+ version = "1.21.0";
src = fetchFromGitHub {
owner = "detachhead";
repo = "basedpyright";
rev = "refs/tags/v${version}";
- hash = "sha256-R8QEINTlO84YrnfRsZU5vNEwYcy5uZEKmmTPJ4qxYk8=";
+ hash = "sha256-OQXqwpvYIitWGWshEv1/j2hAphFnGXDuvbRav5TilI4=";
};
- # To regenerate the patched package-lock.json, copy the patched package.json
- # and run `nix-shell -p nodejs --command 'npm update --package-lock'`
- patchedPackageJSON = runCommand "package.json" { } ''
- ${jq}/bin/jq '
- .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser" or .key == "@detachhead/ts-helpers"))
- | .scripts = { }
- ' ${src}/package.json > $out
+ npmDepsHash = "sha256-hCZ68sLpQs/7SYVf3pMAHfstRm1C/d80j8fESIFdhnw=";
+ npmWorkspace = "packages/pyright";
+
+ preBuild = ''
+ # Build the docstubs
+ cp -r packages/pyright-internal/typeshed-fallback docstubs
+ docify docstubs/stdlib --builtins-only --in-place
'';
- pyright-root = buildNpmPackage {
- pname = "pyright-root";
- inherit version src;
- npmDepsHash = "sha256-vxfoaShk3ihmhr/5/2GSOuMqeo6rxebO6aiD3DybjW4=";
- dontNpmBuild = true;
- postPatch = ''
- cp ${patchedPackageJSON} ./package.json
- cp ${./package-lock.json} ./package-lock.json
- '';
- installPhase = ''
- runHook preInstall
- cp -r . "$out"
- runHook postInstall
- '';
- };
+ nativeBuildInputs = [
+ docify
+ pkg-config
+ ];
- pyright-internal = buildNpmPackage {
- pname = "pyright-internal";
- inherit version src;
- sourceRoot = "${src.name}/packages/pyright-internal";
- npmDepsHash = "sha256-Xswt1kH9Iet6DSAlZctEV3qCpn+IWwceQgldyFzsaRk=";
- dontNpmBuild = true;
- # Uncomment this flag when using unreleased peer dependencies
- # npmFlags = [ "--legacy-peer-deps" ];
- installPhase = ''
- runHook preInstall
- cp -r . "$out"
- runHook postInstall
- '';
- };
-
- docstubs = stdenvNoCC.mkDerivation {
- name = "docstubs";
- inherit src;
- nativeBuildInputs = [ docify ];
-
- installPhase = ''
- runHook preInstall
- cp -r packages/pyright-internal/typeshed-fallback docstubs
- docify docstubs/stdlib --builtins-only --in-place
- cp -rv docstubs "$out"
- runHook postInstall
- '';
- };
-in
-buildNpmPackage rec {
- pname = "basedpyright";
- inherit version src;
-
- sourceRoot = "${src.name}/packages/pyright";
- npmDepsHash = "sha256-YhXVoh5sAnUkuc4iDMd/N15y92vMhUwT7PlLn2pzb20=";
-
- postPatch = ''
- chmod +w ../../
- ln -s ${docstubs} ../../docstubs
- ln -s ${pyright-root}/node_modules ../../node_modules
- chmod +w ../pyright-internal
- ln -s ${pyright-internal}/node_modules ../pyright-internal/node_modules
- '';
+ buildInputs = [ libsecret ];
postInstall = ''
mv "$out/bin/pyright" "$out/bin/basedpyright"
mv "$out/bin/pyright-langserver" "$out/bin/basedpyright-langserver"
'';
- dontNpmBuild = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ versionCheckProgramArg = [ "--version" ];
+ doInstallCheck = true;
passthru = {
- updateScript = ./update.sh;
+ updateScript = nix-update-script { };
tests = {
- version = testers.testVersion { package = basedpyright; };
-
- # We are expecting 3 errors. Any other amount would indicate, not working
+ # We are expecting 4 errors. Any other amount would indicate not working
# stub files, for instance.
simple = testers.testEqualContents {
assertion = "simple type checking";
expected = writeText "expected" ''
- 3
+ 4
'';
actual =
runCommand "actual"
@@ -117,16 +67,24 @@ buildNpmPackage rec {
jq
basedpyright
];
- base = writeText "base" ''
+ base = writeText "test.py" ''
import sys
+ from time import tzset
+
+ def print_string(a_string: str):
+ a_string += 42
+ print(a_string)
if sys.platform == "win32":
- a = "a" + 1
-
- print(3)
- nonexistentfunction(3)
+ print_string(69)
+ this_function_does_not_exist("nice!")
+ else:
+ result_of_tzset_is_None: str = tzset()
+ '';
+ configFile = writeText "pyproject.toml" ''
+ [tool.pyright]
+ typeCheckingMode = "strict"
'';
-
}
''
(basedpyright --outputjson $base || true) | jq -r .summary.errorCount > $out
diff --git a/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/update.sh b/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/update.sh
deleted file mode 100755
index 64e00f242a..0000000000
--- a/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/update.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps
-set -euo pipefail
-
-version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -v -s https://api.github.com/repos/detachhead/basedpyright/releases/latest | jq -r '.tag_name | sub("^v"; "")')
-
-update-source-version basedpyright "$version"
-
-root="$(dirname "$(readlink -f "$0")")"
-FILE_PATH="$root/package.nix"
-REPO_URL_PREFIX="https://github.com/detachhead/basedpyright/raw"
-TEMP_DIR=$(mktemp -d)
-
-trap 'rm -rf "$TEMP_DIR"' EXIT
-
-# Function to download `package-lock.json` for a given source path and update hash
-update_hash() {
- local source_root_path="$1"
- local existing_hash="$2"
-
- # Formulate download URL
- local download_url="${REPO_URL_PREFIX}/v${version}${source_root_path}/package-lock.json"
-
- # Download package-lock.json to temporary directory
- curl -fsSL -v -o "${TEMP_DIR}/package-lock.json" "$download_url"
-
- # Calculate the new hash
- local new_hash
- new_hash=$(prefetch-npm-deps "${TEMP_DIR}/package-lock.json")
-
- # Update npmDepsHash in the original file
- sed -i "s|$existing_hash|${new_hash}|" "$FILE_PATH"
-}
-
-while IFS= read -r source_root_line; do
- [[ "$source_root_line" =~ sourceRoot ]] || continue
- source_root_path=$(echo "$source_root_line" | sed -e 's/^.*"${src.name}\(.*\)";.*$/\1/')
-
- # Extract the current npmDepsHash for this sourceRoot
- existing_hash=$(grep -A1 "$source_root_line" "$FILE_PATH" | grep 'npmDepsHash' | sed -e 's/^.*npmDepsHash = "\(.*\)";$/\1/')
-
- # Call the function to download and update the hash
- update_hash "$source_root_path" "$existing_hash"
-done < "$FILE_PATH"
diff --git a/third_party/nixpkgs/pkgs/servers/baserow/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/baserow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/baserow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/baserow/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/basex/basex.svg b/third_party/nixpkgs/pkgs/by-name/ba/basex/basex.svg
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xml/basex/basex.svg
rename to third_party/nixpkgs/pkgs/by-name/ba/basex/basex.svg
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/basex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/basex/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/basez/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/basez/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/basez/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/basez/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bash-completion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bash-completion/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/bash-my-aws/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bash-my-aws/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/bash-my-aws/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bash-my-aws/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bash-preexec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bash-preexec/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bash-supergenpass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bash-supergenpass/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bashSnippets/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bashSnippets/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bash_unit/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bash_unit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bash_unit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bash_unit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch b/third_party/nixpkgs/pkgs/by-name/ba/bashblog/0001-Setting-markdown_bin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch
rename to third_party/nixpkgs/pkgs/by-name/ba/bashblog/0001-Setting-markdown_bin.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/bashblog/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bashblog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/bashblog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bashblog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bashcards/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bashcards/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bashcards/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bashcards/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bashdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bashdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bashmount/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bashmount/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bashplotlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bashplotlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/basiliskii/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/basiliskii/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/basiliskii/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/basiliskii/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch b/third_party/nixpkgs/pkgs/by-name/ba/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch
rename to third_party/nixpkgs/pkgs/by-name/ba/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch
diff --git a/third_party/nixpkgs/pkgs/games/bastet/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bastet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/bastet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bastet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/libraries.nix b/third_party/nixpkgs/pkgs/by-name/ba/bats/libraries.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/bats/libraries.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bats/libraries.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bats/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bats/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/batsignal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/batsignal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/baudline/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/baudline/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/baudline/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/baudline/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bayescan/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bayescan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bayescan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bayescan/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bazarr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/bazarr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bazarr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bazel-buildtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bazel-buildtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-gazelle/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bazel-gazelle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bazel-gazelle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bazel-gazelle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bazel-kazel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bazel-kazel/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bazel-remote/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bazel-remote/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bazel-watcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bazel-watcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bazelisk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ba/bazelisk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bb/included-files-updates.diff b/third_party/nixpkgs/pkgs/by-name/bb/bb/included-files-updates.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/bb/included-files-updates.diff
rename to third_party/nixpkgs/pkgs/by-name/bb/bb/included-files-updates.diff
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bb/default.nix b/third_party/nixpkgs/pkgs/by-name/bb/bb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/bb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bb/bb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bbe/default.nix b/third_party/nixpkgs/pkgs/by-name/bb/bbe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bbe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bb/bbe/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bbin/default.nix b/third_party/nixpkgs/pkgs/by-name/bb/bbin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bbin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bb/bbin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bc-decaf/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bc-decaf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bc-decaf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bc/bc-decaf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bc/cross-bc.patch b/third_party/nixpkgs/pkgs/by-name/bc/bc/cross-bc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bc/cross-bc.patch
rename to third_party/nixpkgs/pkgs/by-name/bc/bc/cross-bc.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bc/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bc/bc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch b/third_party/nixpkgs/pkgs/by-name/bc/bcache-tools/bcache-udev-modern.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch
rename to third_party/nixpkgs/pkgs/by-name/bc/bcache-tools/bcache-udev-modern.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/fix-static.patch b/third_party/nixpkgs/pkgs/by-name/bc/bcache-tools/fix-static.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/fix-static.patch
rename to third_party/nixpkgs/pkgs/by-name/bc/bcache-tools/fix-static.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bcache-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bc/bcache-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bcal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bc/bcal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bcftools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bc/bcftools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bcg729/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bcg729/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bcg729/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bc/bcg729/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bchoppr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bc/bchoppr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bchunk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bc/bchunk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bctoolbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bc/bctoolbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bcunit/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bcunit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bcunit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bc/bcunit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/third_party/nixpkgs/pkgs/by-name/bd/bdf2psf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bd/bdf2psf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix b/third_party/nixpkgs/pkgs/by-name/bd/bdf2sfd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bd/bdf2sfd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdfresize/default.nix b/third_party/nixpkgs/pkgs/by-name/bd/bdfresize/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bdfresize/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bd/bdfresize/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch b/third_party/nixpkgs/pkgs/by-name/bd/bdfresize/remove-malloc-declaration.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch
rename to third_party/nixpkgs/pkgs/by-name/bd/bdfresize/remove-malloc-declaration.patch
diff --git a/third_party/nixpkgs/pkgs/tools/backup/bdsync/default.nix b/third_party/nixpkgs/pkgs/by-name/bd/bdsync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/bdsync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bd/bdsync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/be/beancount-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/beancount-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/beancount-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bearer/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bearer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bearer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bearer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bearssl/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bearssl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bearssl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bearssl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/beats/default.nix b/third_party/nixpkgs/pkgs/by-name/be/beats/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/beats/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/beats/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bedops/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bedops/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bedtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bedtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/beecrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/be/beecrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/beecrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/beecrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/beefi/default.nix b/third_party/nixpkgs/pkgs/by-name/be/beefi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/beefi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/beefi/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/beep/default.nix b/third_party/nixpkgs/pkgs/by-name/be/beep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/beep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/beep/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix b/third_party/nixpkgs/pkgs/by-name/be/beeper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/beeper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bees/bees-service-wrapper b/third_party/nixpkgs/pkgs/by-name/be/bees/bees-service-wrapper
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/bees/bees-service-wrapper
rename to third_party/nixpkgs/pkgs/by-name/be/bees/bees-service-wrapper
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bees/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bees/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/bees/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bees/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/be/behdad-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/behdad-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix b/third_party/nixpkgs/pkgs/by-name/be/belcard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/belcard/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/third_party/nixpkgs/pkgs/by-name/be/belle-sip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/belle-sip/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/below/default.nix b/third_party/nixpkgs/pkgs/by-name/be/below/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/below/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/below/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix b/third_party/nixpkgs/pkgs/by-name/be/belr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/belr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/belr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix b/third_party/nixpkgs/pkgs/by-name/be/beluga/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/beluga/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bemenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bemenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bencode/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bencode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bencode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bencode/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bencodetools/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bencodetools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bencodetools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bencodetools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/benthos/default.nix b/third_party/nixpkgs/pkgs/by-name/be/benthos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/benthos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/benthos/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/bento4/libap4.patch b/third_party/nixpkgs/pkgs/by-name/be/bento4/libap4.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/bento4/libap4.patch
rename to third_party/nixpkgs/pkgs/by-name/be/bento4/libap4.patch
diff --git a/third_party/nixpkgs/pkgs/tools/video/bento4/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bento4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/bento4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bento4/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bepasty/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bepasty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bepasty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bepasty/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix b/third_party/nixpkgs/pkgs/by-name/be/berglas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/berglas/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix b/third_party/nixpkgs/pkgs/by-name/be/besu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/besu/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/be/beszel/0001-fix-build.patch b/third_party/nixpkgs/pkgs/by-name/be/beszel/0001-fix-build.patch
new file mode 100644
index 0000000000..ae120cac4f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/be/beszel/0001-fix-build.patch
@@ -0,0 +1,405 @@
+From 402b2d72ad3bcc4a8cdb0115220888154bdb3c39 Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Tue, 29 Oct 2024 19:32:07 +0800
+Subject: [PATCH] fix build
+
+---
+ package-lock.json | 368 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 368 insertions(+)
+
+diff --git a/package-lock.json b/package-lock.json
+index 8e4532e..d3b3605 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -679,6 +679,262 @@
+ "node": ">=6.9.0"
+ }
+ },
++ "node_modules/@esbuild/aix-ppc64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
++ "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
++ "cpu": [
++ "ppc64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "aix"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/android-arm": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
++ "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
++ "cpu": [
++ "arm"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "android"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/android-arm64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
++ "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
++ "cpu": [
++ "arm64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "android"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/android-x64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
++ "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
++ "cpu": [
++ "x64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "android"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/darwin-arm64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
++ "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
++ "cpu": [
++ "arm64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "darwin"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/darwin-x64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
++ "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
++ "cpu": [
++ "x64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "darwin"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/freebsd-arm64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
++ "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
++ "cpu": [
++ "arm64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "freebsd"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/freebsd-x64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
++ "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
++ "cpu": [
++ "x64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "freebsd"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/linux-arm": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
++ "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
++ "cpu": [
++ "arm"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "linux"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/linux-arm64": {
++ "version": "0.24.0",
++ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
++ "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
++ "cpu": [
++ "arm64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "linux"
++ ],
++ "engines": {
++ "node": ">=18"
++ }
++ },
++ "node_modules/@esbuild/linux-ia32": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
++ "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
++ "cpu": [
++ "ia32"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "linux"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/linux-loong64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
++ "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
++ "cpu": [
++ "loong64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "linux"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/linux-mips64el": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
++ "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
++ "cpu": [
++ "mips64el"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "linux"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/linux-ppc64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
++ "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
++ "cpu": [
++ "ppc64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "linux"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/linux-riscv64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
++ "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
++ "cpu": [
++ "riscv64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "linux"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/linux-s390x": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
++ "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
++ "cpu": [
++ "s390x"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "linux"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
+ "node_modules/@esbuild/linux-x64": {
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+@@ -695,6 +951,102 @@
+ "node": ">=12"
+ }
+ },
++ "node_modules/@esbuild/netbsd-x64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
++ "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
++ "cpu": [
++ "x64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "netbsd"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/openbsd-x64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
++ "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
++ "cpu": [
++ "x64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "openbsd"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/sunos-x64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
++ "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
++ "cpu": [
++ "x64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "sunos"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/win32-arm64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
++ "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
++ "cpu": [
++ "arm64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "win32"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/win32-ia32": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
++ "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
++ "cpu": [
++ "ia32"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "win32"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
++ "node_modules/@esbuild/win32-x64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
++ "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
++ "cpu": [
++ "x64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "win32"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
+ "node_modules/@floating-ui/core": {
+ "version": "1.6.4",
+ "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.4.tgz",
+@@ -3545,6 +3897,22 @@
+ "@esbuild/win32-x64": "0.21.5"
+ }
+ },
++ "node_modules/esbuild/node_modules/@esbuild/linux-arm64": {
++ "version": "0.21.5",
++ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
++ "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
++ "cpu": [
++ "arm64"
++ ],
++ "license": "MIT",
++ "optional": true,
++ "os": [
++ "linux"
++ ],
++ "engines": {
++ "node": ">=12"
++ }
++ },
+ "node_modules/escalade": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+--
+2.46.1
+
diff --git a/third_party/nixpkgs/pkgs/by-name/be/beszel/package.nix b/third_party/nixpkgs/pkgs/by-name/be/beszel/package.nix
new file mode 100644
index 0000000000..6a8aa389da
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/be/beszel/package.nix
@@ -0,0 +1,84 @@
+{
+ buildGoModule,
+ lib,
+ fetchFromGitHub,
+ nix-update-script,
+ buildNpmPackage,
+ fetchpatch,
+}:
+
+buildGoModule rec {
+ pname = "beszel";
+ version = "0.6.2";
+
+ src = fetchFromGitHub {
+ owner = "henrygd";
+ repo = "beszel";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-x9HU+sDjxRthC4ROJaKbuKHPHgxFSpyn/dywyGWE/v8=";
+ };
+
+ webui = buildNpmPackage {
+ inherit
+ pname
+ version
+ src
+ meta
+ ;
+
+ npmFlags = [ "--legacy-peer-deps" ];
+
+ patches = [
+ # add missing @esbuild for multi platform
+ # https://github.com/henrygd/beszel/pull/235
+ # add missing @esbuild for multi platform
+ # https://github.com/henrygd/beszel/pull/235
+ ./0001-fix-build.patch
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out
+ cp -r dist/* $out
+
+ runHook postInstall
+ '';
+
+ sourceRoot = "${src.name}/beszel/site";
+
+ npmDepsHash = "sha256-t7Qcuvqbt0sPHAu3vcZaU8/Ij2yY5/g1TguozlKu0mU=";
+ };
+
+ sourceRoot = "${src.name}/beszel";
+
+ vendorHash = "sha256-/FePQkqoeuH63mV81v1NxpFw9osMUCcZ1bP+0yN1Qlo=";
+
+ preBuild = ''
+ mkdir -p site/dist
+ cp -r ${webui}/* site/dist
+ '';
+
+ postInstall = ''
+ mv $out/bin/agent $out/bin/beszel-agent
+ mv $out/bin/hub $out/bin/beszel-hub
+ '';
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ homepage = "https://github.com/henrygd/beszel";
+ changelog = "https://github.com/henrygd/beszel/releases/tag/v${version}";
+ description = "Lightweight server monitoring hub with historical data, docker stats, and alerts";
+ maintainers = with lib.maintainers; [ bot-wxt1221 ];
+ license = lib.licenses.mit;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/third_party/nixpkgs/pkgs/by-name/be/betaflight-configurator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/betaflight-configurator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bettercap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/bettercap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix b/third_party/nixpkgs/pkgs/by-name/be/betterdiscord-installer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/betterdiscord-installer/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix b/third_party/nixpkgs/pkgs/by-name/be/betterlockscreen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/betterlockscreen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/beyond-identity/default.nix b/third_party/nixpkgs/pkgs/by-name/be/beyond-identity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/beyond-identity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/beyond-identity/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/bfc/default.nix b/third_party/nixpkgs/pkgs/by-name/bf/bfc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/bfc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bf/bfc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bfetch/default.nix b/third_party/nixpkgs/pkgs/by-name/bf/bfetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bfetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bf/bfetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bfg-repo-cleaner/default.nix b/third_party/nixpkgs/pkgs/by-name/bf/bfg-repo-cleaner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/bfg-repo-cleaner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bf/bfg-repo-cleaner/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bfr/default.nix b/third_party/nixpkgs/pkgs/by-name/bf/bfr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bfr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bf/bfr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix b/third_party/nixpkgs/pkgs/by-name/bf/bfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/bfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bf/bfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bfscripts/default.nix b/third_party/nixpkgs/pkgs/by-name/bf/bfscripts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bfscripts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bf/bfscripts/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bftools/default.nix b/third_party/nixpkgs/pkgs/by-name/bf/bftools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bftools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bf/bftools/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix b/third_party/nixpkgs/pkgs/by-name/bf/bftpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bf/bftpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/documentation/bgnet/default.nix b/third_party/nixpkgs/pkgs/by-name/bg/bgnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/bgnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bg/bgnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bgpdump/default.nix b/third_party/nixpkgs/pkgs/by-name/bg/bgpdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/bgpdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bg/bgpdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bgpq3/default.nix b/third_party/nixpkgs/pkgs/by-name/bg/bgpq3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/bgpq3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bg/bgpq3/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix b/third_party/nixpkgs/pkgs/by-name/bg/bgpq4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bg/bgpq4/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/bgs/default.nix b/third_party/nixpkgs/pkgs/by-name/bg/bgs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/bgs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bg/bgs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bibclean/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bibclean/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/biber-ms/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/biber-ms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/biber-ms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/biber-ms/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/biber/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/biber/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/biber/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/biber/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/biblatex-check/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/biblatex-check/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/biblatex-check/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/biblatex-check/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/biboumi/catch.patch b/third_party/nixpkgs/pkgs/by-name/bi/biboumi/catch.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/xmpp/biboumi/catch.patch
rename to third_party/nixpkgs/pkgs/by-name/bi/biboumi/catch.patch
diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/biboumi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/biboumi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bibtex-tidy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bibtex-tidy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bibtex2html/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bibtex2html/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bibtool/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bibtool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bibtool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bibtool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bibutils/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bibutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bibutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bibutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bic/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/bic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bic/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bicgl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bicgl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bicon/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bicon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/bicon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bicon/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bicpl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bicpl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bigloo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bigloo/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/bililiverecorder/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bililiverecorder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/bililiverecorder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bililiverecorder/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bin2c/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bin2c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bin2c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bin2c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/binbloom/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/binbloom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/binbloom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/binbloom/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/third_party/nixpkgs/pkgs/by-name/bi/bind/dont-keep-configure-flags.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
rename to third_party/nixpkgs/pkgs/by-name/bi/bind/dont-keep-configure-flags.patch
diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/bind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bind/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bindfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bindfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bingrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bingrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bioawk/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bioawk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bioawk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bioawk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/biodiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/biodiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/biosdevname/makefile.patch b/third_party/nixpkgs/pkgs/by-name/bi/biosdevname/makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/biosdevname/makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/bi/biosdevname/makefile.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/biosdevname/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/biosdevname/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/biosdevname/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/biosdevname/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/bip/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/bip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bip/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/bird-lg/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bird-lg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/bird-lg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bird-lg/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/third_party/nixpkgs/pkgs/by-name/bi/bird/dont-create-sysconfdir-2.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/bird/dont-create-sysconfdir-2.patch
rename to third_party/nixpkgs/pkgs/by-name/bi/bird/dont-create-sysconfdir-2.patch
diff --git a/third_party/nixpkgs/pkgs/servers/bird/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bird/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/bird/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bird/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/biscuit-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/biscuit-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/biscuit-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/biscuit-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bison/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bison/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bisoncpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bisoncpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bit/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/bit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitlbee-discord/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bitlbee-discord/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitlbee-facebook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bitlbee-facebook/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitlbee-mastodon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bitlbee-mastodon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitlbee-steam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bitlbee-steam/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitmeter/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitmeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/bitmeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bitmeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bitwise/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitwise/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bitwise/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bitwise/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/bitwuzla/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitwuzla/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/bitwuzla/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bi/bitwuzla/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bjumblr/default.nix b/third_party/nixpkgs/pkgs/by-name/bj/bjumblr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/bjumblr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bj/bjumblr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/bkcrack/default.nix b/third_party/nixpkgs/pkgs/by-name/bk/bkcrack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/bkcrack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bk/bkcrack/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bklk/default.nix b/third_party/nixpkgs/pkgs/by-name/bk/bklk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/bklk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bk/bklk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bkt/default.nix b/third_party/nixpkgs/pkgs/by-name/bk/bkt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bkt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bk/bkt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bkyml/default.nix b/third_party/nixpkgs/pkgs/by-name/bk/bkyml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bkyml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bk/bkyml/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/blackbird/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blackbird/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/blackbird/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blackbird/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/third_party/nixpkgs/pkgs/by-name/bl/blackbox-terminal/marble.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blackbox-terminal/marble.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blackbox-terminal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blackbox-terminal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/blackmagic/helper.sh b/third_party/nixpkgs/pkgs/by-name/bl/blackmagic/helper.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/blackmagic/helper.sh
rename to third_party/nixpkgs/pkgs/by-name/bl/blackmagic/helper.sh
diff --git a/third_party/nixpkgs/pkgs/development/embedded/blackmagic/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blackmagic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/blackmagic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blackmagic/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/blackout/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blackout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/blackout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blackout/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/blackshades/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blackshades/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/blackshades/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blackshades/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/blahaj/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blahaj/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/blahaj/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blahaj/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/blahtexml/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blahtexml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/tex/blahtexml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blahtexml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blas-reference/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blas-reference/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/alternatives/blas/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/alternatives/blas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blas/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/blaze/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blaze/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/blaze/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blaze/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bleachbit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/bleachbit/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/bash/blesh/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blesh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/bash/blesh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blesh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/blflash/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blflash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/blflash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blflash/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blink1-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blink1-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blis/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/bliss/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bliss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/bliss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/bliss/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/blitz/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blitz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/blitz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blitz/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blktrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blktrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/bloat/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bloat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/bloat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/bloat/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/blobby/blobby.sh b/third_party/nixpkgs/pkgs/by-name/bl/blobby/blobby.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/blobby/blobby.sh
rename to third_party/nixpkgs/pkgs/by-name/bl/blobby/blobby.sh
diff --git a/third_party/nixpkgs/pkgs/games/blobby/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blobby/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/blobby/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blobby/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blobfuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blobfuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch b/third_party/nixpkgs/pkgs/by-name/bl/blobwars/blobwars-2.00-glibc-2.38.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch
rename to third_party/nixpkgs/pkgs/by-name/bl/blobwars/blobwars-2.00-glibc-2.38.patch
diff --git a/third_party/nixpkgs/pkgs/games/blobwars/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blobwars/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/blobwars/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blobwars/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blockbook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/blockbook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blockbook/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/blockhash/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blockhash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/blockhash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blockhash/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blocky/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blocky/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/blogc/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blogc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/blogc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blogc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bloodhound/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bloodhound/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/bloodhound/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/bloodhound/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/bloomrpc/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bloomrpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/bloomrpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/bloomrpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bloop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/bloop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/blst/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/blst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blst/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blueberry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blueberry/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/bluemail/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluemail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/bluemail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/bluemail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blueman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blueman/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluemix-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/bluemix-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/bluewalker/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluewalker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/bluetooth/bluewalker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/bluewalker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/blugon/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blugon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/blugon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blugon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blur-effect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bl/blur-effect/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bmon/default.nix b/third_party/nixpkgs/pkgs/by-name/bm/bmon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bmon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bm/bmon/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/boa/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/boa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boa/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/boatswain/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boatswain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/boatswain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boatswain/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bob/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bob/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/bob/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bob/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boca/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/boca/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boca/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bodyclose/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bodyclose/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bodyclose/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bodyclose/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bogofilter/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bogofilter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bogofilter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bogofilter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bolliedelayxt.lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bolliedelayxt-lv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/bolliedelayxt.lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bolliedelayxt-lv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch b/third_party/nixpkgs/pkgs/by-name/bo/bolt/0001-skip-mkdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch
rename to third_party/nixpkgs/pkgs/by-name/bo/bolt/0001-skip-mkdir.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bolt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bolt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/boltbrowser/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boltbrowser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/boltbrowser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boltbrowser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/bom/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/bom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bom/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bombadillo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bombadillo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bombardier/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bombardier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/bombardier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bombardier/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bomber-go/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bomber-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bomber-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bomber-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/bombono/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bombono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/bombono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bombono/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/bomutils/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bomutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/bomutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bomutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bonk/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bonk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bonk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bonk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bonmin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bonmin/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bonnie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bonnie/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bonnmotion/install.patch b/third_party/nixpkgs/pkgs/by-name/bo/bonnmotion/install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/bonnmotion/install.patch
rename to third_party/nixpkgs/pkgs/by-name/bo/bonnmotion/install.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bonnmotion/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bonnmotion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/bonnmotion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bonnmotion/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bonzomatic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bonzomatic/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/boofuzz/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boofuzz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/boofuzz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boofuzz/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/boohu/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boohu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/boohu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boohu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/book-summary/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/book-summary/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/book-summary/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/book-summary/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bookworm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bookworm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/boolector/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boolector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/boolector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boolector/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boolstuff/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boolstuff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/boolstuff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boolstuff/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/boops/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boops/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/boops/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boops/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/boost-build/fix-clang-target.patch b/third_party/nixpkgs/pkgs/by-name/bo/boost-build/fix-clang-target.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/boost-build/fix-clang-target.patch
rename to third_party/nixpkgs/pkgs/by-name/bo/boost-build/fix-clang-target.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boost-build/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boost-build/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boost-sml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/boost-ext/boost-sml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boost-sml/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/system/booster/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/booster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/system/booster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/booster/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/boot/builder.sh b/third_party/nixpkgs/pkgs/by-name/bo/boot/builder.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/boot/builder.sh
rename to third_party/nixpkgs/pkgs/by-name/bo/boot/builder.sh
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bootil/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bootil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bootil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bootil/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/bootiso/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bootiso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/bootiso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bootiso/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bootspec/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bootspec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bootspec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bootspec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bootstrap-studio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bootstrap-studio/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/bo/bootterm/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/bootterm/package.nix
new file mode 100644
index 0000000000..d5eab94880
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/bo/bootterm/package.nix
@@ -0,0 +1,41 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ testers,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "bootterm";
+ version = "0.5";
+
+ src = fetchFromGitHub {
+ owner = "wtarreau";
+ repo = "bootterm";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-AYpO2Xcd51B2qVUWoyI190BV0pIdA3HfuQJPzJ4yT/U=";
+ };
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ passthru.tests = {
+ version = testers.testVersion {
+ package = finalAttrs.finalPackage;
+ command = "${finalAttrs.meta.mainProgram} -V";
+ };
+ };
+
+ meta = {
+ description = "Simple, reliable and powerful terminal to ease connection to serial ports";
+ longDescription = ''
+ BootTerm is a simple, reliable and powerful terminal designed to
+ ease connection to ephemeral serial ports as found on various SBCs,
+ and typically USB-based ones.
+ '';
+ homepage = "https://github.com/wtarreau/bootterm";
+ license = lib.licenses.mit;
+ mainProgram = "bt";
+ maintainers = with lib.maintainers; [ deadbaed ];
+ platforms = lib.platforms.unix;
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/data/fonts/borg-sans-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/borg-sans-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/borg-sans-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/borg-sans-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/borgbackup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/borgbackup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/borgmatic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/borgmatic/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boringssl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boringssl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boringtun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boringtun/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boron/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bosh-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bosh-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/bosun/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bosun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/bosun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bosun/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bottom-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bottom-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bottom-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bottom-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boulder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boulder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bowtie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bowtie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bowtie/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/bowtie2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/bowtie2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/boxes/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boxes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/boxes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boxes/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boxfort/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boxfort/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/boxfort/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boxfort/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff b/third_party/nixpkgs/pkgs/by-name/bo/boxfs/libapp-include-ctype.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff
rename to third_party/nixpkgs/pkgs/by-name/bo/boxfs/libapp-include-ctype.diff
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boxfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boxfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch b/third_party/nixpkgs/pkgs/by-name/bo/boxfs/work-around-API-borkage.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch
rename to third_party/nixpkgs/pkgs/by-name/bo/boxfs/work-around-API-borkage.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix b/third_party/nixpkgs/pkgs/by-name/bo/boxxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bo/boxxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bpf-linker/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/bp/bpf-linker/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bpf-linker/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/bp/bpf-linker/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/bpf-linker/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpf-linker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bpf-linker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bp/bpf-linker/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpfmon/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpfmon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/bpfmon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bp/bpfmon/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch b/third_party/nixpkgs/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch
rename to third_party/nixpkgs/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftools/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpftools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/bpftools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bp/bpftools/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftune/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpftune/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/bpftune/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bp/bpftune/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/bpm-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpm-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/bpm-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bp/bpm-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpp-core/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bp/bpp-core/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpp-phyl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bp/bpp-phyl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpp-popgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bp/bpp-popgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpp-seq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bp/bpp-seq/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bppsuite/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bppsuite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bppsuite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bp/bppsuite/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/bqn386/default.nix b/third_party/nixpkgs/pkgs/by-name/bq/bqn386/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/bqn386/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bq/bqn386/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/braincurses/default.nix b/third_party/nixpkgs/pkgs/by-name/br/braincurses/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/braincurses/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/braincurses/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/br/brave/make-brave.nix b/third_party/nixpkgs/pkgs/by-name/br/brave/make-brave.nix
index e902fe3c4d..d0fe9afde4 100644
--- a/third_party/nixpkgs/pkgs/by-name/br/brave/make-brave.nix
+++ b/third_party/nixpkgs/pkgs/by-name/br/brave/make-brave.nix
@@ -1,103 +1,155 @@
-{ lib, stdenv, fetchurl, buildPackages
-, alsa-lib
-, at-spi2-atk
-, at-spi2-core
-, atk
-, cairo
-, cups
-, dbus
-, dpkg
-, expat
-, fontconfig
-, freetype
-, gdk-pixbuf
-, glib
-, adwaita-icon-theme
-, gsettings-desktop-schemas
-, gtk3
-, gtk4
-, qt6
-, libX11
-, libXScrnSaver
-, libXcomposite
-, libXcursor
-, libXdamage
-, libXext
-, libXfixes
-, libXi
-, libXrandr
-, libXrender
-, libXtst
-, libdrm
-, libkrb5
-, libuuid
-, libxkbcommon
-, libxshmfence
-, mesa
-, nspr
-, nss
-, pango
-, pipewire
-, snappy
-, udev
-, wayland
-, xdg-utils
-, coreutils
-, xorg
-, zlib
+{
+ lib,
+ stdenv,
+ fetchurl,
+ buildPackages,
+ alsa-lib,
+ at-spi2-atk,
+ at-spi2-core,
+ atk,
+ cairo,
+ cups,
+ dbus,
+ dpkg,
+ expat,
+ fontconfig,
+ freetype,
+ gdk-pixbuf,
+ glib,
+ adwaita-icon-theme,
+ gsettings-desktop-schemas,
+ gtk3,
+ gtk4,
+ qt6,
+ libX11,
+ libXScrnSaver,
+ libXcomposite,
+ libXcursor,
+ libXdamage,
+ libXext,
+ libXfixes,
+ libXi,
+ libXrandr,
+ libXrender,
+ libXtst,
+ libdrm,
+ libkrb5,
+ libuuid,
+ libxkbcommon,
+ libxshmfence,
+ mesa,
+ nspr,
+ nss,
+ pango,
+ pipewire,
+ snappy,
+ udev,
+ wayland,
+ xdg-utils,
+ coreutils,
+ xorg,
+ zlib,
-# command line arguments which are always set e.g "--disable-gpu"
-, commandLineArgs ? ""
+ # command line arguments which are always set e.g "--disable-gpu"
+ commandLineArgs ? "",
-# Necessary for USB audio devices.
-, pulseSupport ? stdenv.hostPlatform.isLinux
-, libpulseaudio
+ # Necessary for USB audio devices.
+ pulseSupport ? stdenv.hostPlatform.isLinux,
+ libpulseaudio,
-# For GPU acceleration support on Wayland (without the lib it doesn't seem to work)
-, libGL
+ # For GPU acceleration support on Wayland (without the lib it doesn't seem to work)
+ libGL,
-# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder)
-, libvaSupport ? stdenv.hostPlatform.isLinux
-, libva
-, enableVideoAcceleration ? libvaSupport
+ # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder)
+ libvaSupport ? stdenv.hostPlatform.isLinux,
+ libva,
+ enableVideoAcceleration ? libvaSupport,
-# For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API
-, vulkanSupport ? false
-, addDriverRunpath
-, enableVulkan ? vulkanSupport
+ # For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API
+ vulkanSupport ? false,
+ addDriverRunpath,
+ enableVulkan ? vulkanSupport,
}:
-{ pname
-, version
-, hash
-, url
-, platform
+{
+ pname,
+ version,
+ hash,
+ url,
+ platform,
}:
let
- inherit (lib) optional optionals makeLibraryPath makeSearchPathOutput makeBinPath
- optionalString strings escapeShellArg;
+ inherit (lib)
+ optional
+ optionals
+ makeLibraryPath
+ makeSearchPathOutput
+ makeBinPath
+ optionalString
+ strings
+ escapeShellArg
+ ;
deps = [
- alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat
- fontconfig freetype gdk-pixbuf glib gtk3 gtk4 libdrm libX11 libGL
- libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage
- libXext libXfixes libXi libXrandr libXrender libxshmfence
- libXtst libuuid mesa nspr nss pango pipewire udev wayland
- xorg.libxcb zlib snappy libkrb5 qt6.qtbase
- ]
- ++ optional pulseSupport libpulseaudio
- ++ optional libvaSupport libva;
+ alsa-lib
+ at-spi2-atk
+ at-spi2-core
+ atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gdk-pixbuf
+ glib
+ gtk3
+ gtk4
+ libdrm
+ libX11
+ libGL
+ libxkbcommon
+ libXScrnSaver
+ libXcomposite
+ libXcursor
+ libXdamage
+ libXext
+ libXfixes
+ libXi
+ libXrandr
+ libXrender
+ libxshmfence
+ libXtst
+ libuuid
+ mesa
+ nspr
+ nss
+ pango
+ pipewire
+ udev
+ wayland
+ xorg.libxcb
+ zlib
+ snappy
+ libkrb5
+ qt6.qtbase
+ ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva;
rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps;
binpath = makeBinPath deps;
- enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ]
+ enableFeatures =
+ optionals enableVideoAcceleration [
+ "VaapiVideoDecoder"
+ "VaapiVideoEncoder"
+ ]
++ optional enableVulkan "Vulkan";
- disableFeatures = [ "OutdatedBuildDetector" ] # disable automatic updates
+ disableFeatures =
+ [ "OutdatedBuildDetector" ] # disable automatic updates
# The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935
- ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ];
+ ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ];
in
stdenv.mkDerivation {
inherit pname version;
@@ -120,7 +172,10 @@ stdenv.mkDerivation {
buildInputs = [
# needed for GSETTINGS_SCHEMAS_PATH
- glib gsettings-desktop-schemas gtk3 gtk4
+ glib
+ gsettings-desktop-schemas
+ gtk3
+ gtk4
# needed for XDG_ICON_DIRS
adwaita-icon-theme
@@ -129,51 +184,51 @@ stdenv.mkDerivation {
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
installPhase = ''
- runHook preInstall
+ runHook preInstall
- mkdir -p $out $out/bin
+ mkdir -p $out $out/bin
- cp -R usr/share $out
- cp -R opt/ $out/opt
+ cp -R usr/share $out
+ cp -R opt/ $out/opt
- export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser
+ export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser
- # Fix path to bash in $BINARYWRAPPER
- substituteInPlace $BINARYWRAPPER \
- --replace /bin/bash ${stdenv.shell}
+ # Fix path to bash in $BINARYWRAPPER
+ substituteInPlace $BINARYWRAPPER \
+ --replace /bin/bash ${stdenv.shell}
- ln -sf $BINARYWRAPPER $out/bin/brave
+ ln -sf $BINARYWRAPPER $out/bin/brave
- for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${rpath}" $exe
- done
+ for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${rpath}" $exe
+ done
- # Fix paths
- substituteInPlace $out/share/applications/brave-browser.desktop \
- --replace /usr/bin/brave-browser-stable $out/bin/brave
- substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
- --replace /opt/brave.com $out/opt/brave.com
- substituteInPlace $out/share/menu/brave-browser.menu \
- --replace /opt/brave.com $out/opt/brave.com
- substituteInPlace $out/opt/brave.com/brave/default-app-block \
- --replace /opt/brave.com $out/opt/brave.com
+ # Fix paths
+ substituteInPlace $out/share/applications/brave-browser.desktop \
+ --replace /usr/bin/brave-browser-stable $out/bin/brave
+ substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
+ --replace /opt/brave.com $out/opt/brave.com
+ substituteInPlace $out/share/menu/brave-browser.menu \
+ --replace /opt/brave.com $out/opt/brave.com
+ substituteInPlace $out/opt/brave.com/brave/default-app-block \
+ --replace /opt/brave.com $out/opt/brave.com
- # Correct icons location
- icon_sizes=("16" "24" "32" "48" "64" "128" "256")
+ # Correct icons location
+ icon_sizes=("16" "24" "32" "48" "64" "128" "256")
- for icon in ''${icon_sizes[*]}
- do
- mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps
- ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png
- done
+ for icon in ''${icon_sizes[*]}
+ do
+ mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps
+ ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png
+ done
- # Replace xdg-settings and xdg-mime
- ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
- ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
+ # Replace xdg-settings and xdg-mime
+ ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
+ ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
- runHook postInstall
+ runHook postInstall
'';
preFixup = ''
@@ -181,16 +236,25 @@ stdenv.mkDerivation {
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : ${rpath}
--prefix PATH : ${binpath}
- --suffix PATH : ${lib.makeBinPath [ xdg-utils coreutils ]}
- ${optionalString (enableFeatures != []) ''
- --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations}}"
- ''}
- ${optionalString (disableFeatures != []) ''
- --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}"
- ''}
+ --suffix PATH : ${
+ lib.makeBinPath [
+ xdg-utils
+ coreutils
+ ]
+ }
+ ${
+ optionalString (enableFeatures != [ ]) ''
+ --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations}}"
+ ''
+ }
+ ${
+ optionalString (disableFeatures != [ ]) ''
+ --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}"
+ ''
+ }
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
${optionalString vulkanSupport ''
- --prefix XDG_DATA_DIRS : "${addDriverRunpath.driverLink}/share"
+ --prefix XDG_DATA_DIRS : "${addDriverRunpath.driverLink}/share"
''}
--add-flags ${escapeShellArg commandLineArgs}
)
@@ -206,7 +270,9 @@ stdenv.mkDerivation {
meta = {
homepage = "https://brave.com/";
description = "Privacy-oriented browser for Desktop and Laptop computers";
- changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + lib.replaceStrings [ "." ] [ "" ] version;
+ changelog =
+ "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#"
+ + lib.replaceStrings [ "." ] [ "" ] version;
longDescription = ''
Brave browser blocks the ads and trackers that slow you down,
chew up your bandwidth, and invade your privacy. Brave lets you
@@ -214,8 +280,17 @@ stdenv.mkDerivation {
'';
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ uskudnik rht jefflabonte nasirhm buckley310 ];
- platforms = [ "aarch64-linux" "x86_64-linux" ];
+ maintainers = with lib.maintainers; [
+ uskudnik
+ rht
+ jefflabonte
+ nasirhm
+ buckley310
+ ];
+ platforms = [
+ "aarch64-linux"
+ "x86_64-linux"
+ ];
mainProgram = "brave";
};
}
diff --git a/third_party/nixpkgs/pkgs/by-name/br/brave/package.nix b/third_party/nixpkgs/pkgs/by-name/br/brave/package.nix
index 591496c885..79bc50213e 100644
--- a/third_party/nixpkgs/pkgs/by-name/br/brave/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/br/brave/package.nix
@@ -1,24 +1,32 @@
# Expression generated by update.sh; do not edit it by hand!
{ stdenv, callPackage, ... }@args:
-callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
- (
- if stdenv.hostPlatform.isAarch64 then
- rec {
- pname = "brave";
- version = "1.71.121";
- url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
- hash = "sha256-+MBZXtgaEiTqEd63HpPbi4KjHOHPRRcf8q3QDe+YsKk=";
- platform = "aarch64-linux";
- }
- else if stdenv.hostPlatform.isx86_64 then
- rec {
- pname = "brave";
- version = "1.71.121";
- url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- hash = "sha256-sc2FFSttm9+yh8atJQ6KS5ZL87Ov9vUXJeVKYTPNpy0=";
- platform = "x86_64-linux";
- }
+let
+ pname = "brave";
+ version = "1.71.123";
+
+ allArchives = {
+ aarch64-linux = {
+ url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
+ hash = "sha256-u3fme771Q5F00fYiLez9mhGQR2mORYdSabXovr0+OYE=";
+ };
+ x86_64-linux = {
+ url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
+ hash = "sha256-fJczTAra+j8+veicz4lIyKSNJyxJK4q9gpZoAyQwkxQ=";
+ };
+ };
+
+ archive =
+ if builtins.hasAttr stdenv.system allArchives then
+ allArchives.${stdenv.system}
else
- throw "Unsupported platform."
- )
+ throw "Unsupported platform.";
+
+in
+callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) (
+ archive
+ // {
+ inherit pname version;
+ platform = stdenv.system;
+ }
+)
diff --git a/third_party/nixpkgs/pkgs/by-name/br/brave/update.sh b/third_party/nixpkgs/pkgs/by-name/br/brave/update.sh
index aff0dd5521..306f4d12e5 100755
--- a/third_party/nixpkgs/pkgs/by-name/br/brave/update.sh
+++ b/third_party/nixpkgs/pkgs/by-name/br/brave/update.sh
@@ -1,17 +1,15 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnused nix
+#!nix-shell -i bash -p curl gnused nix jq
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-latestVersionAarch64="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \
- | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)"
+latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/brave/brave-browser/releases/latest" | jq -r '.tag_name' | sed 's/^v//')"
+
hashAarch64="$(nix hash to-sri --type sha256 \
$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \
| sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1)
)"
-latestVersionAmd64="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \
- | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)"
hashAmd64="$(nix hash to-sri --type sha256 \
$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \
| sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1)
@@ -21,25 +19,33 @@ cat > $SCRIPT_DIR/package.nix << EOF
# Expression generated by update.sh; do not edit it by hand!
{ stdenv, callPackage, ... }@args:
-callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
- (
- if stdenv.hostPlatform.isAarch64 then
- rec {
- pname = "brave";
- version = "${latestVersionAarch64}";
- url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb";
- hash = "${hashAarch64}";
- platform = "aarch64-linux";
- }
- else if stdenv.hostPlatform.isx86_64 then
- rec {
- pname = "brave";
- version = "${latestVersionAmd64}";
- url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb";
- hash = "${hashAmd64}";
- platform = "x86_64-linux";
- }
+let
+ pname = "brave";
+ version = "${latestVersion}";
+
+ allArchives = {
+ aarch64-linux = {
+ url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb";
+ hash = "${hashAarch64}";
+ };
+ x86_64-linux = {
+ url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb";
+ hash = "${hashAmd64}";
+ };
+ };
+
+ archive =
+ if builtins.hasAttr stdenv.system allArchives then
+ allArchives.\${stdenv.system}
else
- throw "Unsupported platform."
- )
+ throw "Unsupported platform.";
+
+in
+callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) (
+ archive
+ // {
+ inherit pname version;
+ platform = stdenv.system;
+ }
+)
EOF
diff --git a/third_party/nixpkgs/pkgs/applications/misc/break-time/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/br/break-time/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/break-time/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/br/break-time/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/misc/break-time/default.nix b/third_party/nixpkgs/pkgs/by-name/br/break-time/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/break-time/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/break-time/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/misc/breakpad/default.nix b/third_party/nixpkgs/pkgs/by-name/br/breakpad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/misc/breakpad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/breakpad/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brev-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brev-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brgenml1cupswrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brgenml1cupswrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brial/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brial/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/br/briar-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/briar-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/brickd/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brickd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/brickd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brickd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch b/third_party/nixpkgs/pkgs/by-name/br/bridge-utils/autoconf-ar.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
rename to third_party/nixpkgs/pkgs/by-name/br/bridge-utils/autoconf-ar.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bridge-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/br/bridge-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/bridge-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/bridge-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/brig/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/brig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brig/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/brigand/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brigand/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/brigand/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brigand/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/brightnessctl/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brightnessctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/brightnessctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brightnessctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/brillo/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brillo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/brillo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brillo/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/brillo/udev-rule.patch b/third_party/nixpkgs/pkgs/by-name/br/brillo/udev-rule.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/brillo/udev-rule.patch
rename to third_party/nixpkgs/pkgs/by-name/br/brillo/udev-rule.patch
diff --git a/third_party/nixpkgs/pkgs/data/misc/brise/fetchPackages.nix b/third_party/nixpkgs/pkgs/by-name/br/brise/fetchPackages.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/brise/fetchPackages.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brise/fetchPackages.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/brise/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brise/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/brise/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brise/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/briss/default.nix b/third_party/nixpkgs/pkgs/by-name/br/briss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/briss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/briss/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bristol/default.nix b/third_party/nixpkgs/pkgs/by-name/br/bristol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/bristol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/bristol/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brlaser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brlaser/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/brlcad/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brlcad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/brlcad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brlcad/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brltty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brltty/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/engineering/brmodelo/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brmodelo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/engineering/brmodelo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brmodelo/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/third_party/nixpkgs/pkgs/by-name/br/broadcom-bt-firmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/broadcom-bt-firmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/br/broadlink-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/broadlink-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/bront/default.nix b/third_party/nixpkgs/pkgs/by-name/br/bront_fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/bront/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/bront_fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/brook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brook/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brotli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brotli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix b/third_party/nixpkgs/pkgs/by-name/br/browserpass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/browserpass/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix b/third_party/nixpkgs/pkgs/by-name/br/browsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/browsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix b/third_party/nixpkgs/pkgs/by-name/br/browsr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/browsr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brscan4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brscan4/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/preload.c b/third_party/nixpkgs/pkgs/by-name/br/brscan4/preload.c
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/preload.c
rename to third_party/nixpkgs/pkgs/by-name/br/brscan4/preload.c
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/third_party/nixpkgs/pkgs/by-name/br/brscan4/udev_rules_type1.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brscan4/udev_rules_type1.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brscan5/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan5/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brscan5/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/brunsli/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brunsli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/brunsli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brunsli/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/brutalmaze/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brutalmaze/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/brutalmaze/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brutalmaze/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/brutefir/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brutefir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/brutefir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brutefir/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/bruteforce-luks/default.nix b/third_party/nixpkgs/pkgs/by-name/br/bruteforce-luks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/bruteforce-luks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/bruteforce-luks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brutespray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/br/brutespray/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/bs/bsc/package.nix b/third_party/nixpkgs/pkgs/by-name/bs/bsc/package.nix
index 03bbb66e55..4b0cea6f54 100644
--- a/third_party/nixpkgs/pkgs/by-name/bs/bsc/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/bs/bsc/package.nix
@@ -20,17 +20,25 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
+ postPatch = lib.optional (!stdenv.hostPlatform.isx86) ''
+ substituteInPlace makefile \
+ --replace-fail "-mavx2" ""
+
+ substituteInPlace makefile.cuda \
+ --replace-fail "-mavx2" ""
+ '';
+
makeFlags = [
"CC=$(CXX)"
"PREFIX=${placeholder "out"}"
];
- meta = with lib; {
+ meta = {
description = "High performance block-sorting data compression library";
homepage = "http://libbsc.com/";
- maintainers = with maintainers; [ sigmanificient ];
+ maintainers = with lib.maintainers; [ sigmanificient ];
license = lib.licenses.asl20;
- platforms = platforms.unix;
+ platforms = lib.platforms.unix;
mainProgram = "bsc";
};
})
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bschaffl/default.nix b/third_party/nixpkgs/pkgs/by-name/bs/bschaffl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/bschaffl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bs/bschaffl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix b/third_party/nixpkgs/pkgs/by-name/bs/bsdbuild/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bs/bsdbuild/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/bsdgames/default.nix b/third_party/nixpkgs/pkgs/by-name/bs/bsdgames/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/bsdgames/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bs/bsdgames/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/bsdiff/CVE-2020-14315.patch b/third_party/nixpkgs/pkgs/by-name/bs/bsdiff/CVE-2020-14315.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/bsdiff/CVE-2020-14315.patch
rename to third_party/nixpkgs/pkgs/by-name/bs/bsdiff/CVE-2020-14315.patch
diff --git a/third_party/nixpkgs/pkgs/tools/compression/bsdiff/include-systypes.patch b/third_party/nixpkgs/pkgs/by-name/bs/bsdiff/include-systypes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/bsdiff/include-systypes.patch
rename to third_party/nixpkgs/pkgs/by-name/bs/bsdiff/include-systypes.patch
diff --git a/third_party/nixpkgs/pkgs/tools/compression/bsdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/bs/bsdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/bsdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bs/bsdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix b/third_party/nixpkgs/pkgs/by-name/bs/bsequencer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bs/bsequencer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bshapr/default.nix b/third_party/nixpkgs/pkgs/by-name/bs/bshapr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/bshapr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bs/bshapr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bslizr/default.nix b/third_party/nixpkgs/pkgs/by-name/bs/bslizr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/bslizr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bs/bslizr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bsp-layout/default.nix b/third_party/nixpkgs/pkgs/by-name/bs/bsp-layout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bsp-layout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bs/bsp-layout/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/bspwm/default.nix b/third_party/nixpkgs/pkgs/by-name/bs/bspwm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/bspwm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bs/bspwm/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/bt-fw-converter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/bt-fw-converter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/btar/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/btar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btar/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/btc-rpc-explorer/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btc-rpc-explorer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/btc-rpc-explorer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btc-rpc-explorer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcd/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btcd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/btcd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btcd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcdeb/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btcdeb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/btcdeb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btcdeb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/btdu/dub-lock.json b/third_party/nixpkgs/pkgs/by-name/bt/btdu/dub-lock.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/btdu/dub-lock.json
rename to third_party/nixpkgs/pkgs/by-name/bt/btdu/dub-lock.json
diff --git a/third_party/nixpkgs/pkgs/tools/misc/btdu/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btdu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/btdu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btdu/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btor2tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btor2tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btrbk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btrbk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-heatmap/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btrfs-heatmap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/btrfs-heatmap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btrfs-heatmap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btrfs-progs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btrfs-progs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-snap/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btrfs-snap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/btrfs-snap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bt/btrfs-snap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/bubblemail/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bubblemail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/bubblemail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bubblemail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bubblewrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bubblewrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch b/third_party/nixpkgs/pkgs/by-name/bu/buddy/gcc-4.3.3-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/bu/buddy/gcc-4.3.3-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/buddy/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buddy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/buddy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buddy/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/budgie-media-player-applet/package.nix
index ee883480d3..7d7065dcef 100644
--- a/third_party/nixpkgs/pkgs/by-name/bu/budgie-media-player-applet/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/bu/budgie-media-player-applet/package.nix
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
glib,
+ gtk3,
meson,
ninja,
nix-update-script,
@@ -11,30 +12,31 @@
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-media-player-applet";
- version = "1.0.1";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "zalesyc";
repo = "budgie-media-player-applet";
- rev = "v${finalAttrs.version}";
- hash = "sha256-E4aD7/SJNvWe6B3iX8fUZeZj14+uxjn0s+30BhU0dxE=";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-wmtO4Djs1xXBjimAEV6pvPo7zxDM+XQIOi/WOPRieQ8=";
};
+ strictDeps = true;
+
nativeBuildInputs = [
- glib # glib-compile-schemas
+ glib # for `glib-compile-schemas`
+ gtk3 # for `gtk-update-icon-theme`
meson
ninja
python3Packages.wrapPython
];
pythonPath = with python3Packages; [
- pillow
requests
];
postPatch = ''
substituteInPlace meson.build --replace-fail "/usr" "$out"
- substituteInPlace meson_post_install.py --replace-fail '"/", "usr"' "\"$out\""
'';
postFixup = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/buf-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buf-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/buf-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buf-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/buildkit-nix/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buildkit-nix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/buildkit-nix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buildkit-nix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buildkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buildkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buildkite-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buildkite-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buildtorrent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buildtorrent/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buku/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/buku/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buku/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bukubrow/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bukubrow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/bukubrow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bukubrow/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bulletml/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bulletml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bulletml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bulletml/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bully/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bully/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/bully/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bully/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bump/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bumpver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bumpver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/bun/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/bun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bun/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bundler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bundler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bunnyfetch/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bunnyfetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/bunnyfetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bunnyfetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/bunyan-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bunyan-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/bunyan-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bunyan-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/burp/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/burp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/burp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/burp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/burpsuite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/burpsuite/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/butane/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/butane/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/butane/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buttercup-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buttercup-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/buzztrax/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buzztrax/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/buzztrax/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buzztrax/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/bvi/default.nix b/third_party/nixpkgs/pkgs/by-name/bv/bvi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/bvi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bv/bvi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/bviplus/default.nix b/third_party/nixpkgs/pkgs/by-name/bv/bviplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/bviplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bv/bviplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix b/third_party/nixpkgs/pkgs/by-name/bw/bwa-mem2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bw/bwa-mem2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bwa/default.nix b/third_party/nixpkgs/pkgs/by-name/bw/bwa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/bwa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bw/bwa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bwbasic/default.nix b/third_party/nixpkgs/pkgs/by-name/bw/bwbasic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/bwbasic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bw/bwbasic/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/bw/bwm_ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bw/bwm_ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/bws/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/bw/bws/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/bws/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/bw/bws/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/security/bws/default.nix b/third_party/nixpkgs/pkgs/by-name/bw/bws/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/bws/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bw/bws/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/byzanz/add-amflags.patch b/third_party/nixpkgs/pkgs/by-name/by/byzanz/add-amflags.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/byzanz/add-amflags.patch
rename to third_party/nixpkgs/pkgs/by-name/by/byzanz/add-amflags.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/byzanz/default.nix b/third_party/nixpkgs/pkgs/by-name/by/byzanz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/byzanz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/by/byzanz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/third_party/nixpkgs/pkgs/by-name/bz/bzrtp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bz/bzrtp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix b/third_party/nixpkgs/pkgs/by-name/c2/c2ffi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/c2/c2ffi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix b/third_party/nixpkgs/pkgs/by-name/c3/c3c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/c3/c3c/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/c64-debugger/default.nix b/third_party/nixpkgs/pkgs/by-name/c6/c64-debugger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/c64-debugger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/c6/c64-debugger/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/cabextract/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cabextract/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/cabextract/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cabextract/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/cabin/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cabin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/cabin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cabin/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cachefilesd/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cachefilesd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cachefilesd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cachefilesd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cadaver/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cadaver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cadaver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cadaver/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cadical/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cadical/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cadvisor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cadvisor/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/caeml/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caeml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/caeml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caeml/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caerbannog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caerbannog/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/caf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/fix-build.patch b/third_party/nixpkgs/pkgs/by-name/ca/caffeine-ng/fix-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/fix-build.patch
rename to third_party/nixpkgs/pkgs/by-name/ca/caffeine-ng/fix-build.patch
diff --git a/third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caffeine-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caffeine-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/caffeine/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caffeine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/caffeine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caffeine/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cairo-lang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cairo-lang/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cairo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cairo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/cakelisp/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cakelisp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/cakelisp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cakelisp/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/caladea/cambria-alias.conf b/third_party/nixpkgs/pkgs/by-name/ca/caladea/cambria-alias.conf
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/caladea/cambria-alias.conf
rename to third_party/nixpkgs/pkgs/by-name/ca/caladea/cambria-alias.conf
diff --git a/third_party/nixpkgs/pkgs/data/fonts/caladea/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caladea/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/caladea/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caladea/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/calamares-nixos-extensions/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/calc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/calc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/calcium/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/calcium/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/calcium/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/calcium/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch b/third_party/nixpkgs/pkgs/by-name/ca/calculix/calculix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch
rename to third_party/nixpkgs/pkgs/by-name/ca/calculix/calculix.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calculix/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/calculix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/calculix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/calculix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/calcure/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/calcure/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/calcure/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/calcure/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/calcurse/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/calcurse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/calcurse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/calcurse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/calendar-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/calendar-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/calendar-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/calendar-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/callaudiod/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/callaudiod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/callaudiod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/callaudiod/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/calls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/calls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/calls/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cambalache/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cambalache/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cameradar/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cameradar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cameradar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cameradar/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/camingo-code/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/camingo-code/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/camingo-code/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/camingo-code/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/camunda-modeler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/camunda-modeler/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/can-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/can-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cannelloni/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cannelloni/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cannelloni/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cannelloni/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/canon-cups-ufr2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/canon-cups-ufr2/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/canta/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/canta-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/canta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/canta-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cantarell-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cantarell-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/canto-curses/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/canto-curses/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/canto-curses/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/canto-daemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/canto-daemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cantoolz/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cantoolz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cantoolz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cantoolz/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors-themed/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/capitaine-cursors-themed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/capitaine-cursors-themed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/capitaine-cursors-themed/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/capitaine-cursors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/capitaine-cursors/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/capnproto-java/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/capnproto-java/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/capnproto-java/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/capnproto-java/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/capnproto-rust/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/capnproto-rust/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/capnproto-rust/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/capnproto-rust/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/capnproto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/capnproto/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/caprice32/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caprice32/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/caprice32/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caprice32/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/caprice32/string.patch b/third_party/nixpkgs/pkgs/by-name/ca/caprice32/string.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/caprice32/string.patch
rename to third_party/nixpkgs/pkgs/by-name/ca/caprice32/string.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/third_party/nixpkgs/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix b/third_party/nixpkgs/pkgs/by-name/ca/caprine-bin/build-from-dmg.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caprine-bin/build-from-dmg.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caprine-bin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caprine-bin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/caps/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/caps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caps/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/captive-browser/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/captive-browser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/captive-browser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/captive-browser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/capture/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/capture/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/capture/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/capture/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/carbon-now-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/carbon-now-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/carbon-now-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/carbon-now-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/carddav-util/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/carddav-util/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/carddav-util/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/carddav-util/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cardinal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cardinal/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/cardo/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cardo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/cardo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cardo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-about/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-about/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-all-features/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-all-features/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-apk/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-apk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-apk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-apk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/fix-test-binary-path.patch b/third_party/nixpkgs/pkgs/by-name/ca/cargo-benchcmp/fix-test-binary-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/fix-test-binary-path.patch
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-benchcmp/fix-test-binary-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-benchcmp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-benchcmp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-binstall/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-binstall/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-binutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-binutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bitbake/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bitbake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-bitbake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-bitbake/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bolero/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bolero/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-bolero/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-bolero/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bootimage/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bootimage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/bootimage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-bootimage/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bundle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-bundle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-careful/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-careful/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-careful/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-careful/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-chef/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-chef/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-chef/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-chef/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-component/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-component/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cranky/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-cranky/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-cranky/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-cranky/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-criterion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-criterion/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-cross/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-cross/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-deb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-deb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-deny/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-deny/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-depgraph/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-depgraph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-depgraph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-depgraph/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dephell/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ca/cargo-dephell/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-dephell/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-dephell/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dephell/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-dephell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-dephell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-dephell/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-diet/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-diet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-diet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-diet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-dist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-dist/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-docset/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-docset/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-docset/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-docset/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-duplicates/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-duplicates/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-espmonitor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-espmonitor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-espmonitor/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-feature/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-feature/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-fuzz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-fuzz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-generate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-generate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-guppy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-guppy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-hack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-hack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-info/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-info/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-info/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-info/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-insta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-insta/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-kcov/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-kcov/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-kcov/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-kcov/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-leptos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-leptos/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-license/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-license/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-license/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-license/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-limit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-limit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-llvm-cov/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-llvm-cov/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-llvm-lines/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-llvm-lines/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-local-registry/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-local-registry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-local-registry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-local-registry/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lock/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-lock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-lock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-lock/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-machete/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-machete/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-machete/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-machete/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-mobile2/package.nix
similarity index 89%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-mobile2/package.nix
index 4ee8ec165f..efce68a529 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-mobile2/package.nix
@@ -12,7 +12,7 @@
let
inherit (darwin.apple_sdk.frameworks) CoreServices;
pname = "cargo-mobile2";
- version = "0.17.3";
+ version = "0.17.4";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -20,14 +20,14 @@ rustPlatform.buildRustPackage {
owner = "tauri-apps";
repo = pname;
rev = "cargo-mobile2-v${version}";
- hash = "sha256-DOV4QjtjOH1420KH70kkISo9lNbcjbnAn34MnAJWYvQ=";
+ hash = "sha256-1lrimBdJwur5b4wB8hZVUtJEbgXoib0ytzjzhkqNE6c=";
};
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
# sourceRoot = "${src.name}/tooling/cli";
- cargoHash = "sha256-aC6IxamPHRZ1V6ZTiXGVSt4YIa+GPK/j6IWh86JOrV8=";
+ cargoHash = "sha256-vmoR5pA8CNf4eZpQgj0Wn1/FmId4hmpSi7FYxBY5O9M=";
preBuild = ''
mkdir -p $out/share/
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mommy/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-mommy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-mommy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-mommy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-mutants/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-mutants/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-nextest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-nextest/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-play/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-play/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-public-api/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-public-api/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-readme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-readme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ca/cargo-release/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-release/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-release/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-release/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-rr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-rr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-run-bin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-run-bin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-semver-checks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-semver-checks/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-show-asm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-show-asm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-show-asm/test-basic-x86_64.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-show-asm/test-basic-x86_64.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ca/cargo-shuttle/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-shuttle/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-shuttle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-shuttle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-sort/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-sort/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-supply-chain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-supply-chain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-supply-chain/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-sweep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-sweep/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-sync-readme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-sync-readme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-tally/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-tally/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-temp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-temp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-toml-lint/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-toml-lint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-toml-lint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-toml-lint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ui/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-ui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-ui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-ui/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-unused-features/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-unused-features/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-unused-features/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-unused-features/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-update/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-update/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-valgrind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-valgrind/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-wipe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-wipe/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-workspaces/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-workspaces/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-workspaces/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-workspaces/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-xbuild/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-xbuild/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cariddi/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cariddi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cariddi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cariddi/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/carlito/calibri-alias.conf b/third_party/nixpkgs/pkgs/by-name/ca/carlito/calibri-alias.conf
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/carlito/calibri-alias.conf
rename to third_party/nixpkgs/pkgs/by-name/ca/carlito/calibri-alias.conf
diff --git a/third_party/nixpkgs/pkgs/data/fonts/carlito/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/carlito/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/carlito/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/carlito/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/caroline/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caroline/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/caroline/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caroline/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/carp/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/carp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/carp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/carp/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/carps-cups/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/carps-cups/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/carps-cups/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/carps-cups/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/carto/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/carto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/carto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/carto/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cartridges/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cartridges/package.nix
index 53f13d3232..dcf191f9cc 100644
--- a/third_party/nixpkgs/pkgs/by-name/ca/cartridges/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ca/cartridges/package.nix
@@ -1,34 +1,41 @@
{
lib,
- fetchFromGitHub,
- python3Packages,
appstream,
blueprint-compiler,
desktop-file-utils,
- gobject-introspection,
+ fetchFromGitHub,
+ glib,
glib-networking,
+ gobject-introspection,
+ gtk4,
libadwaita,
meson,
ninja,
pkg-config,
+ python3Packages,
wrapGAppsHook4,
}:
+
python3Packages.buildPythonApplication rec {
pname = "cartridges";
- version = "2.9.3";
+ version = "2.10.1";
pyproject = false;
src = fetchFromGitHub {
owner = "kra-mo";
repo = "cartridges";
rev = "refs/tags/v${version}";
- hash = "sha256-37i8p6KaS/G7ybw850XYaPiG83/Lffn/+21xVk5xva0=";
+ hash = "sha256-uwU0jW5+33hiqpuG83r0GVfANl6ltDLa3s4s0IJHRoQ=";
};
+ strictDeps = true;
+
nativeBuildInputs = [
appstream
blueprint-compiler
- desktop-file-utils
+ desktop-file-utils # for `desktop-file-validate`
+ glib # for `glib-compile-schemas`
+ gtk4 # for `gtk-update-icon-cache`
gobject-introspection
meson
ninja
@@ -49,12 +56,19 @@ python3Packages.buildPythonApplication rec {
];
dontWrapGApps = true;
- makeWrapperArgs = [ ''''${gappsWrapperArgs[@]}'' ];
+ makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
postFixup = ''
wrapPythonProgramsIn $out/libexec $out $pythonPath
'';
+ # NOTE: `postCheck` is intentionally not used here, as the entire checkPhase
+ # is skipped by `buildPythonApplication`
+ # https://github.com/NixOS/nixpkgs/blob/9d4343b7b27a3e6f08fc22ead568233ff24bbbde/pkgs/development/interpreters/python/mk-python-derivation.nix#L296
+ postInstallCheck = ''
+ mesonCheckPhase
+ '';
+
meta = {
description = "GTK4 + Libadwaita game launcher";
longDescription = ''
@@ -64,7 +78,7 @@ python3Packages.buildPythonApplication rec {
You can sort and hide games or download cover art from SteamGridDB.
'';
homepage = "https://apps.gnome.org/Cartridges/";
- changelog = "https://github.com/kra-mo/cartridges/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+ changelog = "https://github.com/kra-mo/cartridges/releases/tag/${version}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "cartridges";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cascadia-code/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cascadia-code/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cassowary/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cassowary/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/castget/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/castget/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/castget/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/castget/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/castnow/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/castnow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/castnow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/castnow/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/castor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/castor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/castty/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/castty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/castty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/castty/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catatonit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catatonit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/catch/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/catch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/catclock/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catclock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/catclock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catclock/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/catdoc/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catdoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/catdoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catdoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/catdocx/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catdocx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/catdocx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catdocx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/catdvi/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catdvi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/tex/catdvi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catdvi/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/catfs/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ca/catfs/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/catfs/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ca/catfs/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catgirl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catgirl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/catimg/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catimg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/catimg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catimg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/catnip-gtk4/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catnip-gtk4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/catnip-gtk4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catnip-gtk4/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/catnip/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catnip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/catnip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catnip/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin-kde/color.sh b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-kde/color.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/catppuccin-kde/color.sh
rename to third_party/nixpkgs/pkgs/by-name/ca/catppuccin-kde/color.sh
diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin-kde/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-kde/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/catppuccin-kde/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catppuccin-kde/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin-kvantum/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-kvantum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/catppuccin-kvantum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catppuccin-kvantum/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/catppuccin-papirus-folders/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-papirus-folders/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/catppuccin-papirus-folders/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catppuccin-papirus-folders/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/catt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/catt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/caudec/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caudec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/caudec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/caudec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cauwugo/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cauwugo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/cauwugo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cauwugo/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/cayley/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cayley/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/cayley/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ca/cayley/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cbatticon/default.nix b/third_party/nixpkgs/pkgs/by-name/cb/cbatticon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/cbatticon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cb/cbatticon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/cbc/default.nix b/third_party/nixpkgs/pkgs/by-name/cb/cbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/cbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cb/cbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/cbfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/cb/cbfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/cbfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cb/cbfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch b/third_party/nixpkgs/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch
rename to third_party/nixpkgs/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix b/third_party/nixpkgs/pkgs/by-name/cb/cbmc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cb/cbmc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/cbonsai/default.nix b/third_party/nixpkgs/pkgs/by-name/cb/cbonsai/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/cbonsai/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cb/cbonsai/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff b/third_party/nixpkgs/pkgs/by-name/cb/cbrowser/backslashes-quotes.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
rename to third_party/nixpkgs/pkgs/by-name/cb/cbrowser/backslashes-quotes.diff
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix b/third_party/nixpkgs/pkgs/by-name/cb/cbrowser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cb/cbrowser/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/cc-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/cc-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/cc-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/cc-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/cc2538-bsl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/cc2538-bsl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ccal/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ccal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/ccal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cccc/cccc.patch b/third_party/nixpkgs/pkgs/by-name/cc/cccc/cccc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/cccc/cccc.patch
rename to third_party/nixpkgs/pkgs/by-name/cc/cccc/cccc.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/cccc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/cccc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/include.patch b/third_party/nixpkgs/pkgs/by-name/cc/ccd2iso/include.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/include.patch
rename to third_party/nixpkgs/pkgs/by-name/cc/ccd2iso/include.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccd2iso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/ccd2iso/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ccemux/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccemux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/ccemux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/ccemux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/cconv/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/cconv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/cconv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/cconv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ccrtp/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccrtp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/ccrtp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ccrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ccrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/ccrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ccsymbols/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccsymbols/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ccsymbols/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/ccsymbols/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ccze/default.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccze/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ccze/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cc/ccze/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cddlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cddlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cde/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cde/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/cde/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cde/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/cdecrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdecrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/cdecrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cdecrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdesktopenv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cdesktopenv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdi2iso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cdi2iso/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch b/third_party/nixpkgs/pkgs/by-name/cd/cdimgtools/nrgtool_fix_my.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch
rename to third_party/nixpkgs/pkgs/by-name/cd/cdimgtools/nrgtool_fix_my.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdimgtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cdimgtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch b/third_party/nixpkgs/pkgs/by-name/cd/cdimgtools/removed_dvdcss_interface_2.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch
rename to third_party/nixpkgs/pkgs/by-name/cd/cdimgtools/removed_dvdcss_interface_2.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdk-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cdk-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cdo/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/cdogs-sdl/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdogs-sdl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/cdogs-sdl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cdogs-sdl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdpr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cdpr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch b/third_party/nixpkgs/pkgs/by-name/cd/cdrkit/cdrkit-1.1.11-fno-common.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch
rename to third_party/nixpkgs/pkgs/by-name/cd/cdrkit/cdrkit-1.1.11-fno-common.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch b/third_party/nixpkgs/pkgs/by-name/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch
rename to third_party/nixpkgs/pkgs/by-name/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/include-path.patch b/third_party/nixpkgs/pkgs/by-name/cd/cdrkit/include-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/include-path.patch
rename to third_party/nixpkgs/pkgs/by-name/cd/cdrkit/include-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdrkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cdrkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdxgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cdxgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cd/cdxgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/cegui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/cegui/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cel-go/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/cel-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/cel-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/cel-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/librclone-path.patch b/third_party/nixpkgs/pkgs/by-name/ce/celeste/librclone-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sync/celeste/librclone-path.patch
rename to third_party/nixpkgs/pkgs/by-name/ce/celeste/librclone-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/celeste/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/celeste/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/celf/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/celf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/celf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/celf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cen64/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/cen64/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/cen64/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/cen64/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/centerim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/centerim/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ceptre/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/ceptre/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/ceptre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/ceptre/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/cernlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/cernlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/ce/cernlib/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/ce/cernlib/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/tools/security/certgraph/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/certgraph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/certgraph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/certgraph/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/certigo/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/certigo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/certigo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/certigo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/certinfo/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/certinfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/certinfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/certinfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/certstrap/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/certstrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/certstrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/certstrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/certsync/default.nix b/third_party/nixpkgs/pkgs/by-name/ce/certsync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/certsync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ce/certsync/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cf-terraforming/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cf-terraforming/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/cf-vault/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cf-vault/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/cf-vault/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cf-vault/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/cfdg/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfdg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/cfdg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfdg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfdg/src-info-for-default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/cfdg/src-info-for-default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfdg/src-info-for-default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/cf/cfdyndns/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/cf/cfdyndns/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfdyndns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfdyndns/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch b/third_party/nixpkgs/pkgs/by-name/cf/cfitsio/darwin-rpath-universal.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch
rename to third_party/nixpkgs/pkgs/by-name/cf/cfitsio/darwin-rpath-universal.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfitsio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfitsio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cflow/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cflow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/cflow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cflow/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/cfm/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/cfm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfm/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/Gemfile b/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/Gemfile
index 7f4f5e950d..233f201bc4 100644
--- a/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/Gemfile
+++ b/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/Gemfile
@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-
source 'https://rubygems.org'
-
-gemspec
+gem 'cfn-nag'
+gem 'logger'
+gem 'ostruct'
+gem 'syslog'
diff --git a/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/Gemfile.lock b/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/Gemfile.lock
index 7892e62b05..7c00936be2 100644
--- a/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/Gemfile.lock
@@ -1,6 +1,25 @@
-PATH
- remote: .
+GEM
+ remote: https://rubygems.org/
specs:
+ aws-eventstream (1.3.0)
+ aws-partitions (1.1001.0)
+ aws-sdk-core (3.211.0)
+ aws-eventstream (~> 1, >= 1.3.0)
+ aws-partitions (~> 1, >= 1.992.0)
+ aws-sigv4 (~> 1.9)
+ jmespath (~> 1, >= 1.6.1)
+ aws-sdk-kms (1.95.0)
+ aws-sdk-core (~> 3, >= 3.210.0)
+ aws-sigv4 (~> 1.5)
+ aws-sdk-s3 (1.169.0)
+ aws-sdk-core (~> 3, >= 3.210.0)
+ aws-sdk-kms (~> 1)
+ aws-sigv4 (~> 1.5)
+ aws-sigv4 (1.10.1)
+ aws-eventstream (~> 1, >= 1.0.2)
+ cfn-model (0.6.6)
+ kwalify (= 0.7.2)
+ psych (~> 3)
cfn-nag (0.8.10)
aws-sdk-s3 (~> 1.76)
cfn-model (= 0.6.6)
@@ -9,98 +28,30 @@ PATH
netaddr (~> 2.0.4)
optimist (~> 3.0.0)
rexml
-
-GEM
- remote: https://rubygems.org/
- specs:
- ast (2.4.2)
- aws-eventstream (1.3.0)
- aws-partitions (1.982.0)
- aws-sdk-core (3.209.1)
- aws-eventstream (~> 1, >= 1.3.0)
- aws-partitions (~> 1, >= 1.651.0)
- aws-sigv4 (~> 1.9)
- jmespath (~> 1, >= 1.6.1)
- aws-sdk-kms (1.94.0)
- aws-sdk-core (~> 3, >= 3.207.0)
- aws-sigv4 (~> 1.5)
- aws-sdk-s3 (1.166.0)
- aws-sdk-core (~> 3, >= 3.207.0)
- aws-sdk-kms (~> 1)
- aws-sigv4 (~> 1.5)
- aws-sigv4 (1.10.0)
- aws-eventstream (~> 1, >= 1.0.2)
- cfn-model (0.6.6)
- kwalify (= 0.7.2)
- psych (~> 3)
- diff-lcs (1.5.1)
- docile (1.4.1)
jmespath (1.6.2)
- json (2.7.2)
kwalify (0.7.2)
- language_server-protocol (3.17.0.3)
lightly (0.3.3)
little-plugger (1.1.4)
+ logger (1.6.1)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
multi_json (1.15.0)
netaddr (2.0.6)
optimist (3.0.1)
- parallel (1.26.3)
- parser (3.3.5.0)
- ast (~> 2.4.1)
- racc
+ ostruct (0.6.0)
psych (3.3.4)
- racc (1.8.1)
- rainbow (3.1.1)
- rake (13.2.1)
- regexp_parser (2.9.2)
- rexml (3.3.8)
- rspec (3.13.0)
- rspec-core (~> 3.13.0)
- rspec-expectations (~> 3.13.0)
- rspec-mocks (~> 3.13.0)
- rspec-core (3.13.1)
- rspec-support (~> 3.13.0)
- rspec-expectations (3.13.3)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.13.0)
- rspec-mocks (3.13.1)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.13.0)
- rspec-support (3.13.1)
- rubocop (1.66.1)
- json (~> 2.3)
- language_server-protocol (>= 3.17.0)
- parallel (~> 1.10)
- parser (>= 3.3.0.2)
- rainbow (>= 2.2.2, < 4.0)
- regexp_parser (>= 2.4, < 3.0)
- rubocop-ast (>= 1.32.2, < 2.0)
- ruby-progressbar (~> 1.7)
- unicode-display_width (>= 2.4.0, < 3.0)
- rubocop-ast (1.32.3)
- parser (>= 3.3.1.0)
- ruby-progressbar (1.13.0)
- simplecov (0.22.0)
- docile (~> 1.1)
- simplecov-html (~> 0.11)
- simplecov_json_formatter (~> 0.1)
- simplecov-html (0.13.1)
- simplecov_json_formatter (0.1.4)
- unicode-display_width (2.6.0)
+ rexml (3.3.9)
+ syslog (0.1.2)
PLATFORMS
- arm64-darwin-23
ruby
DEPENDENCIES
- cfn-nag!
- rake
- rspec (~> 3.4)
- rubocop
- simplecov (~> 0.21)
+ cfn-nag
+ logger
+ ostruct
+ syslog
BUNDLED WITH
- 2.5.11
+ 2.3.27
diff --git a/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/gemset.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/gemset.nix
index c8d2cd75d6..621a733e55 100644
--- a/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/gemset.nix
+++ b/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/gemset.nix
@@ -1,17 +1,4 @@
{
- ast = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
- type = "gem";
- };
- version = "2.4.2";
- };
aws-eventstream = {
groups = [ "default" ];
platforms = [ ];
@@ -27,10 +14,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "075y2zwfqwg7qb7w34bfvp8dkjcmiz6hx5a3rbhpqglnlkav7ir4";
+ sha256 = "01w3b84d129q9b6bg2cm8p4cn8pl74l343sxsc47ax9sglqz6y99";
type = "gem";
};
- version = "1.982.0";
+ version = "1.1001.0";
};
aws-sdk-core = {
dependencies = [
@@ -43,10 +30,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "06mrp7g24ndg55w85ndyrvxfx2v6hnkh5fj32w9s6w3xsc8v5kqq";
+ sha256 = "16mvscjhxdyhlvk2rpbxdzqmyikcf64xavb35grk4dkh0pg390rk";
type = "gem";
};
- version = "3.209.1";
+ version = "3.211.0";
};
aws-sdk-kms = {
dependencies = [
@@ -57,10 +44,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "1acx3bhqkhni3kbl7xnjdgy8raq5y7p0zyniq61bsihzkwcj7imh";
+ sha256 = "0ppxhw2qyj69achpmksp1sh2y6k0x44928ln2am9pifx8b30ir9a";
type = "gem";
};
- version = "1.94.0";
+ version = "1.95.0";
};
aws-sdk-s3 = {
dependencies = [
@@ -72,10 +59,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "0zpww3lxpjg8smmznz2nbx5hrpnkzflbasllxjwprkqr56rrrjap";
+ sha256 = "1jnf9k9d91ki3yvy12q4kph5wvd8l3ziwwh0qsmar5xhyb7zbwrz";
type = "gem";
};
- version = "1.166.0";
+ version = "1.169.0";
};
aws-sigv4 = {
dependencies = [ "aws-eventstream" ];
@@ -83,10 +70,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "176zh13m1vhwgys0drlqiw79ljmmx84vva036shsb7rzr4yi36qm";
+ sha256 = "1fq3lbvkgm1vk5wa8l7vdnq3vjnlmsnyf4bbd0jq3qadyd9hf54a";
type = "gem";
};
- version = "1.10.0";
+ version = "1.10.1";
};
cfn-model = {
dependencies = [
@@ -115,37 +102,12 @@
groups = [ "default" ];
platforms = [ ];
source = {
- path = ./.;
- type = "path";
+ remotes = [ "https://rubygems.org" ];
+ sha256 = "0cyk4pimz1g5lqf4vw2p9kf8ji3v53zfi8jix8sgz4ndy81ylah5";
+ type = "gem";
};
version = "0.8.10";
};
- diff-lcs = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
- type = "gem";
- };
- version = "1.5.1";
- };
- docile = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn";
- type = "gem";
- };
- version = "1.4.1";
- };
jmespath = {
groups = [ "default" ];
platforms = [ ];
@@ -156,19 +118,6 @@
};
version = "1.6.2";
};
- json = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
- type = "gem";
- };
- version = "2.7.2";
- };
kwalify = {
groups = [ "default" ];
platforms = [ ];
@@ -179,19 +128,6 @@
};
version = "0.7.2";
};
- language_server-protocol = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
- type = "gem";
- };
- version = "3.17.0.3";
- };
lightly = {
groups = [ "default" ];
platforms = [ ];
@@ -212,6 +148,16 @@
};
version = "1.1.4";
};
+ logger = {
+ groups = [ "default" ];
+ platforms = [ ];
+ source = {
+ remotes = [ "https://rubygems.org" ];
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+ type = "gem";
+ };
+ version = "1.6.1";
+ };
logging = {
dependencies = [
"little-plugger"
@@ -256,35 +202,15 @@
};
version = "3.0.1";
};
- parallel = {
- groups = [
- "default"
- "development"
- ];
+ ostruct = {
+ groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
+ sha256 = "11dsv71gfbhy92yzj3xkckjzdai2bsz5a4fydgimv62dkz4kc5rv";
type = "gem";
};
- version = "1.26.3";
- };
- parser = {
- dependencies = [
- "ast"
- "racc"
- ];
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "1cqs31cyg2zp8yx2zzm3zkih0j93q870wasbviy2w343nxqvn3pk";
- type = "gem";
- };
- version = "3.3.5.0";
+ version = "0.6.0";
};
psych = {
groups = [ "default" ];
@@ -296,241 +222,24 @@
};
version = "3.3.4";
};
- racc = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
- type = "gem";
- };
- version = "1.8.1";
- };
- rainbow = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
- type = "gem";
- };
- version = "3.1.1";
- };
- rake = {
- groups = [ "development" ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
- type = "gem";
- };
- version = "13.2.1";
- };
- regexp_parser = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss";
- type = "gem";
- };
- version = "2.9.2";
- };
rexml = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn";
+ sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
- version = "3.3.8";
+ version = "3.3.9";
};
- rspec = {
- dependencies = [
- "rspec-core"
- "rspec-expectations"
- "rspec-mocks"
- ];
- groups = [ "development" ];
+ syslog = {
+ groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
+ sha256 = "12xqgjrnjpc1c7shajyz2h96bw2nlgb4lkaypj58dp6rch7s36sr";
type = "gem";
};
- version = "3.13.0";
- };
- rspec-core = {
- dependencies = [ "rspec-support" ];
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx";
- type = "gem";
- };
- version = "3.13.1";
- };
- rspec-expectations = {
- dependencies = [
- "diff-lcs"
- "rspec-support"
- ];
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf";
- type = "gem";
- };
- version = "3.13.3";
- };
- rspec-mocks = {
- dependencies = [
- "diff-lcs"
- "rspec-support"
- ];
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88";
- type = "gem";
- };
- version = "3.13.1";
- };
- rspec-support = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8";
- type = "gem";
- };
- version = "3.13.1";
- };
- rubocop = {
- dependencies = [
- "json"
- "language_server-protocol"
- "parallel"
- "parser"
- "rainbow"
- "regexp_parser"
- "rubocop-ast"
- "ruby-progressbar"
- "unicode-display_width"
- ];
- groups = [ "development" ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "1rsyxrl647bz49gpa4flh8igg6wy7qxyh2jrp01x0kqnn5iw4y86";
- type = "gem";
- };
- version = "1.66.1";
- };
- rubocop-ast = {
- dependencies = [ "parser" ];
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820";
- type = "gem";
- };
- version = "1.32.3";
- };
- ruby-progressbar = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40";
- type = "gem";
- };
- version = "1.13.0";
- };
- simplecov = {
- dependencies = [
- "docile"
- "simplecov-html"
- "simplecov_json_formatter"
- ];
- groups = [ "development" ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py";
- type = "gem";
- };
- version = "0.22.0";
- };
- simplecov-html = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx";
- type = "gem";
- };
- version = "0.13.1";
- };
- simplecov_json_formatter = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j";
- type = "gem";
- };
- version = "0.1.4";
- };
- unicode-display_width = {
- groups = [
- "default"
- "development"
- ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
- type = "gem";
- };
- version = "2.6.0";
+ version = "0.1.2";
};
}
diff --git a/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/package.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/package.nix
index 4ec8f7848c..71c198c9a9 100644
--- a/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/cf/cfn-nag/package.nix
@@ -17,8 +17,12 @@ bundlerEnv {
meta = {
description = "Linting tool for CloudFormation templates";
homepage = "https://github.com/stelligent/cfn_nag";
+ mainProgram = "cfn_nag";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = with lib.maintainers; [
+ momeemt
+ mathstlouis
+ ];
platforms = lib.platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cfonts/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cfonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/java/cfr/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/java/cfr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfripper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfripper/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfs-zen-tweaks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfs-zen-tweaks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cfspeedtest/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfspeedtest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cfspeedtest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfspeedtest/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cfssl/default.nix b/third_party/nixpkgs/pkgs/by-name/cf/cfssl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cfssl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cf/cfssl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cg3/default.nix b/third_party/nixpkgs/pkgs/by-name/cg/cg3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/cg3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cg/cg3/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix b/third_party/nixpkgs/pkgs/by-name/cg/cgdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cg/cgdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/cgif/default.nix b/third_party/nixpkgs/pkgs/by-name/cg/cgif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/cgif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cg/cgif/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/cgiserver/default.nix b/third_party/nixpkgs/pkgs/by-name/cg/cgiserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/cgiserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cg/cgiserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix b/third_party/nixpkgs/pkgs/by-name/cg/cglm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cg/cglm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/cgminer/default.nix b/third_party/nixpkgs/pkgs/by-name/cg/cgminer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/cgminer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cg/cgminer/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/cgoban/default.nix b/third_party/nixpkgs/pkgs/by-name/cg/cgoban/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/cgoban/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cg/cgoban/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cgui/default.nix b/third_party/nixpkgs/pkgs/by-name/cg/cgui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cgui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cg/cgui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/chain-bench/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chain-bench/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/chain-bench/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chain-bench/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/chainsaw/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chainsaw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/chainsaw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chainsaw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chamber/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chamber/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/changedetection-io/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/changedetection-io/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/changelogger/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/changelogger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/changelogger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/changelogger/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/changetower/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/changetower/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/changetower/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/changetower/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/changie/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/changie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/changie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/changie/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/chaos/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chaos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/chaos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chaos/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/charasay/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/charasay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/charasay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/charasay/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/charis-sil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/charis-sil/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/charliecloud/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/charliecloud/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/charls/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/charls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/charls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/charls/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/charm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/charm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/charm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chart-testing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chart-testing/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/chase/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chase/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/chase/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chase/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chatblade/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chatblade/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/chatgpt-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chatgpt-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/chatgpt-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chatgpt-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/chatgpt-retrieval-plugin/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chatgpt-retrieval-plugin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/chatgpt-retrieval-plugin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chatgpt-retrieval-plugin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chatty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chatty/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/chayang/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chayang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/chayang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chayang/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/cheat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/cheat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/check-jsonschema/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/check-jsonschema/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/checkbashisms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/checkbashisms/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/checkinstall/empty-dirs.patch b/third_party/nixpkgs/pkgs/by-name/ch/checkinstall/empty-dirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/checkinstall/empty-dirs.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/checkinstall/empty-dirs.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/checkinstall/etc-dirs.patch b/third_party/nixpkgs/pkgs/by-name/ch/checkinstall/etc-dirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/checkinstall/etc-dirs.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/checkinstall/etc-dirs.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/checkinstall/glibc-check.patch b/third_party/nixpkgs/pkgs/by-name/ch/checkinstall/glibc-check.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/checkinstall/glibc-check.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/checkinstall/glibc-check.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/checkinstall/missing-functions.patch b/third_party/nixpkgs/pkgs/by-name/ch/checkinstall/missing-functions.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/checkinstall/missing-functions.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/checkinstall/missing-functions.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/checkinstall/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/checkinstall/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/checkinstall/readlink-types.patch b/third_party/nixpkgs/pkgs/by-name/ch/checkinstall/readlink-types.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/checkinstall/readlink-types.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/checkinstall/readlink-types.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/checkinstall/scandir.patch b/third_party/nixpkgs/pkgs/by-name/ch/checkinstall/scandir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/checkinstall/scandir.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/checkinstall/scandir.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/checkinstall/set-buildroot.patch b/third_party/nixpkgs/pkgs/by-name/ch/checkinstall/set-buildroot.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/checkinstall/set-buildroot.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/checkinstall/set-buildroot.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch b/third_party/nixpkgs/pkgs/by-name/ch/checkinstall/use-old-memcpy.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/checkinstall/use-old-memcpy.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/checkip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/checkip/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/checkmake/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/checkmake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/checkmake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/checkmake/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/checkmate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/checkmate/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/checkpolicy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/checkpolicy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/checkpwn/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/checkpwn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/checkpwn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/checkpwn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/mobile/checkra1n/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/checkra1n/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/mobile/checkra1n/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/checkra1n/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/third_party/nixpkgs/pkgs/by-name/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch b/third_party/nixpkgs/pkgs/by-name/ch/checksec/0002-don-t-sanatize-the-environment.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/checksec/0002-don-t-sanatize-the-environment.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/checksec/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/checksec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/checksec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/checksec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/checkstyle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/checkstyle/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch b/third_party/nixpkgs/pkgs/by-name/ch/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch b/third_party/nixpkgs/pkgs/by-name/ch/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/cheesecutter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/cheesecutter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/chelf/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chelf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/chelf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chelf/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/cherry/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/cherry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/cherry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/cherry/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cherrybomb/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/cherrybomb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cherrybomb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/cherrybomb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/cherrytree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/cherrytree/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/chessdb/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chessdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/chessdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chessdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/chez-modules/chez-matchable/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chez-matchable/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/chez-modules/chez-matchable/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chez-matchable/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/chez-modules/chez-mit/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chez-mit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/chez-modules/chez-mit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chez-mit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chez-racket/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chez-racket/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/chez-racket/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chez-racket/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chez-racket/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/ch/chez-racket/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/chez-racket/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/ch/chez-racket/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chez-racket/shared.nix b/third_party/nixpkgs/pkgs/by-name/ch/chez-racket/shared.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/chez-racket/shared.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chez-racket/shared.nix
diff --git a/third_party/nixpkgs/pkgs/development/chez-modules/chez-scmutils/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chez-scmutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/chez-modules/chez-scmutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chez-scmutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/chez-modules/chez-srfi/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chez-srfi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/chez-modules/chez-srfi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chez-srfi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chez/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/chez/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chez/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chez/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/ch/chez/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/chez/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/ch/chez/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chibi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chibi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/chipmunk/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chipmunk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/chipmunk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chipmunk/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chiptrack/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ch/chiptrack/Cargo.lock
new file mode 100644
index 0000000000..3febb7cab9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ch/chiptrack/Cargo.lock
@@ -0,0 +1,5112 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ab_glyph"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225"
+dependencies = [
+ "ab_glyph_rasterizer",
+ "owned_ttf_parser",
+]
+
+[[package]]
+name = "ab_glyph_rasterizer"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
+dependencies = [
+ "cfg-if 1.0.0",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
+[[package]]
+name = "alsa"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b"
+dependencies = [
+ "alsa-sys",
+ "bitflags 1.3.2",
+ "libc",
+ "nix 0.23.2",
+]
+
+[[package]]
+name = "alsa"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47"
+dependencies = [
+ "alsa-sys",
+ "bitflags 1.3.2",
+ "libc",
+ "nix 0.24.3",
+]
+
+[[package]]
+name = "alsa-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "android-activity"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289"
+dependencies = [
+ "android-properties",
+ "bitflags 2.4.2",
+ "cc",
+ "cesu8",
+ "jni 0.21.1",
+ "jni-sys",
+ "libc",
+ "log",
+ "ndk 0.8.0",
+ "ndk-context",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "num_enum 0.7.2",
+ "thiserror",
+]
+
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "as-raw-xcb-connection"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
+
+[[package]]
+name = "ascii"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
+
+[[package]]
+name = "ash"
+version = "0.37.3+1.3.251"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
+dependencies = [
+ "libloading 0.7.4",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "auto_enums"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1899bfcfd9340ceea3533ea157360ba8fa864354eccbceab58e1006ecab35393"
+dependencies = [
+ "derive_utils",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "bindgen"
+version = "0.62.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6720a8b7b2d39dd533285ed438d458f65b31b5c257e6ac7bb3d7e82844dd722"
+dependencies = [
+ "bitflags 1.3.2",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 1.0.109",
+ "which",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.69.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+dependencies = [
+ "bitflags 2.4.2",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.48",
+ "which",
+]
+
+[[package]]
+name = "bit_field"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "bitfrob"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a96c7c818dc8807bb1982dd2cba4c7de0ed6eba4ffb5fc24321d1b38676a120"
+
+[[package]]
+name = "blip_buf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45c136cf50e8d0c47fe415008a6be8b50a9a56a6741fffbe2e580e007eda417d"
+dependencies = [
+ "blip_buf-sys",
+ "libc",
+]
+
+[[package]]
+name = "blip_buf-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b84654178cd24117082f5cb10dbc0580425fc06aa02ae209171fe070cd4522e"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
+[[package]]
+name = "block-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7"
+dependencies = [
+ "objc-sys",
+]
+
+[[package]]
+name = "block2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
+dependencies = [
+ "block-sys",
+ "objc2",
+]
+
+[[package]]
+name = "bracer"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6559b8c3065745016f5cc2d1095273fe8a175e953c976426947ad828d6ba6fda"
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "by_address"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf8dba2868114ed769a1f2590fc9ae5eb331175b44313b6c9b922f8f7ca813d0"
+
+[[package]]
+name = "bytemuck"
+version = "1.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "calloop"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
+dependencies = [
+ "bitflags 2.4.2",
+ "log",
+ "polling",
+ "rustix",
+ "slab",
+ "thiserror",
+]
+
+[[package]]
+name = "calloop-wayland-source"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
+dependencies = [
+ "calloop",
+ "rustix",
+ "wayland-backend",
+ "wayland-client",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "jobserver",
+ "libc",
+]
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f"
+
+[[package]]
+name = "cgl"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "chiptrack"
+version = "0.2.0"
+dependencies = [
+ "cpal 0.15.2",
+ "critical-section",
+ "ehttp",
+ "embedded-alloc",
+ "gba",
+ "i-slint-core",
+ "libm",
+ "midir",
+ "midly",
+ "native-dialog",
+ "notify",
+ "once_cell",
+ "postcard",
+ "pulldown-cmark",
+ "rboy",
+ "regex",
+ "serde",
+ "serde_json",
+ "slint",
+ "slint-build",
+ "url",
+ "voladdress",
+ "wamr-sys",
+ "wat",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading 0.8.1",
+]
+
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "bitflags 1.3.2",
+ "textwrap",
+ "unicode-width",
+]
+
+[[package]]
+name = "clipboard-win"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342"
+dependencies = [
+ "lazy-bytes-cast",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "clru"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807"
+
+[[package]]
+name = "cmake"
+version = "0.1.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "cobs"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
+
+[[package]]
+name = "cocoa"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "cocoa-foundation",
+ "core-foundation",
+ "core-graphics 0.22.3",
+ "foreign-types 0.3.2",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "cocoa-foundation",
+ "core-foundation",
+ "core-graphics 0.23.1",
+ "foreign-types 0.5.0",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa-foundation"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "core-foundation",
+ "core-graphics-types",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "codemap"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e769b5c8c8283982a987c6e948e540254f1058d5a74b8794914d4ef5fc2a24"
+
+[[package]]
+name = "codemap-diagnostic"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc20770be05b566a963bf91505e60412c4a2d016d1ef95c5512823bb085a8122"
+dependencies = [
+ "codemap",
+ "termcolor",
+]
+
+[[package]]
+name = "color_quant"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+
+[[package]]
+name = "combine"
+version = "4.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "const-field-offset"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6304465f16f463cddc572b737c3df93576edd3a6b53f057bd8beeb29f4ef8dfd"
+dependencies = [
+ "const-field-offset-macro",
+ "field-offset",
+]
+
+[[package]]
+name = "const-field-offset-macro"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57aaaad9185d3bcb3afe63549d8ba60b2fb0ea8dc2da83f62dd56805edf56fd1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
+[[package]]
+name = "copypasta"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deb85422867ca93da58b7f95fb5c0c10f6183ed6e1ef8841568968a896d3a858"
+dependencies = [
+ "clipboard-win",
+ "objc",
+ "objc-foundation",
+ "objc_id",
+ "smithay-clipboard",
+ "x11-clipboard",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "core-graphics"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types 0.3.2",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "libc",
+]
+
+[[package]]
+name = "core-text"
+version = "20.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
+dependencies = [
+ "core-foundation",
+ "core-graphics 0.23.1",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
+[[package]]
+name = "coreaudio-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88"
+dependencies = [
+ "bitflags 1.3.2",
+ "coreaudio-sys",
+]
+
+[[package]]
+name = "coreaudio-rs"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation-sys",
+ "coreaudio-sys",
+]
+
+[[package]]
+name = "coreaudio-sys"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9"
+dependencies = [
+ "bindgen 0.69.4",
+]
+
+[[package]]
+name = "coremidi"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a7847ca018a67204508b77cb9e6de670125075f7464fff5f673023378fa34f5"
+dependencies = [
+ "core-foundation",
+ "core-foundation-sys",
+ "coremidi-sys",
+]
+
+[[package]]
+name = "coremidi-sys"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79a6deed0c97b2d40abbab77e4c97f81d71e162600423382c277dd640019116c"
+dependencies = [
+ "core-foundation-sys",
+]
+
+[[package]]
+name = "countme"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
+
+[[package]]
+name = "cpal"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116"
+dependencies = [
+ "alsa 0.6.0",
+ "core-foundation-sys",
+ "coreaudio-rs 0.10.0",
+ "jni 0.19.0",
+ "js-sys",
+ "lazy_static",
+ "libc",
+ "mach",
+ "ndk 0.6.0",
+ "ndk-glue",
+ "nix 0.23.2",
+ "oboe 0.4.6",
+ "parking_lot 0.11.2",
+ "stdweb",
+ "thiserror",
+ "web-sys",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "cpal"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c"
+dependencies = [
+ "alsa 0.7.1",
+ "core-foundation-sys",
+ "coreaudio-rs 0.11.3",
+ "dasp_sample",
+ "jni 0.19.0",
+ "js-sys",
+ "libc",
+ "mach2",
+ "ndk 0.7.0",
+ "ndk-context",
+ "oboe 0.5.0",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows 0.46.0",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "critical-section"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "css-color-parser2"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf8ed1639f4b56ec6f31d007ff66ce4a13099dce5a9995d48368a30d62bf04bd"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "ctor"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
+dependencies = [
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "cty"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
+
+[[package]]
+name = "cursor-icon"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
+
+[[package]]
+name = "darling"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "dasp_sample"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
+
+[[package]]
+name = "data-url"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_utils"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if 1.0.0",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "dispatch"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+
+[[package]]
+name = "dlib"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+dependencies = [
+ "libloading 0.8.1",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+
+[[package]]
+name = "drm"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f"
+dependencies = [
+ "bitflags 1.3.2",
+ "bytemuck",
+ "drm-ffi 0.5.0",
+ "drm-fourcc",
+ "nix 0.26.4",
+]
+
+[[package]]
+name = "drm"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
+dependencies = [
+ "bitflags 2.4.2",
+ "bytemuck",
+ "drm-ffi 0.7.1",
+ "drm-fourcc",
+ "rustix",
+]
+
+[[package]]
+name = "drm-ffi"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525"
+dependencies = [
+ "drm-sys 0.4.0",
+ "nix 0.26.4",
+]
+
+[[package]]
+name = "drm-ffi"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
+dependencies = [
+ "drm-sys 0.6.1",
+ "rustix",
+]
+
+[[package]]
+name = "drm-fourcc"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
+
+[[package]]
+name = "drm-sys"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "drm-sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
+dependencies = [
+ "libc",
+ "linux-raw-sys 0.6.4",
+]
+
+[[package]]
+name = "dwrote"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "serde",
+ "serde_derive",
+ "winapi 0.3.9",
+ "wio",
+]
+
+[[package]]
+name = "ehttp"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80b69a6f9168b96c0ae04763bec27a8b06b34343c334dd2703a4ec21f0f5e110"
+dependencies = [
+ "js-sys",
+ "ureq",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "either"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+
+[[package]]
+name = "embedded-alloc"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddae17915accbac2cfbc64ea0ae6e3b330e6ea124ba108dada63646fd3c6f815"
+dependencies = [
+ "critical-section",
+ "linked_list_allocator",
+]
+
+[[package]]
+name = "embedded-io"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "euclid"
+version = "0.22.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "exr"
+version = "1.72.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
+dependencies = [
+ "bit_field",
+ "flume",
+ "half",
+ "lebe",
+ "miniz_oxide",
+ "rayon-core",
+ "smallvec",
+ "zune-inflate",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
+[[package]]
+name = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "femtovg"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18ab822e58e8bc2b89840dc5dde49afe39302e129c60d39c8520200c085404a7"
+dependencies = [
+ "bitflags 2.4.2",
+ "fnv",
+ "generational-arena",
+ "glow",
+ "image",
+ "imgref",
+ "log",
+ "lru",
+ "rgb",
+ "rustybuzz 0.11.0",
+ "unicode-bidi",
+ "unicode-segmentation",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
+dependencies = [
+ "memoffset 0.9.0",
+ "rustc_version",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall 0.4.1",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+
+[[package]]
+name = "flume"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+dependencies = [
+ "spin",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "fontconfig-parser"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d"
+dependencies = [
+ "roxmltree",
+]
+
+[[package]]
+name = "fontdb"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3890d0893c8253d3eb98337af18b3e1a10a9b2958f2a164b53a93fb3a3049e72"
+dependencies = [
+ "fontconfig-parser",
+ "log",
+ "memmap2 0.9.4",
+ "slotmap",
+ "tinyvec",
+ "ttf-parser",
+]
+
+[[package]]
+name = "fontdue"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9099a2f86b8e674b75d03ff154b3fe4c5208ed249ced8d69cc313a9fa40bb488"
+dependencies = [
+ "hashbrown",
+ "ttf-parser",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "fsevent"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
+dependencies = [
+ "bitflags 1.3.2",
+ "fsevent-sys",
+]
+
+[[package]]
+name = "fsevent-sys"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+dependencies = [
+ "bitflags 1.3.2",
+ "fuchsia-zircon-sys",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+
+[[package]]
+name = "gba"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cda2172378c6cfb7f95b64ffef6dc608d87bf83ee7c5ea63edc1631a8edd9a1"
+dependencies = [
+ "bitfrob",
+ "bracer",
+ "voladdress",
+]
+
+[[package]]
+name = "gbm"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2ec389cda876966cf824111bf6e533fb934c711d473498279964a990853b3c6"
+dependencies = [
+ "bitflags 1.3.2",
+ "drm 0.9.0",
+ "drm-fourcc",
+ "gbm-sys",
+ "libc",
+]
+
+[[package]]
+name = "gbm-sys"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "generational-arena"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "gethostname"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gif"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
+[[package]]
+name = "gl_generator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
+dependencies = [
+ "khronos_api",
+ "log",
+ "xml-rs",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "glow"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
+dependencies = [
+ "js-sys",
+ "slotmap",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "glutin"
+version = "0.31.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746"
+dependencies = [
+ "bitflags 2.4.2",
+ "cfg_aliases 0.1.1",
+ "cgl",
+ "core-foundation",
+ "dispatch",
+ "glutin_egl_sys",
+ "glutin_glx_sys",
+ "glutin_wgl_sys",
+ "icrate",
+ "libloading 0.8.1",
+ "objc2",
+ "once_cell",
+ "raw-window-handle 0.5.2",
+ "wayland-sys",
+ "windows-sys 0.48.0",
+ "x11-dl",
+]
+
+[[package]]
+name = "glutin-winit"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735"
+dependencies = [
+ "cfg_aliases 0.1.1",
+ "glutin",
+ "raw-window-handle 0.5.2",
+ "winit",
+]
+
+[[package]]
+name = "glutin_egl_sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd"
+dependencies = [
+ "gl_generator",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "glutin_glx_sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f"
+dependencies = [
+ "gl_generator",
+ "x11-dl",
+]
+
+[[package]]
+name = "glutin_wgl_sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
+dependencies = [
+ "gl_generator",
+]
+
+[[package]]
+name = "half"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872"
+dependencies = [
+ "bytemuck",
+ "cfg-if 1.0.0",
+ "crunchy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "hoot"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df22a4d90f1b0e65fe3e0d6ee6a4608cc4d81f4b2eb3e670f44bb6bde711e452"
+dependencies = [
+ "httparse",
+ "log",
+]
+
+[[package]]
+name = "hootbin"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "354e60868e49ea1a39c44b9562ad207c4259dc6eabf9863bf3b0f058c55cfdb2"
+dependencies = [
+ "fastrand",
+ "hoot",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "i-slint-backend-linuxkms"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fff24de728432445a94f890093bd852a7c3fd01ae282e40ae0eab6ea629a66d"
+dependencies = [
+ "calloop",
+ "drm 0.9.0",
+ "gbm",
+ "glutin",
+ "i-slint-common",
+ "i-slint-core",
+ "i-slint-renderer-femtovg",
+ "i-slint-renderer-skia",
+ "input",
+ "nix 0.27.1",
+ "raw-window-handle 0.5.2",
+ "vulkano",
+ "xkbcommon",
+]
+
+[[package]]
+name = "i-slint-backend-selector"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1953f792a394a7ad26932b4989646719fb126910029006f7cef40ffd189633d0"
+dependencies = [
+ "cfg-if 1.0.0",
+ "i-slint-backend-linuxkms",
+ "i-slint-backend-winit",
+ "i-slint-common",
+ "i-slint-core",
+]
+
+[[package]]
+name = "i-slint-backend-winit"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138c36c5c9e12f22fe07f280200cedb5d31e07641e40e3b45376fe2112ead303"
+dependencies = [
+ "bytemuck",
+ "cfg-if 1.0.0",
+ "cfg_aliases 0.2.0",
+ "cocoa 0.25.0",
+ "const-field-offset",
+ "copypasta",
+ "derive_more",
+ "glutin",
+ "glutin-winit",
+ "i-slint-common",
+ "i-slint-core",
+ "i-slint-core-macros",
+ "i-slint-renderer-femtovg",
+ "i-slint-renderer-skia",
+ "imgref",
+ "lyon_path",
+ "once_cell",
+ "pin-weak",
+ "raw-window-handle 0.5.2",
+ "rgb",
+ "scoped-tls-hkt",
+ "scopeguard",
+ "softbuffer",
+ "vtable",
+ "wasm-bindgen",
+ "web-sys",
+ "winit",
+]
+
+[[package]]
+name = "i-slint-common"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "550e9282fda488b76ce057a728168d1aef947c758f3221b92ae904b167ab008c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "derive_more",
+ "fontdb",
+ "libloading 0.8.1",
+]
+
+[[package]]
+name = "i-slint-compiler"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25aa2c3525ea761b3e9251f7869e64dce5f483f7ea1a5e04fe7b9a3fb5780dd6"
+dependencies = [
+ "by_address",
+ "codemap",
+ "codemap-diagnostic",
+ "css-color-parser2",
+ "derive_more",
+ "fontdue",
+ "i-slint-common",
+ "image",
+ "itertools",
+ "linked_hash_set",
+ "lyon_extra",
+ "lyon_path",
+ "num_enum 0.7.2",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "resvg",
+ "rowan",
+ "smol_str",
+ "strum",
+ "thiserror",
+ "url",
+]
+
+[[package]]
+name = "i-slint-core"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d40990f7ed42c76799edc0e8cae9a8ffcc77569506a94e86eef81626c7387a7"
+dependencies = [
+ "auto_enums",
+ "bytemuck",
+ "cfg-if 1.0.0",
+ "clru",
+ "const-field-offset",
+ "derive_more",
+ "euclid",
+ "fontdue",
+ "i-slint-common",
+ "i-slint-core-macros",
+ "image",
+ "integer-sqrt",
+ "lyon_algorithms",
+ "lyon_extra",
+ "lyon_geom",
+ "lyon_path",
+ "num-traits",
+ "once_cell",
+ "pin-project",
+ "pin-weak",
+ "portable-atomic",
+ "resvg",
+ "rgb",
+ "rustybuzz 0.12.1",
+ "scoped-tls-hkt",
+ "scopeguard",
+ "slab",
+ "static_assertions",
+ "strum",
+ "unicode-linebreak",
+ "unicode-script",
+ "unicode-segmentation",
+ "vtable",
+ "wasm-bindgen",
+ "web-sys",
+ "web-time 1.0.0",
+]
+
+[[package]]
+name = "i-slint-core-macros"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2a4e4c21ed660181abe101b6f141d920e838fec4bc1ff20f7440dc03fb5ad8"
+dependencies = [
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "i-slint-renderer-femtovg"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "337e6ec928bde01baa27d3fdeddd5a33665952aead4d0d9be9818f573a41344c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "const-field-offset",
+ "core-foundation",
+ "core-text",
+ "derive_more",
+ "dwrote",
+ "femtovg",
+ "glow",
+ "i-slint-common",
+ "i-slint-core",
+ "i-slint-core-macros",
+ "imgref",
+ "lyon_path",
+ "once_cell",
+ "pin-weak",
+ "raw-window-handle 0.5.2",
+ "rgb",
+ "scoped-tls-hkt",
+ "ttf-parser",
+ "unicode-script",
+ "unicode-segmentation",
+ "vtable",
+ "wasm-bindgen",
+ "web-sys",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "i-slint-renderer-skia"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1189ac65d7e31129407e2cfef4009cdea500040a73d8f87505949f82af0939db"
+dependencies = [
+ "ash",
+ "bytemuck",
+ "cfg-if 1.0.0",
+ "cfg_aliases 0.2.0",
+ "cocoa 0.25.0",
+ "const-field-offset",
+ "core-foundation",
+ "core-graphics-types",
+ "derive_more",
+ "foreign-types 0.5.0",
+ "glow",
+ "glutin",
+ "i-slint-common",
+ "i-slint-core",
+ "i-slint-core-macros",
+ "lyon_path",
+ "metal",
+ "objc",
+ "once_cell",
+ "pin-weak",
+ "raw-window-handle 0.5.2",
+ "scoped-tls-hkt",
+ "skia-safe",
+ "softbuffer",
+ "unicode-segmentation",
+ "vtable",
+ "vulkano",
+ "windows 0.52.0",
+]
+
+[[package]]
+name = "icrate"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
+dependencies = [
+ "block2",
+ "dispatch",
+ "objc2",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "image"
+version = "0.24.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "exr",
+ "gif",
+ "jpeg-decoder",
+ "num-traits",
+ "png",
+ "qoi",
+ "tiff",
+]
+
+[[package]]
+name = "imagesize"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
+
+[[package]]
+name = "imgref"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
+
+[[package]]
+name = "indexmap"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "inotify"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "input"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059"
+dependencies = [
+ "bitflags 1.3.2",
+ "input-sys",
+ "io-lifetimes",
+ "libc",
+ "log",
+ "udev",
+]
+
+[[package]]
+name = "input-sys"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "integer-sqrt"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "iovec"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+
+[[package]]
+name = "jni"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+dependencies = [
+ "cesu8",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+]
+
+[[package]]
+name = "jni"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
+dependencies = [
+ "cesu8",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+]
+
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if 1.0.0",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+
+[[package]]
+name = "jobserver"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+dependencies = [
+ "rayon",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kernel32-sys"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+dependencies = [
+ "winapi 0.2.8",
+ "winapi-build",
+]
+
+[[package]]
+name = "khronos_api"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
+
+[[package]]
+name = "kurbo"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "lazy-bytes-cast"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "leb128"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
+
+[[package]]
+name = "lebe"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "libloading"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+dependencies = [
+ "cfg-if 1.0.0",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.2",
+ "libc",
+ "redox_syscall 0.4.1",
+]
+
+[[package]]
+name = "libredox"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
+dependencies = [
+ "bitflags 2.4.2",
+ "libc",
+ "redox_syscall 0.4.1",
+]
+
+[[package]]
+name = "libudev-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linked_hash_set"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588"
+dependencies = [
+ "linked-hash-map",
+]
+
+[[package]]
+name = "linked_list_allocator"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afa463f5405ee81cdb9cc2baf37e08ec7e4c8209442b5d72c04cfb2cd6e6286"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4"
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "lru"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22"
+
+[[package]]
+name = "lyon_algorithms"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623"
+dependencies = [
+ "lyon_path",
+ "num-traits",
+]
+
+[[package]]
+name = "lyon_extra"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9ce2ae38f2480094ec1f0d5df51a75581fa84f0e8f32a0edb1d264630c99f3b"
+dependencies = [
+ "lyon_path",
+]
+
+[[package]]
+name = "lyon_geom"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9"
+dependencies = [
+ "arrayvec",
+ "euclid",
+ "num-traits",
+]
+
+[[package]]
+name = "lyon_path"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45"
+dependencies = [
+ "lyon_geom",
+ "num-traits",
+]
+
+[[package]]
+name = "mach"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "mach2"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "memmap2"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memmap2"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "metal"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
+dependencies = [
+ "bitflags 2.4.2",
+ "block",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
+ "log",
+ "objc",
+ "paste",
+]
+
+[[package]]
+name = "midir"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a456444d83e7ead06ae6a5c0a215ed70282947ff3897fb45fcb052b757284731"
+dependencies = [
+ "alsa 0.7.1",
+ "bitflags 1.3.2",
+ "coremidi",
+ "js-sys",
+ "libc",
+ "wasm-bindgen",
+ "web-sys",
+ "windows 0.43.0",
+]
+
+[[package]]
+name = "midly"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "207d755f4cb882d20c4da58d707ca9130a0c9bc5061f657a4f299b8e36362b7a"
+dependencies = [
+ "rayon",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mio"
+version = "0.6.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
+dependencies = [
+ "cfg-if 0.1.10",
+ "fuchsia-zircon",
+ "fuchsia-zircon-sys",
+ "iovec",
+ "kernel32-sys",
+ "libc",
+ "log",
+ "miow",
+ "net2",
+ "slab",
+ "winapi 0.2.8",
+]
+
+[[package]]
+name = "mio-extras"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
+dependencies = [
+ "lazycell",
+ "log",
+ "mio",
+ "slab",
+]
+
+[[package]]
+name = "miow"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
+dependencies = [
+ "kernel32-sys",
+ "net2",
+ "winapi 0.2.8",
+ "ws2_32-sys",
+]
+
+[[package]]
+name = "native-dialog"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bbf55edb2747e4e4b3a9cd3989194b88aae32274b4422635dcf98aa6e84197b"
+dependencies = [
+ "ascii",
+ "block",
+ "cocoa 0.24.1",
+ "dirs-next",
+ "objc",
+ "objc-foundation",
+ "objc_id",
+ "once_cell",
+ "raw-window-handle 0.4.3",
+ "thiserror",
+ "wfd",
+ "which",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "ndk"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
+dependencies = [
+ "bitflags 1.3.2",
+ "jni-sys",
+ "ndk-sys 0.3.0",
+ "num_enum 0.5.11",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
+dependencies = [
+ "bitflags 1.3.2",
+ "jni-sys",
+ "ndk-sys 0.4.1+23.1.7779620",
+ "num_enum 0.5.11",
+ "raw-window-handle 0.5.2",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
+dependencies = [
+ "bitflags 2.4.2",
+ "jni-sys",
+ "log",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "num_enum 0.7.2",
+ "raw-window-handle 0.5.2",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk-context"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
+
+[[package]]
+name = "ndk-glue"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "ndk 0.6.0",
+ "ndk-context",
+ "ndk-macro",
+ "ndk-sys 0.3.0",
+]
+
+[[package]]
+name = "ndk-macro"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
+dependencies = [
+ "darling",
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ndk-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
+dependencies = [
+ "jni-sys",
+]
+
+[[package]]
+name = "ndk-sys"
+version = "0.4.1+23.1.7779620"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
+dependencies = [
+ "jni-sys",
+]
+
+[[package]]
+name = "ndk-sys"
+version = "0.5.0+25.2.9519653"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
+dependencies = [
+ "jni-sys",
+]
+
+[[package]]
+name = "net2"
+version = "0.2.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "nix"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
+dependencies = [
+ "bitflags 1.3.2",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset 0.6.5",
+]
+
+[[package]]
+name = "nix"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if 1.0.0",
+ "libc",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset 0.7.1",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.2",
+ "cfg-if 1.0.0",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "notify"
+version = "4.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257"
+dependencies = [
+ "bitflags 1.3.2",
+ "filetime",
+ "fsevent",
+ "fsevent-sys",
+ "inotify",
+ "libc",
+ "mio",
+ "mio-extras",
+ "walkdir",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "num-derive"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive 0.5.11",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+dependencies = [
+ "num_enum_derive 0.7.2",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+ "objc_exception",
+]
+
+[[package]]
+name = "objc-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
+[[package]]
+name = "objc-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459"
+
+[[package]]
+name = "objc2"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"
+
+[[package]]
+name = "objc_exception"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "objc_id"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+dependencies = [
+ "objc",
+]
+
+[[package]]
+name = "oboe"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1"
+dependencies = [
+ "jni 0.19.0",
+ "ndk 0.6.0",
+ "ndk-context",
+ "num-derive",
+ "num-traits",
+ "oboe-sys 0.4.5",
+]
+
+[[package]]
+name = "oboe"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0"
+dependencies = [
+ "jni 0.20.0",
+ "ndk 0.7.0",
+ "ndk-context",
+ "num-derive",
+ "num-traits",
+ "oboe-sys 0.5.0",
+]
+
+[[package]]
+name = "oboe-sys"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "oboe-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+dependencies = [
+ "critical-section",
+ "portable-atomic",
+]
+
+[[package]]
+name = "orbclient"
+version = "0.3.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
+dependencies = [
+ "libredox 0.0.2",
+]
+
+[[package]]
+name = "owned_ttf_parser"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7"
+dependencies = [
+ "ttf-parser",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if 1.0.0",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall 0.4.1",
+ "smallvec",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
+[[package]]
+name = "pin-project"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pin-weak"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b330c9d1b92dfe68442ca20b009c717d5f0b1e3cf4965e62f704c3c6e95a1305"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "png"
+version = "0.17.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "polling"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14"
+dependencies = [
+ "cfg-if 1.0.0",
+ "concurrent-queue",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+dependencies = [
+ "critical-section",
+]
+
+[[package]]
+name = "postcard"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8"
+dependencies = [
+ "cobs",
+ "embedded-io",
+ "serde",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pulldown-cmark"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
+dependencies = [
+ "bitflags 2.4.2",
+ "getopts",
+ "memchr",
+ "unicase",
+]
+
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "raw-window-handle"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
+dependencies = [
+ "cty",
+]
+
+[[package]]
+name = "raw-window-handle"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+
+[[package]]
+name = "rayon"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "rboy"
+version = "0.1.0"
+source = "git+https://github.com/jturcotte/rboy.git?rev=8f886fee45395b1ed093c978ad070321dd81ea6b#8f886fee45395b1ed093c978ad070321dd81ea6b"
+dependencies = [
+ "blip_buf",
+ "clap",
+ "cpal 0.13.5",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
+dependencies = [
+ "getrandom",
+ "libredox 0.0.1",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "resvg"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c34501046959e06470ba62a2dc7f31c15f94ac250d842a45f9e012f4ee40c1e"
+dependencies = [
+ "log",
+ "pico-args",
+ "rgb",
+ "svgtypes",
+ "tiny-skia",
+ "usvg",
+]
+
+[[package]]
+name = "rgb"
+version = "0.8.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+dependencies = [
+ "cc",
+ "getrandom",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rowan"
+version = "0.15.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49"
+dependencies = [
+ "countme",
+ "hashbrown",
+ "memoffset 0.9.0",
+ "rustc-hash",
+ "text-size",
+]
+
+[[package]]
+name = "roxmltree"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+dependencies = [
+ "bitflags 2.4.2",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.13",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+
+[[package]]
+name = "rustybuzz"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa"
+dependencies = [
+ "bitflags 1.3.2",
+ "bytemuck",
+ "smallvec",
+ "ttf-parser",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-properties",
+ "unicode-script",
+]
+
+[[package]]
+name = "rustybuzz"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c"
+dependencies = [
+ "bitflags 2.4.2",
+ "bytemuck",
+ "smallvec",
+ "ttf-parser",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-properties",
+ "unicode-script",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scoped-tls-hkt"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ddc765d3410d9f6c6ca071bf0b67f6b01e3ec4595dc3892f02677e75819dddc"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "sctk-adwaita"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550"
+dependencies = [
+ "ab_glyph",
+ "log",
+ "memmap2 0.9.4",
+ "smithay-client-toolkit",
+ "tiny-skia",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+
+[[package]]
+name = "serde"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.113"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simplecss"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "skia-bindings"
+version = "0.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bc61a106126a429bb4775ce5fbe23b2bcaa74d1a9c484997f4700de31480b44"
+dependencies = [
+ "bindgen 0.69.4",
+ "cc",
+ "flate2",
+ "heck",
+ "lazy_static",
+ "regex",
+ "serde_json",
+ "tar",
+ "toml",
+]
+
+[[package]]
+name = "skia-safe"
+version = "0.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3201eba92bca1f83864f5c3a48309bcfee7e0590bebd7826e7ab0a49aa24a750"
+dependencies = [
+ "bitflags 2.4.2",
+ "lazy_static",
+ "skia-bindings",
+ "windows 0.52.0",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "slint"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d51a972e5c6f22793f9b334eeb537121337fbf66ed73e978475fca031fd367a"
+dependencies = [
+ "const-field-offset",
+ "i-slint-backend-selector",
+ "i-slint-core",
+ "i-slint-renderer-femtovg",
+ "num-traits",
+ "once_cell",
+ "pin-weak",
+ "slint-macros",
+ "vtable",
+]
+
+[[package]]
+name = "slint-build"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebf98969a520e19ec675435b8c21b883d4a06489947e137bbd30859b50ad0c36"
+dependencies = [
+ "i-slint-compiler",
+ "spin_on",
+ "thiserror",
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "slint-macros"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "564b2a25cc34007aa9cd73630394efa972b956fee86538caa5d09808b3ba0c05"
+dependencies = [
+ "i-slint-compiler",
+ "proc-macro2",
+ "quote",
+ "spin_on",
+]
+
+[[package]]
+name = "slotmap"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a"
+dependencies = [
+ "bitflags 2.4.2",
+ "calloop",
+ "calloop-wayland-source",
+ "cursor-icon",
+ "libc",
+ "log",
+ "memmap2 0.9.4",
+ "rustix",
+ "thiserror",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-csd-frame",
+ "wayland-cursor",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "xkeysym",
+]
+
+[[package]]
+name = "smithay-clipboard"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb62b280ce5a5cba847669933a0948d00904cf83845c944eae96a4738cea1a6"
+dependencies = [
+ "libc",
+ "smithay-client-toolkit",
+ "wayland-backend",
+]
+
+[[package]]
+name = "smol_str"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "softbuffer"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f266ce2aa23eaaaa4e758ed44495d505d00fb79f359d46f6c1900cb053123b62"
+dependencies = [
+ "as-raw-xcb-connection",
+ "bytemuck",
+ "cfg_aliases 0.1.1",
+ "cocoa 0.25.0",
+ "core-graphics 0.23.1",
+ "drm 0.11.1",
+ "fastrand",
+ "foreign-types 0.5.0",
+ "js-sys",
+ "log",
+ "memmap2 0.9.4",
+ "objc",
+ "raw-window-handle 0.5.2",
+ "redox_syscall 0.4.1",
+ "rustix",
+ "tiny-xlib",
+ "wasm-bindgen",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-sys",
+ "web-sys",
+ "windows-sys 0.48.0",
+ "x11rb 0.12.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "spin_on"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "076e103ed41b9864aa838287efe5f4e3a7a0362dd00671ae62a212e5e4612da2"
+dependencies = [
+ "pin-utils",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "stdweb"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
+
+[[package]]
+name = "strict-num"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
+dependencies = [
+ "float-cmp",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strum"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
+[[package]]
+name = "svgtypes"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70"
+dependencies = [
+ "kurbo",
+ "siphasher",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tar"
+version = "0.4.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "text-size"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if 1.0.0",
+ "once_cell",
+]
+
+[[package]]
+name = "tiff"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
+dependencies = [
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
+]
+
+[[package]]
+name = "tiny-skia"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "bytemuck",
+ "cfg-if 1.0.0",
+ "log",
+ "png",
+ "tiny-skia-path",
+]
+
+[[package]]
+name = "tiny-skia-path"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
+[[package]]
+name = "tiny-xlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d"
+dependencies = [
+ "as-raw-xcb-connection",
+ "ctor",
+ "libloading 0.8.1",
+ "tracing",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "toml"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.5",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99e68c159e8f5ba8a28c4eb7b0c0c190d77bb479047ca713270048145a9ad28a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.1",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+
+[[package]]
+name = "ttf-parser"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
+
+[[package]]
+name = "udev"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a"
+dependencies = [
+ "libc",
+ "libudev-sys",
+ "pkg-config",
+]
+
+[[package]]
+name = "unicase"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-bidi-mirroring"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694"
+
+[[package]]
+name = "unicode-ccc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-properties"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+
+[[package]]
+name = "unicode-script"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-vo"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "ureq"
+version = "2.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b52731d03d6bb2fd18289d4028aee361d6c28d44977846793b994b13cdcc64d"
+dependencies = [
+ "base64",
+ "flate2",
+ "hootbin",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "url",
+ "webpki-roots",
+]
+
+[[package]]
+name = "url"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "usvg"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "377f62b4a3c173de8654c1aa80ab1dac1154e6f13a779a9943e53780120d1625"
+dependencies = [
+ "base64",
+ "log",
+ "pico-args",
+ "usvg-parser",
+ "usvg-text-layout",
+ "usvg-tree",
+ "xmlwriter",
+]
+
+[[package]]
+name = "usvg-parser"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "351a05e6f2023d6b4e946f734240a3927aefdcf930d7d42587a2c8a8869814b0"
+dependencies = [
+ "data-url",
+ "flate2",
+ "imagesize",
+ "kurbo",
+ "log",
+ "roxmltree",
+ "simplecss",
+ "siphasher",
+ "svgtypes",
+ "usvg-tree",
+]
+
+[[package]]
+name = "usvg-text-layout"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c41888b9d5cf431fe852eaf9d047bbde83251b98f1749c2f08b1071e6db46e2"
+dependencies = [
+ "fontdb",
+ "kurbo",
+ "log",
+ "rustybuzz 0.12.1",
+ "unicode-bidi",
+ "unicode-script",
+ "unicode-vo",
+ "usvg-tree",
+]
+
+[[package]]
+name = "usvg-tree"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18863e0404ed153d6e56362c5b1146db9f4f262a3244e3cf2dbe7d8a85909f05"
+dependencies = [
+ "strict-num",
+ "svgtypes",
+ "tiny-skia-path",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "vk-parse"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81086c28be67a8759cd80cbb3c8f7b520e0874605fc5eb74d5a1c9c2d1878e79"
+dependencies = [
+ "xml-rs",
+]
+
+[[package]]
+name = "voladdress"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fbf3fef7bc995d3f8350936bdd07966c7a1f96183d52e3f28c29d099d0b5ecc"
+
+[[package]]
+name = "vtable"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f4c7506238561777a1861d3dc3c0001877c475187e7bc4392ea87ebf631fd9c"
+dependencies = [
+ "const-field-offset",
+ "portable-atomic",
+ "stable_deref_trait",
+ "vtable-macro",
+]
+
+[[package]]
+name = "vtable-macro"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b2b8eecdb8e4284adf5546fc518f048f6dc33e7203dbe36fa93a4add39b31f6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "vulkano"
+version = "0.34.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f4278f76307b3c388679234b397b4f90de29cdba53873c26b624ed82653d75"
+dependencies = [
+ "ahash",
+ "ash",
+ "bytemuck",
+ "core-graphics-types",
+ "crossbeam-queue",
+ "half",
+ "heck",
+ "indexmap",
+ "libloading 0.8.1",
+ "objc",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "proc-macro2",
+ "quote",
+ "raw-window-handle 0.5.2",
+ "regex",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "thread_local",
+ "vk-parse",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wamr-sys"
+version = "1.2.0"
+source = "git+https://github.com/jturcotte/wamr-sys.git?rev=e85c0a32f02b1907bf77530830e56628b496bb32#e85c0a32f02b1907bf77530830e56628b496bb32"
+dependencies = [
+ "bindgen 0.62.0",
+ "cc",
+ "cmake",
+ "libc",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+
+[[package]]
+name = "wasm-encoder"
+version = "0.41.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "972f97a5d8318f908dded23594188a90bcd09365986b1163e66d70170e5287ae"
+dependencies = [
+ "leb128",
+]
+
+[[package]]
+name = "wast"
+version = "71.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "647c3ac4354da32688537e8fc4d2fe6c578df51896298cb64727d98088a1fd26"
+dependencies = [
+ "bumpalo",
+ "leb128",
+ "memchr",
+ "unicode-width",
+ "wasm-encoder",
+]
+
+[[package]]
+name = "wat"
+version = "1.0.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b69c36f634411568a2c6d24828b674961e37ea03340fe1d605c337ed8162d901"
+dependencies = [
+ "wast",
+]
+
+[[package]]
+name = "wayland-backend"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f"
+dependencies = [
+ "bitflags 2.4.2",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-csd-frame"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
+dependencies = [
+ "bitflags 2.4.2",
+ "cursor-icon",
+ "wayland-backend",
+]
+
+[[package]]
+name = "wayland-cursor"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba"
+dependencies = [
+ "rustix",
+ "wayland-client",
+ "xcursor",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
+dependencies = [
+ "bitflags 2.4.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-plasma"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
+dependencies = [
+ "bitflags 2.4.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
+dependencies = [
+ "bitflags 2.4.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
+dependencies = [
+ "proc-macro2",
+ "quick-xml",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
+dependencies = [
+ "dlib",
+ "log",
+ "once_cell",
+ "pkg-config",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ee269d72cc29bf77a2c4bc689cc750fb39f5cbd493d2205bbb3f5c7779cf7b0"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "weezl"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+
+[[package]]
+name = "wfd"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "winapi"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-build"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+dependencies = [
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "winapi-wsapoll"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
+dependencies = [
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
+[[package]]
+name = "winit"
+version = "0.29.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf"
+dependencies = [
+ "ahash",
+ "android-activity",
+ "atomic-waker",
+ "bitflags 2.4.2",
+ "bytemuck",
+ "calloop",
+ "cfg_aliases 0.1.1",
+ "core-foundation",
+ "core-graphics 0.23.1",
+ "cursor-icon",
+ "icrate",
+ "js-sys",
+ "libc",
+ "log",
+ "memmap2 0.9.4",
+ "ndk 0.8.0",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "objc2",
+ "once_cell",
+ "orbclient",
+ "percent-encoding",
+ "raw-window-handle 0.5.2",
+ "redox_syscall 0.3.5",
+ "rustix",
+ "sctk-adwaita",
+ "smithay-client-toolkit",
+ "smol_str",
+ "unicode-segmentation",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-plasma",
+ "web-sys",
+ "web-time 0.2.4",
+ "windows-sys 0.48.0",
+ "x11-dl",
+ "x11rb 0.13.0",
+ "xkbcommon-dl",
+]
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wio"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
+dependencies = [
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "ws2_32-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
+dependencies = [
+ "winapi 0.2.8",
+ "winapi-build",
+]
+
+[[package]]
+name = "x11-clipboard"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613c2be3e772af2bbb57c5a94413675f5ec668bac00a71ada2ced28c420ef087"
+dependencies = [
+ "libc",
+ "x11rb 0.13.0",
+]
+
+[[package]]
+name = "x11-dl"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
+dependencies = [
+ "libc",
+ "once_cell",
+ "pkg-config",
+]
+
+[[package]]
+name = "x11rb"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a"
+dependencies = [
+ "as-raw-xcb-connection",
+ "gethostname 0.3.0",
+ "libc",
+ "libloading 0.7.4",
+ "nix 0.26.4",
+ "once_cell",
+ "winapi 0.3.9",
+ "winapi-wsapoll",
+ "x11rb-protocol 0.12.0",
+]
+
+[[package]]
+name = "x11rb"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
+dependencies = [
+ "as-raw-xcb-connection",
+ "gethostname 0.4.3",
+ "libc",
+ "libloading 0.8.1",
+ "once_cell",
+ "rustix",
+ "x11rb-protocol 0.13.0",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc"
+dependencies = [
+ "nix 0.26.4",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
+
+[[package]]
+name = "xattr"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+dependencies = [
+ "libc",
+ "linux-raw-sys 0.4.13",
+ "rustix",
+]
+
+[[package]]
+name = "xcursor"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911"
+
+[[package]]
+name = "xkbcommon"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e"
+dependencies = [
+ "libc",
+ "memmap2 0.8.0",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkbcommon-dl"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
+dependencies = [
+ "bitflags 2.4.2",
+ "dlib",
+ "log",
+ "once_cell",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
+
+[[package]]
+name = "xml-rs"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
+
+[[package]]
+name = "xmlwriter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+
+[[package]]
+name = "zune-inflate"
+version = "0.2.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+dependencies = [
+ "simd-adler32",
+]
diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chiptrack/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chiptrack/package.nix
new file mode 100644
index 0000000000..a57f713673
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ch/chiptrack/package.nix
@@ -0,0 +1,146 @@
+{
+ clangStdenv,
+ rustPlatform,
+ lib,
+ linkFarm,
+ fetchgit,
+ fetchFromGitHub,
+ runCommand,
+ alsa-lib,
+ brotli,
+ cmake,
+ expat,
+ fontconfig,
+ freetype,
+ gn,
+ harfbuzz,
+ icu,
+ libglvnd,
+ libjpeg,
+ libxkbcommon,
+ libX11,
+ libXcursor,
+ libXext,
+ libXi,
+ libXrandr,
+ makeWrapper,
+ ninja,
+ pkg-config,
+ python3,
+ removeReferencesTo,
+ wayland,
+ zlib,
+}:
+
+rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
+ pname = "chiptrack";
+ version = "0.3.1";
+
+ src = fetchFromGitHub {
+ owner = "jturcotte";
+ repo = "chiptrack";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-Iehe4dD7nWoBB6RaYLvPvV6bBKEc3Kdkwrhb8Ry+s9s=";
+ };
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ rustPlatform.bindgenHook
+ cmake
+ makeWrapper
+ pkg-config
+ python3
+ removeReferencesTo
+ ];
+
+ buildInputs = [
+ expat
+ fontconfig
+ freetype
+ harfbuzz
+ icu
+ libjpeg
+ ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ alsa-lib ];
+
+ # Has git dependencies
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "rboy-0.1.0" = "sha256-2Acgg5phDAVTJht3XIXO7/TV5FxEXyLQJtC5n7cd9Ek=";
+ "wamr-sys-1.2.0" = "sha256-lNpJjHqdaYi/cyoAb8RlsKuLQ9WhuGwlzcSpDM68Kco=";
+ };
+ };
+
+ env = {
+ SKIA_SOURCE_DIR =
+ let
+ repo = fetchFromGitHub {
+ owner = "rust-skia";
+ repo = "skia";
+ # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
+ rev = "refs/tags/m121-0.69.1";
+ hash = "sha256-OviOIiw3RvQx1dvtQ9kWIc/mGVPOOsLVCIRoBJrC72M=";
+ };
+ # The externals for skia are taken from skia/DEPS
+ # Reduced to only what's necessary
+ externals = linkFarm "skia-externals" (
+ lib.mapAttrsToList (name: value: {
+ inherit name;
+ path = fetchgit value;
+ }) (lib.importJSON ./skia-externals.json)
+ );
+ in
+ runCommand "source" { } ''
+ cp -R ${repo} $out
+ chmod -R +w $out
+ ln -s ${externals} $out/third_party/externals
+ '';
+ SKIA_GN_COMMAND = lib.getExe gn;
+ SKIA_NINJA_COMMAND = lib.getExe ninja;
+ SKIA_USE_SYSTEM_LIBRARIES = "1";
+
+ NIX_CFLAGS_COMPILE = "-I${lib.getDev harfbuzz}/include/harfbuzz";
+ };
+
+ # library skia embeds the path to its sources
+ postFixup = ''
+ remove-references-to -t "$SKIA_SOURCE_DIR" \
+ $out/bin/chiptrack
+
+ wrapProgram $out/bin/chiptrack \
+ --prefix LD_LIBRARY_PATH : ${
+ lib.makeLibraryPath (
+ [
+ brotli
+ zlib
+ ]
+ ++ lib.optionals clangStdenv.hostPlatform.isLinux [
+ libglvnd
+ libxkbcommon
+ libX11
+ libXcursor
+ libXext
+ libXrandr
+ libXi
+ wayland
+ ]
+ )
+ }
+ '';
+
+ disallowedReferences = [ env.SKIA_SOURCE_DIR ];
+
+ meta = {
+ description = "Programmable cross-platform sequencer for the Game Boy Advance sound chip";
+ homepage = "https://github.com/jturcotte/chiptrack";
+ license = with lib.licenses; [
+ mit # main
+ gpl3Only # GPL dependencies
+ ];
+ mainProgram = "chiptrack";
+ maintainers = with lib.maintainers; [ OPNA2608 ];
+ # Various issues with wrong max macOS version & misparsed target conditional checks, can't figure out the magic combination for this
+ broken = clangStdenv.hostPlatform.isDarwin;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chiptrack/skia-externals.json b/third_party/nixpkgs/pkgs/by-name/ch/chiptrack/skia-externals.json
new file mode 100644
index 0000000000..53c0a2ad42
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ch/chiptrack/skia-externals.json
@@ -0,0 +1,7 @@
+{
+ "wuffs": {
+ "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
+ "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
+ "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw="
+ }
+}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chisel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chisel/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/chit/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ch/chit/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/chit/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ch/chit/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/chit/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/chit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chkcrontab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chkcrontab/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/chkrootkit/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chkrootkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/chkrootkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chkrootkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/chmlib/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chmlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/chmlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chmlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch b/third_party/nixpkgs/pkgs/by-name/ch/chntpw/00-chntpw-build-arch-autodetect.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/chntpw/00-chntpw-build-arch-autodetect.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/chntpw/01-chntpw-install-target.patch b/third_party/nixpkgs/pkgs/by-name/ch/chntpw/01-chntpw-install-target.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/chntpw/01-chntpw-install-target.patch
rename to third_party/nixpkgs/pkgs/by-name/ch/chntpw/01-chntpw-install-target.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/chntpw/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chntpw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/chntpw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chntpw/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/chocolate-doom/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chocolate-doom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/doom-ports/chocolate-doom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chocolate-doom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/cholmod-extra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/cholmod-extra/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/chonburi/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chonburi-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/chonburi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chonburi-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/choose/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/choose/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/choose/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/choose/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/chopchop/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chopchop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/chopchop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chopchop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chroma/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/chroma/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chroma/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/chroma/src.json b/third_party/nixpkgs/pkgs/by-name/ch/chroma/src.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/chroma/src.json
rename to third_party/nixpkgs/pkgs/by-name/ch/chroma/src.json
diff --git a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chromaprint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chromaprint/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/chrome-export/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chrome-export/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/chrome-export/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chrome-export/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/chromium-xorg-conf/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chromium-xorg-conf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/chromium-xorg-conf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chromium-xorg-conf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chrpath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chrpath/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/chruby-fish/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chruby-fish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/chruby-fish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chruby-fish/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cht.sh/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/cht-sh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cht.sh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/cht-sh/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/chunk/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chunk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/chunk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chunk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chunkfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chunkfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/chunksync/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/chunksync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/chunksync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ch/chunksync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/ciao/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/ciao/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ci/cicero-tui/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cicero-tui/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ci/cicero-tui/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cicero-tui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/cicero-tui/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cider/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cider/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/cider/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/cider/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/cidrgrep/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cidrgrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/cidrgrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/cidrgrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cie-middleware-linux/deps.json b/third_party/nixpkgs/pkgs/by-name/ci/cie-middleware-linux/deps.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cie-middleware-linux/deps.json
rename to third_party/nixpkgs/pkgs/by-name/ci/cie-middleware-linux/deps.json
diff --git a/third_party/nixpkgs/pkgs/tools/security/cie-middleware-linux/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cie-middleware-linux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cie-middleware-linux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/cie-middleware-linux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cie-middleware-linux/use-system-podofo.patch b/third_party/nixpkgs/pkgs/by-name/ci/cie-middleware-linux/use-system-podofo.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cie-middleware-linux/use-system-podofo.patch
rename to third_party/nixpkgs/pkgs/by-name/ci/cie-middleware-linux/use-system-podofo.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/ciel/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ci/ciel/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/ciel/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ci/ciel/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/ciel/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/ciel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/ciel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/ciel/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cifs-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/cifs-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/ciftilib/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/ciftilib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/ciftilib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/ciftilib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cilium-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/cilium-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/cinelerra/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cinelerra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/cinelerra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/cinelerra/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/ciopfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/ciopfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cipher/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cipher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/cipher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/cipher/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/circleci-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/circleci-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/circumflex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/circumflex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/circup/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/circup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/circup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/circup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cirrusgo/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cirrusgo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cirrusgo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/cirrusgo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cista/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cista/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cista/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/cista/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/citron/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/citron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/citron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/citron/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/civetweb/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/civetweb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/civetweb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ci/civetweb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/cj/cjdns-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cj/cjdns-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/wrapper.sh b/third_party/nixpkgs/pkgs/by-name/cj/cjdns-tools/wrapper.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/wrapper.sh
rename to third_party/nixpkgs/pkgs/by-name/cj/cjdns-tools/wrapper.sh
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cjdns/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/cj/cjdns/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cjdns/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/cj/cjdns/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix b/third_party/nixpkgs/pkgs/by-name/cj/cjdns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cj/cjdns/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cjdns/system-libsodium.patch b/third_party/nixpkgs/pkgs/by-name/cj/cjdns/system-libsodium.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cjdns/system-libsodium.patch
rename to third_party/nixpkgs/pkgs/by-name/cj/cjdns/system-libsodium.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix b/third_party/nixpkgs/pkgs/by-name/cj/cjose/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cj/cjose/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cjson/default.nix b/third_party/nixpkgs/pkgs/by-name/cj/cjson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cjson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cj/cjson/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/ckan/default.nix b/third_party/nixpkgs/pkgs/by-name/ck/ckan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/ckan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ck/ckan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/third_party/nixpkgs/pkgs/by-name/ck/ckbcomp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ck/ckbcomp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cksfv/default.nix b/third_party/nixpkgs/pkgs/by-name/ck/cksfv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cksfv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ck/cksfv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cl-launch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/cl-launch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cl-launch/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/cl-wordle/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cl-wordle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/cl-wordle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cl-wordle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cl/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clac/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clac/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clair/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clair/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/clairvoyance/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clairvoyance/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/clairvoyance/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clairvoyance/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/clamsmtp/header-order.patch b/third_party/nixpkgs/pkgs/by-name/cl/clamsmtp/header-order.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/clamsmtp/header-order.patch
rename to third_party/nixpkgs/pkgs/by-name/cl/clamsmtp/header-order.patch
diff --git a/third_party/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clamsmtp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clamsmtp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clanlib/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clanlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/clanlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clanlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clap/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/clap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/clapboard/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clapboard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/clapboard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clapboard/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/clapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/classads/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/classads/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/classads/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/classads/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/classicube/fix-linking.patch b/third_party/nixpkgs/pkgs/by-name/cl/classicube/fix-linking.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/classicube/fix-linking.patch
rename to third_party/nixpkgs/pkgs/by-name/cl/classicube/fix-linking.patch
diff --git a/third_party/nixpkgs/pkgs/games/classicube/font-location.patch b/third_party/nixpkgs/pkgs/by-name/cl/classicube/font-location.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/classicube/font-location.patch
rename to third_party/nixpkgs/pkgs/by-name/cl/classicube/font-location.patch
diff --git a/third_party/nixpkgs/pkgs/games/classicube/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/classicube/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/classicube/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/classicube/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/mime.patch b/third_party/nixpkgs/pkgs/by-name/cl/claws-mail/mime.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
rename to third_party/nixpkgs/pkgs/by-name/cl/claws-mail/mime.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/claws-mail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/claws-mail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/claws/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/claws/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/claws/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/claws/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/clblast/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clblast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/clblast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clblast/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clboss/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clboss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/clboss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clboss/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/cldr-annotations/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cldr-annotations/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/cldr-annotations/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cldr-annotations/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch b/third_party/nixpkgs/pkgs/by-name/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch
rename to third_party/nixpkgs/pkgs/by-name/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/clean/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clean/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/clean/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clean/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/clearlooks-phenix/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clearlooks-phenix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/clearlooks-phenix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clearlooks-phenix/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/clearlyU/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clearlyU/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/clearlyU/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clearlyU/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clematis/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clematis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clematis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clematis/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/clex/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/clex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clfft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clfft/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clhep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clhep/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cli-visualizer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cli-visualizer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/cli53/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cli53/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/cli53/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cli53/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cliam/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cliam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cliam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cliam/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/clib/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/clib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/click/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/click/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clickclack/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clickclack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clickclack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clickclack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clickhouse-backup/package.nix
similarity index 82%
rename from third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clickhouse-backup/package.nix
index a16fbaddc2..f61093c2e1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/cl/clickhouse-backup/package.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "clickhouse-backup";
- version = "2.6.2";
+ version = "2.6.3";
src = fetchFromGitHub {
owner = "Altinity";
repo = "clickhouse-backup";
rev = "v${version}";
- hash = "sha256-t9sRhcNKFvTTysornYf/7JQ7mkasTunnzKR4pYCAOk0=";
+ hash = "sha256-431bdyE2MEWwgl9xDVsRHKpjrv/cIjaOQpg25qDlvPk=";
};
- vendorHash = "sha256-n3rlijycZ5qZtR/e+Z/UPCcr47p4wN3kFgfWr+73WAQ=";
+ vendorHash = "sha256-D1sjizuyHnfNplZtuw3zqRjFl/r1h478N+iGyF2OAyc=";
ldflags = [
"-X main.version=${version}"
diff --git a/third_party/nixpkgs/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/third_party/nixpkgs/pkgs/by-name/cl/client-ip-echo/client-ip-echo.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/client-ip-echo/client-ip-echo.nix
diff --git a/third_party/nixpkgs/pkgs/servers/misc/client-ip-echo/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/client-ip-echo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/client-ip-echo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/client-ip-echo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clifm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clifm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clightning/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clightning/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/clima/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clima/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/clima/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clima/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cling/no-clang-cpp.patch b/third_party/nixpkgs/pkgs/by-name/cl/cling/no-clang-cpp.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/cling/no-clang-cpp.patch
rename to third_party/nixpkgs/pkgs/by-name/cl/cling/no-clang-cpp.patch
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cling/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cling/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clini/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clini/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clini/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clini/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipboard-jh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clipboard-jh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clipit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/clipman/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/clipman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clipman/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipmenu/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipmenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/clipmenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clipmenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clipnotify/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipnotify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clipnotify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clipnotify/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clipp/clipp.pc b/third_party/nixpkgs/pkgs/by-name/cl/clipp/clipp.pc
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/clipp/clipp.pc
rename to third_party/nixpkgs/pkgs/by-name/cl/clipp/clipp.pc
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clipp/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/clipp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clipp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clipper/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/clipper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clipper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipqr/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipqr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/clipqr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clipqr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clips/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clips/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/clips/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clips/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clipster/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clipster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clipster/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cliquer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cliquer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clj-kondo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clj-kondo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clmagma/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clmagma/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cln/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cln/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cln/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cln/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/clockify/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clockify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/clockify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clockify/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/clog-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clog-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/clog-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clog-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clolcat/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clolcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clolcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clolcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/clonehero/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clonehero/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/clonehero/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clonehero/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/closurecompiler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/closure/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/closurecompiler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cloud-custodian/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloud-custodian/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cloud-custodian/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloud-custodian/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/cl/cloud-hypervisor/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/cl/cloud-hypervisor/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloud-hypervisor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloud-hypervisor/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloud-nuke/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloud-nuke/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloud-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloud-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cloudbrute/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudbrute/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cloudbrute/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloudbrute/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clouddrive2/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clouddrive2/package.nix
index c15a390b2a..b68af648c6 100644
--- a/third_party/nixpkgs/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,16 +11,16 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "clouddrive2";
- version = "0.7.21";
+ version = "0.8.3";
src = fetchurl {
url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
hash =
{
- x86_64-linux = "sha256-U8th7cEAFDBg+CV6DEX0YnqaM2+NJNKmyA/IRtnWESo=";
- aarch64-linux = "sha256-LaAVO4p0sSfsGmFPSzly1Hzo+t4oY6mgaTdnHrhu0vI=";
- x86_64-darwin = "sha256-/cyLcX7A+WpuS6yciqAz3jvDIJvXEoyQyX+xe6+eRmE=";
- aarch64-darwin = "sha256-Y5cKIHVzX0TjMNZGW3YvU8MNpuGsIjp4qNlB+b2BRJM=";
+ x86_64-linux = "sha256-5vyWMoDASzRa9m2UueoyMbmK8JPUpplqk0/uv8fHPAU=";
+ aarch64-linux = "sha256-zfar/dZkSVSrnrRpfF4RnwvkPVzmdLJa4W9Ds8NNNaI=";
+ x86_64-darwin = "sha256-3jab0NxGH+cac2Ughq/l2ZAQLISD7z+WBtFFyiFc+5A=";
+ aarch64-darwin = "sha256-SO5L9aBMN5pYloBeVH1uQO0QeiHzDK+6kHVEg8uYnTo=";
}
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudflare-dyndns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloudflare-dyndns/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudflare-warp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cloudflare-warp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloudflare-warp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudfoundry-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloudfoundry-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cloudfox/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudfox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cloudfox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloudfox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cloudhunter/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudhunter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cloudhunter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloudhunter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cloudlist/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudlist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cloudlist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloudlist/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudlog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloudlog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudmonkey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloudmonkey/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudsmith-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/cloudsmith-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/clp/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/clp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff b/third_party/nixpkgs/pkgs/by-name/cl/clpeak/clpeak-clhpp2.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff
rename to third_party/nixpkgs/pkgs/by-name/cl/clpeak/clpeak-clhpp2.diff
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clpeak/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clpeak/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clpeak/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clpeak/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clubhouse-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clubhouse-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/clubhouse-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clubhouse-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/clustal-omega/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clustal-omega/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/clustal-omega/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clustal-omega/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clusterctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clusterctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clutter-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clutter-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/clutter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cl/clutter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cm256cc/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cm256cc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cm256cc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cm256cc/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cm_unicode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cm_unicode/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmark-gfm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmark-gfm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmark/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmdstan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmdstan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/cmigemo/no-http-tool-check.patch b/third_party/nixpkgs/pkgs/by-name/cm/cmigemo/no-http-tool-check.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/cmigemo/no-http-tool-check.patch
rename to third_party/nixpkgs/pkgs/by-name/cm/cmigemo/no-http-tool-check.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmigemo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmigemo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cminpack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cminpack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmocka/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmocka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cmocka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmocka/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmocka/uintptr_t.patch b/third_party/nixpkgs/pkgs/by-name/cm/cmocka/uintptr_t.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cmocka/uintptr_t.patch
rename to third_party/nixpkgs/pkgs/by-name/cm/cmocka/uintptr_t.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/cmospwd/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmospwd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cmospwd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmospwd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmrt/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmrt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cmrt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmrt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmt/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/cmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmusfm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cm/cmusfm/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/third_party/nixpkgs/pkgs/by-name/cn/cnijfilter2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cn/cnijfilter2/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch b/third_party/nixpkgs/pkgs/by-name/cn/cnijfilter2/patches/get_protocol.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch
rename to third_party/nixpkgs/pkgs/by-name/cn/cnijfilter2/patches/get_protocol.patch
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch b/third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch
rename to third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch b/third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch
rename to third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch b/third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch
rename to third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch b/third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch
rename to third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch b/third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch
rename to third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch b/third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch
rename to third_party/nixpkgs/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cnping/default.nix b/third_party/nixpkgs/pkgs/by-name/cn/cnping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cnping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cn/cnping/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cnquery/default.nix b/third_party/nixpkgs/pkgs/by-name/cn/cnquery/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cnquery/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cn/cnquery/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/cnstrokeorder/default.nix b/third_party/nixpkgs/pkgs/by-name/cn/cnstrokeorder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/cnstrokeorder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cn/cnstrokeorder/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cntlm/default.nix b/third_party/nixpkgs/pkgs/by-name/cn/cntlm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/cntlm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cn/cntlm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cntr/default.nix b/third_party/nixpkgs/pkgs/by-name/cn/cntr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/cntr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cn/cntr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/coan/fix-big-endian-config-check.diff b/third_party/nixpkgs/pkgs/by-name/co/coan/fix-big-endian-config-check.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/coan/fix-big-endian-config-check.diff
rename to third_party/nixpkgs/pkgs/by-name/co/coan/fix-big-endian-config-check.diff
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/coan/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/coan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coan/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cockroachdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cockroachdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/coconutbattery/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coconutbattery/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/coconutbattery/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coconutbattery/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cod/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/code-maat/default.nix b/third_party/nixpkgs/pkgs/by-name/co/code-maat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/code-maat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/code-maat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix b/third_party/nixpkgs/pkgs/by-name/co/code-minimap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/code-minimap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codeberg-pages/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/codeberg-pages/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch b/third_party/nixpkgs/pkgs/by-name/co/codeblocks/fix-clipboard-flush.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch
rename to third_party/nixpkgs/pkgs/by-name/co/codeblocks/fix-clipboard-flush.patch
diff --git a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codeblocks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/codeblocks/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/writable-projects.patch b/third_party/nixpkgs/pkgs/by-name/co/codeblocks/writable-projects.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/codeblocks/writable-projects.patch
rename to third_party/nixpkgs/pkgs/by-name/co/codeblocks/writable-projects.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/codebraid/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codebraid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/codebraid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/codebraid/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codec2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/codec2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/codemov/fix-build-with-rust-1.80.patch b/third_party/nixpkgs/pkgs/by-name/co/codemov/fix-build-with-rust-1.80.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/codemov/fix-build-with-rust-1.80.patch
rename to third_party/nixpkgs/pkgs/by-name/co/codemov/fix-build-with-rust-1.80.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/codemov/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codemov/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/codemov/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/codemov/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/codeowners/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codeowners/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/codeowners/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/codeowners/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codeql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/codeql/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/codesearch/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codesearch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/codesearch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/codesearch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codespell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/codespell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/codespell/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/codevis/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codevis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/codevis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/codevis/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/coercer/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coercer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/coercer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coercer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/coffeescript/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coffeescript/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/coffeescript/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coffeescript/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/cog/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/cog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cog/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/coin-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coin-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/coin-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coin-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coin3d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coin3d/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cointop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cointop/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/colemak-dh/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colemak-dh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/colemak-dh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colemak-dh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colima/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colima/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/collapseos-cvm/default.nix b/third_party/nixpkgs/pkgs/by-name/co/collapseos-cvm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/collapseos-cvm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/collapseos-cvm/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colloid-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colloid-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/colloid-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colloid-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/colloid-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colloid-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/colm/cross-compile.patch b/third_party/nixpkgs/pkgs/by-name/co/colm/cross-compile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/colm/cross-compile.patch
rename to third_party/nixpkgs/pkgs/by-name/co/colm/cross-compile.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/colm/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/colm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colmena/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colmena/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/colobot/data.nix b/third_party/nixpkgs/pkgs/by-name/co/colobot/data.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/colobot/data.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colobot/data.nix
diff --git a/third_party/nixpkgs/pkgs/games/colobot/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colobot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/colobot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colobot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/electronics/coloquinte/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coloquinte/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/electronics/coloquinte/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coloquinte/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/colord-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colord-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/colord-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colord-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/colord/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/co/colord/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/colord/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/co/colord/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/colord/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colord/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/colord/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colord/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colordiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colordiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/colorless/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colorless/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/colorless/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colorless/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colormake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colormake/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/colorpanes/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colorpanes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/colorpanes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colorpanes/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/colorstorm/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colorstorm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/colorstorm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colorstorm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/colort/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colort/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/colort/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colort/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/colorz/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colorz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/colorz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colorz/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix b/third_party/nixpkgs/pkgs/by-name/co/colpack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/colpack/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix b/third_party/nixpkgs/pkgs/by-name/co/combinatorial_designs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/combinatorial_designs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/comedilib/default.nix b/third_party/nixpkgs/pkgs/by-name/co/comedilib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/comedilib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/comedilib/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix b/third_party/nixpkgs/pkgs/by-name/co/comfortaa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/comfortaa/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/comic-mono/comic-mono-weight.conf b/third_party/nixpkgs/pkgs/by-name/co/comic-mono/comic-mono-weight.conf
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/comic-mono/comic-mono-weight.conf
rename to third_party/nixpkgs/pkgs/by-name/co/comic-mono/comic-mono-weight.conf
diff --git a/third_party/nixpkgs/pkgs/data/fonts/comic-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/co/comic-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/comic-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/comic-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf b/third_party/nixpkgs/pkgs/by-name/co/comic-relief/comic-sans-ms-alias.conf
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf
rename to third_party/nixpkgs/pkgs/by-name/co/comic-relief/comic-sans-ms-alias.conf
diff --git a/third_party/nixpkgs/pkgs/data/fonts/comic-relief/default.nix b/third_party/nixpkgs/pkgs/by-name/co/comic-relief/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/comic-relief/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/comic-relief/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/comixcursors/makefile-shell-var.patch b/third_party/nixpkgs/pkgs/by-name/co/comixcursors/makefile-shell-var.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/comixcursors/makefile-shell-var.patch
rename to third_party/nixpkgs/pkgs/by-name/co/comixcursors/makefile-shell-var.patch
diff --git a/third_party/nixpkgs/pkgs/data/icons/comixcursors/default.nix b/third_party/nixpkgs/pkgs/by-name/co/comixcursors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/comixcursors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/comixcursors/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix b/third_party/nixpkgs/pkgs/by-name/co/comma/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/comma/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/commandergenius/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commandergenius/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/commandergenius/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commandergenius/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commit-formatter/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commit-formatter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/commit-formatter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commit-formatter/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/commit-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commit-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/commit-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commit-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/commix/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/commix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commix/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/common-licenses/default.nix b/third_party/nixpkgs/pkgs/by-name/co/common-licenses/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/common-licenses/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/common-licenses/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commonsBcel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commonsBcel/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commonsBsf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commonsBsf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commonsCompress/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commonsCompress/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/daemon/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commonsDaemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/commons/daemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commonsDaemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commonsFileUpload/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commonsFileUpload/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commonsIo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commonsIo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commonsLang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commonsLang/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commonsLogging/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commonsLogging/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix b/third_party/nixpkgs/pkgs/by-name/co/commonsMath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/commonsMath/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/comodoro/default.nix b/third_party/nixpkgs/pkgs/by-name/co/comodoro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/comodoro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/comodoro/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/compdb/default.nix b/third_party/nixpkgs/pkgs/by-name/co/compdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/compdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/compdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/compile-daemon/default.nix b/third_party/nixpkgs/pkgs/by-name/co/compile-daemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/compile-daemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/compile-daemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/complete-alias/default.nix b/third_party/nixpkgs/pkgs/by-name/co/complete-alias/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/complete-alias/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/complete-alias/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile b/third_party/nixpkgs/pkgs/by-name/co/completely/Gemfile
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile
rename to third_party/nixpkgs/pkgs/by-name/co/completely/Gemfile
diff --git a/third_party/nixpkgs/pkgs/by-name/co/completely/Gemfile.lock b/third_party/nixpkgs/pkgs/by-name/co/completely/Gemfile.lock
new file mode 100644
index 0000000000..d698597827
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/co/completely/Gemfile.lock
@@ -0,0 +1,20 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ colsole (1.0.0)
+ completely (0.6.3)
+ colsole (>= 0.8.1, < 2)
+ mister_bin (~> 0.7)
+ docopt_ng (0.7.1)
+ mister_bin (0.7.6)
+ colsole (>= 0.8.1, < 2)
+ docopt_ng (~> 0.7, >= 0.7.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ completely
+
+BUNDLED WITH
+ 2.5.16
diff --git a/third_party/nixpkgs/pkgs/tools/misc/completely/gemset.nix b/third_party/nixpkgs/pkgs/by-name/co/completely/gemset.nix
similarity index 59%
rename from third_party/nixpkgs/pkgs/tools/misc/completely/gemset.nix
rename to third_party/nixpkgs/pkgs/by-name/co/completely/gemset.nix
index a078a113f6..f99da8f722 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/completely/gemset.nix
+++ b/third_party/nixpkgs/pkgs/by-name/co/completely/gemset.nix
@@ -4,10 +4,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1l29sxy4p9jbvcihckxfsyqx98b8xwzd3hjqvdh1zxw8nv5walnp";
+ sha256 = "1fvf6dz2wsvjk7q24z0dm8lajq3p2l6i5ywf3mxj683rmhwq49bg";
type = "gem";
};
- version = "0.8.2";
+ version = "1.0.0";
};
completely = {
dependencies = ["colsole" "mister_bin"];
@@ -15,30 +15,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w7cmmsp9m42c8w4j03kr98zy7x7yszw3qsm3ww600dmc0d0xd2b";
+ sha256 = "0ci8iza647hvc4f1cmf9mpsm3i78ysf6g6213wkyrr5jk296hjjb";
type = "gem";
};
- version = "0.5.2";
+ version = "0.6.3";
};
- docopt = {
+ docopt_ng = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rvlfbb7kzyagncm4zdpcjwrh682zamgf5rcf5qmj0bd6znkgy3k";
+ sha256 = "0rsnl5s7k2s1gl4n4dg68ssg577kf11sl4a4l2lb2fpswj718950";
type = "gem";
};
- version = "0.6.1";
+ version = "0.7.1";
};
mister_bin = {
- dependencies = ["colsole" "docopt"];
+ dependencies = ["colsole" "docopt_ng"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1f51zs9wjpslhdadp8yfx4ij0jj1ya92cbzqlfd2wfr19wdr2jgd";
+ sha256 = "0xx8cxvzcn47zsnshcllf477x4rbssrchvp76929qnsg5k9q7fas";
type = "gem";
};
- version = "0.7.3";
+ version = "0.7.6";
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/completely/default.nix b/third_party/nixpkgs/pkgs/by-name/co/completely/package.nix
similarity index 65%
rename from third_party/nixpkgs/pkgs/tools/misc/completely/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/completely/package.nix
index 326887299c..47e6189bd5 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/completely/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/co/completely/package.nix
@@ -1,6 +1,7 @@
-{ lib
-, bundlerApp
-, bundlerUpdateScript
+{
+ lib,
+ bundlerApp,
+ bundlerUpdateScript,
}:
bundlerApp {
@@ -11,12 +12,12 @@ bundlerApp {
passthru.updateScript = bundlerUpdateScript "completely";
- meta = with lib; {
+ meta = {
description = "Generate bash completion scripts using a simple configuration file";
homepage = "https://github.com/DannyBen/completely";
- license = licenses.mit;
- platforms = platforms.unix;
- maintainers = with maintainers; [ zendo ];
+ license = lib.licenses.mit;
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ zendo ];
mainProgram = "completely";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/complexity/default.nix b/third_party/nixpkgs/pkgs/by-name/co/complexity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/complexity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/complexity/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/complgen/default.nix b/third_party/nixpkgs/pkgs/by-name/co/complgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/complgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/complgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/co/compose2nix/package.nix b/third_party/nixpkgs/pkgs/by-name/co/compose2nix/package.nix
index af02f0d7c6..550eb49b12 100644
--- a/third_party/nixpkgs/pkgs/by-name/co/compose2nix/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/co/compose2nix/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "compose2nix";
- version = "0.2.3";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "aksiksi";
repo = "compose2nix";
rev = "v${version}";
- hash = "sha256-qN7MFw6JKBbzwiqURkZ3or/8hT29mRpfITovSHdzDEY=";
+ hash = "sha256-rFnnbRVVv/N5021Al3vmjFAui1cTp8NBZDBNQo8CsXM=";
};
- vendorHash = "sha256-yGBdsej6DjRMWzS13WyqCLaY5M/N9BrMARAM3oHsc+s=";
+ vendorHash = "sha256-kiUXgbXJg4x89k2SXf/1e1DLB04ETS+Qp2gx8uJA2DU=";
passthru.tests = {
version = testers.testVersion {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/compsize/default.nix b/third_party/nixpkgs/pkgs/by-name/co/compsize/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/compsize/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/compsize/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/computecpp/default.nix b/third_party/nixpkgs/pkgs/by-name/co/computecpp-unwrapped/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/computecpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/computecpp-unwrapped/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/comrak/default.nix b/third_party/nixpkgs/pkgs/by-name/co/comrak/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/comrak/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/comrak/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conan/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/conceal/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conceal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/conceal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conceal/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/conda/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conda/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/conda/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conda/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/conduktor/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conduktor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/conduktor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conduktor/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/confetty/default.nix b/third_party/nixpkgs/pkgs/by-name/co/confetty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/confetty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/confetty/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/configurable-http-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/co/configurable-http-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/configurable-http-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/configurable-http-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/confluencepot/default.nix b/third_party/nixpkgs/pkgs/by-name/co/confluencepot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/confluencepot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/confluencepot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/co/confluent-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/confluent-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix b/third_party/nixpkgs/pkgs/by-name/co/confluent-platform/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/confluent-platform/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/conform/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conform/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/conform/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conform/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conftest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/conftest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conftest/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix b/third_party/nixpkgs/pkgs/by-name/co/confy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/confy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/confy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conglomerate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conglomerate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/conjure/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conjure/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/conjure/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conjure/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conmon-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/conmon-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conmon-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conmon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conmon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/connect/default.nix b/third_party/nixpkgs/pkgs/by-name/co/connect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/connect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/connect/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/conntrack-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conntrack-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/conntrack-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conntrack-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/conserve/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conserve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/conserve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conserve/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/conserver/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/conserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/console-bridge/default.nix b/third_party/nixpkgs/pkgs/by-name/co/console-bridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/console-bridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/console-bridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/conspy/default.nix b/third_party/nixpkgs/pkgs/by-name/co/conspy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/conspy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/conspy/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix b/third_party/nixpkgs/pkgs/by-name/co/consul-alerts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/consul-alerts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix b/third_party/nixpkgs/pkgs/by-name/co/consul-template/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/consul-template/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/container2wasm/default.nix b/third_party/nixpkgs/pkgs/by-name/co/container2wasm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/container2wasm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/container2wasm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/by-name/co/containerd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/containerd/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix b/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix
index 47f1cfb73e..ab1980449c 100644
--- a/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/co/containerlab/package.nix
@@ -7,18 +7,18 @@
buildGoModule rec {
pname = "containerlab";
- version = "0.58.0";
+ version = "0.59.0";
src = fetchFromGitHub {
owner = "srl-labs";
repo = "containerlab";
rev = "v${version}";
- hash = "sha256-yToqJnL2T9qTGCl1MgUkg/JSWV/kEibF59lk85tAX44=";
+ hash = "sha256-4YSnAoQkjDpSRBMqYW8D3TzipE5Co892y5PXkcz+8xA=";
};
nativeBuildInputs = [ installShellFiles ];
- vendorHash = "sha256-Qg6mFd5+Crsn2Xx4yg930Iueo0vfxkzrIHO4vrNFTNc=";
+ vendorHash = "sha256-PJQrQn7QPtUSzdlf2BYY8ARcmH6pzZgpl1oQbc98M4Y=";
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/tools/misc/convbin/default.nix b/third_party/nixpkgs/pkgs/by-name/co/convbin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/convbin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/convbin/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/convchain/default.nix b/third_party/nixpkgs/pkgs/by-name/co/convchain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/convchain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/convchain/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/convertlit/default.nix b/third_party/nixpkgs/pkgs/by-name/co/convertlit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/convertlit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/convertlit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/convfont/default.nix b/third_party/nixpkgs/pkgs/by-name/co/convfont/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/convfont/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/convfont/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/convimg/default.nix b/third_party/nixpkgs/pkgs/by-name/co/convimg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/convimg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/convimg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/third_party/nixpkgs/pkgs/by-name/co/convos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/convos/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cooper-hewitt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cooper-hewitt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coordgenlibs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coordgenlibs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/copier/default.nix b/third_party/nixpkgs/pkgs/by-name/co/copier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/copier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/copier/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/co/copilot-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/copilot-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/copper/default.nix b/third_party/nixpkgs/pkgs/by-name/co/copper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/copper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/copper/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/co/coppwr/package.nix b/third_party/nixpkgs/pkgs/by-name/co/coppwr/package.nix
index 47e99a96f2..55d340563c 100644
--- a/third_party/nixpkgs/pkgs/by-name/co/coppwr/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/co/coppwr/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
libGL
xorg.libXcursor
xorg.libXi
- xorg.libXrandr
xorg.libX11
];
diff --git a/third_party/nixpkgs/pkgs/tools/text/copyright-update/default.nix b/third_party/nixpkgs/pkgs/by-name/co/copyright-update/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/copyright-update/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/copyright-update/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/coq2html/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coq2html/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/coq2html/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coq2html/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cordless/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cordless/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/mobile/cordova/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cordova/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/mobile/cordova/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cordova/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coredns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coredns/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coreth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coreth/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/corkscrew/default.nix b/third_party/nixpkgs/pkgs/by-name/co/corkscrew/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/corkscrew/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/corkscrew/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/corosync/default.nix b/third_party/nixpkgs/pkgs/by-name/co/corosync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/corosync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/corosync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix b/third_party/nixpkgs/pkgs/by-name/co/corrosion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/corrosion/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/corsix-th/darwin-cmake-no-fixup-bundle.patch b/third_party/nixpkgs/pkgs/by-name/co/corsix-th/darwin-cmake-no-fixup-bundle.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/corsix-th/darwin-cmake-no-fixup-bundle.patch
rename to third_party/nixpkgs/pkgs/by-name/co/corsix-th/darwin-cmake-no-fixup-bundle.patch
diff --git a/third_party/nixpkgs/pkgs/games/corsix-th/default.nix b/third_party/nixpkgs/pkgs/by-name/co/corsix-th/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/corsix-th/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/corsix-th/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix
index 09e457dc85..141f1bcfaa 100644
--- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix
@@ -83,14 +83,13 @@ rustPlatform.buildRustPackage rec {
"CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
];
- # Use default stdenv installPhase, not the buildRustPackage one.
- installPhase = "installPhase";
+ dontCargoInstall = true;
# These libraries are only used by the X11 backend, which will not
# be the common case, so just make them available, don't link them.
postInstall = ''
wrapProgramArgs=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
- xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr
+ xorg.libX11 xorg.libXcursor xorg.libXi
]})
'' + lib.optionalString useXWayland ''
wrapProgramArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]})
diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix
index 54f87b4646..a644a3212f 100644
--- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix
@@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec {
wrapProgram "$out/bin/cosmic-edit" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
- xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland
+ xorg.libX11 xorg.libXcursor xorg.libXi vulkan-loader libxkbcommon wayland
]}
'';
diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix
index cfe98f4288..396dff2a74 100644
--- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix
@@ -104,7 +104,6 @@ rustPlatform.buildRustPackage rec {
xorg.libX11
xorg.libXcursor
xorg.libXi
- xorg.libXrandr
]}
'';
diff --git a/third_party/nixpkgs/pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch b/third_party/nixpkgs/pkgs/by-name/co/coturn/dont-call-setgroups-unconditionally.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch
rename to third_party/nixpkgs/pkgs/by-name/co/coturn/dont-call-setgroups-unconditionally.patch
diff --git a/third_party/nixpkgs/pkgs/servers/coturn/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coturn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/coturn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coturn/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/coturn/pure-configure.patch b/third_party/nixpkgs/pkgs/by-name/co/coturn/pure-configure.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/coturn/pure-configure.patch
rename to third_party/nixpkgs/pkgs/by-name/co/coturn/pure-configure.patch
diff --git a/third_party/nixpkgs/pkgs/data/fonts/courier-prime/default.nix b/third_party/nixpkgs/pkgs/by-name/co/courier-prime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/courier-prime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/courier-prime/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coursera-dl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coursera-dl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coursier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/coursier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coursier/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cov-build/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cov-build/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/cowpatty/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cowpatty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/cowpatty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cowpatty/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/coze/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coze/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/coze/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coze/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cozette/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cozette/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cozy-drive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cozy-drive/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cozy/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cozy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/cozy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/cozy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cp210x-program/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cp210x-program/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cp210x-program/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cp210x-program/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cp437/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cp437/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cp437/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cp437/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpcfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpcfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpio/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cplay-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cplay-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/cplay-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cplay-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpm-cmake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpm-cmake/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpp-hocon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpp-hocon/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch b/third_party/nixpkgs/pkgs/by-name/cp/cpp-ipfs-http-client/unvendor-nlohmann-json.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch
rename to third_party/nixpkgs/pkgs/by-name/cp/cpp-ipfs-http-client/unvendor-nlohmann-json.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-jwt/fix-version.patch b/third_party/nixpkgs/pkgs/by-name/cp/cpp-jwt/fix-version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cpp-jwt/fix-version.patch
rename to third_party/nixpkgs/pkgs/by-name/cp/cpp-jwt/fix-version.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-jwt/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpp-jwt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cpp-jwt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpp-jwt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpp-netlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpp-netlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpp-utilities/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpp-utilities/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/cppclean/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppclean/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/cppclean/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cppclean/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cppcms/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppcms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cppcms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cppcms/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cppcodec/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppcodec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cppcodec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cppcodec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cppdb/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cppdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cppdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/cppe/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/cppe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cppe/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cppi/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/cppi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cppi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/misc/cppreference-doc/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppreference-doc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/misc/cppreference-doc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cppreference-doc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpptest/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpptest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cpptest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpptest/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpptoml/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpptoml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cpptoml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpptoml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cppunit/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppunit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cppunit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cppunit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpputest/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpputest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cpputest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpputest/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cppzmq/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppzmq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cppzmq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cppzmq/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cproto/cproto.patch b/third_party/nixpkgs/pkgs/by-name/cp/cproto/cproto.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/cproto/cproto.patch
rename to third_party/nixpkgs/pkgs/by-name/cp/cproto/cproto.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cproto/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cproto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/cproto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cproto/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cpufetch/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpufetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cpufetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpufetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpufrequtils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpufrequtils/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch b/third_party/nixpkgs/pkgs/by-name/cp/cpufrequtils/remove-pot-creation-date.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch
rename to third_party/nixpkgs/pkgs/by-name/cp/cpufrequtils/remove-pot-creation-date.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpuid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpuid/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cpulimit/get-missing-basename.patch b/third_party/nixpkgs/pkgs/by-name/cp/cpulimit/get-missing-basename.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cpulimit/get-missing-basename.patch
rename to third_party/nixpkgs/pkgs/by-name/cp/cpulimit/get-missing-basename.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cpulimit/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpulimit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cpulimit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpulimit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch b/third_party/nixpkgs/pkgs/by-name/cp/cpulimit/remove-sys-sysctl.h.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch
rename to third_party/nixpkgs/pkgs/by-name/cp/cpulimit/remove-sys-sysctl.h.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cpuminer/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpuminer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cpuminer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpuminer/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpustat/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpustat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cpustat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cp/cpustat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/crabz/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crabz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/crabz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crabz/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch b/third_party/nixpkgs/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch
rename to third_party/nixpkgs/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch
diff --git a/third_party/nixpkgs/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch b/third_party/nixpkgs/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch
rename to third_party/nixpkgs/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch
diff --git a/third_party/nixpkgs/pkgs/games/crack-attack/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crack_attack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/crack-attack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crack_attack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/crackle/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crackle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/crackle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crackle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cracklib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cracklib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/crackql/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crackql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/crackql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crackql/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/crackxls/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crackxls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/crackxls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crackxls/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/craftos-pc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/craftos-pc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/craftos-pc/test-eval-hello-world/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/craftos-pc/test-eval-hello-world/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/init.lua b/third_party/nixpkgs/pkgs/by-name/cr/craftos-pc/test-eval-hello-world/init.lua
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/init.lua
rename to third_party/nixpkgs/pkgs/by-name/cr/craftos-pc/test-eval-hello-world/init.lua
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/craftos-pc/test-eval-periphemu/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/craftos-pc/test-eval-periphemu/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/init.lua b/third_party/nixpkgs/pkgs/by-name/cr/craftos-pc/test-eval-periphemu/init.lua
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/init.lua
rename to third_party/nixpkgs/pkgs/by-name/cr/craftos-pc/test-eval-periphemu/init.lua
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch b/third_party/nixpkgs/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch
rename to third_party/nixpkgs/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cramfsprogs/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cramfsprogs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cramfsprogs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cramfsprogs/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cramfsswap/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cramfsswap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cramfsswap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cramfsswap/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cramfsswap/parallel-make.patch b/third_party/nixpkgs/pkgs/by-name/cr/cramfsswap/parallel-make.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cramfsswap/parallel-make.patch
rename to third_party/nixpkgs/pkgs/by-name/cr/cramfsswap/parallel-make.patch
diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crates-tui/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crates-tui/package.nix
new file mode 100644
index 0000000000..8c3af93971
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/cr/crates-tui/package.nix
@@ -0,0 +1,49 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ pkg-config,
+ openssl,
+ versionCheckHook,
+ nix-update-script,
+}:
+let
+ version = "0.1.20";
+in
+rustPlatform.buildRustPackage {
+ pname = "crates-tui";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "ratatui";
+ repo = "crates-tui";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-K3ttXoSS4GZyHnqS95op8kmbAi4/KjKa0P6Nzqqpjyw=";
+ };
+
+ cargoHash = "sha256-ztLBM6CR2WMKR9cfBY95BvSaD05C+AEa6C/nOdDxqf0=";
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ openssl ];
+
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ doInstallCheck = true;
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "TUI for exploring crates.io using Ratatui";
+ homepage = "https://github.com/ratatui/crates-tui";
+ license = with lib.licenses; [ mit ];
+ # See Cargo.toml: workspaces.metadata.dist.targets
+ # Other platforms may work but YMMV
+ platforms = [
+ "x86_64-linux"
+ "aarch64-darwin"
+ "x86_64-darwin"
+ "x86_64-windows"
+ ];
+ maintainers = with lib.maintainers; [ pluiedev ];
+ mainProgram = "crates-tui";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crc32c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crc32c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crcpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crcpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/crd2pulumi/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crd2pulumi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/crd2pulumi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crd2pulumi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cre2/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cre2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cre2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cre2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/third_party/nixpkgs/pkgs/by-name/cr/createrepo_c/fix-bash-completion-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch
rename to third_party/nixpkgs/pkgs/by-name/cr/createrepo_c/fix-bash-completion-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/third_party/nixpkgs/pkgs/by-name/cr/createrepo_c/fix-python-install-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch
rename to third_party/nixpkgs/pkgs/by-name/cr/createrepo_c/fix-python-install-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/createrepo_c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/createrepo_c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/credential-detector/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/credential-detector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/credential-detector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/credential-detector/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/credhub-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/credhub-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/creds/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/creds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/creds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/creds/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/credslayer/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/credslayer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/credslayer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/credslayer/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/creep/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/creep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/creep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/creep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/crex/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/crex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crex/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cri-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cri-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/crimson-pro/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crimson-pro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/crimson-pro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crimson-pro/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/crimson/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crimson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/crimson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crimson/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/crip/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/crip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crip/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/crispy-doom/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crispy-doom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/doom-ports/crispy-doom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crispy-doom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/critcmp/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/critcmp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/critcmp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/critcmp/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/criu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/criu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/crlfsuite/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crlfsuite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/crlfsuite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crlfsuite/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/crlfuzz/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crlfuzz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/crlfuzz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crlfuzz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/croaring/fix-pkg-config.patch b/third_party/nixpkgs/pkgs/by-name/cr/croaring/fix-pkg-config.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/croaring/fix-pkg-config.patch
rename to third_party/nixpkgs/pkgs/by-name/cr/croaring/fix-pkg-config.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/croaring/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/croaring/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/croaring/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/croaring/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/croc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/croc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/croc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix b/third_party/nixpkgs/pkgs/by-name/cr/croc/test-local-relay.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/croc/test-local-relay.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/cromfs/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cromfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/cromfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cromfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crossguid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crossguid/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/crowbar/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crowbar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/crowbar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crowbar/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crowdin-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crowdin-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/crowdsec/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crowdsec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/crowdsec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crowdsec/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/crrcsim/gcc6.patch b/third_party/nixpkgs/pkgs/by-name/cr/crrcsim/gcc6.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/crrcsim/gcc6.patch
rename to third_party/nixpkgs/pkgs/by-name/cr/crrcsim/gcc6.patch
diff --git a/third_party/nixpkgs/pkgs/games/crrcsim/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crrcsim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/crrcsim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crrcsim/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/crudini/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crudini/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/crudini/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crudini/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/crumbs/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crumbs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/crumbs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crumbs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crun/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/crunch/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crunch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/crunch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crunch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cryfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cryfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crypto-org-wallet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crypto-org-wallet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/crypto-tracker/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crypto-tracker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/crypto-tracker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crypto-tracker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cryptominisat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cryptominisat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cryptopp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/crypto++/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cryptopp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cryptoverif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cryptoverif/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/cryptsetup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/cryptsetup/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/relative-token-path.patch b/third_party/nixpkgs/pkgs/by-name/cr/cryptsetup/relative-token-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/relative-token-path.patch
rename to third_party/nixpkgs/pkgs/by-name/cr/cryptsetup/relative-token-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crystal2nix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crystal2nix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/shards.nix b/third_party/nixpkgs/pkgs/by-name/cr/crystal2nix/shards.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/crystal2nix/shards.nix
rename to third_party/nixpkgs/pkgs/by-name/cr/crystal2nix/shards.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/csa/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/csa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cscope/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/cscope/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/cscope/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/cscope/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/csdp/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csdp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/csdp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csdp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/csdr/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csdr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/csdr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csdr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/csfml/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csfml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/csfml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csfml/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cshatag/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/cshatag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/cshatag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/cshatag/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/csmith/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csmith/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/csmith/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csmith/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csound-manual/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csound-manual/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/csv2latex/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csv2latex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/csv2latex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csv2latex/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/csv2odf/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csv2odf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/csv2odf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csv2odf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/csv2parquet/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csv2parquet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/csv2parquet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csv2parquet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/csv2svg/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csv2svg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/csv2svg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csv2svg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/csvdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csvdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/csvdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csvdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/csview/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/csview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csview/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/csvquote/csvquote-path.patch b/third_party/nixpkgs/pkgs/by-name/cs/csvquote/csvquote-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/csvquote/csvquote-path.patch
rename to third_party/nixpkgs/pkgs/by-name/cs/csvquote/csvquote-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/csvquote/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csvquote/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/csvquote/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csvquote/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csvs-to-sqlite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csvs-to-sqlite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csxcad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/csxcad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cs/csxcad/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/csxcad/searchPath.patch b/third_party/nixpkgs/pkgs/by-name/cs/csxcad/searchPath.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/csxcad/searchPath.patch
rename to third_party/nixpkgs/pkgs/by-name/cs/csxcad/searchPath.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/ctlptl/default.nix b/third_party/nixpkgs/pkgs/by-name/ct/ctlptl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ctlptl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ct/ctlptl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ctmg/default.nix b/third_party/nixpkgs/pkgs/by-name/ct/ctmg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ctmg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ct/ctmg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ctodo/default.nix b/third_party/nixpkgs/pkgs/by-name/ct/ctodo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ctodo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ct/ctodo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix b/third_party/nixpkgs/pkgs/by-name/ct/ctop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ctop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ct/ctop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctpl/default.nix b/third_party/nixpkgs/pkgs/by-name/ct/ctpl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ctpl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ct/ctpl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctpp2/default.nix b/third_party/nixpkgs/pkgs/by-name/ct/ctpp2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ctpp2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ct/ctpp2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctre/default.nix b/third_party/nixpkgs/pkgs/by-name/ct/ctre/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ctre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ct/ctre/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix b/third_party/nixpkgs/pkgs/by-name/ct/ctrtool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ct/ctrtool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix b/third_party/nixpkgs/pkgs/by-name/ct/ctypes_sh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ct/ctypes_sh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cudd/cudd.patch b/third_party/nixpkgs/pkgs/by-name/cu/cudd/cudd.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cudd/cudd.patch
rename to third_party/nixpkgs/pkgs/by-name/cu/cudd/cudd.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cudd/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cudd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cudd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cudd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/cuelsp/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cuelsp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/cuelsp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cuelsp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cuetools/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cuetools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/cuetools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cuetools/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/culmus/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/culmus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/culmus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/culmus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cum/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/cum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cum/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cuneiform/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cuneiform/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cunit/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cunit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cunit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cunit/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-bjnp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-bjnp/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/hll2350dw/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/hll2350dw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch b/third_party/nixpkgs/pkgs/by-name/cu/cups-brother-hll2375dw/fix-perm.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-brother-hll2375dw/fix-perm.patch
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/brother/hll2375dw/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/brother/hll2375dw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2750dw/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2750dw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-drv-rastertosag-gdi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-drv-rastertosag-gdi/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/dymo/fix-includes.patch b/third_party/nixpkgs/pkgs/by-name/cu/cups-dymo/fix-includes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/dymo/fix-includes.patch
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-dymo/fix-includes.patch
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-dymo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-dymo/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-kyocera-ecosys-m2x35-40-p2x35-40dnw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-kyocera-ecosys-m2x35-40-p2x35-40dnw/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-kyocera-ecosys-m552x-p502x/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-kyocera-ecosys-m552x-p502x/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-kyocera/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-kyocera/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/kyodialog/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-kyodialog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/kyodialog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-kyodialog/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-toshiba-estudio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-toshiba-estudio/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-zj-58/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cups-zj-58/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/curie/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/curie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/curie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/curie/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/curlMinimal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/curlMinimal/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch b/third_party/nixpkgs/pkgs/by-name/cu/curlftpfs/fix-rpl_malloc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch
rename to third_party/nixpkgs/pkgs/by-name/cu/curlftpfs/fix-rpl_malloc.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/curlftpfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/curlftpfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch b/third_party/nixpkgs/pkgs/by-name/cu/curlftpfs/suse-bug-580609.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch
rename to third_party/nixpkgs/pkgs/by-name/cu/curlftpfs/suse-bug-580609.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch b/third_party/nixpkgs/pkgs/by-name/cu/curlftpfs/suse-bug-955687.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch
rename to third_party/nixpkgs/pkgs/by-name/cu/curlftpfs/suse-bug-955687.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/curlie/bump-golang-x-sys.patch b/third_party/nixpkgs/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/curlie/bump-golang-x-sys.patch
rename to third_party/nixpkgs/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/curlie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/curlie/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/curlpp/curl_8_10_build_failure.patch b/third_party/nixpkgs/pkgs/by-name/cu/curlpp/curl_8_10_build_failure.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/curlpp/curl_8_10_build_failure.patch
rename to third_party/nixpkgs/pkgs/by-name/cu/curlpp/curl_8_10_build_failure.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/curlpp/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/curlpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/curlpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/curlpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/curseradio/mpv.patch b/third_party/nixpkgs/pkgs/by-name/cu/curseradio/mpv.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/curseradio/mpv.patch
rename to third_party/nixpkgs/pkgs/by-name/cu/curseradio/mpv.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/curseradio/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/curseradio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/curseradio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/curseradio/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/curtail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/curtail/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/curv/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/curv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/curv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/curv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/cutecapture/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cutecapture/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/cutecapture/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cutecapture/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cutee/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cutee/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cutee/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cutee/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/cuyo/default.nix b/third_party/nixpkgs/pkgs/by-name/cu/cuyo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/cuyo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cu/cuyo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch b/third_party/nixpkgs/pkgs/by-name/cv/cvc4/cvc4-bash-patsub-replacement.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch
rename to third_party/nixpkgs/pkgs/by-name/cv/cvc4/cvc4-bash-patsub-replacement.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/minisat-fenv.patch b/third_party/nixpkgs/pkgs/by-name/cv/cvc4/minisat-fenv.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/cvc4/minisat-fenv.patch
rename to third_party/nixpkgs/pkgs/by-name/cv/cvc4/minisat-fenv.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix b/third_party/nixpkgs/pkgs/by-name/cv/cvc4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cv/cvc4/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cvehound/default.nix b/third_party/nixpkgs/pkgs/by-name/cv/cvehound/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/cvehound/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cv/cvehound/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix b/third_party/nixpkgs/pkgs/by-name/cv/cvs-fast-export/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cv/cvs-fast-export/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs/CVE-2012-0804.patch b/third_party/nixpkgs/pkgs/by-name/cv/cvs/CVE-2012-0804.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/cvs/CVE-2012-0804.patch
rename to third_party/nixpkgs/pkgs/by-name/cv/cvs/CVE-2012-0804.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs/CVE-2017-12836.patch b/third_party/nixpkgs/pkgs/by-name/cv/cvs/CVE-2017-12836.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/cvs/CVE-2017-12836.patch
rename to third_party/nixpkgs/pkgs/by-name/cv/cvs/CVE-2017-12836.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs/getcwd-chroot.patch b/third_party/nixpkgs/pkgs/by-name/cv/cvs/getcwd-chroot.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/cvs/getcwd-chroot.patch
rename to third_party/nixpkgs/pkgs/by-name/cv/cvs/getcwd-chroot.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs/default.nix b/third_party/nixpkgs/pkgs/by-name/cv/cvs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/cvs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cv/cvs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix b/third_party/nixpkgs/pkgs/by-name/cv/cvs2svn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cv/cvs2svn/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvsps/default.nix b/third_party/nixpkgs/pkgs/by-name/cv/cvsps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/cvsps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cv/cvsps/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvsq/default.nix b/third_party/nixpkgs/pkgs/by-name/cv/cvsq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/cvsq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cv/cvsq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/cw/default.nix b/third_party/nixpkgs/pkgs/by-name/cw/cw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/cw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cw/cw/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix b/third_party/nixpkgs/pkgs/by-name/cw/cwebbin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cw/cwebbin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cwiid/fix-ar.diff b/third_party/nixpkgs/pkgs/by-name/cw/cwiid/fix-ar.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cwiid/fix-ar.diff
rename to third_party/nixpkgs/pkgs/by-name/cw/cwiid/fix-ar.diff
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cwiid/default.nix b/third_party/nixpkgs/pkgs/by-name/cw/cwiid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cwiid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cw/cwiid/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix b/third_party/nixpkgs/pkgs/by-name/cw/cwltool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cw/cwltool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix b/third_party/nixpkgs/pkgs/by-name/cw/cwm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cw/cwm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix b/third_party/nixpkgs/pkgs/by-name/cx/cxx-prettyprint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cx/cxx-prettyprint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxx-rs/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/cx/cxx-rs/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cxx-rs/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/cx/cxx-rs/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/cx/cxx-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cx/cxx-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix b/third_party/nixpkgs/pkgs/by-name/cx/cxxopts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cx/cxxopts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxxtools/default.nix b/third_party/nixpkgs/pkgs/by-name/cx/cxxtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cxxtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cx/cxxtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/cyan/default.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/cyan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cy/cyan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cyber/default.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyber/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/cyber/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cy/cyber/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyberchef/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cy/cyberchef/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cyberduck/default.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyberduck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cyberduck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cy/cyberduck/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyclone-scheme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cy/cyclone-scheme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyclone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cy/cyclone/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch b/third_party/nixpkgs/pkgs/by-name/cy/cyclonedds/0001-Use-full-path-in-pkgconfig.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch
rename to third_party/nixpkgs/pkgs/by-name/cy/cyclonedds/0001-Use-full-path-in-pkgconfig.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cyclonedds/default.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyclonedds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cyclonedds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cy/cyclonedds/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyclonedx-python/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cy/cyclonedx-python/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl-xoauth2/default.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl-xoauth2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch b/third_party/nixpkgs/pkgs/by-name/cy/cyrus_sasl/cyrus-sasl-ac-try-run-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/cy/cyrus_sasl/cyrus-sasl-ac-try-run-fix.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyrus_sasl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cy/cyrus_sasl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/cz/cz-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/cz-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cz/cz-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/cz/czkawka/0000-time.diff b/third_party/nixpkgs/pkgs/by-name/cz/czkawka/0000-time.diff
deleted file mode 100644
index 0fac803012..0000000000
--- a/third_party/nixpkgs/pkgs/by-name/cz/czkawka/0000-time.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 5ae2bd6..e4c6f18 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -5676,9 +5676,9 @@ dependencies = [
-
- [[package]]
- name = "time"
--version = "0.3.34"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
- "deranged",
- "itoa",
-@@ -5699,9 +5699,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
- [[package]]
- name = "time-macros"
--version = "0.2.17"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
- "num-conv",
- "time-core",
diff --git a/third_party/nixpkgs/pkgs/development/libraries/czmq/default.nix b/third_party/nixpkgs/pkgs/by-name/cz/czmq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/czmq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/cz/czmq/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/d-seams/default.nix b/third_party/nixpkgs/pkgs/by-name/d-/d-seams/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/d-seams/default.nix
rename to third_party/nixpkgs/pkgs/by-name/d-/d-seams/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/d-spy/default.nix b/third_party/nixpkgs/pkgs/by-name/d-/d-spy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/d-spy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/d-/d-spy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/d2/default.nix b/third_party/nixpkgs/pkgs/by-name/d2/d2/package.nix
similarity index 87%
rename from third_party/nixpkgs/pkgs/tools/text/d2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/d2/d2/package.nix
index 4b36b32fe0..dcfac802de 100644
--- a/third_party/nixpkgs/pkgs/tools/text/d2/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/d2/d2/package.nix
@@ -9,16 +9,16 @@
buildGo123Module rec {
pname = "d2";
- version = "0.6.7";
+ version = "0.6.8";
src = fetchFromGitHub {
owner = "terrastruct";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-HD59q4GFrkjLvQQdYGA7ISwXJztweRxoV5AWbHinTx8=";
+ hash = "sha256-Sd4AkXKQVRJIgQTb7BbDNb8DbULyoWX8TuFtiu+Km5Y=";
};
- vendorHash = "sha256-HcWyhQFRI+dvOhUrVaL9U5PvL/CDBpaOYPXSkYzIYf4=";
+ vendorHash = "sha256-PMqN/6kzXR0d1y1PigBE0KJ8uP14n+qQziFqGai5zLE=";
excludedPackages = [ "./e2etests" ];
diff --git a/third_party/nixpkgs/pkgs/data/fonts/d2coding/default.nix b/third_party/nixpkgs/pkgs/by-name/d2/d2coding/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/d2coding/default.nix
rename to third_party/nixpkgs/pkgs/by-name/d2/d2coding/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dab_lib/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dab_lib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dab_lib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dab_lib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dabet/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dabet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dabet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dabet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/dabtools/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dabtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/dabtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dabtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/dadadodo/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dadadodo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/dadadodo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dadadodo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dae/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dae/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dae/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dae/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/daemon/default.nix b/third_party/nixpkgs/pkgs/by-name/da/daemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/daemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/daemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/daemonize/default.nix b/third_party/nixpkgs/pkgs/by-name/da/daemonize/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/daemonize/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/daemonize/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch b/third_party/nixpkgs/pkgs/by-name/da/daemontools/fix-nix-usernamespace-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
rename to third_party/nixpkgs/pkgs/by-name/da/daemontools/fix-nix-usernamespace-build.patch
diff --git a/third_party/nixpkgs/pkgs/tools/admin/daemontools/default.nix b/third_party/nixpkgs/pkgs/by-name/da/daemontools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/daemontools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/daemontools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/dafny/deps.nix b/third_party/nixpkgs/pkgs/by-name/da/dafny/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/dafny/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dafny/deps.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/dafny/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dafny/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/dafny/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dafny/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/daktilo/default.nix b/third_party/nixpkgs/pkgs/by-name/da/daktilo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/daktilo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/daktilo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dale/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/dale/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dale/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dalfox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dalfox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/damon/default.nix b/third_party/nixpkgs/pkgs/by-name/da/damon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/damon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/damon/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/dancing-script/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dancing-script/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/dancing-script/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dancing-script/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dante/clang-osint-m4.patch b/third_party/nixpkgs/pkgs/by-name/da/dante/clang-osint-m4.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dante/clang-osint-m4.patch
rename to third_party/nixpkgs/pkgs/by-name/da/dante/clang-osint-m4.patch
diff --git a/third_party/nixpkgs/pkgs/servers/dante/dante-1.4.3-miniupnpc-2.2.8.patch b/third_party/nixpkgs/pkgs/by-name/da/dante/dante-1.4.3-miniupnpc-2.2.8.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dante/dante-1.4.3-miniupnpc-2.2.8.patch
rename to third_party/nixpkgs/pkgs/by-name/da/dante/dante-1.4.3-miniupnpc-2.2.8.patch
diff --git a/third_party/nixpkgs/pkgs/servers/dante/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dante/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dante/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dante/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dapper/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/daq/default.nix b/third_party/nixpkgs/pkgs/by-name/da/daq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/ids/daq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/daq/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/darcnes/label.patch b/third_party/nixpkgs/pkgs/by-name/da/darcnes/label.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/darcnes/label.patch
rename to third_party/nixpkgs/pkgs/by-name/da/darcnes/label.patch
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/darcnes/default.nix b/third_party/nixpkgs/pkgs/by-name/da/darcnes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/darcnes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/darcnes/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/darkhttpd/default.nix b/third_party/nixpkgs/pkgs/by-name/da/darkhttpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/darkhttpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/darkhttpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch b/third_party/nixpkgs/pkgs/by-name/da/darkice/fix-undeclared-memmove.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch
rename to third_party/nixpkgs/pkgs/by-name/da/darkice/fix-undeclared-memmove.patch
diff --git a/third_party/nixpkgs/pkgs/tools/audio/darkice/default.nix b/third_party/nixpkgs/pkgs/by-name/da/darkice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/darkice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/darkice/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/darkman/go-mod.patch b/third_party/nixpkgs/pkgs/by-name/da/darkman/go-mod.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/darkman/go-mod.patch
rename to third_party/nixpkgs/pkgs/by-name/da/darkman/go-mod.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/darkman/makefile.patch b/third_party/nixpkgs/pkgs/by-name/da/darkman/makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/darkman/makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/da/darkman/makefile.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix b/third_party/nixpkgs/pkgs/by-name/da/darkman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/darkman/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/darkplaces/default.nix b/third_party/nixpkgs/pkgs/by-name/da/darkplaces/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/darkplaces/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/darkplaces/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/darkstat/default.nix b/third_party/nixpkgs/pkgs/by-name/da/darkstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/darkstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/darkstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/darktile/default.nix b/third_party/nixpkgs/pkgs/by-name/da/darktile/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/darktile/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/darktile/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix b/third_party/nixpkgs/pkgs/by-name/da/darling/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/darling/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/das_watchdog/default.nix b/third_party/nixpkgs/pkgs/by-name/da/das_watchdog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/das_watchdog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/das_watchdog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dasel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dasel/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/dash/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/dash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dash/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dasher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dasher/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dashing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dashing/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dasht/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dasht/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dasht/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dasht/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/da/dashy-ui/package.nix b/third_party/nixpkgs/pkgs/by-name/da/dashy-ui/package.nix
new file mode 100644
index 0000000000..dafb76a7c8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/da/dashy-ui/package.nix
@@ -0,0 +1,57 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ fetchYarnDeps,
+ yarnConfigHook,
+ yarnBuildHook,
+ nodejs,
+ yq-go,
+ settings ? { },
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "dashy-ui";
+ # This is like 3.1.1 but the latest working yarn.lock.
+ # All other changes are for docs with the exception of 768d746cbfcf365c58ad1194c5ccc74c14f3ed3a, which simply adds no-referrer meta tag
+ version = "3.1.1-unstable-2024-07-14";
+ src = fetchFromGitHub {
+ owner = "lissy93";
+ repo = "dashy";
+ rev = "0b1af9db483f80323e782e7834da2a337393e111";
+ hash = "sha256-lRJ3lI9UUIaw9GWPEy81Dbf4cu6rClA4VjdWejVQN+g=";
+ };
+ yarnOfflineCache = fetchYarnDeps {
+ yarnLock = finalAttrs.src + "/yarn.lock";
+ hash = "sha256-KVAZIBM47yp1NWYc2esvTwfoAev4q7Wgi0c73PUZRNw=";
+ };
+ # - If no settings are passed, use the default config provided by upstream
+ # - Despite JSON being valid YAML (and the JSON passing the config validator),
+ # there seem to be some issues with JSON in the final build - potentially due to
+ # the way the client parses things
+ # - Instead, we use `yq-go` to convert it to yaml
+ # Config validation needs to happen after yarnConfigHook, since it's what sets the yarn offline cache
+ postYarnConfigHook = lib.optional (settings != { }) ''
+ echo "Writing settings override..."
+ yq --output-format yml '${builtins.toFile "conf.json" ''${builtins.toJSON settings}''}' > user-data/conf.yml
+ yarn validate-config --offline
+ '';
+ installPhase = ''
+ mkdir $out
+ cp -R dist/* $out
+ '';
+
+ nativeBuildInputs = [
+ yarnConfigHook
+ yarnBuildHook
+ nodejs
+ # For yaml parsing
+ yq-go
+ ];
+ doDist = false;
+ meta = {
+ description = "dashy";
+ homepage = "https://dashy.to";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.therealgramdalf ];
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dasm/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dasm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/dasm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dasm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix b/third_party/nixpkgs/pkgs/by-name/da/datafusion-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/datafusion-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/datamash/default.nix b/third_party/nixpkgs/pkgs/by-name/da/datamash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/datamash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/datamash/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/datefmt/default.nix b/third_party/nixpkgs/pkgs/by-name/da/datefmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/datefmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/datefmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix b/third_party/nixpkgs/pkgs/by-name/da/datefudge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/datefudge/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dateutils/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dateutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dateutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dateutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix b/third_party/nixpkgs/pkgs/by-name/da/datree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/datree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/datree/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dav1d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dav1d/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/dave/go-modules.patch b/third_party/nixpkgs/pkgs/by-name/da/dave/go-modules.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/dave/go-modules.patch
rename to third_party/nixpkgs/pkgs/by-name/da/dave/go-modules.patch
diff --git a/third_party/nixpkgs/pkgs/servers/http/dave/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dave/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/dave/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dave/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch b/third_party/nixpkgs/pkgs/by-name/da/davfs2/0001-umount_davfs-substitute-ps-command.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch
rename to third_party/nixpkgs/pkgs/by-name/da/davfs2/0001-umount_davfs-substitute-ps-command.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/third_party/nixpkgs/pkgs/by-name/da/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch
rename to third_party/nixpkgs/pkgs/by-name/da/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/disable-suid.patch b/third_party/nixpkgs/pkgs/by-name/da/davfs2/disable-suid.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/davfs2/disable-suid.patch
rename to third_party/nixpkgs/pkgs/by-name/da/davfs2/disable-suid.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch b/third_party/nixpkgs/pkgs/by-name/da/davfs2/fix-sysconfdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch
rename to third_party/nixpkgs/pkgs/by-name/da/davfs2/fix-sysconfdir.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/third_party/nixpkgs/pkgs/by-name/da/davfs2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/davfs2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/davtest/default.nix b/third_party/nixpkgs/pkgs/by-name/da/davtest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/davtest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/davtest/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/dawn/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dawn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/dawn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dawn/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/dawncut/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dawncut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/dawncut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dawncut/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/dayon/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dayon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/remote/dayon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/da/dayon/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/db-rest/default.nix b/third_party/nixpkgs/pkgs/by-name/db/db-rest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/db-rest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/db-rest/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dbacl/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbacl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dbacl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbacl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbcsr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbcsr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch b/third_party/nixpkgs/pkgs/by-name/db/dbench/fix-missing-stdint.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch
rename to third_party/nixpkgs/pkgs/by-name/db/dbench/fix-missing-stdint.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dbench/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbench/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/dbench/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbench/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dblab/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dblab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/dblab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dblab/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dblatex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dblatex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbmate/package.nix
similarity index 77%
rename from third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbmate/package.nix
index 2d0ca3e768..ef549a3488 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/db/dbmate/package.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dbmate";
- version = "2.21.0";
+ version = "2.22.0";
src = fetchFromGitHub {
owner = "amacneil";
repo = "dbmate";
rev = "refs/tags/v${version}";
- hash = "sha256-RX8ocfXHoo1imjx7SRml6Ao6KjNK7xp43pVmth2zfPc=";
+ hash = "sha256-stemIBwUYW1TsDUBrgQLq858kPBiaHaXaRIr65lnWQo=";
};
- vendorHash = "sha256-lov0Ye+pmI5eyILepN87okZDDA9OPz4cTzK1KluHQuI=";
+ vendorHash = "sha256-xJIY0vaN7gw/EhqeepKQPhaKISXNNPnaAMbowmHSUz4=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/security/dbmonster/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbmonster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dbmonster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbmonster/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/disable-test.patch b/third_party/nixpkgs/pkgs/by-name/db/dbus-broker/disable-test.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/disable-test.patch
rename to third_party/nixpkgs/pkgs/by-name/db/dbus-broker/disable-test.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbus-broker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbus-broker/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/paths.patch b/third_party/nixpkgs/pkgs/by-name/db/dbus-broker/paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/paths.patch
rename to third_party/nixpkgs/pkgs/by-name/db/dbus-broker/paths.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbus-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbus-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dbus-test-runner/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbus-test-runner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dbus-test-runner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbus-test-runner/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbus_cplusplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbus_cplusplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbus_java/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbus_java/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbxml/cxx11.patch b/third_party/nixpkgs/pkgs/by-name/db/dbxml/cxx11.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dbxml/cxx11.patch
rename to third_party/nixpkgs/pkgs/by-name/db/dbxml/cxx11.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbxml/incorrect-optimization.patch b/third_party/nixpkgs/pkgs/by-name/db/dbxml/incorrect-optimization.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dbxml/incorrect-optimization.patch
rename to third_party/nixpkgs/pkgs/by-name/db/dbxml/incorrect-optimization.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbxml/default.nix b/third_party/nixpkgs/pkgs/by-name/db/dbxml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dbxml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/db/dbxml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dcadec/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcadec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dcadec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcadec/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dcap/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dcap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/dcfldd/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcfldd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/dcfldd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcfldd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcgm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcgm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dclib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dclib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dclxvi/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dclxvi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dclxvi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dclxvi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch b/third_party/nixpkgs/pkgs/by-name/dc/dcm2niix/dont-fetch-external-libs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch
rename to third_party/nixpkgs/pkgs/by-name/dc/dcm2niix/dont-fetch-external-libs.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcm2niix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcm2niix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/medicine/dcmtk/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcmtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/medicine/dcmtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcmtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dconf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dconf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcraw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcraw/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcrctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcrctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dcrd/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcrd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/dcrd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcrd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dcrwallet/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcrwallet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/dcrwallet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcrwallet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix b/third_party/nixpkgs/pkgs/by-name/dc/dcs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/dcs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dc/dcs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/dd_rescue/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/dd_rescue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/dd_rescue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/dd_rescue/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddate/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ddate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddate/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddccontrol-db/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddccontrol-db/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddccontrol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddccontrol/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ddclient/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ddclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddcutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddcutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ddd/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/ddd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddev/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ddgr/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddgr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ddgr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddgr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ddh/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ddh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ddns-go/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddns-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ddns-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddns-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddosify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddosify/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddrescue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddrescue/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ddrescueview/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddrescueview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ddrescueview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddrescueview/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ddrutility/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/ddrutility/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ddrutility/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/ddrutility/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix b/third_party/nixpkgs/pkgs/by-name/dd/dduper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dd/dduper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/deadnix/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deadnix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/deadnix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deadnix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deadpixi-sam-unstable/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deadpixi-sam-unstable/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix b/third_party/nixpkgs/pkgs/by-name/de/debian-devscripts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/debian-devscripts/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/debian-goodies/default.nix b/third_party/nixpkgs/pkgs/by-name/de/debian-goodies/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/debian-goodies/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/debian-goodies/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/debootstrap/default.nix b/third_party/nixpkgs/pkgs/by-name/de/debootstrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/debootstrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/debootstrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/debugedit/default.nix b/third_party/nixpkgs/pkgs/by-name/de/debugedit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/debugedit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/debugedit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dec-decode/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dec-decode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dec-decode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dec-decode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/deckmaster/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deckmaster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/deckmaster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deckmaster/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/deco/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/deco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deco/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/decode-spam-headers/default.nix b/third_party/nixpkgs/pkgs/by-name/de/decode-spam-headers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/decode-spam-headers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/decode-spam-headers/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/decoder/default.nix b/third_party/nixpkgs/pkgs/by-name/de/decoder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/decoder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/decoder/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/dedup/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dedup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/dedup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dedup/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/deepgit/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deepgit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/deepgit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deepgit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/deepsea/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deepsea/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/deepsea/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deepsea/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deeptools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deeptools/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-deer/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-deer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deer/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-deer/realpath.patch b/third_party/nixpkgs/pkgs/by-name/de/deer/realpath.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-deer/realpath.patch
rename to third_party/nixpkgs/pkgs/by-name/de/deer/realpath.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/deface/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deface/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/deface/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deface/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/degit/default.nix b/third_party/nixpkgs/pkgs/by-name/de/degit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/degit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/degit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/deheader/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deheader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/deheader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deheader/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/dehydrated/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dehydrated/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/dehydrated/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dehydrated/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/backup/deja-dup/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/de/deja-dup/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/deja-dup/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/de/deja-dup/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deja-dup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deja-dup/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dejagnu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dejagnu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dejsonlz4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dejsonlz4/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/delayarchitect/default.nix b/third_party/nixpkgs/pkgs/by-name/de/delayarchitect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/delayarchitect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/delayarchitect/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/dell-530cdn/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dell-530cdn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/dell-530cdn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dell-530cdn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/dell-command-configure/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dell-command-configure/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/dell-command-configure/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dell-command-configure/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/dell-command-configure/wrapper-lib.c b/third_party/nixpkgs/pkgs/by-name/de/dell-command-configure/wrapper-lib.c
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/dell-command-configure/wrapper-lib.c
rename to third_party/nixpkgs/pkgs/by-name/de/dell-command-configure/wrapper-lib.c
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix b/third_party/nixpkgs/pkgs/by-name/de/delly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/delly/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix b/third_party/nixpkgs/pkgs/by-name/de/delta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/delta/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deltachat-cursed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deltachat-cursed/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix b/third_party/nixpkgs/pkgs/by-name/de/delve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/delve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/delve/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/demoit/default.nix b/third_party/nixpkgs/pkgs/by-name/de/demoit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/demoit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/demoit/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dendrite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dendrite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dendrite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix b/third_party/nixpkgs/pkgs/by-name/de/denemo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/denemo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/deqp-runner/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deqp-runner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/deqp-runner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deqp-runner/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/der-ascii/default.nix b/third_party/nixpkgs/pkgs/by-name/de/der-ascii/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/der-ascii/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/der-ascii/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/deskew/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deskew/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/deskew/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deskew/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/de/desktop-file-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/desktop-file-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/de/desktop-file-utils/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/de/desktop-file-utils/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/desync/default.nix b/third_party/nixpkgs/pkgs/by-name/de/desync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sync/desync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/desync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix b/third_party/nixpkgs/pkgs/by-name/de/detekt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/detekt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/detekt/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/third_party/nixpkgs/pkgs/by-name/de/deterministic-uname/deterministic-uname.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/deterministic-uname/deterministic-uname.sh
rename to third_party/nixpkgs/pkgs/by-name/de/deterministic-uname/deterministic-uname.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/deterministic-uname/default.nix b/third_party/nixpkgs/pkgs/by-name/de/deterministic-uname/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/deterministic-uname/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/deterministic-uname/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix b/third_party/nixpkgs/pkgs/by-name/de/detox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/detox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/detox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/devd/default.nix b/third_party/nixpkgs/pkgs/by-name/de/devd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/devd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/devd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/de/devdocs-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/devdocs-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/devede/default.nix b/third_party/nixpkgs/pkgs/by-name/de/devede/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/devede/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/devede/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix b/third_party/nixpkgs/pkgs/by-name/de/devmem2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/devmem2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/devour/default.nix b/third_party/nixpkgs/pkgs/by-name/de/devour/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/devour/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/devour/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix b/third_party/nixpkgs/pkgs/by-name/de/devspace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/devspace/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/devtodo/default.nix b/third_party/nixpkgs/pkgs/by-name/de/devtodo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/devtodo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/devtodo/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dex/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dex-oidc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dex-oidc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/dex/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/dex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix b/third_party/nixpkgs/pkgs/by-name/de/dex2jar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/de/dex2jar/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/dfc/default.nix b/third_party/nixpkgs/pkgs/by-name/df/dfc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/dfc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/df/dfc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/dfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/df/dfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/dfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/df/dfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/dfrs/default.nix b/third_party/nixpkgs/pkgs/by-name/df/dfrs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/dfrs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/df/dfrs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/fortran-module-dir.patch b/third_party/nixpkgs/pkgs/by-name/df/dftd4/fortran-module-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/fortran-module-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/df/dftd4/fortran-module-dir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/third_party/nixpkgs/pkgs/by-name/df/dftd4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/df/dftd4/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix b/third_party/nixpkgs/pkgs/by-name/df/dfu-programmer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/df/dfu-programmer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix b/third_party/nixpkgs/pkgs/by-name/df/dfu-util/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix
rename to third_party/nixpkgs/pkgs/by-name/df/dfu-util/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dgraph/default.nix b/third_party/nixpkgs/pkgs/by-name/dg/dgraph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dgraph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dg/dgraph/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/third_party/nixpkgs/pkgs/by-name/dh/dhcpcd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dh/dhcpcd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix b/third_party/nixpkgs/pkgs/by-name/dh/dhcpdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dh/dhcpdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcping/default.nix b/third_party/nixpkgs/pkgs/by-name/dh/dhcping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dhcping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dh/dhcping/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/dhewm3/default.nix b/third_party/nixpkgs/pkgs/by-name/dh/dhewm3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/doom-ports/dhewm3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dh/dhewm3/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/dhex/default.nix b/third_party/nixpkgs/pkgs/by-name/dh/dhex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/dhex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dh/dhex/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix b/third_party/nixpkgs/pkgs/by-name/dh/dht/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dh/dht/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/di/default.nix b/third_party/nixpkgs/pkgs/by-name/di/di/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/di/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/di/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dia/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diamond/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diamond/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dico/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dico/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dico/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dico/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dict-cc-py/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dict-cc-py/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dict-cc-py/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dict-cc-py/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/diction/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diction/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/diction/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diction/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch b/third_party/nixpkgs/pkgs/by-name/di/dictu/0001-force-sqlite-to-be-found.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch
rename to third_party/nixpkgs/pkgs/by-name/di/dictu/0001-force-sqlite-to-be-found.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dictu/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dictu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/dictu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dictu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/didu/default.nix b/third_party/nixpkgs/pkgs/by-name/di/didu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/didu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/didu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diebahn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diebahn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dieharder/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dieharder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dieharder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dieharder/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dieharder/stdint.patch b/third_party/nixpkgs/pkgs/by-name/di/dieharder/stdint.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dieharder/stdint.patch
rename to third_party/nixpkgs/pkgs/by-name/di/dieharder/stdint.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diff-so-fancy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diff-so-fancy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoci/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diffoci/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/diffoci/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diffoci/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/diffsitter/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diffsitter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/diffsitter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diffsitter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/diffstat/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diffstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/diffstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diffstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/di/difftastic/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/di/difftastic/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix b/third_party/nixpkgs/pkgs/by-name/di/difftastic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/difftastic/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diffuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diffuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/digiham/default.nix b/third_party/nixpkgs/pkgs/by-name/di/digiham/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/digiham/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/digiham/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix b/third_party/nixpkgs/pkgs/by-name/di/digital/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/digital/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/digitemp/default.nix b/third_party/nixpkgs/pkgs/by-name/di/digitemp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/digitemp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/digitemp/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/dina/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dina-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/dina/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dina-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ding-libs/default.nix b/third_party/nixpkgs/pkgs/by-name/di/ding-libs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ding-libs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/ding-libs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/diopser/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diopser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/diopser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diopser/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dioxus-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dioxus-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dirb/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dirb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dirb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dirb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch b/third_party/nixpkgs/pkgs/by-name/di/dirdiff/dirdiff-2.1-vars.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch
rename to third_party/nixpkgs/pkgs/by-name/di/dirdiff/dirdiff-2.1-vars.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/dirdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dirdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/dirdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dirdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/directfb/default.nix b/third_party/nixpkgs/pkgs/by-name/di/directfb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/directfb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/directfb/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix b/third_party/nixpkgs/pkgs/by-name/di/directvnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/directvnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/directx-headers/default.nix b/third_party/nixpkgs/pkgs/by-name/di/directx-headers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/directx-headers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/directx-headers/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/direvent/default.nix b/third_party/nixpkgs/pkgs/by-name/di/direvent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/direvent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/direvent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dirstalk/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dirstalk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dirstalk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dirstalk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/dirt/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dirt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/dirt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dirt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/dirvish/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dirvish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/dirvish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dirvish/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix b/third_party/nixpkgs/pkgs/by-name/di/discocss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/discocss/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/discord-sh/default.nix b/third_party/nixpkgs/pkgs/by-name/di/discord-sh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/discord-sh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/discord-sh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/discount/fix-configure-path.patch b/third_party/nixpkgs/pkgs/by-name/di/discount/fix-configure-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/discount/fix-configure-path.patch
rename to third_party/nixpkgs/pkgs/by-name/di/discount/fix-configure-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/discount/default.nix b/third_party/nixpkgs/pkgs/by-name/di/discount/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/discount/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/discount/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/mail_receiver/default.nix b/third_party/nixpkgs/pkgs/by-name/di/discourse-mail-receiver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/discourse/mail_receiver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/discourse-mail-receiver/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix b/third_party/nixpkgs/pkgs/by-name/di/disfetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/disfetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/disk-inventory-x/default.nix b/third_party/nixpkgs/pkgs/by-name/di/disk-inventory-x/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/disk-inventory-x/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/disk-inventory-x/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/disk-indicator/default.nix b/third_party/nixpkgs/pkgs/by-name/di/disk_indicator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/disk-indicator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/disk_indicator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diskonaut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diskonaut/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/diskrsync/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diskrsync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/diskrsync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diskrsync/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/diskscan/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diskscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/diskscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diskscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dislocker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dislocker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dismap/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dismap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dismap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dismap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dismember/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dismember/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dismember/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dismember/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix b/third_party/nixpkgs/pkgs/by-name/di/disnixos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/disnixos/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/distgen/default.nix b/third_party/nixpkgs/pkgs/by-name/di/distgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/distgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/distgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix b/third_party/nixpkgs/pkgs/by-name/di/distrobox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/distrobox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/relative-default-icon.patch b/third_party/nixpkgs/pkgs/by-name/di/distrobox/relative-default-icon.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/distrobox/relative-default-icon.patch
rename to third_party/nixpkgs/pkgs/by-name/di/distrobox/relative-default-icon.patch
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/generator.nix b/third_party/nixpkgs/pkgs/by-name/di/distrobuilder/generator.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/generator.nix
rename to third_party/nixpkgs/pkgs/by-name/di/distrobuilder/generator.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch b/third_party/nixpkgs/pkgs/by-name/di/distrobuilder/nixos-generator.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch
rename to third_party/nixpkgs/pkgs/by-name/di/distrobuilder/nixos-generator.patch
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix b/third_party/nixpkgs/pkgs/by-name/di/distrobuilder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/distrobuilder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/diswall/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diswall/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/diswall/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diswall/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/dit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ditaa/default.nix b/third_party/nixpkgs/pkgs/by-name/di/ditaa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/ditaa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/ditaa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dive/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diylc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/diylc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch b/third_party/nixpkgs/pkgs/by-name/dj/djbdns/fix-nix-usernamespace-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch
rename to third_party/nixpkgs/pkgs/by-name/dj/djbdns/fix-nix-usernamespace-build.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/djbdns/hier.patch b/third_party/nixpkgs/pkgs/by-name/dj/djbdns/hier.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/djbdns/hier.patch
rename to third_party/nixpkgs/pkgs/by-name/dj/djbdns/hier.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/djbdns/default.nix b/third_party/nixpkgs/pkgs/by-name/dj/djbdns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/djbdns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dj/djbdns/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/djbdns/softlimit.patch b/third_party/nixpkgs/pkgs/by-name/dj/djbdns/softlimit.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/djbdns/softlimit.patch
rename to third_party/nixpkgs/pkgs/by-name/dj/djbdns/softlimit.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/djenrandom/default.nix b/third_party/nixpkgs/pkgs/by-name/dj/djenrandom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/djenrandom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dj/djenrandom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/djlint/default.nix b/third_party/nixpkgs/pkgs/by-name/dj/djlint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/djlint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dj/djlint/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/djmount/default.nix b/third_party/nixpkgs/pkgs/by-name/dj/djmount/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/djmount/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dj/djmount/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/djot-js/default.nix b/third_party/nixpkgs/pkgs/by-name/dj/djot-js/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/djot-js/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dj/djot-js/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/djv/default.nix b/third_party/nixpkgs/pkgs/by-name/dj/djv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/djv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dj/djv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix b/third_party/nixpkgs/pkgs/by-name/dj/djvu2pdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dj/djvu2pdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch b/third_party/nixpkgs/pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
rename to third_party/nixpkgs/pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/c++17-register-class.patch b/third_party/nixpkgs/pkgs/by-name/dj/djvulibre/c++17-register-class.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/djvulibre/c++17-register-class.patch
rename to third_party/nixpkgs/pkgs/by-name/dj/djvulibre/c++17-register-class.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/default.nix b/third_party/nixpkgs/pkgs/by-name/dj/djvulibre/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/djvulibre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dj/djvulibre/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dk/default.nix b/third_party/nixpkgs/pkgs/by-name/dk/dk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/dk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dk/dk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/dkh/default.nix b/third_party/nixpkgs/pkgs/by-name/dk/dkh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/dkh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dk/dkh/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/dk/dkimproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dk/dkimproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix b/third_party/nixpkgs/pkgs/by-name/dl/dl-librescore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dl/dl-librescore/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/third_party/nixpkgs/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/third_party/nixpkgs/pkgs/by-name/dl/dleyna-connector-dbus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dl/dleyna-connector-dbus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix b/third_party/nixpkgs/pkgs/by-name/dl/dleyna-core/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dl/dleyna-core/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dleyna-core/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/dl/dleyna-core/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dleyna-core/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/dl/dleyna-core/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix b/third_party/nixpkgs/pkgs/by-name/dl/dleyna-renderer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dl/dleyna-renderer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix b/third_party/nixpkgs/pkgs/by-name/dl/dleyna-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dl/dleyna-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix b/third_party/nixpkgs/pkgs/by-name/dl/dlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dl/dlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dlx/default.nix b/third_party/nixpkgs/pkgs/by-name/dl/dlx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/dlx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dl/dlx/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/dm-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/dm/dm-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/dm-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dm/dm-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/third_party/nixpkgs/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dmg2img/default.nix b/third_party/nixpkgs/pkgs/by-name/dm/dmg2img/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dmg2img/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dm/dmg2img/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix b/third_party/nixpkgs/pkgs/by-name/dm/dmidecode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dm/dmidecode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix b/third_party/nixpkgs/pkgs/by-name/dm/dmrconfig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dm/dmrconfig/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch b/third_party/nixpkgs/pkgs/by-name/dm/dmtcp/ld-linux-so-buffer-size.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch
rename to third_party/nixpkgs/pkgs/by-name/dm/dmtcp/ld-linux-so-buffer-size.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix b/third_party/nixpkgs/pkgs/by-name/dm/dmtcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dm/dmtcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/dnadd/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnadd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/dnadd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnadd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dnd-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnd-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dnd-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnd-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/dnf5/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnf5/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/dnf5/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnf5/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dnglab/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnglab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/dnglab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnglab/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/dns-root-data/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dns-root-data/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/dns-root-data/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dns-root-data/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/dns-root-data/root.ds b/third_party/nixpkgs/pkgs/by-name/dn/dns-root-data/root.ds
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/dns-root-data/root.ds
rename to third_party/nixpkgs/pkgs/by-name/dn/dns-root-data/root.ds
diff --git a/third_party/nixpkgs/pkgs/data/misc/dns-root-data/root.key b/third_party/nixpkgs/pkgs/by-name/dn/dns-root-data/root.key
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/dns-root-data/root.key
rename to third_party/nixpkgs/pkgs/by-name/dn/dns-root-data/root.key
diff --git a/third_party/nixpkgs/pkgs/data/misc/dns-root-data/update-root-key.sh b/third_party/nixpkgs/pkgs/by-name/dn/dns-root-data/update-root-key.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/dns-root-data/update-root-key.sh
rename to third_party/nixpkgs/pkgs/by-name/dn/dns-root-data/update-root-key.sh
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnscontrol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnscontrol/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnscrypt-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnscrypt-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/disable-network-tests.patch b/third_party/nixpkgs/pkgs/by-name/dn/dnsdist/disable-network-tests.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/dnsdist/disable-network-tests.patch
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsdist/disable-network-tests.patch
diff --git a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsdist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsdist/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dnsenum/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsenum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dnsenum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsenum/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsmasq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsmasq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmon-go/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsmon-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dnsmon-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsmon-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsmonster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsmonster/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsname-cni/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsname-cni/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dnspeep/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/dn/dnspeep/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dnspeep/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/dn/dnspeep/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/security/dnspeep/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnspeep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dnspeep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnspeep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsperf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsperf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsrecon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsrecon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstake/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnstake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dnstake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnstake/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstop/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnstop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dnstop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnstop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnstwist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnstwist/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix b/third_party/nixpkgs/pkgs/by-name/dn/dnsx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dn/dnsx/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/do/do-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/do-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/doas-sudo-shim/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doas-sudo-shim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/doas-sudo-shim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doas-sudo-shim/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch b/third_party/nixpkgs/pkgs/by-name/do/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch
rename to third_party/nixpkgs/pkgs/by-name/do/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/doas/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/doas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doas/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/doc2go/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doc2go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/doc2go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doc2go/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docbook2mdoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docbook2mdoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docbook2odf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docbook2odf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch b/third_party/nixpkgs/pkgs/by-name/do/docbook2x/db2x_texixml-to-stdout.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch
rename to third_party/nixpkgs/pkgs/by-name/do/docbook2x/db2x_texixml-to-stdout.patch
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docbook2x/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docbook2x/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docbook5/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docbook5/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat b/third_party/nixpkgs/pkgs/by-name/do/docbook_xml_ebnf_dtd/docbook-ebnf.cat
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat
rename to third_party/nixpkgs/pkgs/by-name/do/docbook_xml_ebnf_dtd/docbook-ebnf.cat
diff --git a/third_party/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docbook_xml_ebnf_dtd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docbook_xml_ebnf_dtd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dockbarx/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dockbarx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dockbarx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dockbarx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docker-compose-language-service/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docker-compose-language-service/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docker-credential-helpers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docker-credential-helpers/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docker-ls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docker-ls/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docker-slim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docker-slim/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dockfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dockfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dockfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dockfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dockle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dockle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dockle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/dockstarter/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dockstarter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/dockstarter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dockstarter/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/dockutil/generated/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dockutil/generated/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/dockutil/generated/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dockutil/generated/default.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/dockutil/generated/workspace-state.json b/third_party/nixpkgs/pkgs/by-name/do/dockutil/generated/workspace-state.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/dockutil/generated/workspace-state.json
rename to third_party/nixpkgs/pkgs/by-name/do/dockutil/generated/workspace-state.json
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/dockutil/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dockutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/dockutil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dockutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doclifter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doclifter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docopt_cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docopt_cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doctest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doctest/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/doctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/docui/default.nix b/third_party/nixpkgs/pkgs/by-name/do/docui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/docui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/docui/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/documenso/default.nix b/third_party/nixpkgs/pkgs/by-name/do/documenso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/documenso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/documenso/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/documize-community/default.nix b/third_party/nixpkgs/pkgs/by-name/do/documize-community/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/documize-community/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/documize-community/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/dog/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/dog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/doitlive/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doitlive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/doitlive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doitlive/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dokuwiki/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/dokuwiki/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dokuwiki/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dolbybcsoftwaredecode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dolbybcsoftwaredecode/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dolibarr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dolibarr/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dolt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dolt/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/domination/default.nix b/third_party/nixpkgs/pkgs/by-name/do/domination/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/domination/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/domination/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/domine/default.nix b/third_party/nixpkgs/pkgs/by-name/do/domine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/domine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/domine/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/domine/pubspec.lock.json b/third_party/nixpkgs/pkgs/by-name/do/domine/pubspec.lock.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/domine/pubspec.lock.json
rename to third_party/nixpkgs/pkgs/by-name/do/domine/pubspec.lock.json
diff --git a/third_party/nixpkgs/pkgs/servers/domoticz/default.nix b/third_party/nixpkgs/pkgs/by-name/do/domoticz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/domoticz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/domoticz/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/done/default.nix b/third_party/nixpkgs/pkgs/by-name/do/done/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/done/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/done/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/donkey/default.nix b/third_party/nixpkgs/pkgs/by-name/do/donkey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/donkey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/donkey/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dontgo403/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dontgo403/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doodle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/search/doodle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doodle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/dool/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/dool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/doona/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doona/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/doona/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doona/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/doq/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/doq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dorkscout/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dorkscout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dorkscout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dorkscout/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/dos2unix/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dos2unix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/dos2unix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dos2unix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/dosage/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dosage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/dosage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dosage/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/dosemu-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dosemu_fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/dosemu-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dosemu_fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dosfstools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dosfstools/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/dosis/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dosis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/dosis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dosis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/dot-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dot-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/dot-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dot-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dotacat/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dotacat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dotacat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dotacat/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/dotcolon-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dotcolon-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/dotcolon-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dotcolon-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dotconf/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dotconf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dotconf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dotconf/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/do/dotenvx/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dotenvx/package.nix
index 2871a5f52b..3c71830afe 100644
--- a/third_party/nixpkgs/pkgs/by-name/do/dotenvx/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/do/dotenvx/package.nix
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "dotenvx";
- version = "1.14.2";
+ version = "1.22.0";
src = fetchFromGitHub {
owner = "dotenvx";
repo = "dotenvx";
rev = "refs/tags/v${version}";
- hash = "sha256-SlZ18ToGbC+c5ffuYFGeOy30w90ukBO0qKxD+HNVt3E=";
+ hash = "sha256-i6181Ot40t2IlAGpj0pES9nPFB1dZrcypgs4qLQ05hE=";
};
- npmDepsHash = "sha256-KaqSCtraMmQHe7Tcs/2CVaQcmazgHkV5K4T64lHEVP4=";
+ npmDepsHash = "sha256-wo+Gtq2gdcIWY0yDzf5vrxEHfFzMfpgIjG+/MBdvz1U=";
dontNpmBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dotfiles/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dotfiles/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dotfiles/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dotfiles/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/create-pkg-config-for-dll.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh
rename to third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/create-pkg-config-for-dll.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh b/third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/patch-fsharp-targets.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh
rename to third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/patch-fsharp-targets.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh b/third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/placate-nuget.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh
rename to third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/placate-nuget.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh b/third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/placate-paket.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh
rename to third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/placate-paket.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh b/third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/remove-duplicated-dlls.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh
rename to third_party/nixpkgs/pkgs/by-name/do/dotnetbuildhelpers/remove-duplicated-dlls.sh
diff --git a/third_party/nixpkgs/pkgs/tools/dotool/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/do/dotool/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/dotool/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/do/dotool/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/dotool/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dotool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/dotool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dotool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/double-conversion/default.nix b/third_party/nixpkgs/pkgs/by-name/do/double-conversion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/double-conversion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/double-conversion/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doulos-sil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/doulos-sil/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dovecot_fts_xapian/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dovecot_fts_xapian/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dovecot_pigeonhole/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dovecot_pigeonhole/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dozenal/lua-header.patch b/third_party/nixpkgs/pkgs/by-name/do/dozenal/lua-header.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dozenal/lua-header.patch
rename to third_party/nixpkgs/pkgs/by-name/do/dozenal/lua-header.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dozenal/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dozenal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dozenal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/do/dozenal/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix b/third_party/nixpkgs/pkgs/by-name/dp/dpdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dp/dpdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dpic/default.nix b/third_party/nixpkgs/pkgs/by-name/dp/dpic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/dpic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dp/dpic/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/third_party/nixpkgs/pkgs/by-name/dp/dpkg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/dpkg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dp/dpkg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/dpkg/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/dp/dpkg/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/dpkg/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/dp/dpkg/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix b/third_party/nixpkgs/pkgs/by-name/dp/dpt-rp1-py/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dp/dpt-rp1-py/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/third_party/nixpkgs/pkgs/by-name/dq/dqlite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dq/dqlite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/dr14_tmeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/dr14_tmeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/dra-cla/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/dra-cla/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/dra-cla/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/dra-cla/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/dracula-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/dracula-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/dracula-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/dracula-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/dracula-qt5-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/dracula-qt5-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/dracula-qt5-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/dracula-qt5-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/dracula-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/dracula-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/dracula-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/dracula-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/dracut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/dracut/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/dragonfly-reverb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/dragonfly-reverb/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/dragonflydb/fixes.patch b/third_party/nixpkgs/pkgs/by-name/dr/dragonflydb/fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/dragonflydb/fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/dr/dragonflydb/fixes.patch
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/dragonflydb/glog.patch b/third_party/nixpkgs/pkgs/by-name/dr/dragonflydb/glog.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/dragonflydb/glog.patch
rename to third_party/nixpkgs/pkgs/by-name/dr/dragonflydb/glog.patch
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/dragonflydb/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/dragonflydb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/dragonflydb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/dragonflydb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drat-trim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drat-trim/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drawing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drawing/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/driftctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/driftctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/driftnet/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/driftnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/driftnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/driftnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/drip/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/drip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drip/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/drive/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/drive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drive/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drm_info/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drm_info/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/drogon/fix_find_package.patch b/third_party/nixpkgs/pkgs/by-name/dr/drogon/fix_find_package.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/drogon/fix_find_package.patch
rename to third_party/nixpkgs/pkgs/by-name/dr/drogon/fix_find_package.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drogon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drogon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/droidcam/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/droidcam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/droidcam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/droidcam/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/droidmote/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/droidmote/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/droidmote/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/droidmote/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch b/third_party/nixpkgs/pkgs/by-name/dr/drone-cli/0001-use-builtin-go-syscerts.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch
rename to third_party/nixpkgs/pkgs/by-name/dr/drone-cli/0001-use-builtin-go-syscerts.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drone-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drone-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drone-runner-docker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drone-runner-docker/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drone-runner-exec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drone-runner-exec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drone-runner-ssh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drone-runner-ssh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/dropbear/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/dropbear/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dropbear/pass-path.patch b/third_party/nixpkgs/pkgs/by-name/dr/dropbear/pass-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dropbear/pass-path.patch
rename to third_party/nixpkgs/pkgs/by-name/dr/dropbear/pass-path.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/dropwatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/dropwatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix b/third_party/nixpkgs/pkgs/by-name/dr/drumgizmo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dr/drumgizmo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dsdcc/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dsdcc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dsdcc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dsdcc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/dsf2flac/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dsf2flac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/dsf2flac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dsf2flac/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dsniff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dsniff/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/dspam/mariadb.patch b/third_party/nixpkgs/pkgs/by-name/ds/dspam/mariadb.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/dspam/mariadb.patch
rename to third_party/nixpkgs/pkgs/by-name/ds/dspam/mariadb.patch
diff --git a/third_party/nixpkgs/pkgs/servers/mail/dspam/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dspam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/dspam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dspam/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dsq/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dsq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dsq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dsq/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dsseries/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dsseries/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dssi/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dssi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dssi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dssi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dssp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dssp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dstask/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dstask/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dstat/fix_pluginpath.patch b/third_party/nixpkgs/pkgs/by-name/ds/dstat/fix_pluginpath.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dstat/fix_pluginpath.patch
rename to third_party/nixpkgs/pkgs/by-name/ds/dstat/fix_pluginpath.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dstp/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dstp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dstp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dstp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dsvpn/default.nix b/third_party/nixpkgs/pkgs/by-name/ds/dsvpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/dsvpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ds/dsvpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix b/third_party/nixpkgs/pkgs/by-name/dt/dt-schema/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dt/dt-schema/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/dt/default.nix b/third_party/nixpkgs/pkgs/by-name/dt/dt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/dt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dt/dt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dtach/default.nix b/third_party/nixpkgs/pkgs/by-name/dt/dtach/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dtach/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dt/dtach/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix b/third_party/nixpkgs/pkgs/by-name/dt/dtc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dt/dtc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/dterm/default.nix b/third_party/nixpkgs/pkgs/by-name/dt/dterm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/dterm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dt/dterm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dtool/default.nix b/third_party/nixpkgs/pkgs/by-name/dt/dtool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dtool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dt/dtool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dtool/rustc-serialize-fix.patch b/third_party/nixpkgs/pkgs/by-name/dt/dtool/rustc-serialize-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dtool/rustc-serialize-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/dt/dtool/rustc-serialize-fix.patch
diff --git a/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix b/third_party/nixpkgs/pkgs/by-name/dt/dtrx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dt/dtrx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix b/third_party/nixpkgs/pkgs/by-name/du/duc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/duc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/duc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/duckling-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/du/duckling-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/duckling-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/duckling-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix b/third_party/nixpkgs/pkgs/by-name/du/duf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/duf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/duf/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/dufs/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dufs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/dufs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dufs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/duktape/duktape.pc.in b/third_party/nixpkgs/pkgs/by-name/du/duktape/duktape.pc.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/duktape/duktape.pc.in
rename to third_party/nixpkgs/pkgs/by-name/du/duktape/duktape.pc.in
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix b/third_party/nixpkgs/pkgs/by-name/du/duktape/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/duktape/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dum/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dum/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dumb-init/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dumb-init/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/dumb/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dumb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/dumb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dumb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/dump/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/dump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dump/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/dump1090/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dump1090/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/dump1090/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dump1090/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/dumpasn1/configpath.patch b/third_party/nixpkgs/pkgs/by-name/du/dumpasn1/configpath.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dumpasn1/configpath.patch
rename to third_party/nixpkgs/pkgs/by-name/du/dumpasn1/configpath.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/dumpasn1/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dumpasn1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/dumpasn1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dumpasn1/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/dumpnar/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dumpnar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/dumpnar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dumpnar/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dumptorrent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dumptorrent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/duo-unix/default.nix b/third_party/nixpkgs/pkgs/by-name/du/duo-unix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/duo-unix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/duo-unix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dupd/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dupd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dupd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dupd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dupe-krill/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dupe-krill/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/dupe-krill/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dupe-krill/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix b/third_party/nixpkgs/pkgs/by-name/du/duperemove/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/duperemove/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/keep-pythonpath-in-testing.patch b/third_party/nixpkgs/pkgs/by-name/du/duplicity/keep-pythonpath-in-testing.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/duplicity/keep-pythonpath-in-testing.patch
rename to third_party/nixpkgs/pkgs/by-name/du/duplicity/keep-pythonpath-in-testing.patch
diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/by-name/du/duplicity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/duplicity/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/duply/default.nix b/third_party/nixpkgs/pkgs/by-name/du/duply/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/duply/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/duply/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dutree/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dutree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dutree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/du/dutree/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix b/third_party/nixpkgs/pkgs/by-name/dv/dvd-slideshow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dv/dvd-slideshow/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix b/third_party/nixpkgs/pkgs/by-name/dv/dvd-vr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dv/dvd-vr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/dvdauthor/default.nix b/third_party/nixpkgs/pkgs/by-name/dv/dvdauthor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/dvdauthor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dv/dvdauthor/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/dvdbackup/default.nix b/third_party/nixpkgs/pkgs/by-name/dv/dvdbackup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/dvdbackup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dv/dvdbackup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch b/third_party/nixpkgs/pkgs/by-name/dv/dvdisaster/dvdrom.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch
rename to third_party/nixpkgs/pkgs/by-name/dv/dvdisaster/dvdrom.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/encryption.patch b/third_party/nixpkgs/pkgs/by-name/dv/dvdisaster/encryption.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
rename to third_party/nixpkgs/pkgs/by-name/dv/dvdisaster/encryption.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix b/third_party/nixpkgs/pkgs/by-name/dv/dvdisaster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dv/dvdisaster/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch b/third_party/nixpkgs/pkgs/by-name/dv/dvdplusrwtools/darwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch
rename to third_party/nixpkgs/pkgs/by-name/dv/dvdplusrwtools/darwin.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/dv/dvdplusrwtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dv/dvdplusrwtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/dvgrab/default.nix b/third_party/nixpkgs/pkgs/by-name/dv/dvgrab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/dvgrab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dv/dvgrab/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dwarf2json/default.nix b/third_party/nixpkgs/pkgs/by-name/dw/dwarf2json/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dwarf2json/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dw/dwarf2json/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix b/third_party/nixpkgs/pkgs/by-name/dw/dwarfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dw/dwarfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dwdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/dw/dwdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dwdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dw/dwdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dwmbar/default.nix b/third_party/nixpkgs/pkgs/by-name/dw/dwmbar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dwmbar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dw/dwmbar/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dwmblocks/default.nix b/third_party/nixpkgs/pkgs/by-name/dw/dwmblocks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/dwmblocks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dw/dwmblocks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix b/third_party/nixpkgs/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dwz/default.nix b/third_party/nixpkgs/pkgs/by-name/dw/dwz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/dwz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dw/dwz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix b/third_party/nixpkgs/pkgs/by-name/dy/dydisnix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dy/dydisnix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix b/third_party/nixpkgs/pkgs/by-name/dy/dyff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/dyff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dy/dyff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dynamic-colors/default.nix b/third_party/nixpkgs/pkgs/by-name/dy/dynamic-colors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/dynamic-colors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dy/dynamic-colors/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dynamic-wallpaper/default.nix b/third_party/nixpkgs/pkgs/by-name/dy/dynamic-wallpaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/dynamic-wallpaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dy/dynamic-wallpaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dyncall/default.nix b/third_party/nixpkgs/pkgs/by-name/dy/dyncall/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/dyncall/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dy/dyncall/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/third_party/nixpkgs/pkgs/by-name/dy/dyndnsc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dy/dyndnsc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dysk/default.nix b/third_party/nixpkgs/pkgs/by-name/dy/dysk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/dysk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dy/dysk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dzen2/default.nix b/third_party/nixpkgs/pkgs/by-name/dz/dzen2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/dzen2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/dz/dzen2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/e16/default.nix b/third_party/nixpkgs/pkgs/by-name/e1/e16/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/e16/default.nix
rename to third_party/nixpkgs/pkgs/by-name/e1/e16/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/e17gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/e1/e17gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/e17gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/e1/e17gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/third_party/nixpkgs/pkgs/by-name/e2/e2fsprogs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/e2/e2fsprogs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix b/third_party/nixpkgs/pkgs/by-name/e2/e2tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/e2/e2tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ea/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/ea/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ea/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/ea/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/each/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/each/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/each/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/each/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/eaglemode/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/eaglemode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/eaglemode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/eaglemode/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/earlybird/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/earlybird/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/earlybird/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/earlybird/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/eartag/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/eartag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/eartag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/eartag/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/earthly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/earthly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/earthly/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/easeprobe/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/easeprobe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/easeprobe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/easeprobe/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/easyjson/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/easyjson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/easyjson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/easyjson/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/easyloggingpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/easyloggingpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/easypdkprog/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/easypdkprog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/easypdkprog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/easypdkprog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/easyrsa/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/easyrsa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/easyrsa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/easyrsa/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/easysnap/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/easysnap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/easysnap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/easysnap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/easytag/default.nix b/third_party/nixpkgs/pkgs/by-name/ea/easytag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/easytag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ea/easytag/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/eb-garamond/default.nix b/third_party/nixpkgs/pkgs/by-name/eb/eb-garamond/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/eb-garamond/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eb/eb-garamond/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix b/third_party/nixpkgs/pkgs/by-name/eb/ebook2cw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eb/ebook2cw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/ebook-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/eb/ebook_tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/ebook-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eb/ebook_tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ebtables/default.nix b/third_party/nixpkgs/pkgs/by-name/eb/ebtables/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ebtables/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eb/ebtables/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ebumeter/default.nix b/third_party/nixpkgs/pkgs/by-name/eb/ebumeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ebumeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eb/ebumeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ebusd/default.nix b/third_party/nixpkgs/pkgs/by-name/eb/ebusd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ebusd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eb/ebusd/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ebusd/patches/ebusd-cmake.patch b/third_party/nixpkgs/pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ebusd/patches/ebusd-cmake.patch
rename to third_party/nixpkgs/pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ec2-ami-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ec2-ami-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/writable.patch b/third_party/nixpkgs/pkgs/by-name/ec/ec2-ami-tools/writable.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/writable.patch
rename to third_party/nixpkgs/pkgs/by-name/ec/ec2-ami-tools/writable.patch
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ec2-api-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ec2-api-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ec2-metadata-mock/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ec2-metadata-mock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ec2-metadata-mock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ec2-metadata-mock/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ec2stepshell/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ec2stepshell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ec2stepshell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ec2stepshell/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ecasound/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecasound/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ecasound/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ecasound/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ecdsatool/ctype-header-c99-implicit-function-declaration.patch b/third_party/nixpkgs/pkgs/by-name/ec/ecdsatool/ctype-header-c99-implicit-function-declaration.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ecdsatool/ctype-header-c99-implicit-function-declaration.patch
rename to third_party/nixpkgs/pkgs/by-name/ec/ecdsatool/ctype-header-c99-implicit-function-declaration.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/ecdsatool/openssl-header-c99-implicit-function-declaration.patch b/third_party/nixpkgs/pkgs/by-name/ec/ecdsatool/openssl-header-c99-implicit-function-declaration.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ecdsatool/openssl-header-c99-implicit-function-declaration.patch
rename to third_party/nixpkgs/pkgs/by-name/ec/ecdsatool/openssl-header-c99-implicit-function-declaration.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/ecdsatool/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecdsatool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ecdsatool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ecdsatool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecdsautils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ecdsautils/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/echoip/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/echoip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/echoip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/echoip/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/eclair/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/eclair/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/eclair/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/eclair/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/eclib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/eclib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/eclipse-mat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/eclipse-mat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ecm/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/ecm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ecm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/ecopcr/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecopcr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/ecopcr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ecopcr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ecos/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecs-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ecs-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/ecwolf/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecwolf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/ecwolf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ec/ecwolf/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/edac-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edac-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/edac-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edac-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edgetpu-compiler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edgetpu-compiler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/edid-decode/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edid-decode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/edid-decode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edid-decode/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/edid-generator/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edid-generator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/edid-generator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edid-generator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/edir/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/edir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edir/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/editline/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/editline/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/editline/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/editline/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/editorconfig-checker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/editorconfig-checker/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/editorconfig-core-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/editorconfig-core-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/editres/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/editres/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/editres/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/editres/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/edk2-uefi-shell/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edk2-uefi-shell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/edk2-uefi-shell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edk2-uefi-shell/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/edl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/edlib/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/edlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/edukai/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edukai/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/edukai/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edukai/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/eduli/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/eduli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/eduli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/eduli/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/edusong/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edusong/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/edusong/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edusong/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/edwin/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edwin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/edwin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edwin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/edwood/default.nix b/third_party/nixpkgs/pkgs/by-name/ed/edwood/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/edwood/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ed/edwood/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix b/third_party/nixpkgs/pkgs/by-name/ef/eff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ef/eff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/efficient-compression-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/ef/efficient-compression-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/efficient-compression-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ef/efficient-compression-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch b/third_party/nixpkgs/pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch
rename to third_party/nixpkgs/pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix b/third_party/nixpkgs/pkgs/by-name/ef/effitask/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ef/effitask/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/efitools/aarch64.patch b/third_party/nixpkgs/pkgs/by-name/ef/efitools/aarch64.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/efitools/aarch64.patch
rename to third_party/nixpkgs/pkgs/by-name/ef/efitools/aarch64.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/efitools/default.nix b/third_party/nixpkgs/pkgs/by-name/ef/efitools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/efitools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ef/efitools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/efivar/default.nix b/third_party/nixpkgs/pkgs/by-name/ef/efivar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/efivar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ef/efivar/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix b/third_party/nixpkgs/pkgs/by-name/ef/efm-langserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ef/efm-langserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix b/third_party/nixpkgs/pkgs/by-name/ef/efont-unicode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ef/efont-unicode/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/eget/default.nix b/third_party/nixpkgs/pkgs/by-name/eg/eget/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/eget/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eg/eget/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix b/third_party/nixpkgs/pkgs/by-name/eg/eggdbus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/eggdbus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eg/eggdbus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix b/third_party/nixpkgs/pkgs/by-name/eg/eggdrop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eg/eggdrop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/egglog/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/eg/egglog/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/egglog/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/eg/egglog/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/egglog/default.nix b/third_party/nixpkgs/pkgs/by-name/eg/egglog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/egglog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eg/egglog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix b/third_party/nixpkgs/pkgs/by-name/eg/eggnog-mapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eg/eggnog-mapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix b/third_party/nixpkgs/pkgs/by-name/eg/egl-wayland/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eg/egl-wayland/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/eglexternalplatform/default.nix b/third_party/nixpkgs/pkgs/by-name/eg/eglexternalplatform/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/eglexternalplatform/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eg/eglexternalplatform/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ego/default.nix b/third_party/nixpkgs/pkgs/by-name/eg/ego/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ego/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eg/ego/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/egoboo/default.nix b/third_party/nixpkgs/pkgs/by-name/eg/egoboo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/egoboo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eg/egoboo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix b/third_party/nixpkgs/pkgs/by-name/eg/egypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eg/egypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/eiciel/default.nix b/third_party/nixpkgs/pkgs/by-name/ei/eiciel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/eiciel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ei/eiciel/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/eidolon/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ei/eidolon/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/eidolon/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ei/eidolon/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/games/eidolon/default.nix b/third_party/nixpkgs/pkgs/by-name/ei/eidolon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/eidolon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ei/eidolon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix b/third_party/nixpkgs/pkgs/by-name/ei/eigenmath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ei/eigenmath/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ejson/default.nix b/third_party/nixpkgs/pkgs/by-name/ej/ejson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ejson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ej/ejson/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/ejson2env/default.nix b/third_party/nixpkgs/pkgs/by-name/ej/ejson2env/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/ejson2env/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ej/ejson2env/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/ejson2env/test-decryption.nix b/third_party/nixpkgs/pkgs/by-name/ej/ejson2env/test-decryption.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/ejson2env/test-decryption.nix
rename to third_party/nixpkgs/pkgs/by-name/ej/ejson2env/test-decryption.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/ekam/default.nix b/third_party/nixpkgs/pkgs/by-name/ek/ekam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/ekam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ek/ekam/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/third_party/nixpkgs/pkgs/by-name/el/elan/0001-dynamically-patchelf-binaries.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch
rename to third_party/nixpkgs/pkgs/by-name/el/elan/0001-dynamically-patchelf-binaries.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elan/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/elastic/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elastic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/elastic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elastic/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/third_party/nixpkgs/pkgs/by-name/el/electricsheep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/electricsheep/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/electron-fiddle/default.nix b/third_party/nixpkgs/pkgs/by-name/el/electron-fiddle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/electron-fiddle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/electron-fiddle/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/third_party/nixpkgs/pkgs/by-name/el/electron-mail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/electron-mail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/electron-mail/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/element/default.nix b/third_party/nixpkgs/pkgs/by-name/el/element/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/element/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/element/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/elf-header/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elf-header-real/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/elf-header/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elf-header-real/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/elfcat/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elfcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/elfcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elfcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elfinfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elfinfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/elfio/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elfio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/elfio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elfio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elfkickers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elfkickers/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch b/third_party/nixpkgs/pkgs/by-name/el/elfutils/cxx-header-collision.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch
rename to third_party/nixpkgs/pkgs/by-name/el/elfutils/cxx-header-collision.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch b/third_party/nixpkgs/pkgs/by-name/el/elfutils/debug-info-from-env.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch
rename to third_party/nixpkgs/pkgs/by-name/el/elfutils/debug-info-from-env.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/musl-error_h.patch b/third_party/nixpkgs/pkgs/by-name/el/elfutils/musl-error_h.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/elfutils/musl-error_h.patch
rename to third_party/nixpkgs/pkgs/by-name/el/elfutils/musl-error_h.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elfutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elfutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/elfx86exts/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elfx86exts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/elfx86exts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elfx86exts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/eli/default.nix b/third_party/nixpkgs/pkgs/by-name/el/eli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/eli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/eli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/eliot-tree/default.nix b/third_party/nixpkgs/pkgs/by-name/el/eliot-tree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/eliot-tree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/eliot-tree/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/elkhound/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elkhound/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/elkhound/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elkhound/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/by-name/el/ell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/ell/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elliptic_curves/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elliptic_curves/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elmerfem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elmerfem/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/elogind/Add-missing-musl_missing.h-includes-for-basename.patch b/third_party/nixpkgs/pkgs/by-name/el/elogind/Add-missing-musl_missing.h-includes-for-basename.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/elogind/Add-missing-musl_missing.h-includes-for-basename.patch
rename to third_party/nixpkgs/pkgs/by-name/el/elogind/Add-missing-musl_missing.h-includes-for-basename.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch b/third_party/nixpkgs/pkgs/by-name/el/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
rename to third_party/nixpkgs/pkgs/by-name/el/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elogind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elogind/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix b/third_party/nixpkgs/pkgs/by-name/el/elpa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/elpa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/elpa/pkg-config.patch b/third_party/nixpkgs/pkgs/by-name/el/elpa/pkg-config.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/elpa/pkg-config.patch
rename to third_party/nixpkgs/pkgs/by-name/el/elpa/pkg-config.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/eltclsh/default.nix b/third_party/nixpkgs/pkgs/by-name/el/eltclsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/eltclsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/el/eltclsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emacs-all-the-icons-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emacs-all-the-icons-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/email/default.nix b/third_party/nixpkgs/pkgs/by-name/em/email/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/email/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/email/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emblem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emblem/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/emboss/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emboss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/emboss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emboss/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/emem/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/emem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emem/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/emma/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emma/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/emma/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emma/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/emmet-language-server/package-lock.json b/third_party/nixpkgs/pkgs/by-name/em/emmet-language-server/package-lock.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/emmet-language-server/package-lock.json
rename to third_party/nixpkgs/pkgs/by-name/em/emmet-language-server/package-lock.json
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/emmet-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emmet-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/emmet-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emmet-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/emmet-ls/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emmet-ls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/emmet-ls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emmet-ls/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/emoji-picker/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emoji-picker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/emoji-picker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emoji-picker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/emoji-picker/xsys.patch b/third_party/nixpkgs/pkgs/by-name/em/emoji-picker/xsys.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/emoji-picker/xsys.patch
rename to third_party/nixpkgs/pkgs/by-name/em/emoji-picker/xsys.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/emojipick/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emojipick/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/emojipick/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emojipick/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/emptty/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emptty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/display-managers/emptty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emptty/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/empty/0.6-Makefile.patch b/third_party/nixpkgs/pkgs/by-name/em/empty/0.6-Makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/empty/0.6-Makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/em/empty/0.6-Makefile.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/empty/default.nix b/third_party/nixpkgs/pkgs/by-name/em/empty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/empty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/empty/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emuflight-configurator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/robotics/emuflight-configurator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emuflight-configurator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emulsion-palette/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emulsion-palette/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/emulsion-palette/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emulsion-palette/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/emv/default.nix b/third_party/nixpkgs/pkgs/by-name/em/emv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/emv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/em/emv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enblend-enfuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enblend-enfuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/enc/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/enc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/enca/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enca/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/enca/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enca/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/enchive/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enchive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/enchive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enchive/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/encode-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/en/encode-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/encode-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/encode-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/encpipe/default.nix b/third_party/nixpkgs/pkgs/by-name/en/encpipe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/encpipe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/encpipe/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/endeavour/default.nix b/third_party/nixpkgs/pkgs/by-name/en/endeavour/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/endeavour/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/endeavour/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix b/third_party/nixpkgs/pkgs/by-name/en/endgame-singularity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/endgame-singularity/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/endless-sky/fixes.patch b/third_party/nixpkgs/pkgs/by-name/en/endless-sky/fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/endless-sky/fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/en/endless-sky/fixes.patch
diff --git a/third_party/nixpkgs/pkgs/games/endless-sky/default.nix b/third_party/nixpkgs/pkgs/by-name/en/endless-sky/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/endless-sky/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/endless-sky/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/endlessh/default.nix b/third_party/nixpkgs/pkgs/by-name/en/endlessh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/endlessh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/endlessh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/enet/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/enet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enet/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix b/third_party/nixpkgs/pkgs/by-name/en/engelsystem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/engelsystem/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enhanced-ctorrent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enhanced-ctorrent/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/enigma/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enigma/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/enigma/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enigma/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/enjarify/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enjarify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/enjarify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enjarify/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/enpass/data.json b/third_party/nixpkgs/pkgs/by-name/en/enpass/data.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/enpass/data.json
rename to third_party/nixpkgs/pkgs/by-name/en/enpass/data.json
diff --git a/third_party/nixpkgs/pkgs/tools/security/enpass/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enpass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/enpass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enpass/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/enpass/update_script.py b/third_party/nixpkgs/pkgs/by-name/en/enpass/update_script.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/enpass/update_script.py
rename to third_party/nixpkgs/pkgs/by-name/en/enpass/update_script.py
diff --git a/third_party/nixpkgs/pkgs/tools/text/enscript/0001-use-system-getopt.patch b/third_party/nixpkgs/pkgs/by-name/en/enscript/0001-use-system-getopt.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/enscript/0001-use-system-getopt.patch
rename to third_party/nixpkgs/pkgs/by-name/en/enscript/0001-use-system-getopt.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/enscript/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enscript/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/enscript/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enscript/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff b/third_party/nixpkgs/pkgs/by-name/en/ensemble-chorus/juice-cxx-packing-fix.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff
rename to third_party/nixpkgs/pkgs/by-name/en/ensemble-chorus/juice-cxx-packing-fix.diff
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/default.nix b/third_party/nixpkgs/pkgs/by-name/en/ensemble-chorus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/ensemble-chorus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ent/default.nix b/third_party/nixpkgs/pkgs/by-name/en/ent-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/ent-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ent/default.nix b/third_party/nixpkgs/pkgs/by-name/en/ent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/ent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/entr/default.nix b/third_party/nixpkgs/pkgs/by-name/en/entr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/entr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/entr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix b/third_party/nixpkgs/pkgs/by-name/en/entt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/entt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/entt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/entwine/default.nix b/third_party/nixpkgs/pkgs/by-name/en/entwine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/entwine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/entwine/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/enum4linux-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enum4linux-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/enum4linux-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enum4linux-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/enum4linux/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enum4linux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/enum4linux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enum4linux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/enumer/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enumer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/enumer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enumer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/enumerepo/default.nix b/third_party/nixpkgs/pkgs/by-name/en/enumerepo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/enumerepo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/enumerepo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/envconsul/default.nix b/third_party/nixpkgs/pkgs/by-name/en/envconsul/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/envconsul/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/envconsul/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/envfs/default.nix b/third_party/nixpkgs/pkgs/by-name/en/envfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/envfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/envfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix b/third_party/nixpkgs/pkgs/by-name/en/envsubst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/envsubst/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/envypn-font/default.nix b/third_party/nixpkgs/pkgs/by-name/en/envypn-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/envypn-font/default.nix
rename to third_party/nixpkgs/pkgs/by-name/en/envypn-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix b/third_party/nixpkgs/pkgs/by-name/eo/eolie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eo/eolie/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/eos-installer/default.nix b/third_party/nixpkgs/pkgs/by-name/eo/eos-installer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/eos-installer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eo/eos-installer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix b/third_party/nixpkgs/pkgs/by-name/eo/eot_utilities/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eo/eot_utilities/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/epeg/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epeg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/epeg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epeg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/epgstation.1 b/third_party/nixpkgs/pkgs/by-name/ep/epgstation/epgstation.1
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/epgstation/epgstation.1
rename to third_party/nixpkgs/pkgs/by-name/ep/epgstation/epgstation.1
diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epgstation/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epgstation/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch b/third_party/nixpkgs/pkgs/by-name/ep/epgstation/use-mysql-over-domain-socket.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch
rename to third_party/nixpkgs/pkgs/by-name/ep/epgstation/use-mysql-over-domain-socket.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/ephemeral/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/ephemeral/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/ephemeralpg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/ephemeralpg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/epilys-bb/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epilys-bb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/epilys-bb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epilys-bb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/eplot/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/eplot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/eplot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/eplot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/epm/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/epm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/epr/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/epr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epr/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epson-201106w/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epson-201106w/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-201401w/fixbuild.patch b/third_party/nixpkgs/pkgs/by-name/ep/epson-201401w/fixbuild.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson-201401w/fixbuild.patch
rename to third_party/nixpkgs/pkgs/by-name/ep/epson-201401w/fixbuild.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-201401w/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epson-201401w/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson-201401w/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epson-201401w/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch b/third_party/nixpkgs/pkgs/by-name/ep/epson-alc1100/cups-data-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/ep/epson-alc1100/cups-data-dir.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epson-alc1100/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epson-alc1100/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-alc1100/ppd.patch b/third_party/nixpkgs/pkgs/by-name/ep/epson-alc1100/ppd.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson-alc1100/ppd.patch
rename to third_party/nixpkgs/pkgs/by-name/ep/epson-alc1100/ppd.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/third_party/nixpkgs/pkgs/by-name/ep/epson-escpr/cups-filter-ppd-dirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
rename to third_party/nixpkgs/pkgs/by-name/ep/epson-escpr/cups-filter-ppd-dirs.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epson-escpr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epson-escpr/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epson-escpr2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epson-escpr2/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epson-workforce-635-nx625-series/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epson-workforce-635-nx625-series/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epson_201207w/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epson_201207w/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/epstool/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epstool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/epstool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epstool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/epub2txt2/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epub2txt2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/epub2txt2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epub2txt2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix b/third_party/nixpkgs/pkgs/by-name/ep/epubcheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ep/epubcheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/eq10q/default.nix b/third_party/nixpkgs/pkgs/by-name/eq/eq10q/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/eq10q/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eq/eq10q/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/equilux-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/eq/equilux-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/equilux-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eq/equilux-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/er-patcher/default.nix b/third_party/nixpkgs/pkgs/by-name/er/er-patcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/er-patcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/er-patcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/erdtree/default.nix b/third_party/nixpkgs/pkgs/by-name/er/erdtree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/erdtree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/erdtree/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix b/third_party/nixpkgs/pkgs/by-name/er/eresi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/eresi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix b/third_party/nixpkgs/pkgs/by-name/er/erg/package.nix
similarity index 89%
rename from third_party/nixpkgs/pkgs/development/compilers/erg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/erg/package.nix
index fa414937b1..853451f18c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/er/erg/package.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "erg";
- version = "0.6.45";
+ version = "0.6.47";
src = fetchFromGitHub {
owner = "erg-lang";
repo = "erg";
rev = "v${version}";
- hash = "sha256-P6AIe3IadY64ydGShlRmgZ1pITiAA8G59Oe8P2ktDqM=";
+ hash = "sha256-DcoADVQGiCjPgawMLSvH5tCnOCHmykazsRoF1UXbPNs=";
};
- cargoHash = "sha256-5h/0MqaRmjFkeg50Y7WpEDl+VWpR0d4NnqIzoZHeKZ8=";
+ cargoHash = "sha256-Uzv+hSarIAXRXDZ3sa3zd3Xdo8ZVrDCP+72cAlJOyvw=";
nativeBuildInputs = [
makeWrapper
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/by-name/er/ergo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/ergo/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/irc/ergochat/default.nix b/third_party/nixpkgs/pkgs/by-name/er/ergochat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/irc/ergochat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/ergochat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/math-constants.patch b/third_party/nixpkgs/pkgs/by-name/er/ergoscf/math-constants.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/math-constants.patch
rename to third_party/nixpkgs/pkgs/by-name/er/ergoscf/math-constants.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/default.nix b/third_party/nixpkgs/pkgs/by-name/er/ergoscf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/ergoscf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ericw-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/er/ericw-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ericw-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/ericw-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix b/third_party/nixpkgs/pkgs/by-name/er/erigon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/erigon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/er/erofs-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/erofs-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/erosmb/default.nix b/third_party/nixpkgs/pkgs/by-name/er/erosmb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/erosmb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/erosmb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix b/third_party/nixpkgs/pkgs/by-name/er/errbot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/errbot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix b/third_party/nixpkgs/pkgs/by-name/er/errcheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/er/errcheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/es/default.nix b/third_party/nixpkgs/pkgs/by-name/es/es/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/es/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/es/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/eschalot/default.nix b/third_party/nixpkgs/pkgs/by-name/es/eschalot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/eschalot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/eschalot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix b/third_party/nixpkgs/pkgs/by-name/es/escrotum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/escrotum/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/esdm/default.nix b/third_party/nixpkgs/pkgs/by-name/es/esdm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/esdm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/esdm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/esh/default.nix b/third_party/nixpkgs/pkgs/by-name/es/esh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/esh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/esh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/espanso/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/es/espanso/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/espanso/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/es/espanso/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix b/third_party/nixpkgs/pkgs/by-name/es/espanso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/espanso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/espanso/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/espeakup/default.nix b/third_party/nixpkgs/pkgs/by-name/es/espeakup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/accessibility/espeakup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/espeakup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix b/third_party/nixpkgs/pkgs/by-name/es/esptool-ck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/esptool-ck/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix b/third_party/nixpkgs/pkgs/by-name/es/esptool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/esptool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/espup/default.nix b/third_party/nixpkgs/pkgs/by-name/es/espup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/espup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/espup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/essentia-extractor/default.nix b/third_party/nixpkgs/pkgs/by-name/es/essentia-extractor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/essentia-extractor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/essentia-extractor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/esshader/default.nix b/third_party/nixpkgs/pkgs/by-name/es/esshader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/esshader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/esshader/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/est-sfs/default.nix b/third_party/nixpkgs/pkgs/by-name/es/est-sfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/est-sfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/es/est-sfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/et/default.nix b/third_party/nixpkgs/pkgs/by-name/et/et/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/et/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/et/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/et-book/default.nix b/third_party/nixpkgs/pkgs/by-name/et/etBook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/et-book/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/etBook/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/etebase/default.nix b/third_party/nixpkgs/pkgs/by-name/et/etebase-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/etebase/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/etebase-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/etebase/secret.patch b/third_party/nixpkgs/pkgs/by-name/et/etebase-server/secret.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/etebase/secret.patch
rename to third_party/nixpkgs/pkgs/by-name/et/etebase-server/secret.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix b/third_party/nixpkgs/pkgs/by-name/et/eternal-terminal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/eternal-terminal/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/eternity-engine/default.nix b/third_party/nixpkgs/pkgs/by-name/et/eternity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/doom-ports/eternity-engine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/eternity/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix b/third_party/nixpkgs/pkgs/by-name/et/etesync-dav/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/etesync-dav/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix b/third_party/nixpkgs/pkgs/by-name/et/ethash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/ethash/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix b/third_party/nixpkgs/pkgs/by-name/et/etherape/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/etherape/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ethq/default.nix b/third_party/nixpkgs/pkgs/by-name/et/ethq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ethq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/ethq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ethtool/default.nix b/third_party/nixpkgs/pkgs/by-name/et/ethtool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ethtool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/ethtool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ets/default.nix b/third_party/nixpkgs/pkgs/by-name/et/ets/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ets/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/ets/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix b/third_party/nixpkgs/pkgs/by-name/et/ettercap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/et/ettercap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch b/third_party/nixpkgs/pkgs/by-name/eu/eukleides/gs-allowpstransparency.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch
rename to third_party/nixpkgs/pkgs/by-name/eu/eukleides/gs-allowpstransparency.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/eukleides/default.nix b/third_party/nixpkgs/pkgs/by-name/eu/eukleides/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/eukleides/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eu/eukleides/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/eukleides/use-CC.patch b/third_party/nixpkgs/pkgs/by-name/eu/eukleides/use-CC.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/eukleides/use-CC.patch
rename to third_party/nixpkgs/pkgs/by-name/eu/eukleides/use-CC.patch
diff --git a/third_party/nixpkgs/pkgs/data/fonts/eunomia/default.nix b/third_party/nixpkgs/pkgs/by-name/eu/eunomia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/eunomia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eu/eunomia/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/eureka-editor/default.nix b/third_party/nixpkgs/pkgs/by-name/eu/eureka-editor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/doom-ports/eureka-editor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/eu/eureka-editor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/eva/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/eva/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/eva/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/eva/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/evans/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/evans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evans/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evcc/package.nix
similarity index 91%
rename from third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evcc/package.nix
index 11809da781..2849c35094 100644
--- a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ev/evcc/package.nix
@@ -16,16 +16,16 @@
buildGoModule rec {
pname = "evcc";
- version = "0.131.4";
+ version = "0.131.5";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
rev = version;
- hash = "sha256-sU5h29sXz1am44iFGNrVfMzrI1aAc/m355Aevm81sQc=";
+ hash = "sha256-CRqxxbPkcjswntMgGkIrPFEbnjI90sfTmG6D1eCo45w=";
};
- vendorHash = "sha256-hPCTAK4u79r9EoHkv6g1QvkRDZ95hXzyiiQpRD+0aLQ=";
+ vendorHash = "sha256-x0EWFsR/O2Ztg39DL+yZx2ZDzJHADo2aPAeg/i+5KqM=";
npmDeps = fetchNpmDeps {
inherit src;
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evdev-proto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evdev-proto/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evdevremapkeys/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/evdevremapkeys/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evdevremapkeys/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/evemu/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evemu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/evemu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evemu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/eventlog/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/eventlog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/eventlog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/eventlog/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/eventstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/eventstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/everspace/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/everspace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/everspace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/everspace/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/evhz/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evhz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/evhz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evhz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/evil-winrm/Gemfile b/third_party/nixpkgs/pkgs/by-name/ev/evil-winrm/Gemfile
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/evil-winrm/Gemfile
rename to third_party/nixpkgs/pkgs/by-name/ev/evil-winrm/Gemfile
diff --git a/third_party/nixpkgs/pkgs/tools/security/evil-winrm/Gemfile.lock b/third_party/nixpkgs/pkgs/by-name/ev/evil-winrm/Gemfile.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/evil-winrm/Gemfile.lock
rename to third_party/nixpkgs/pkgs/by-name/ev/evil-winrm/Gemfile.lock
diff --git a/third_party/nixpkgs/pkgs/tools/security/evil-winrm/gemset.nix b/third_party/nixpkgs/pkgs/by-name/ev/evil-winrm/gemset.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/evil-winrm/gemset.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evil-winrm/gemset.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/evil-winrm/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evil-winrm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/evil-winrm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evil-winrm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evmdis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evmdis/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evscript/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evscript/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/evsieve/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evsieve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/evsieve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evsieve/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/evtest/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evtest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/evtest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evtest/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/evtx/default.nix b/third_party/nixpkgs/pkgs/by-name/ev/evtx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/evtx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ev/evtx/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/networking/exabgp/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exabgp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/networking/exabgp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exabgp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/exact-audio-copy/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exactaudiocopy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/exact-audio-copy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exactaudiocopy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exaile/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exaile/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exempi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exempi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/exercism/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exercism/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/exercism/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exercism/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/exfat/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exfat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/exfat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exfat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exfatprogs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exfatprogs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/exhaustive/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exhaustive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/exhaustive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exhaustive/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/exif/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/exif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exif/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exifprobe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exifprobe/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/exiftags/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exiftags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/exiftags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exiftags/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/exim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exim/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exiv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exiv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/exonerate/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exonerate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/exonerate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exonerate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exoscale-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exoscale-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/expand-response-params/expand-response-params.c b/third_party/nixpkgs/pkgs/by-name/ex/expand-response-params/expand-response-params.c
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/expand-response-params/expand-response-params.c
rename to third_party/nixpkgs/pkgs/by-name/ex/expand-response-params/expand-response-params.c
diff --git a/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/expand-response-params/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/expand-response-params/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/expat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/expat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/expat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/expected-lite/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/expected-lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/expected-lite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/expected-lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/expenses/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/expenses/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/explain/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/explain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/explain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/explain/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/expliot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/expliot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/expliot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exploitdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exploitdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exportarr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exportarr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/expr/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/expr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/expr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/expr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/expressvpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/expressvpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/exprtk/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exprtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/exprtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exprtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/exrtools/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exrtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/exrtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/exrtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ext4magic/glibc-fix.patch b/third_party/nixpkgs/pkgs/by-name/ex/ext4magic/glibc-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/ext4magic/glibc-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/ex/ext4magic/glibc-fix.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/ext4magic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/ext4magic/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/extism-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/extism-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/extra-container/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/extra-container/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/extra-container/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/extra-container/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/extrace/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/extrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/extrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/extrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/extract_url/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/extract_url/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/extract_url/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/extract_url/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/extremetuxracer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/extremetuxracer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/extrude/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/extrude/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/extrude/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/extrude/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/extundelete/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ex/extundelete/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix b/third_party/nixpkgs/pkgs/by-name/ey/eyedropper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ey/eyedropper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix b/third_party/nixpkgs/pkgs/by-name/ez/ezminc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ez/ezminc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ezno/default.nix b/third_party/nixpkgs/pkgs/by-name/ez/ezno/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/ezno/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ez/ezno/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/ezquake/default.nix b/third_party/nixpkgs/pkgs/by-name/ez/ezquake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/ezquake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ez/ezquake/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ezra-sil/default.nix b/third_party/nixpkgs/pkgs/by-name/ez/ezra-sil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ezra-sil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ez/ezra-sil/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/ezstream/default.nix b/third_party/nixpkgs/pkgs/by-name/ez/ezstream/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/ezstream/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ez/ezstream/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix b/third_party/nixpkgs/pkgs/by-name/ez/eztrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ez/eztrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/f1_8/default.nix b/third_party/nixpkgs/pkgs/by-name/f1/f1_8/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/f1_8/default.nix
rename to third_party/nixpkgs/pkgs/by-name/f1/f1_8/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/f1viewer/default.nix b/third_party/nixpkgs/pkgs/by-name/f1/f1viewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/f1viewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/f1/f1viewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/f2/default.nix b/third_party/nixpkgs/pkgs/by-name/f2/f2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/f2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/f2/f2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/f2c/default.nix b/third_party/nixpkgs/pkgs/by-name/f2/f2c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/f2c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/f2/f2c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/f3/default.nix b/third_party/nixpkgs/pkgs/by-name/f3/f3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/f3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/f3/f3/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/f5_6/default.nix b/third_party/nixpkgs/pkgs/by-name/f5/f5_6/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/f5_6/default.nix
rename to third_party/nixpkgs/pkgs/by-name/f5/f5_6/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/fa_1/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fa_1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/fa_1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fa_1/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/faac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faac/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faad2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faad2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faas-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faas-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faba-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faba-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faba-mono-icons/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faba-mono-icons/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fabric-installer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fabric-installer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/fabs/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fabs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/fabs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fabs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/facedetect/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/facedetect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/facedetect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/facedetect/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/facetimehd-calibration/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/facetimehd-calibration/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/facetimehd-firmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/facetimehd-firmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/fa/factorio/versions.json b/third_party/nixpkgs/pkgs/by-name/fa/factorio/versions.json
index 539f31d6f0..2cc76cc166 100644
--- a/third_party/nixpkgs/pkgs/by-name/fa/factorio/versions.json
+++ b/third_party/nixpkgs/pkgs/by-name/fa/factorio/versions.json
@@ -3,25 +3,25 @@
"alpha": {
"experimental": {
"candidateHashFilenames": [
- "factorio_linux_2.0.14.tar.xz"
+ "factorio_linux_2.0.16.tar.xz"
],
- "name": "factorio_alpha_x64-2.0.14.tar.xz",
+ "name": "factorio_alpha_x64-2.0.16.tar.xz",
"needsAuth": true,
- "sha256": "8853ce1cdea0c142f78c3ebb3b7d51420f9eb28e9113f2be08a12d4e476dcadc",
+ "sha256": "9828ae257a3b2f95de2dae2f262e9d8d6b85f356911449166ceef1472d231e6d",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.14/alpha/linux64",
- "version": "2.0.14"
+ "url": "https://factorio.com/get-download/2.0.16/alpha/linux64",
+ "version": "2.0.16"
},
"stable": {
"candidateHashFilenames": [
- "factorio_linux_2.0.14.tar.xz"
+ "factorio_linux_2.0.15.tar.xz"
],
- "name": "factorio_alpha_x64-2.0.14.tar.xz",
+ "name": "factorio_alpha_x64-2.0.15.tar.xz",
"needsAuth": true,
- "sha256": "8853ce1cdea0c142f78c3ebb3b7d51420f9eb28e9113f2be08a12d4e476dcadc",
+ "sha256": "39df353fe8f14394d2618b9627659f3c0c16922362708e681f006083a8f5163e",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.14/alpha/linux64",
- "version": "2.0.14"
+ "url": "https://factorio.com/get-download/2.0.15/alpha/linux64",
+ "version": "2.0.15"
}
},
"demo": {
@@ -51,51 +51,51 @@
"expansion": {
"experimental": {
"candidateHashFilenames": [
- "factorio-space-age_linux_2.0.14.tar.xz"
+ "factorio-space-age_linux_2.0.16.tar.xz"
],
- "name": "factorio_expansion_x64-2.0.14.tar.xz",
+ "name": "factorio_expansion_x64-2.0.16.tar.xz",
"needsAuth": true,
- "sha256": "7878444d65dc12815d7ce4d2c941441b8b7e05605e3f0bd69d45d02b3aa8f81a",
+ "sha256": "32ae1b8f525148b3bb1f68e41b398543c2b0da29734f9f3b4f9509a86c64ecf4",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.14/expansion/linux64",
- "version": "2.0.14"
+ "url": "https://factorio.com/get-download/2.0.16/expansion/linux64",
+ "version": "2.0.16"
},
"stable": {
"candidateHashFilenames": [
- "factorio-space-age_linux_2.0.14.tar.xz"
+ "factorio-space-age_linux_2.0.15.tar.xz"
],
- "name": "factorio_expansion_x64-2.0.14.tar.xz",
+ "name": "factorio_expansion_x64-2.0.15.tar.xz",
"needsAuth": true,
- "sha256": "7878444d65dc12815d7ce4d2c941441b8b7e05605e3f0bd69d45d02b3aa8f81a",
+ "sha256": "09de33402fee3dbae9d0207409f05a19e2fa8019b53d3de96557d2ec904e10f3",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.14/expansion/linux64",
- "version": "2.0.14"
+ "url": "https://factorio.com/get-download/2.0.15/expansion/linux64",
+ "version": "2.0.15"
}
},
"headless": {
"experimental": {
"candidateHashFilenames": [
- "factorio-headless_linux_2.0.14.tar.xz",
- "factorio_headless_x64_2.0.14.tar.xz"
+ "factorio-headless_linux_2.0.16.tar.xz",
+ "factorio_headless_x64_2.0.16.tar.xz"
],
- "name": "factorio_headless_x64-2.0.14.tar.xz",
+ "name": "factorio_headless_x64-2.0.16.tar.xz",
"needsAuth": false,
- "sha256": "5a4bc4c3b2a97ed1fc58eb796321e848dcc64435bd91013dd9c78a14a8ce8815",
+ "sha256": "f2069b4b746500d945eeb67ef7eda5e7aebe7fd0294c2af4e117af22a3bbaea3",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.14/headless/linux64",
- "version": "2.0.14"
+ "url": "https://factorio.com/get-download/2.0.16/headless/linux64",
+ "version": "2.0.16"
},
"stable": {
"candidateHashFilenames": [
- "factorio-headless_linux_2.0.14.tar.xz",
- "factorio_headless_x64_2.0.14.tar.xz"
+ "factorio-headless_linux_2.0.15.tar.xz",
+ "factorio_headless_x64_2.0.15.tar.xz"
],
- "name": "factorio_headless_x64-2.0.14.tar.xz",
+ "name": "factorio_headless_x64-2.0.15.tar.xz",
"needsAuth": false,
- "sha256": "5a4bc4c3b2a97ed1fc58eb796321e848dcc64435bd91013dd9c78a14a8ce8815",
+ "sha256": "70b441cb807811a60586c01107248c1d8d7ae043bd1f23675fc924fbaaa538d8",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.14/headless/linux64",
- "version": "2.0.14"
+ "url": "https://factorio.com/get-download/2.0.15/headless/linux64",
+ "version": "2.0.15"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/faircamp/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/fa/faircamp/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/faircamp/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/fa/faircamp/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faircamp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faircamp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/faircamp/test-wav.nix b/third_party/nixpkgs/pkgs/by-name/fa/faircamp/test-wav.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/faircamp/test-wav.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faircamp/test-wav.nix
diff --git a/third_party/nixpkgs/pkgs/games/fairymax/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fairymax/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/fairymax/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fairymax/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/fake-nss/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fakeNss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/fake-nss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fakeNss/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/fakechroot/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fakechroot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/fakechroot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fakechroot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/fakeroot/einval.patch b/third_party/nixpkgs/pkgs/by-name/fa/fakeroot/einval.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/fakeroot/einval.patch
rename to third_party/nixpkgs/pkgs/by-name/fa/fakeroot/einval.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fakeroot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fakeroot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/fakeroute/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fakeroute/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/fakeroute/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fakeroute/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/faketty/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faketty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/faketty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faketty/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/falcoctl/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/falcoctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/falcoctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/falcoctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fan2go/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fan2go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fan2go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fan2go/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fanctl/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fanctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fanctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fanctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/fancy-motd/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fancy-motd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/fancy-motd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fancy-motd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/fanficfare/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fanficfare/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/fanficfare/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fanficfare/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fantasque-sans-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fantasque-sans-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/fanwood/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fanwood/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/fanwood/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fanwood/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/faq/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/faq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/faraday-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faraday-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/faraday-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faraday-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/faraday/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faraday/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/faraday/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faraday/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/farbfeld/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/farbfeld/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/farbfeld/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/farbfeld/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fasd/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fasd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fasd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fasd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fasmg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fasmg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in b/third_party/nixpkgs/pkgs/by-name/fa/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in
rename to third_party/nixpkgs/pkgs/by-name/fa/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fast-cpp-csv-parser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fast-cpp-csv-parser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fast-cpp-csv-parser/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fast-downward/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/fast-downward/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fast-downward/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fastjson/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastJson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fastjson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fastJson/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/fastd/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/fastd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fastd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fastddsgen/deps.json b/third_party/nixpkgs/pkgs/by-name/fa/fastddsgen/deps.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fastddsgen/deps.json
rename to third_party/nixpkgs/pkgs/by-name/fa/fastddsgen/deps.json
diff --git a/third_party/nixpkgs/pkgs/development/tools/fastddsgen/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastddsgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fastddsgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fastddsgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fastgron/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastgron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fastgron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fastgron/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/fasthenry/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fasthenry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/fasthenry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fasthenry/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastjet-contrib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fastjet-contrib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastjet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fastjet/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/fastnetmon-advanced/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastnetmon-advanced/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/fastnetmon-advanced/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fastnetmon-advanced/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastnlo-toolkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fastnlo-toolkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch b/third_party/nixpkgs/pkgs/by-name/fa/fastnlo-toolkit/yoda2_support.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch
rename to third_party/nixpkgs/pkgs/by-name/fa/fastnlo-toolkit/yoda2_support.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/fastp/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/fastp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fastp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fastpbkdf2/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastpbkdf2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fastpbkdf2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fastpbkdf2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fasttext/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fasttext/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fatcat/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fatcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fatcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fatcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fatrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fatrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fatresize/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fatresize/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fatsort/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/fatsort/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faudio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faudio/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/faustPhysicalModeling/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fa/faustPhysicalModeling/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fbcat/default.nix b/third_party/nixpkgs/pkgs/by-name/fb/fbcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fbcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fb/fbcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fbida/default.nix b/third_party/nixpkgs/pkgs/by-name/fb/fbida/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/fbida/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fb/fbida/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fbjni/default.nix b/third_party/nixpkgs/pkgs/by-name/fb/fbjni/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fbjni/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fb/fbjni/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fblog/default.nix b/third_party/nixpkgs/pkgs/by-name/fb/fblog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fblog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fb/fblog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fbmark/default.nix b/third_party/nixpkgs/pkgs/by-name/fb/fbmark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fbmark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fb/fbmark/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/fb/fbmenugen/0001-Fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/fb/fbmenugen/0001-Fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix b/third_party/nixpkgs/pkgs/by-name/fb/fbmenugen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fb/fbmenugen/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix b/third_party/nixpkgs/pkgs/by-name/fb/fbpanel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fb/fbpanel/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix b/third_party/nixpkgs/pkgs/by-name/fb/fbterm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fb/fbterm/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fbterm/select.patch b/third_party/nixpkgs/pkgs/by-name/fb/fbterm/select.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fbterm/select.patch
rename to third_party/nixpkgs/pkgs/by-name/fb/fbterm/select.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/fbv/default.nix b/third_party/nixpkgs/pkgs/by-name/fb/fbv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/fbv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fb/fbv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/fbvnc/default.nix b/third_party/nixpkgs/pkgs/by-name/fb/fbvnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/fbvnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fb/fbvnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fc/fcft/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcgiwrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fc/fcgiwrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcl/default.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fcl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fc/fcl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcppt/default.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcppt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fcppt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fc/fcppt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch b/third_party/nixpkgs/pkgs/by-name/fc/fcrackzip/fcrackzip_forkexec.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch
rename to third_party/nixpkgs/pkgs/by-name/fc/fcrackzip/fcrackzip_forkexec.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/fcrackzip/default.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcrackzip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/fcrackzip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fc/fcrackzip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/fcron/default.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/fcron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fc/fcron/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/fcron/relative-fcronsighup.patch b/third_party/nixpkgs/pkgs/by-name/fc/fcron/relative-fcronsighup.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/fcron/relative-fcronsighup.patch
rename to third_party/nixpkgs/pkgs/by-name/fc/fcron/relative-fcronsighup.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix b/third_party/nixpkgs/pkgs/by-name/fd/fd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fd/fd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix b/third_party/nixpkgs/pkgs/by-name/fd/fdk-aac-encoder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fd/fdk-aac-encoder/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix b/third_party/nixpkgs/pkgs/by-name/fd/fdk_aac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fd/fdk_aac/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/fdm/default.nix b/third_party/nixpkgs/pkgs/by-name/fd/fdm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/fdm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fd/fdm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fdtools/new-skalibs.patch b/third_party/nixpkgs/pkgs/by-name/fd/fdtools/new-skalibs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fdtools/new-skalibs.patch
rename to third_party/nixpkgs/pkgs/by-name/fd/fdtools/new-skalibs.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix b/third_party/nixpkgs/pkgs/by-name/fd/fdtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fd/fdtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fdupes/default.nix b/third_party/nixpkgs/pkgs/by-name/fd/fdupes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fdupes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fd/fdupes/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fead/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/fead/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fead/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/fead/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/fedifetcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/fedifetcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/feed2imap-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/feed2imap-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/feedbackd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/feedbackd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/feedgnuplot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/feedgnuplot/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fehlstart/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/fehlstart/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fehlstart/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/fehlstart/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fehlstart/use-nix-profiles.patch b/third_party/nixpkgs/pkgs/by-name/fe/fehlstart/use-nix-profiles.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fehlstart/use-nix-profiles.patch
rename to third_party/nixpkgs/pkgs/by-name/fe/fehlstart/use-nix-profiles.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/feishu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/feishu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/femtolisp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/femtolisp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/fend/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fend/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/fend/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ferm/import-ferm-wrapped.patch b/third_party/nixpkgs/pkgs/by-name/fe/ferm/import-ferm-wrapped.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ferm/import-ferm-wrapped.patch
rename to third_party/nixpkgs/pkgs/by-name/fe/ferm/import-ferm-wrapped.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ferm/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/ferm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ferm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/ferm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fermyon-spin/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/fermyon-spin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fermyon-spin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/fermyon-spin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fermyon-spin/update.sh b/third_party/nixpkgs/pkgs/by-name/fe/fermyon-spin/update.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fermyon-spin/update.sh
rename to third_party/nixpkgs/pkgs/by-name/fe/fermyon-spin/update.sh
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/ferretdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/ferretdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ferrum/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/ferrum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ferrum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/ferrum/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fet-sh/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/fet-sh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fet-sh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/fet-sh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fetch-scm/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/fetch-scm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fetch-scm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/fetch-scm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fetchit/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/fetchit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/fetchit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/fetchit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fetchutils/default.nix b/third_party/nixpkgs/pkgs/by-name/fe/fetchutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fetchutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fe/fetchutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ff2mpv/default.nix b/third_party/nixpkgs/pkgs/by-name/ff/ff2mpv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ff2mpv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ff/ff2mpv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/ffcast/default.nix b/third_party/nixpkgs/pkgs/by-name/ff/ffcast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/ffcast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ff/ffcast/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fff/default.nix b/third_party/nixpkgs/pkgs/by-name/ff/fff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ff/fff/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/third_party/nixpkgs/pkgs/by-name/ff/fflas-ffpack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ff/fflas-ffpack/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/fflinuxprint/default.nix b/third_party/nixpkgs/pkgs/by-name/ff/fflinuxprint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/fflinuxprint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ff/fflinuxprint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/third_party/nixpkgs/pkgs/by-name/ff/ffmpegthumbnailer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ff/ffmpegthumbnailer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffms/default.nix b/third_party/nixpkgs/pkgs/by-name/ff/ffms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ffms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ff/ffms/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix b/third_party/nixpkgs/pkgs/by-name/ff/fftw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ff/fftw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix b/third_party/nixpkgs/pkgs/by-name/ff/ffuf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ff/ffuf/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/fg-virgil/default.nix b/third_party/nixpkgs/pkgs/by-name/fg/fg-virgil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/fg-virgil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fg/fg-virgil/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/fgallery/default.nix b/third_party/nixpkgs/pkgs/by-name/fg/fgallery/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/fgallery/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fg/fgallery/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/fh/default.nix b/third_party/nixpkgs/pkgs/by-name/fh/fh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/fh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fh/fh/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix b/third_party/nixpkgs/pkgs/by-name/fh/fheroes2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/fheroes2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fh/fheroes2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fiano/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fiano/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fiano/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fiano/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/fiche/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fiche/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/fiche/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fiche/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/fierce/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fierce/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/fierce/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fierce/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fig2dev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fig2dev/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/figlet/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/figlet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/figlet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/figlet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fiji/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fiji/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/fiji/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fiji/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/file-rename/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/file-rename/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/filebench/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/filebench/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/filebench/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/filebench/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/filebrowser/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/filebrowser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/filebrowser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/filebrowser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/filegive/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/filegive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/filegive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/filegive/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/fileshare/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fileshare/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/fileshare/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fileshare/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/fileshelter/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fileshelter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/fileshelter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fileshelter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/filet/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/filet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/filet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/filet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/filter-audio/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/filter-audio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/filter-audio/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/filtron/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/filtron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/filtron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/filtron/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/fim/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/fim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fim/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/find-cursor/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/find-cursor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/find-cursor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/find-cursor/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/findbugs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/findbugs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/findex/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/findex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/findex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/findex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/findnewest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/findnewest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/findnewest/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/findomain/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/fi/findomain/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/findomain/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/fi/findomain/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/findomain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/findomain/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/findup/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/findup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/findup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/findup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/fingerprintx/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fingerprintx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/fingerprintx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fingerprintx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/fio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fio/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fioctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fioctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/fira-go/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fira-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/fira-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fira-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/firectl/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/firectl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/firectl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/firectl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/firefly-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/firefly-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch b/third_party/nixpkgs/pkgs/by-name/fi/firejail/fbuilder-call-firejail-on-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch
rename to third_party/nixpkgs/pkgs/by-name/fi/firejail/fbuilder-call-firejail-on-path.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch b/third_party/nixpkgs/pkgs/by-name/fi/firejail/mount-nix-dir-on-overlay.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch
rename to third_party/nixpkgs/pkgs/by-name/fi/firejail/mount-nix-dir-on-overlay.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/firejail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/firejail/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/firestarter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/firestarter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/firewalld/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/firewalld/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch b/third_party/nixpkgs/pkgs/by-name/fi/firewalld/respect-xml-catalog-files-var.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch
rename to third_party/nixpkgs/pkgs/by-name/fi/firewalld/respect-xml-catalog-files-var.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/fi/firmware-manager/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/fi/firmware-manager/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/firmware-manager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/firmware-manager/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/firmware-updater/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/firmware-updater/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock.json b/third_party/nixpkgs/pkgs/by-name/fi/firmware-updater/pubspec.lock.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock.json
rename to third_party/nixpkgs/pkgs/by-name/fi/firmware-updater/pubspec.lock.json
diff --git a/third_party/nixpkgs/pkgs/development/compilers/firrtl/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/firrtl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/firrtl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/firrtl/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/fish-fillets-ng/icon.xpm b/third_party/nixpkgs/pkgs/by-name/fi/fish-fillets-ng/icon.xpm
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/fish-fillets-ng/icon.xpm
rename to third_party/nixpkgs/pkgs/by-name/fi/fish-fillets-ng/icon.xpm
diff --git a/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fish-fillets-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fish-fillets-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch b/third_party/nixpkgs/pkgs/by-name/fi/fish-irssi/irssi-include-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/fi/fish-irssi/irssi-include-dir.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fish-irssi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fish-irssi/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fishnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/fishnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fishnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fission/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fission/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fission/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fission/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fits-cloudctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fits-cloudctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/fityk/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fityk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/misc/fityk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fityk/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/fixedsys-excelsior/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fi/fixedsys-excelsior/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/flac/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/flac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flac/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/flac2all/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flac2all/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/flac2all/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flac2all/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/flamegraph/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flamegraph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/flamegraph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flamegraph/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/flamerobin/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flamerobin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/flamerobin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flamerobin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/flamp/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flamp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/flamp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flamp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flann/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/flann/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flann/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flare-floss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flare-floss/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/fl/flare-signal/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/fl/flare-signal/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flare-signal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flare-signal/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flashbench/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flashbench/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flashfocus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/flashfocus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flashfocus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flashrom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flashrom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flasm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flasm/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flat-remix-gnome/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flat-remix-gnome/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flat-remix-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/flat-remix-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flat-remix-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatcc/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flatcc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/flatcc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flatcc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flavours/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flavours/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/flawfinder/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flawfinder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/flawfinder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flawfinder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/flex-ncat/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flex-ncat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/flex-ncat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flex-ncat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/flex-ndax/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flex-ndax/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/flex-ndax/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flex-ndax/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flexcpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flexcpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/flexibee/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flexibee/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/flexibee/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flexibee/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/disable-autoupdate.patch b/third_party/nixpkgs/pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/disable-autoupdate.patch
rename to third_party/nixpkgs/pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flexoptix-app/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flexoptix-app/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flink/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/flintlock/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flintlock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/flintlock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flintlock/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/flips/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flips/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/flips/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flips/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/flips/use-system-libdivsufsort.patch b/third_party/nixpkgs/pkgs/by-name/fl/flips/use-system-libdivsufsort.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/flips/use-system-libdivsufsort.patch
rename to third_party/nixpkgs/pkgs/by-name/fl/flips/use-system-libdivsufsort.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flitter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flitter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/flix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/fllog/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/fllog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/fllog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/fllog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/flmsg/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flmsg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/flmsg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flmsg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/flock/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/flock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flock/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/flockit/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flockit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/flockit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flockit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/flood-for-transmission/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flood-for-transmission/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/flood-for-transmission/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flood-for-transmission/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/flood/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flood/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/flood/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flood/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/flootty/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flootty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/flootty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flootty/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/flopoco/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flopoco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/flopoco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flopoco/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/flowblade/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flowblade/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/flowblade/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flowblade/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/flpsed/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flpsed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/flpsed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flpsed/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flrig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flrig/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/fl/fluent-bit/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/fluent-bit/package.nix
index 6d0aff14b5..8c6c762e66 100644
--- a/third_party/nixpkgs/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/fl/fluent-bit/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fluent-bit";
- version = "3.1.9";
+ version = "3.1.10";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${finalAttrs.version}";
- hash = "sha256-SIBdiKgg444sZ8RUQscnOg8XzuAZcLvU4++0HY0G/ss=";
+ hash = "sha256-/YKXWYaDqkJ8fWgcYktXWJPcjDJTupgRTSQVp0cWruY=";
};
# optional only to avoid linux rebuild
diff --git a/third_party/nixpkgs/pkgs/data/icons/fluent-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/fluent-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/fluent-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/fluent-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/fluent-reader/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/fluent-reader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/fluent-reader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/fluent-reader/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/fluffychat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/fluffychat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json b/third_party/nixpkgs/pkgs/by-name/fl/fluffychat/pubspec.lock.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json
rename to third_party/nixpkgs/pkgs/by-name/fl/fluffychat/pubspec.lock.json
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/fluidd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/fluidd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/flux/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/flux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flux/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluxboxlauncher/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/fluxboxlauncher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fluxboxlauncher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/fluxboxlauncher/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/fluxctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/fluxctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fluxus/fix-build.patch b/third_party/nixpkgs/pkgs/by-name/fl/fluxus/fix-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/fluxus/fix-build.patch
rename to third_party/nixpkgs/pkgs/by-name/fl/fluxus/fix-build.patch
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fluxus/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/fluxus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/fluxus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/fluxus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flvstreamer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flvstreamer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/flwrap/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flwrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/flwrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flwrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/fly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/fly/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flycast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flycast/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flyway/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/flyway/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flyway/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/flywheel-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flywheel-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/flywheel-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fl/flywheel-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/fm/default.nix b/third_party/nixpkgs/pkgs/by-name/fm/fm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/fm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fm/fm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/fmsynth/default.nix b/third_party/nixpkgs/pkgs/by-name/fm/fmsynth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/fmsynth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fm/fmsynth/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/fn/fn-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fn/fn-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fnlfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/fn/fnlfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fnlfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fn/fnlfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix b/third_party/nixpkgs/pkgs/by-name/fn/fnotifystat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fn/fnotifystat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fntsample/default.nix b/third_party/nixpkgs/pkgs/by-name/fn/fntsample/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fntsample/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fn/fntsample/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/focus-stack/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/focus-stack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/focus-stack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/focus-stack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/focus/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/focus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/focus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/focus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/foliate/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/foliate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/foliate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/foliate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/folks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/folks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/folks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/foma/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/foma/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/foma/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/foma/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/fomp/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/fomp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/fomp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/fomp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/font-config-info/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/font-config-info/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/font-config-info/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/font-config-info/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fontfinder/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/fontfinder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fontfinder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/fontfinder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fontpreview/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/fontpreview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fontpreview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/fontpreview/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch b/third_party/nixpkgs/pkgs/by-name/fo/foo2zjs/dell1250c-color-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/fo/foo2zjs/dell1250c-color-fix.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/hbpl1.patch b/third_party/nixpkgs/pkgs/by-name/fo/foo2zjs/hbpl1.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/hbpl1.patch
rename to third_party/nixpkgs/pkgs/by-name/fo/foo2zjs/hbpl1.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff b/third_party/nixpkgs/pkgs/by-name/fo/foo2zjs/no-hardcode-fw.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
rename to third_party/nixpkgs/pkgs/by-name/fo/foo2zjs/no-hardcode-fw.diff
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/foo2zjs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/foo2zjs/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch b/third_party/nixpkgs/pkgs/by-name/fo/foo2zjs/papercode-format-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/fo/foo2zjs/papercode-format-fix.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/foomatic-filters/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/foomatic-filters/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/foot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/foot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/fop/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/fop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/fop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/fop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/foremost/makefile.patch b/third_party/nixpkgs/pkgs/by-name/fo/foremost/makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/foremost/makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/fo/foremost/makefile.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/foremost/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/foremost/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/foremost/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/foremost/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/forge-mtg/no-launch4j.patch b/third_party/nixpkgs/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/forge-mtg/no-launch4j.patch
rename to third_party/nixpkgs/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
diff --git a/third_party/nixpkgs/pkgs/games/forge-mtg/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/forge-mtg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/forge-mtg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/forge-mtg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/forge/no-download-glad.patch b/third_party/nixpkgs/pkgs/by-name/fo/forge/no-download-glad.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/forge/no-download-glad.patch
rename to third_party/nixpkgs/pkgs/by-name/fo/forge/no-download-glad.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/forge/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/forge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/forge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/forge/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/forkstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/forkstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/forktty/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/forktty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/forktty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/forktty/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/form/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/form/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/form/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/form/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/formatter/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/fo/formatter/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/formatter/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/fo/formatter/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/formatter/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/formatter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/formatter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/formatter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/formula/nuget.nix b/third_party/nixpkgs/pkgs/by-name/fo/formula/nuget.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/formula/nuget.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/formula/nuget.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/formula/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/formula/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/formula/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/formula/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/fornalder/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/fornalder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/fornalder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/fornalder/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fortify-headers/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/fortify-headers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fortify-headers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/fortify-headers/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fortify-headers/restore-macros.patch b/third_party/nixpkgs/pkgs/by-name/fo/fortify-headers/restore-macros.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fortify-headers/restore-macros.patch
rename to third_party/nixpkgs/pkgs/by-name/fo/fortify-headers/restore-macros.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fortify-headers/wchar-imports-skip.patch b/third_party/nixpkgs/pkgs/by-name/fo/fortify-headers/wchar-imports-skip.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fortify-headers/wchar-imports-skip.patch
rename to third_party/nixpkgs/pkgs/by-name/fo/fortify-headers/wchar-imports-skip.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/fortran-fpm/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/fortran-fpm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/fortran-fpm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/fortran-fpm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fortune/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/fortune/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fortune/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/fortune/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/foxtrotgps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/foxtrotgps/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/fparser/default.nix b/third_party/nixpkgs/pkgs/by-name/fp/fparser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/fparser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fp/fparser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fpart/default.nix b/third_party/nixpkgs/pkgs/by-name/fp/fpart/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fpart/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fp/fpart/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fpattern/default.nix b/third_party/nixpkgs/pkgs/by-name/fp/fpattern/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fpattern/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fp/fpattern/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/fped/default.nix b/third_party/nixpkgs/pkgs/by-name/fp/fped/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/fped/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fp/fped/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/fping/default.nix b/third_party/nixpkgs/pkgs/by-name/fp/fping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/fping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fp/fping/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/fpm2/default.nix b/third_party/nixpkgs/pkgs/by-name/fp/fpm2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/fpm2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fp/fpm2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fpp/default.nix b/third_party/nixpkgs/pkgs/by-name/fp/fpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fp/fpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fprettify/default.nix b/third_party/nixpkgs/pkgs/by-name/fp/fprettify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fprettify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fp/fprettify/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix b/third_party/nixpkgs/pkgs/by-name/fq/fq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fq/fq/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/fr/fractal/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/fr/fractal/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/fractal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/fractal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/framac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/framac/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/frame/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frame/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/frame/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frame/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/framesh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/framesh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/frangipanni/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frangipanni/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/frangipanni/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frangipanni/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/fraunces/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/fraunces/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/frawk/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frawk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/frawk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frawk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fre/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/fre/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/fre/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/freac/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/freac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freac/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/frece/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frece/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/frece/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frece/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freealut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freealut/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freebayes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freebayes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/freebind/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freebind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/freebind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freebind/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/freedink/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freedink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/freedink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freedink/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/freedroid/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freedroid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/freedroid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freedroid/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/freedroidrpg/drop-build-deps.patch b/third_party/nixpkgs/pkgs/by-name/fr/freedroidrpg/drop-build-deps.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/freedroidrpg/drop-build-deps.patch
rename to third_party/nixpkgs/pkgs/by-name/fr/freedroidrpg/drop-build-deps.patch
diff --git a/third_party/nixpkgs/pkgs/games/freedroidrpg/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freedroidrpg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/freedroidrpg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freedroidrpg/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/freefont-ttf/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freefont_ttf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/freefont-ttf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freefont_ttf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freeglut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freeglut/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freeipmi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freeipmi/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/freenukum/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freenukum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/freenukum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freenukum/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/freeorion/fix-paths.sh b/third_party/nixpkgs/pkgs/by-name/fr/freeorion/fix-paths.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/freeorion/fix-paths.sh
rename to third_party/nixpkgs/pkgs/by-name/fr/freeorion/fix-paths.sh
diff --git a/third_party/nixpkgs/pkgs/games/freeorion/fix-paths.xslt b/third_party/nixpkgs/pkgs/by-name/fr/freeorion/fix-paths.xslt
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/freeorion/fix-paths.xslt
rename to third_party/nixpkgs/pkgs/by-name/fr/freeorion/fix-paths.xslt
diff --git a/third_party/nixpkgs/pkgs/games/freeorion/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freeorion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/freeorion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freeorion/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/freepats/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freepats/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/freepats/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freepats/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freepv/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freepv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/freepv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freepv/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/freeradius/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freeradius/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/freeradius/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freeradius/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/freesweep/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freesweep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/freesweep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freesweep/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freetalk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freetalk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freetds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freetds/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetts/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freetts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/freetts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freetts/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freetube/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/freetube/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freetube/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/third_party/nixpkgs/pkgs/by-name/fr/freetype/enable-subpixel-rendering.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch
rename to third_party/nixpkgs/pkgs/by-name/fr/freetype/enable-subpixel-rendering.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/enable-table-validation.patch b/third_party/nixpkgs/pkgs/by-name/fr/freetype/enable-table-validation.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/freetype/enable-table-validation.patch
rename to third_party/nixpkgs/pkgs/by-name/fr/freetype/enable-table-validation.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freetype/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freetype/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/freewheeling/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freewheeling/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/freewheeling/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freewheeling/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freexl/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freexl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/freexl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freexl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/freeze/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/freeze/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/freeze/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/freeze/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/frei/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frei/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/frei/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frei/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/frei0r/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frei0r/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/frei0r/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frei0r/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frescobaldi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/frescobaldi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frescobaldi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fribidi/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/fribidi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fribidi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/fribidi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/fricas/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/fricas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/fricas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/fricas/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/frida-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frida-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/frida-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frida-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/frigate/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frigate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/frigate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frigate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/frigate/web.nix b/third_party/nixpkgs/pkgs/by-name/fr/frigate/web.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/frigate/web.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frigate/web.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/frink/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/frink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frink/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/frogatto/data.nix b/third_party/nixpkgs/pkgs/by-name/fr/frogatto/data.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/frogatto/data.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frogatto/data.nix
diff --git a/third_party/nixpkgs/pkgs/games/frogatto/engine.nix b/third_party/nixpkgs/pkgs/by-name/fr/frogatto/engine.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/frogatto/engine.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frogatto/engine.nix
diff --git a/third_party/nixpkgs/pkgs/games/frogatto/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frogatto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/frogatto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frogatto/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/frogmouth/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frogmouth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/frogmouth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frogmouth/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/frotz/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frotz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/frotz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frotz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/frozen/meson.build b/third_party/nixpkgs/pkgs/by-name/fr/frozen/meson.build
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/frozen/meson.build
rename to third_party/nixpkgs/pkgs/by-name/fr/frozen/meson.build
diff --git a/third_party/nixpkgs/pkgs/development/libraries/frozen/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frozen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/frozen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frozen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/frp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frp/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/frr/clippy-helper.nix b/third_party/nixpkgs/pkgs/by-name/fr/frr/clippy-helper.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/frr/clippy-helper.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frr/clippy-helper.nix
diff --git a/third_party/nixpkgs/pkgs/servers/frr/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/frr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frugal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/frugal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frugal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/frugally-deep/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/frugally-deep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/frugally-deep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fr/frugally-deep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsarchiver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsarchiver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsatrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsatrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsautocomplete/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsautocomplete/deps.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsautocomplete/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsautocomplete/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/fscan/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/fscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fscrypt-experimental/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fscrypt-experimental/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fsearch/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsearch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fsearch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsearch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fselect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fselect/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/fsg/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/fsg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsg/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/fsg/wxgtk-3.2.patch b/third_party/nixpkgs/pkgs/by-name/fs/fsg/wxgtk-3.2.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/fsg/wxgtk-3.2.patch
rename to third_party/nixpkgs/pkgs/by-name/fs/fsg/wxgtk-3.2.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/fsharp/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsharp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/fsharp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsharp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fsmark/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsmark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fsmark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsmark/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fsmon/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsmon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fsmon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsmon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fspy/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fspy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fspy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fspy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fsql/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fsql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsql/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fsrx/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsrx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fsrx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsrx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/fst/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/fst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fst/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fstrcmp/cross.patch b/third_party/nixpkgs/pkgs/by-name/fs/fstrcmp/cross.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fstrcmp/cross.patch
rename to third_party/nixpkgs/pkgs/by-name/fs/fstrcmp/cross.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fstrcmp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fstrcmp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fstrm/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fstrm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fstrm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fstrm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fsv/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fsv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsv/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fsverity-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fsverity-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fsverity-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fsverity-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch b/third_party/nixpkgs/pkgs/by-name/fs/fsverity-utils/remove-dynamic-libs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch
rename to third_party/nixpkgs/pkgs/by-name/fs/fsverity-utils/remove-dynamic-libs.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix b/third_party/nixpkgs/pkgs/by-name/fs/fswebcam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fs/fswebcam/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch b/third_party/nixpkgs/pkgs/by-name/ft/ftop/ftop-fix_buffer_overflow.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch
rename to third_party/nixpkgs/pkgs/by-name/ft/ftop/ftop-fix_buffer_overflow.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch b/third_party/nixpkgs/pkgs/by-name/ft/ftop/ftop-fix_printf_format.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch
rename to third_party/nixpkgs/pkgs/by-name/ft/ftop/ftop-fix_printf_format.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ftop/default.nix b/third_party/nixpkgs/pkgs/by-name/ft/ftop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ftop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ft/ftop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix b/third_party/nixpkgs/pkgs/by-name/ft/ftxui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ft/ftxui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fuc/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fuc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fuc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fuc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/funambol/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/funambol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/funambol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/funambol/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/func/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/func/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/func/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/func/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/function-runner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/function-runner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/function-runner/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/functionalplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/functionalplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/functiontrace-server/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/functiontrace-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/functiontrace-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/functiontrace-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fundoc/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fundoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fundoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fundoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/funzzy/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/funzzy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/funzzy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/funzzy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/furtherance/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/furtherance/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/furtherance/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/furtherance/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch b/third_party/nixpkgs/pkgs/by-name/fu/fuse-7z-ng/no-pthread.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch
rename to third_party/nixpkgs/pkgs/by-name/fu/fuse-7z-ng/no-pthread.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fuse-7z-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fuse-7z-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch b/third_party/nixpkgs/pkgs/by-name/fu/fuse-7z-ng/zero-init-fuse-operations.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch
rename to third_party/nixpkgs/pkgs/by-name/fu/fuse-7z-ng/zero-init-fuse-operations.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-archive/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fuse-archive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/fuse-archive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fuse-archive/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/fuse-emulator/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fuse-emulator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/fuse-emulator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fuse-emulator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fuse-overlayfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fuse-overlayfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fusee-interfacee-tk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fusee-interfacee-tk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fusee-interfacee-tk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fusee-launcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fusee-launcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/fusee-nano/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fusee-nano/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/fusee-nano/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fusee-nano/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fuseiso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fuseiso/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fusionInventory/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fusionInventory/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fuzzel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fuzzel/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/fuzzylite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fu/fuzzylite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/fverb/default.nix b/third_party/nixpkgs/pkgs/by-name/fv/fverb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/fverb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fv/fverb/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fw-ectool/default.nix b/third_party/nixpkgs/pkgs/by-name/fw/fw-ectool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fw-ectool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fw/fw-ectool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix b/third_party/nixpkgs/pkgs/by-name/fw/fw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fw/fw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fwanalyzer/default.nix b/third_party/nixpkgs/pkgs/by-name/fw/fwanalyzer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/fwanalyzer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fw/fwanalyzer/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/third_party/nixpkgs/pkgs/by-name/fw/fwupd-efi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fw/fwupd-efi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix b/third_party/nixpkgs/pkgs/by-name/fx/fx-cast-bridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fx/fx-cast-bridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/third_party/nixpkgs/pkgs/by-name/fx/fxlinuxprint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fx/fxlinuxprint/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch b/third_party/nixpkgs/pkgs/by-name/fx/fxlinuxprintutil/fxlocalechk.tcl.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch
rename to third_party/nixpkgs/pkgs/by-name/fx/fxlinuxprintutil/fxlocalechk.tcl.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch b/third_party/nixpkgs/pkgs/by-name/fx/fxlinuxprintutil/fxlputil.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch
rename to third_party/nixpkgs/pkgs/by-name/fx/fxlinuxprintutil/fxlputil.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch b/third_party/nixpkgs/pkgs/by-name/fx/fxlinuxprintutil/fxlputil.tcl.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch
rename to third_party/nixpkgs/pkgs/by-name/fx/fxlinuxprintutil/fxlputil.tcl.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix b/third_party/nixpkgs/pkgs/by-name/fx/fxlinuxprintutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fx/fxlinuxprintutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fxload/default.nix b/third_party/nixpkgs/pkgs/by-name/fx/fxload/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/fxload/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fx/fxload/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/fzf-git-sh/default.nix b/third_party/nixpkgs/pkgs/by-name/fz/fzf-git-sh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/fzf-git-sh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fz/fzf-git-sh/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/bash/fzf-obc/default.nix b/third_party/nixpkgs/pkgs/by-name/fz/fzf-obc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/bash/fzf-obc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fz/fzf-obc/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix b/third_party/nixpkgs/pkgs/by-name/fz/fzf-zsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fz/fzf-zsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzy/default.nix b/third_party/nixpkgs/pkgs/by-name/fz/fzy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/fzy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fz/fzy/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/g15daemon/default.nix b/third_party/nixpkgs/pkgs/by-name/g1/g15daemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/g15daemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/g1/g15daemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/g15daemon/pid_location.patch b/third_party/nixpkgs/pkgs/by-name/g1/g15daemon/pid_location.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/g15daemon/pid_location.patch
rename to third_party/nixpkgs/pkgs/by-name/g1/g15daemon/pid_location.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/g203-led/default.nix b/third_party/nixpkgs/pkgs/by-name/g2/g203-led/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/g203-led/default.nix
rename to third_party/nixpkgs/pkgs/by-name/g2/g203-led/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/g810-led/default.nix b/third_party/nixpkgs/pkgs/by-name/g8/g810-led/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/g810-led/default.nix
rename to third_party/nixpkgs/pkgs/by-name/g8/g810-led/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/g933-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/g9/g933-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/g933-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/g9/g933-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/galario/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/galario/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/galario/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/galatia-sil/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/galatia-sil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/galatia-sil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/galatia-sil/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/deps.nix b/third_party/nixpkgs/pkgs/by-name/ga/galaxy-buds-client/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/galaxy-buds-client/deps.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/galaxy-buds-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/galaxy-buds-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/galen/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/galen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/galen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/galen/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/galene/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/galene/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/galer/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/galer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/galer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/galer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gallia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gallia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gallia/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/gam/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/gam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gam/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gama/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gama/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gambit/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gambit-chess/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gambit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gambit-chess/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/game-devices-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/game-devices-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/game-devices-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/game-devices-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/game-music-emu/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/game-music-emu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/game-music-emu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/game-music-emu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gamecube-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gamecube-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gamehub/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gamehub/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gamehub/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gamehub/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gamepad-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gamepad-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gamepad-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gamepad-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gammu/bashcomp-dir.patch b/third_party/nixpkgs/pkgs/by-name/ga/gammu/bashcomp-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gammu/bashcomp-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/ga/gammu/bashcomp-dir.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gammu/gammu-config-dialog.patch b/third_party/nixpkgs/pkgs/by-name/ga/gammu/gammu-config-dialog.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gammu/gammu-config-dialog.patch
rename to third_party/nixpkgs/pkgs/by-name/ga/gammu/gammu-config-dialog.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gammu/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gammu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gammu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gammu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gammu/systemd.patch b/third_party/nixpkgs/pkgs/by-name/ga/gammu/systemd.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gammu/systemd.patch
rename to third_party/nixpkgs/pkgs/by-name/ga/gammu/systemd.patch
diff --git a/third_party/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gandom-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gandom-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ganv/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/ganv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ganv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/ganv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/gappa/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gappa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/gappa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gappa/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/garamond-libre/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/garamond-libre/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/garamond-libre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/garamond-libre/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gargoyle/darwin.sh b/third_party/nixpkgs/pkgs/by-name/ga/gargoyle/darwin.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gargoyle/darwin.sh
rename to third_party/nixpkgs/pkgs/by-name/ga/gargoyle/darwin.sh
diff --git a/third_party/nixpkgs/pkgs/games/gargoyle/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gargoyle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gargoyle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gargoyle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/garmintools/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/garmintools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/garmintools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/garmintools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gatekeeper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gatekeeper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/gatk/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gatk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/gatk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gatk/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/gatling/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gatling/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/gatling/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gatling/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gau/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gau/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gau/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gau/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gav/gcc.patch b/third_party/nixpkgs/pkgs/by-name/ga/gav/gcc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gav/gcc.patch
rename to third_party/nixpkgs/pkgs/by-name/ga/gav/gcc.patch
diff --git a/third_party/nixpkgs/pkgs/games/gav/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gav/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gav/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gav/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gavrasm/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gavrasm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gavrasm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gavrasm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gaw/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gaw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/gaw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gaw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix b/third_party/nixpkgs/pkgs/by-name/gb/gb-backup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gb/gb-backup/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/third_party/nixpkgs/pkgs/by-name/gb/gbenchmark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gb/gbenchmark/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gbforth/default.nix b/third_party/nixpkgs/pkgs/by-name/gb/gbforth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gbforth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gb/gbforth/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcab/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/gc/gcab/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gcab/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/gc/gcab/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcab/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gcab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcab/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcal/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gcal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcalcli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcalcli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/11/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/12/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/13/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcfflasher/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcfflasher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gcfflasher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcfflasher/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gci/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gci/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gci/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gci/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcolor3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcolor3/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcov2lcov/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcov2lcov/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcsfuse/package.nix
similarity index 77%
rename from third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcsfuse/package.nix
index e4dbfb1cf5..315fc51a7a 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gc/gcsfuse/package.nix
@@ -1,20 +1,21 @@
{ lib
, buildGoModule
, fetchFromGitHub
+, stdenv
}:
buildGoModule rec {
pname = "gcsfuse";
- version = "2.4.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
- hash = "sha256-4susiXFe1aBcakxRkhmOe7dvcwsNfam4KKyFFzYXhcU=";
+ hash = "sha256-4UzRg6fNKBrTSoimJ9jURW9oPRhUOAUDMG3JaM7f100=";
};
- vendorHash = "sha256-uOr929RS8q7LB+WDiyxEIyScE/brmvPJKfnq28PfsDM=";
+ vendorHash = "sha256-QrpILFzgUQwmrvjCdtrlgq1zSW7f82qMHsifI39WaB0=";
subPackages = [ "." "tools/mount_gcsfuse" ];
@@ -41,5 +42,7 @@ buildGoModule rec {
changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ ];
+ # internal/cache/file/downloader/job.go:386:77: undefined: syscall.O_DIRECT
+ broken = stdenv.hostPlatform.isDarwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcstar/default.nix b/third_party/nixpkgs/pkgs/by-name/gc/gcstar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gcstar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gc/gcstar/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdl/default.nix b/third_party/nixpkgs/pkgs/by-name/gd/gdl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gdl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gd/gdl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/gdmap/get_sensitive.patch b/third_party/nixpkgs/pkgs/by-name/gd/gdmap/get_sensitive.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gdmap/get_sensitive.patch
rename to third_party/nixpkgs/pkgs/by-name/gd/gdmap/get_sensitive.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/gdmap/default.nix b/third_party/nixpkgs/pkgs/by-name/gd/gdmap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gdmap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gd/gdmap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/gdmap/set_flags.patch b/third_party/nixpkgs/pkgs/by-name/gd/gdmap/set_flags.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gdmap/set_flags.patch
rename to third_party/nixpkgs/pkgs/by-name/gd/gdmap/set_flags.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdome2/fno-common.patch b/third_party/nixpkgs/pkgs/by-name/gd/gdome2/fno-common.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gdome2/fno-common.patch
rename to third_party/nixpkgs/pkgs/by-name/gd/gdome2/fno-common.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdome2/default.nix b/third_party/nixpkgs/pkgs/by-name/gd/gdome2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gdome2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gd/gdome2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdome2/xml-document.patch b/third_party/nixpkgs/pkgs/by-name/gd/gdome2/xml-document.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gdome2/xml-document.patch
rename to third_party/nixpkgs/pkgs/by-name/gd/gdome2/xml-document.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gdrive/default.nix b/third_party/nixpkgs/pkgs/by-name/gd/gdrive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/gdrive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gd/gdrive/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gdrive3/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/gd/gdrive3/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/gdrive3/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/gd/gdrive3/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gdrive3/default.nix b/third_party/nixpkgs/pkgs/by-name/gd/gdrive3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/gdrive3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gd/gdrive3/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/by-name/gd/gdu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gd/gdu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/gebaar-libinput/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gebaar-libinput/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/gebaar-libinput/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gebaar-libinput/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/gedit/correct-gir-lib-path.patch b/third_party/nixpkgs/pkgs/by-name/ge/gedit/correct-gir-lib-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/gedit/correct-gir-lib-path.patch
rename to third_party/nixpkgs/pkgs/by-name/ge/gedit/correct-gir-lib-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gedit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gedit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/geek-life/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geek-life/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/geek-life/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geek-life/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geeqie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geeqie/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gef/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gef/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/gef/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gef/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/gelasio/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gelasio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/gelasio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gelasio/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gem/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/gemget/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gemget/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/gemget/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gemget/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gemrb/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gemrb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gemrb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gemrb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gen-oath-safe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gen-oath-safe/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/gen6dns/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gen6dns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/gen6dns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gen6dns/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/genact/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/genact/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/genact/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/genact/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/genann/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/genann/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/genann/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/genann/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gencfsm/makefile-mkdir.patch b/third_party/nixpkgs/pkgs/by-name/ge/gencfsm/makefile-mkdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gencfsm/makefile-mkdir.patch
rename to third_party/nixpkgs/pkgs/by-name/ge/gencfsm/makefile-mkdir.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/gencfsm/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gencfsm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gencfsm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gencfsm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gendef/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gendef/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gendef/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gendef/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/genemichaels/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ge/genemichaels/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/genemichaels/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ge/genemichaels/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/genemichaels/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/genemichaels/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/genemichaels/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/genemichaels/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/genesys/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/genesys/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/genesys/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/genesys/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/genext2fs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/genext2fs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gengetopt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gengetopt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/genimage/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/genimage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/genimage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/genimage/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/genmap/gtest.patch b/third_party/nixpkgs/pkgs/by-name/ge/genmap/gtest.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/genmap/gtest.patch
rename to third_party/nixpkgs/pkgs/by-name/ge/genmap/gtest.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/genmap/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/genmap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/genmap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/genmap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/genromfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/genromfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gentium-book-basic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gentium-book-basic/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/gentium/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gentium/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/gentium/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gentium/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/genxword/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/genxword/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/genxword/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/genxword/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/genymotion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/genymotion/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/third_party/nixpkgs/pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
rename to third_party/nixpkgs/pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geoclue2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geoclue2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/geocode-glib/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/ge/geocode-glib/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/geocode-glib/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/ge/geocode-glib/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geocode-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geocode-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/geogram/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geogram/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/geogram/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geogram/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/geogram/replace-bundled-zlib.patch b/third_party/nixpkgs/pkgs/by-name/ge/geogram/replace-bundled-zlib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/geogram/replace-bundled-zlib.patch
rename to third_party/nixpkgs/pkgs/by-name/ge/geogram/replace-bundled-zlib.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geoipjava/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geoipjava/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geoipupdate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geoipupdate/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geolite-legacy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geolite-legacy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gopher/geomyidae/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geomyidae/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/gopher/geomyidae/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geomyidae/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geonkick/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geonkick/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/gephi/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gephi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/misc/gephi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gephi/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gerbera/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gerbera/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gerbera/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gerbera/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/get_iplayer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/get_iplayer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/getdata/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/getdata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/getdata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/getdata/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/getdp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/getdp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/geteltorito/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geteltorito/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/geteltorito/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geteltorito/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/getopt/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/getopt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/getopt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/getopt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/getoptions/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/getoptions/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/getxbook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/getxbook/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gexiv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gexiv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch b/third_party/nixpkgs/pkgs/by-name/gf/gf/build-use-optional-freetype-with-pkg-config.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch
rename to third_party/nixpkgs/pkgs/by-name/gf/gf/build-use-optional-freetype-with-pkg-config.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gf/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/gf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gf2x/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gf2x/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gf2x/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gf2x/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch b/third_party/nixpkgs/pkgs/by-name/gf/gfan/gfan-0.6.2-cddlib-prefix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch
rename to third_party/nixpkgs/pkgs/by-name/gf/gfan/gfan-0.6.2-cddlib-prefix.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gfan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gfan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gfbgraph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gfbgraph/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gflags/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gflags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gflags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gflags/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gf/gfn-electron/package.nix b/third_party/nixpkgs/pkgs/by-name/gf/gfn-electron/package.nix
new file mode 100644
index 0000000000..3e2ceb67b2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/gf/gfn-electron/package.nix
@@ -0,0 +1,80 @@
+{
+ lib,
+ buildNpmPackage,
+ fetchFromGitHub,
+ electron,
+ nix-update-script,
+ makeBinaryWrapper,
+}:
+let
+ version = "2.1.2";
+in
+buildNpmPackage {
+ pname = "gfn-electron";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "hmlendea";
+ repo = "gfn-electron";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-kTnM4wSDqP2V8hb4mDhbQYpVYouSnUkjuuCfITb/xgY=";
+ };
+
+ npmDepsHash = "sha256-27N0hWOfkLQGaGspm4aCoVF6PWiUOAKs+JzbdQV94lo=";
+
+ nativeBuildInputs = [ makeBinaryWrapper ];
+
+ env.ELECTRON_SKIP_BINARY_DOWNLOAD = true;
+
+ # FIXME: Git dependency node_modules/register-scheme contains install scripts,
+ # but has no lockfile, which is something that will probably break.
+ forceGitDeps = true;
+
+ makeCacheWritable = true;
+
+ buildPhase = ''
+ runHook preBuild
+
+ # NOTE: Upstream explicitly opts to not build an ASAR as it would cause all
+ # text to disappear in the app.
+ npm exec electron-builder -- \
+ --dir \
+ -c.electronDist=${electron.dist} \
+ -c.electronVersion=${electron.version}
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out
+ cp -r dist/*-unpacked $out/dist
+
+ install -Dm644 com.github.hmlendea.geforcenow-electron.desktop -t $out/share/applications
+ install -Dm644 icon.png $out/share/icons/hicolor/512x512/apps/geforcenow-electron.png
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ makeWrapper $out/dist/geforcenow-electron $out/bin/geforcenow-electron \
+ --add-flags "--no-sandbox --disable-gpu-sandbox" \
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
+
+ substituteInPlace $out/share/applications/com.github.hmlendea.geforcenow-electron.desktop \
+ --replace-fail "/opt/geforcenow-electron/geforcenow-electron" "geforcenow-electron" \
+ --replace-fail "Icon=nvidia" "Icon=geforcenow-electron"
+ '';
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Linux Desktop client for Nvidia's GeForce NOW game streaming service";
+ homepage = "https://github.com/hmlendea/gfn-electron";
+ license = with lib.licenses; [ gpl3Only ];
+ platforms = lib.intersectLists lib.platforms.linux electron.meta.platforms;
+ maintainers = with lib.maintainers; [ pluiedev ];
+ mainProgram = "geforcenow-electron";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gforth/boot-forth.nix b/third_party/nixpkgs/pkgs/by-name/gf/gforth/boot-forth.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gforth/boot-forth.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gforth/boot-forth.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gforth/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gforth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gforth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gforth/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gforth/swig.nix b/third_party/nixpkgs/pkgs/by-name/gf/gforth/swig.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gforth/swig.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gforth/swig.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gfs2-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gfs2-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/gfs2-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gfs2-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gfshare/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gfshare/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gfshare/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gfshare/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gfxreconstruct/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gfxreconstruct/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gfxstream/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gfxstream/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gfxstream/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gfxstream/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gfxtablet/default.nix b/third_party/nixpkgs/pkgs/by-name/gf/gfxtablet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/gfxtablet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gf/gfxtablet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gg/default.nix b/third_party/nixpkgs/pkgs/by-name/gg/gg-scm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gg/gg-scm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ggobi/default.nix b/third_party/nixpkgs/pkgs/by-name/gg/ggobi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/ggobi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gg/ggobi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix b/third_party/nixpkgs/pkgs/by-name/gg/ggz_base_libs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gg/ggz_base_libs/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gh/gh-dash/package.nix b/third_party/nixpkgs/pkgs/by-name/gh/gh-dash/package.nix
index 674fa06bd6..281cbe0c2c 100644
--- a/third_party/nixpkgs/pkgs/by-name/gh/gh-dash/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gh/gh-dash/package.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gh-dash";
- version = "4.7.0";
+ version = "4.7.1";
src = fetchFromGitHub {
owner = "dlvhdr";
repo = "gh-dash";
rev = "v${version}";
- hash = "sha256-+tUG+ReP8y6wI4XZsR2Look4LAwK79CZf9fWUgkx4O0=";
+ hash = "sha256-q/p7WDbJU27+m/4HVQJ7zRo0r1A0FkV21gJqHJYHHBE=";
};
vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE=";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/gh-ost/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/gh-ost/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/gh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/gh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/gh2md/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/gh2md/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/gh2md/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/gh2md/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ghauri/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghauri/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ghauri/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghauri/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ghc_filesystem/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghc_filesystem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ghc_filesystem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghc_filesystem/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ghdorker/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghdorker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ghdorker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghdorker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghorg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghorg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ghost/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghost/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ghost/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghost/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ghostie/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/gh/ghostie/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ghostie/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/gh/ghostie/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ghostie/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghostie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ghostie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghostie/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/doc-no-ref.diff b/third_party/nixpkgs/pkgs/by-name/gh/ghostscript/doc-no-ref.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/ghostscript/doc-no-ref.diff
rename to third_party/nixpkgs/pkgs/by-name/gh/ghostscript/doc-no-ref.diff
diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghostscript/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/ghostscript/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghostscript/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/test-corpus-render.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghostscript/test-corpus-render.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/ghostscript/test-corpus-render.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghostscript/test-corpus-render.nix
diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/urw-font-files.patch b/third_party/nixpkgs/pkgs/by-name/gh/ghostscript/urw-font-files.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/ghostscript/urw-font-files.patch
rename to third_party/nixpkgs/pkgs/by-name/gh/ghostscript/urw-font-files.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ghosttohugo/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghosttohugo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ghosttohugo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghosttohugo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghostunnel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghostunnel/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghq/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/ghq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghq/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ghz/default.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ghz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gh/ghz/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gImageReader/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gImageReader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gImageReader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gImageReader/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gi-crystal/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gi-crystal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gi-crystal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gi-crystal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gi-crystal/src.patch b/third_party/nixpkgs/pkgs/by-name/gi/gi-crystal/src.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gi-crystal/src.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/gi-crystal/src.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch b/third_party/nixpkgs/pkgs/by-name/gi/gi-crystal/store-friendly-library-name.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/gi-crystal/store-friendly-library-name.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/gi-docgen/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gi-docgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/documentation/gi-docgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gi-docgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/giac/fix-fltk-guard.patch b/third_party/nixpkgs/pkgs/by-name/gi/giac/fix-fltk-guard.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/giac/fix-fltk-guard.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/giac/fix-fltk-guard.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/giac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/giac/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/giac/remove-old-functional-patterns.patch b/third_party/nixpkgs/pkgs/by-name/gi/giac/remove-old-functional-patterns.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/giac/remove-old-functional-patterns.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/giac/remove-old-functional-patterns.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/giada/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/giada/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/giada/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/giara/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/giara/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/giara/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gibo/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gibo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gibo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gibo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gif-for-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gif-for-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gif2apng/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gif2apng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/gif2apng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gif2apng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/giflib/CVE-2021-40633.patch b/third_party/nixpkgs/pkgs/by-name/gi/giflib/CVE-2021-40633.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/giflib/CVE-2021-40633.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/giflib/CVE-2021-40633.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/giflib/mingw-install-exes.patch b/third_party/nixpkgs/pkgs/by-name/gi/giflib/mingw-install-exes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/giflib/mingw-install-exes.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/giflib/mingw-install-exes.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/giflib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/giflib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gifticlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/gifticlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gifticlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gigalixir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gigalixir/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gigedit/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gigedit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gigedit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gigedit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/clang.patch b/third_party/nixpkgs/pkgs/by-name/gi/gildas/clang.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/clang.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/gildas/clang.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/cpp-darwin.patch b/third_party/nixpkgs/pkgs/by-name/gi/gildas/cpp-darwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/cpp-darwin.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/gildas/cpp-darwin.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gildas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gildas/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/wrapper.patch b/third_party/nixpkgs/pkgs/by-name/gi/gildas/wrapper.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/wrapper.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/gildas/wrapper.patch
diff --git a/third_party/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gimme-aws-creds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gimme-aws-creds/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gimx/conf.patch b/third_party/nixpkgs/pkgs/by-name/gi/gimx/conf.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gimx/conf.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/gimx/conf.patch
diff --git a/third_party/nixpkgs/pkgs/games/gimx/gcc14.patch b/third_party/nixpkgs/pkgs/by-name/gi/gimx/gcc14.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gimx/gcc14.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/gimx/gcc14.patch
diff --git a/third_party/nixpkgs/pkgs/games/gimx/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gimx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gimx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gimx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/ginac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/ginac/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/ginkgo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/ginkgo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gio-sharp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gio-sharp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/giph/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/giph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/giph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/giph/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gir/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/gi/gir-rs/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gir/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/gi/gir-rs/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/gir/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gir-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gir-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/girsh/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/girsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/girsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/girsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-aggregator/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-aggregator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-aggregator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-aggregator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-annex-remote-rclone/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-annex-remote-rclone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-annex-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-annex-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-annex-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-annex-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-appraise/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-appraise/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-appraise/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-appraise/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-backdate/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-backdate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-backdate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-backdate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-bars/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-bars/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-bars/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-bars/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-big-picture/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-big-picture/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-big-picture/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-big-picture/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-bug-migration/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-bug-migration/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-bug-migration/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-bug-migration/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-bug/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-bug/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-bug/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-bug/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cache/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-cache/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-cache/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-cache/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-chglog/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-chglog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-chglog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-chglog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-codereview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-codereview/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-cola/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-cola/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-crecord/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-crecord/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-credential-oauth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-credential-oauth/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-crypt/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-crypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-crypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-crypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-delete-merged-branches/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-delete-merged-branches/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-delete-merged-branches/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-delete-merged-branches/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-dive/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-dive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-dive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-dive/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-extras/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-extras/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-fire/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-fire/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-fire/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-fire/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-ftp/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-ftp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-ftp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-ftp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-graph/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-graph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-graph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-graph/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-hound/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-hound/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-hound/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-hound/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-hub/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-hub/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-hub/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-hub/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-ignore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-ignore/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-latexdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-latexdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/git-latexdiff/version-test.patch b/third_party/nixpkgs/pkgs/by-name/gi/git-latexdiff/version-test.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/git-latexdiff/version-test.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/git-latexdiff/version-test.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-mit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-mit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-octopus/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-octopus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-octopus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-octopus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-open/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-open/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-open/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-open/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-privacy/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-privacy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-privacy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-privacy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-quick-stats/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-quick-stats/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-radar/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-radar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-radar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-radar/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-relevant-history/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-relevant-history/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-relevant-history/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-relevant-history/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-remote-gcrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-remote-gcrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-remote-gcrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-remote-gcrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-remote-hg/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-remote-hg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-remote-hg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-remote-hg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-reparent/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-reparent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-reparent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-reparent/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/third_party/nixpkgs/pkgs/by-name/gi/git-repo/import-ssl-module.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-repo/import-ssl-module.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/git-repo/import-ssl-module.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-repo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-repo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-secret/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-secret/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-secret/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-secret/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-secrets/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-secrets/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-secrets/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-secrets/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-series/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-series/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-series/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-series/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-sizer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-sizer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-stree/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-stree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-stree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-stree/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-subrepo/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-subrepo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-subrepo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-subrepo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-subtrac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-subtrac/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-sync/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-sync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-sync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-sync/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-team/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-team/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-team/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-team/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-test/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-test/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-test/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-test/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-town/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-town/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-vanity-hash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-vanity-hash/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-vendor/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-vendor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-vendor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-vendor/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-warp-time/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-warp-time/package.nix
new file mode 100644
index 0000000000..02b58f2cf7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/gi/git-warp-time/package.nix
@@ -0,0 +1,78 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+
+ # nativeBuildInputs
+ zstd,
+ pkg-config,
+ jq,
+ cargo,
+ rustc,
+ rustPlatform,
+
+ # buildInputs
+ libgit2,
+ typos,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "git-warp-time";
+ version = "0.8.4";
+
+ src = fetchurl {
+ url = "https://github.com/alerque/git-warp-time/releases/download/v${finalAttrs.version}/git-warp-time-${finalAttrs.version}.tar.zst";
+ sha256 = "sha256-Xh30nA77cJ7+UfKlIslnyD+93AtnQ+8P3sCFsG0DAUk=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit (finalAttrs) src;
+ nativeBuildInputs = [ zstd ];
+ dontConfigure = true;
+ hash = "sha256-ozy8Mfl5fTJL2Sr22tCSnK30SOKaC9cL+g4lX6ivi9Q=";
+ };
+
+ nativeBuildInputs = [
+ zstd
+ pkg-config
+ jq
+ cargo
+ rustc
+ rustPlatform.cargoSetupHook
+ ];
+
+ buildInputs = [
+ libgit2
+ typos
+ ];
+
+ env = {
+ LIBGIT2_NO_VENDOR = "1";
+ };
+
+ outputs = [
+ "out"
+ "doc"
+ "man"
+ "dev"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Utility to reset filesystem timestamps based on Git history";
+ longDescription = ''
+ A CLI utility that resets the timestamps of files in a Git repository
+ working directory to the exact timestamp of the last commit which
+ modified each file.
+ '';
+ homepage = "https://github.com/alerque/git-warp-time";
+ changelog = "https://github.com/alerque/git-warp-time/raw/v${finalAttrs.version}/CHANGELOG.md";
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [
+ alerque
+ ];
+ license = lib.licenses.gpl3Only;
+ mainProgram = "git-warp-time";
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-when-merged/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-when-merged/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-when-merged/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-when-merged/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/git2-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git2-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/git2-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git2-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git2cl/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git2cl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/git2cl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git2cl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/git.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitaly/git.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/git.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitaly/git.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitaly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitaly/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitbatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitbatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitflow/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitflow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitflow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitflow/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/github-backup/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/github-backup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/github-backup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/github-backup/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/github-commenter/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/github-commenter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/github-commenter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/github-commenter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/github-copilot-cli/package-lock.json b/third_party/nixpkgs/pkgs/by-name/gi/github-copilot-cli/package-lock.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/github-copilot-cli/package-lock.json
rename to third_party/nixpkgs/pkgs/by-name/gi/github-copilot-cli/package-lock.json
diff --git a/third_party/nixpkgs/pkgs/tools/misc/github-copilot-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/github-copilot-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/github-copilot-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/github-copilot-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/github-copilot-intellij-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/github/github-release/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/github-release/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/github/github-release/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/github-release/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gitit/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gitit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitjacker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitjacker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitkraken/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitkraken/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/gitlab-clippy/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-clippy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/gitlab-clippy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitlab-clippy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-container-registry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitlab-container-registry/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-pages/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitlab-pages/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-shell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitlab-shell/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-shell/remove-hardcoded-locations.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/gitlab-shell/remove-hardcoded-locations.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitleaks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitleaks/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitless/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitless/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitless/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitless/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitls/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitls/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitnr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitnr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitnuro/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitnuro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitnuro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitnuro/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitolite/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitolite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitolite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitolite/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gitrs/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitrs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gitrs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitrs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitsign/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitsign/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitsign/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitsign/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitstats/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitstats/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitstats/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitstats/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitstatus/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitstatus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitstatus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitstatus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitty/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitty/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitweb/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitweb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gitweb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitweb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gixy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gixy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gjay/default.nix b/third_party/nixpkgs/pkgs/by-name/gj/gjay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gjay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gj/gjay/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/gjo/default.nix b/third_party/nixpkgs/pkgs/by-name/gj/gjo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/gjo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gj/gjo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/disable-introspection-test.patch b/third_party/nixpkgs/pkgs/by-name/gj/gjs/disable-introspection-test.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gjs/disable-introspection-test.patch
rename to third_party/nixpkgs/pkgs/by-name/gj/gjs/disable-introspection-test.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/gj/gjs/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gjs/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/gj/gjs/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/gj/gjs/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/gj/gjs/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix b/third_party/nixpkgs/pkgs/by-name/gj/gjs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gj/gjs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/gkraken/default.nix b/third_party/nixpkgs/pkgs/by-name/gk/gkraken/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gkraken/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gk/gkraken/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gl-117/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/gl117/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gl-117/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/gl117/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gl2ps/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/gl2ps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gl2ps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/gl2ps/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/gl3w/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/gl3w/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/glabels/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glabels/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/glabels/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glabels/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glade/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/glade/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glade/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/gladtex/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/gladtex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/tex/gladtex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/gladtex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage b/third_party/nixpkgs/pkgs/by-name/gl/glamoroustoolkit/GlamorousToolkit-GetImage
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage
rename to third_party/nixpkgs/pkgs/by-name/gl/glamoroustoolkit/GlamorousToolkit-GetImage
diff --git a/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glamoroustoolkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glamoroustoolkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/glasgow/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glasgow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/glasgow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glasgow/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/glasstty-ttf/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glasstty-ttf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/glasstty-ttf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glasstty-ttf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/glava/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glava/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/glava/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glava/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glbinding/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glbinding/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glbinding/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glbinding/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gle/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/gle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/gle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/glee/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glee/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/glee/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glee/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glfw3/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glfw3/package.nix
index ba77795b05..08a7aef506 100644
--- a/third_party/nixpkgs/pkgs/by-name/gl/glfw3/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gl/glfw3/package.nix
@@ -1,8 +1,23 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
-, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext
-, darwin, fixDarwinDylibNames
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, pkg-config
+, libGL
+, vulkan-loader
+, libXrandr
+, libXinerama
+, libXcursor
+, libX11
+, libXi
+, libXext
+, darwin
+, fixDarwinDylibNames
, wayland
-, wayland-scanner, wayland-protocols, libxkbcommon, libdecor
+, wayland-scanner
+, wayland-protocols
+, libxkbcommon
+, libdecor
, withMinecraftPatch ? false
}:
let
@@ -51,6 +66,7 @@ stdenv.mkDerivation {
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows) [
"-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'"
"-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'"
+ "-DCMAKE_C_FLAGS=-D_GLFW_VULKAN_LIBRARY='\"${lib.getLib vulkan-loader}/lib/libvulkan.so.1\"'"
];
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch b/third_party/nixpkgs/pkgs/by-name/gl/glib-networking/disable-pkcs11-tests.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch
rename to third_party/nixpkgs/pkgs/by-name/gl/glib-networking/disable-pkcs11-tests.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch b/third_party/nixpkgs/pkgs/by-name/gl/glib-networking/hardcode-gsettings.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch
rename to third_party/nixpkgs/pkgs/by-name/gl/glib-networking/hardcode-gsettings.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/gl/glib-networking/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glib-networking/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/gl/glib-networking/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glib-networking/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glib-networking/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib-testing/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/gl/glib-testing/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glib-testing/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/gl/glib-testing/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib-testing/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glib-testing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glib-testing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glib-testing/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/glicol-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glicol-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/glicol-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glicol-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/glitter/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glitter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/glitter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glitter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/gllvm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/gllvm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glm/glm.pc.in b/third_party/nixpkgs/pkgs/by-name/gl/glm/glm.pc.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glm/glm.pc.in
rename to third_party/nixpkgs/pkgs/by-name/gl/glm/glm.pc.in
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glm/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glmark2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glmark2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/global-platform-pro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/global-platform-pro/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/global/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/global/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/globalarrays/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/globalarrays/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/globalarrays/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/globalarrays/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/globalping-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/globalping-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/globalping-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/globalping-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/globe-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/globe-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/globe-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/globe-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/globulation/header-order.patch b/third_party/nixpkgs/pkgs/by-name/gl/globulation2/header-order.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/globulation/header-order.patch
rename to third_party/nixpkgs/pkgs/by-name/gl/globulation2/header-order.patch
diff --git a/third_party/nixpkgs/pkgs/games/globulation/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/globulation2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/globulation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/globulation2/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/globulation/public-buildproject.patch b/third_party/nixpkgs/pkgs/by-name/gl/globulation2/public-buildproject.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/globulation/public-buildproject.patch
rename to third_party/nixpkgs/pkgs/by-name/gl/globulation2/public-buildproject.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glooctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glooctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/gloox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/gloox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/glow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glow/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glowing-bear/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glowing-bear/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glpaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glpaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glpk/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glpk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glpk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glpk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glslang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glslang/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/glslls/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glslls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/glslls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glslls/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gltron/gentoo-prototypes.patch b/third_party/nixpkgs/pkgs/by-name/gl/gltron/gentoo-prototypes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gltron/gentoo-prototypes.patch
rename to third_party/nixpkgs/pkgs/by-name/gl/gltron/gentoo-prototypes.patch
diff --git a/third_party/nixpkgs/pkgs/games/gltron/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/gltron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gltron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/gltron/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/gluesql/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/gluesql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/gluesql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/gluesql/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glui/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/glui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glusterfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glusterfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch b/third_party/nixpkgs/pkgs/by-name/gl/glusterfs/ssl_cert_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch
rename to third_party/nixpkgs/pkgs/by-name/gl/glusterfs/ssl_cert_path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/audio/glyr/default.nix b/third_party/nixpkgs/pkgs/by-name/gl/glyr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/glyr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gl/glyr/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gmad/default.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gmad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gm/gmad/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmailctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gm/gmailctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmm/default.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gmm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gm/gmm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/gmni/default.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmni/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/gmni/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gm/gmni/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmnisrv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gm/gmnisrv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gmnitohtml/default.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmnitohtml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gmnitohtml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gm/gmnitohtml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gmqcc/default.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmqcc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gmqcc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gm/gmqcc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/fix-python.patch b/third_party/nixpkgs/pkgs/by-name/gm/gmsh/fix-python.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/gmsh/fix-python.patch
rename to third_party/nixpkgs/pkgs/by-name/gm/gmsh/fix-python.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gm/gmsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gmu/default.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gmu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gm/gmu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix b/third_party/nixpkgs/pkgs/by-name/gn/gn/generic.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gn/generic.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/gn/gn/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/gn/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/gn/gn/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnaural/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnaural/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gnaural/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnaural/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnet/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnirehtet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnirehtet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnmic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnmic/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-browser-connector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-browser-connector/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnome-builder/fix-finding-test-typelibs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-builder/fix-finding-test-typelibs.patch
diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-builder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-builder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-console/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-console/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-control-center/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-control-center/package.nix
index 27d9259a1c..6d10ce16a8 100644
--- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -74,11 +74,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-control-center";
- version = "47.0.1";
+ version = "47.1.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
- hash = "sha256-h+7fdDN7PGHfGaDcjCW1wpYp+1+Rm+w0y9CkscfbNWc=";
+ hash = "sha256-BR/UBXFX9LIzcBP778luPRKWVOP8lg1ISdNUJSQAvnc=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-desktop-testing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-desktop-testing/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnome-desktop/bubblewrap-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-desktop/bubblewrap-paths.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-doc-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-doc-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-extension-manager/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-extension-manager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gnome-extension-manager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-extension-manager/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-frog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-frog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnome-frog/update-compatible-with-non-flatpak-env.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-frog/update-compatible-with-non-flatpak-env.patch
diff --git a/third_party/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-inform7/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-inform7/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-keysign/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-keysign/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-menus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-menus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-multi-writer/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-multi-writer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gnome-multi-writer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-multi-writer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-network-displays/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-network-displays/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-online-accounts/package.nix
similarity index 96%
rename from third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-online-accounts/package.nix
index 1f392e4443..bf622966ed 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-online-accounts/package.nix
@@ -31,13 +31,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-online-accounts";
- version = "3.52.0";
+ version = "3.52.1";
outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
- hash = "sha256-YxlTqdnqCYsmigu+LfGMu+xngVicrGsEVSFGCe4Su9g=";
+ hash = "sha256-N8dSL/lFT4NxtahyW7p27XQwyVsfnvx/66YmjwUtHrc=";
};
mesonFlags = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnome-photos/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-photos/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-photos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-photos/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-podcasts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-podcasts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/gnome-randr/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-randr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/gnome-randr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-randr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-recipes/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-recipes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gnome-recipes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-recipes/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-remote-desktop/package.nix
index 8e777477cd..106f67a0ae 100644
--- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-remote-desktop/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-remote-desktop/package.nix
@@ -31,11 +31,11 @@
stdenv.mkDerivation rec {
pname = "gnome-remote-desktop";
- version = "47.0";
+ version = "47.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz";
- hash = "sha256-iqVXdXV7KZ3r5Bfhaebij+y/GM5hHtF2+g1lCrU0R3Y=";
+ hash = "sha256-BG0Py4m4jQskaczTUGPbW0KkUfkHEbU/H6OrFJGsGN4=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-secrets/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-secrets/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon43/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon43/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon43/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-settings-daemon43/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-shell-extensions/package.nix
index 52d852973a..3997815c28 100644
--- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-shell-extensions/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-shell-extensions/package.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell-extensions";
- version = "47.0";
+ version = "47.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
- hash = "sha256-UPBPe6UO3tEM6gekcF+zNj6Gkm0QARvlslA3Vmdwg08=";
+ hash = "sha256-6UOMxdOfmHXf0E6gq7UeWWLqrVwgJ0EjJDsWEgmLOoU=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-shell/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-shell/package.nix
index c9e7c1b976..fca04ba81d 100644
--- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-shell/package.nix
@@ -70,7 +70,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell";
- version = "47.0";
+ version = "47.1";
outputs = [
"out"
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
- hash = "sha256-eiB3DGKQrWmpqCyEl8sn4b+GPzh9sl6Y5ULk9sXwbe0=";
+ hash = "sha256-tGdXX4wVnSBVclhRfw3Wjf0BR9EbSNl6uOH3CbxSKmM=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-solanum/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-solanum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gnome-solanum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-solanum/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-tecla/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-tecla/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gnome-tecla/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-tecla/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-usage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-usage/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-user-docs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-user-docs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-video-effects/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnome-video-effects/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnomecast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnomecast/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gnonograms/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnonograms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gnonograms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnonograms/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gnostic/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnostic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gnostic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnostic/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/gnote/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnote/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/gnote/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnote/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnss-sdr/fix_libcpu_features_install_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnss-sdr/fix_libcpu_features_install_path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnss-sdr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnss-sdr/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gnss-share/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnss-share/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gnss-share/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnss-share/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gnu-cim/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnu-cim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gnu-cim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnu-cim/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnu-config/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gnu-config/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnu-config/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnu-pw-mgr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnu-pw-mgr/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/gnu-shepherd/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnu-shepherd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/gnu-shepherd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnu-shepherd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnuapl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnuapl/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gnubg/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnubg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gnubg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnubg/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gnuchess/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnuchess/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gnuchess/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnuchess/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnuclad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnuclad/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gnugo/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnugo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gnugo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnugo/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gnujump/gnujump.xpm b/third_party/nixpkgs/pkgs/by-name/gn/gnujump/gnujump.xpm
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gnujump/gnujump.xpm
rename to third_party/nixpkgs/pkgs/by-name/gn/gnujump/gnujump.xpm
diff --git a/third_party/nixpkgs/pkgs/games/gnujump/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnujump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gnujump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnujump/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gnulib/gnulib-longdouble-redirect.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnulib/gnulib-longdouble-redirect.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gnulib/gnulib-longdouble-redirect.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnulib/gnulib-longdouble-redirect.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnulib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnulib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gnum4/loong-fix-build.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnum4/loong-fix-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/gnum4/loong-fix-build.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnum4/loong-fix-build.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnum4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnum4/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnumake42/glibc-2.27-glob.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnumake42/glibc-2.27-glob.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnumake42/glibc-2.33-glob.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnumake42/glibc-2.33-glob.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnumake42/impure-dirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnumake42/impure-dirs.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnumake42/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnumake42/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/third_party/nixpkgs/pkgs/by-name/gn/gnumake42/pselect.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch
rename to third_party/nixpkgs/pkgs/by-name/gn/gnumake42/pselect.patch
diff --git a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnumeric/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnumeric/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pth/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnupth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnupth/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gnushogi/default.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnushogi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gnushogi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gn/gnushogi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/2fa/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-2fa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/2fa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-2fa/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/go-audit/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-audit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/go-audit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-audit/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/go-autoconfig/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-autoconfig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/go-autoconfig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-autoconfig/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-bindata-assetfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-bindata-assetfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-bindata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-bindata/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-callvis/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-callvis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-callvis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-callvis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/check/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-check/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/check/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-check/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-containerregistry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-containerregistry/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/go-cqhttp/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-cqhttp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/go-cqhttp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-cqhttp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/go-cve-search/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-cve-search/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/go-cve-search/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-cve-search/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/go-dork/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-dork/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/go-dork/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-dork/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/go-exploitdb/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-exploitdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/go-exploitdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-exploitdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/go-font/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/go-font/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-graft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-graft/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/go-ios/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-ios/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/go-ios/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-ios/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-jet/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-jet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-jet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-jet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-jira/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-jira/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-junit-report/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-junit-report/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-junit-report/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-junit-report/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/go-libp2p-daemon/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-libp2p-daemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/go-libp2p-daemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-libp2p-daemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-license-detector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-license-detector/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch b/third_party/nixpkgs/pkgs/by-name/go/go-licenses/fix-go-version-error.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch
rename to third_party/nixpkgs/pkgs/by-name/go/go-licenses/fix-go-version-error.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-licenses/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/go-licenses/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-licenses/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-md2man/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-md2man/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-migrate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-migrate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-minimock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-minimock/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-mockery/package.nix
similarity index 90%
rename from third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-mockery/package.nix
index 61cc59d4a8..394a16b7e0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/go/go-mockery/package.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-mockery";
- version = "2.46.0";
+ version = "2.46.3";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
rev = "v${version}";
- sha256 = "sha256-qPE4hzdu5soGVfw6mLJLWvjiXxdkUAT+kpOCWMO1sL8=";
+ sha256 = "sha256-KgQ5EV7tnIZGmM8vrP7Sed2jm7ghgORCgkFR9TOXx6Y=";
};
preCheck = ''
@@ -24,7 +24,7 @@ buildGoModule rec {
CGO_ENABLED = false;
proxyVendor = true;
- vendorHash = "sha256-1SzdVM1Ncpym6bPg1aSyfoAM1YiUGal3Glw0paz+buk=";
+ vendorHash = "sha256-fxh0WaopHKHuOjXXYNmO30/jB1zwtf5HhhtRGnCl7fM=";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mod-graph-chart/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-mod-graph-chart/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-mod-graph-chart/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-mod-graph-chart/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-motion/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-motion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-motion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-motion/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-mtpfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-mtpfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-musicfox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-musicfox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-neb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-neb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/go-org/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-org/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/go-org/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-org/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-outline/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-outline/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-outline/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-outline/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-protobuf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-protobuf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/go.rice/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-rice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/go.rice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-rice/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/go-sct/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-sct/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/go-sct/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-sct/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/go-shadowsocks2/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-shadowsocks2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/go-shadowsocks2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-shadowsocks2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-swag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-swag/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-swagger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-swagger/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-task/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-task/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-task/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-toml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-toml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/go2rtc/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go2rtc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/go2rtc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go2rtc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/go365/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go365/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/go365/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/go365/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/goa/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/goa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goa/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goaccess/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goaccess/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/goawk/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goawk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/goawk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goawk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gob2/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gob2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/gob2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gob2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/gobble/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gobble/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/gobble/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gobble/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/gobby/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gobby/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/gobby/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gobby/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gobetween/gomod.patch b/third_party/nixpkgs/pkgs/by-name/go/gobetween/gomod.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gobetween/gomod.patch
rename to third_party/nixpkgs/pkgs/by-name/go/gobetween/gomod.patch
diff --git a/third_party/nixpkgs/pkgs/servers/gobetween/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gobetween/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gobetween/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gobetween/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gobgp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gobgp/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gobgpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gobgpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gobi_loader/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gobi_loader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/gobi_loader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gobi_loader/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/goblob/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goblob/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/goblob/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goblob/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gobuster/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gobuster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gobuster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gobuster/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gocd-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gocd-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gocd-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gocd-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gocode-gomod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gocode-gomod/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/goconst/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goconst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/goconst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goconst/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/goconvey/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goconvey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/goconvey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goconvey/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gocover-cobertura/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gocover-cobertura/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gocover-cobertura/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gocover-cobertura/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gocr/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gocr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/gocr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gocr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gocryptfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gocryptfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gocyclo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gocyclo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/godef/default.nix b/third_party/nixpkgs/pkgs/by-name/go/godef/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/godef/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/godef/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/godspeed/default.nix b/third_party/nixpkgs/pkgs/by-name/go/godspeed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/godspeed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/godspeed/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/godu/default.nix b/third_party/nixpkgs/pkgs/by-name/go/godu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/godu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/godu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/goeland/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goeland/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/goeland/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goeland/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/gof5/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gof5/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/gof5/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gof5/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goffice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goffice/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/goflow/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goflow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/goflow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goflow/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gofu/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gofu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gofu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gofu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gogetdoc/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gogetdoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gogetdoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gogetdoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gogui/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gogui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gogui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gogui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/gohai/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gohai/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gohai/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gohai/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/gohufont/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gohufont/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/gohufont/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gohufont/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goimapnotify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goimapnotify/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goimports-reviser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goimports-reviser/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gojsontoyaml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gojsontoyaml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gojsontoyaml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gokart/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gokart/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gokart/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gokart/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/misc/gokrazy/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gokrazy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/misc/gokrazy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gokrazy/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goku/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/goku/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goku/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint-langserver/default.nix b/third_party/nixpkgs/pkgs/by-name/go/golangci-lint-langserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/golangci-lint-langserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/golangci-lint-langserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/by-name/go/golangci-lint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/golangci-lint/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix b/third_party/nixpkgs/pkgs/by-name/go/golden-cheetah-bin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/golden-cheetah-bin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/golines/default.nix b/third_party/nixpkgs/pkgs/by-name/go/golines/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/golines/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/golines/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/golint/default.nix b/third_party/nixpkgs/pkgs/by-name/go/golint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/golint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/golint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gom/longer-stress-timeout.patch b/third_party/nixpkgs/pkgs/by-name/go/gom/longer-stress-timeout.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gom/longer-stress-timeout.patch
rename to third_party/nixpkgs/pkgs/by-name/go/gom/longer-stress-timeout.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gom/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gomacro/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gomacro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gomacro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gomacro/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gomapenum/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gomapenum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gomapenum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gomapenum/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gomatrix/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gomatrix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gomatrix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gomatrix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gomi/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gomi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gomi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gomi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gomodifytags/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gomodifytags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gomodifytags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gomodifytags/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gomp/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gomp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gomp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gomp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gomplate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gomplate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gomuks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gomuks/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gonic/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gonic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gonic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gonic/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goocanvasmm2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goocanvasmm2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/goodhosts/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goodhosts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/goodhosts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goodhosts/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goodvibes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goodvibes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goofys/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goofys/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-amber/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-amber/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-app-engine-go-sdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-app-engine-go-sdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-authenticator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-authenticator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/google-clasp/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-clasp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/google-clasp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-clasp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/google-cloud-bigtable-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-cloud-bigtable-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/google-cloud-bigtable-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-cloud-bigtable-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/hardcode-googleapis-path.patch b/third_party/nixpkgs/pkgs/by-name/go/google-cloud-cpp/hardcode-googleapis-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/hardcode-googleapis-path.patch
rename to third_party/nixpkgs/pkgs/by-name/go/google-cloud-cpp/hardcode-googleapis-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-cloud-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-cloud-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/google-cloud-sql-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/google-cursor/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-cursor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/google-cursor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-cursor/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/google-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/google-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch b/third_party/nixpkgs/pkgs/by-name/go/google-guest-agent/disable-etc-mutation.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch
rename to third_party/nixpkgs/pkgs/by-name/go/google-guest-agent/disable-etc-mutation.patch
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/go/google-guest-agent/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/go/google-guest-agent/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-guest-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-guest-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/go/google-guest-configs/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/go/google-guest-configs/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-guest-configs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-guest-configs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-guest-oslogin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-guest-oslogin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/google-java-format/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-java-format/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/google-java-format/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/google-java-format/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goose/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/goose/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goose/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gopacked/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gopacked/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gopatch/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gopatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/gopatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gopatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/goperf/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goperf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/goperf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goperf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gopher/gopher/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gopher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/gopher/gopher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gopher/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gophernotes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gophernotes/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gopkgs/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gopkgs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gopkgs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gopkgs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gopro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/gopro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gopro/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gops/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gops/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gops/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gops/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/gopsuinfo/no_bin_install.patch b/third_party/nixpkgs/pkgs/by-name/go/gopsuinfo/no_bin_install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gopsuinfo/no_bin_install.patch
rename to third_party/nixpkgs/pkgs/by-name/go/gopsuinfo/no_bin_install.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/gopsuinfo/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gopsuinfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gopsuinfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gopsuinfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gore/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gore/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/goreplay/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goreplay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/goreplay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goreplay/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goresym/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/goresym/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goresym/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gorilla-bin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gorilla-bin/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/llm/gorilla-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gorilla-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/llm/gorilla-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gorilla-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gosec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gosec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gosec/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gosh/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gosh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gosh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gosh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/gospider/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gospider/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/gospider/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gospider/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gossa/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gossa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/gossa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gossa/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/gost/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gost/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/gost/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gost/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gostatic/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gostatic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gostatic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gostatic/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gosu/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gosu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gosu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gosu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gotags/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gotags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotags/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gotemplate/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotemplate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gotemplate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotemplate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gotest/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gotest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotest/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotestfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gotestfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotestfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gotests/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotests/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gotests/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotests/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotify-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotify-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gotify-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotify-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gotify-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotify-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gotify/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotify-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gotify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotify-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gotify/ui.nix b/third_party/nixpkgs/pkgs/by-name/go/gotify-server/ui.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gotify/ui.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotify-server/ui.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotosocial/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gotosocial/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotosocial/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gotraceui/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotraceui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gotraceui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotraceui/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gotty/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gotty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotty/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gotypist/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gotypist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gotypist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gotypist/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/goudy-bookletter-1911/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goudy-bookletter-1911/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/goudy-bookletter-1911/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goudy-bookletter-1911/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gource/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gource/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gource/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gource/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix b/third_party/nixpkgs/pkgs/by-name/go/govc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/govc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/goverview/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goverview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/goverview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goverview/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/govulncheck/default.nix b/third_party/nixpkgs/pkgs/by-name/go/govulncheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/govulncheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/govulncheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/govulncheck/version.patch b/third_party/nixpkgs/pkgs/by-name/go/govulncheck/version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/govulncheck/version.patch
rename to third_party/nixpkgs/pkgs/by-name/go/govulncheck/version.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/gox/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/goxel/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goxel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/goxel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goxel/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/go/goxlr-utility/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/go/goxlr-utility/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goxlr-utility/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goxlr-utility/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpa/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gpa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpa/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gpart/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpart/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/gpart/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpart/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gparted/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gparted/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gparted/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gparted/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gparted/polkit.patch b/third_party/nixpkgs/pkgs/by-name/gp/gparted/polkit.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gparted/polkit.patch
rename to third_party/nixpkgs/pkgs/by-name/gp/gparted/polkit.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gperftools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gperftools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpg-mdp/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpg-mdp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gpg-mdp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpg-mdp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gphotos-sync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gphotos-sync/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/gphotos-sync/skip-network-tests.patch b/third_party/nixpkgs/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/gphotos-sync/skip-network-tests.patch
rename to third_party/nixpkgs/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gpick/dot-version.patch b/third_party/nixpkgs/pkgs/by-name/gp/gpick/dot-version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gpick/dot-version.patch
rename to third_party/nixpkgs/pkgs/by-name/gp/gpick/dot-version.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gpick/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpick/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gpick/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpick/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch b/third_party/nixpkgs/pkgs/by-name/gp/gpodder/disable-autoupdate.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch
rename to third_party/nixpkgs/pkgs/by-name/gp/gpodder/disable-autoupdate.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpodder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpodder/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gpp/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gprojector/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gprojector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/gprojector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gprojector/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gprolog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gprolog/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gpsd/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gpsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gpsd/sconstruct-env-fixes.patch b/third_party/nixpkgs/pkgs/by-name/gp/gpsd/sconstruct-env-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gpsd/sconstruct-env-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/gp/gpsd/sconstruct-env-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/gptfdisk/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gptfdisk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gptfdisk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gptfdisk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/gptman/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gptman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gptman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gptman/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpu-switch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpu-switch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/gputils/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gputils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/gputils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gputils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpuvis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpuvis/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpx-viewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpx-viewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpx/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gpx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gpython/default.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpython/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/gpython/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gp/gpython/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix b/third_party/nixpkgs/pkgs/by-name/gq/gql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gq/gql/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix b/third_party/nixpkgs/pkgs/by-name/gq/gqlgenc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gq/gqlgenc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gqlint/default.nix b/third_party/nixpkgs/pkgs/by-name/gq/gqlint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gqlint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gq/gqlint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/grabserial/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grabserial/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/grabserial/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grabserial/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gradescope-submit/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/gradescope-submit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gradescope-submit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/gradescope-submit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gradience/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/gradience/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gradience/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/gradience/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/gradle-completion/package.nix
similarity index 95%
rename from third_party/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/gradle-completion/package.nix
index 6112c2edfa..f02977de87 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gr/gradle-completion/package.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
description = "Gradle tab completion for bash and zsh";
homepage = "https://github.com/gradle/gradle-completion";
license = licenses.mit;
- maintainers = [ ];
+ maintainers = [ ] ++ teams.java.members;
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gradm/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/gradm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/gradm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/gradm/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grafana-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grafana-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json b/third_party/nixpkgs/pkgs/by-name/gr/grafana-image-renderer/package.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json
rename to third_party/nixpkgs/pkgs/by-name/gr/grafana-image-renderer/package.json
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grafana-image-renderer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grafana-image-renderer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/grail/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/grail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grail/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/grandperspective/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grandperspective/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/grandperspective/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grandperspective/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix
index c3f26067f3..a105ffedf7 100644
--- a/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix
@@ -15,16 +15,16 @@
buildGoModule rec {
pname = "granted";
- version = "0.36.0";
+ version = "0.36.1";
src = fetchFromGitHub {
owner = "common-fate";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-GWRQYdB3ifpCaAGC98TXGap30o9tWN503P43ZPSX+Ew=";
+ sha256 = "sha256-sIn6D0696QPo4fs7HzvQNIopIfYYV4fYLmVdwQZnZag=";
};
- vendorHash = "sha256-W8PxZyNvZN8MnfJlMUs+TT6ixfqLQ/lV511QYLwqv3U=";
+ vendorHash = "sha256-QswW1PyxrVWf6ZAPKW69q0JIXpyhSHucE5A7hkr8uxw=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graph-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graph-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/graph-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graph-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graph-easy/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graph-easy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/graph-easy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graph-easy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/third_party/nixpkgs/pkgs/by-name/gr/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
rename to third_party/nixpkgs/pkgs/by-name/gr/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphene/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graphene/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/graphinder/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphinder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/graphinder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graphinder/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/graphite-cursors/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphite-cursors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/graphite-cursors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graphite-cursors/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphite-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graphite-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/graphqlmap/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphqlmap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/graphqlmap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graphqlmap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/graphqurl/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphqurl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/graphqurl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graphqurl/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/graphs/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/graphs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graphs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/graphw00f/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphw00f/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/graphw00f/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graphw00f/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/graphwar/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphwar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/graphwar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/graphwar/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/grass-sass/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grass-sass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/grass-sass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grass-sass/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/gravit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/gravit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/grb/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/grb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/search/grepcidr/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grepcidr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/search/grepcidr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grepcidr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/search/grepm/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grepm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/search/grepm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grepm/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/greybird/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/greybird/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/greybird/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/greybird/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/gridlock/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/gridlock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/gridlock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/gridlock/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/gridtracker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/gridtracker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/grig/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/grig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grig/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch b/third_party/nixpkgs/pkgs/by-name/gr/grilo-plugins/chromaprint-gst-plugins.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch
rename to third_party/nixpkgs/pkgs/by-name/gr/grilo-plugins/chromaprint-gst-plugins.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grilo-plugins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grilo-plugins/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grilo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grilo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/grilo/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/gr/grilo/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/grilo/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/gr/grilo/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/tools/text/grin/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/grin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grin/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/grip-search/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grip-search/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/grip-search/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grip-search/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/grip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/grit/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/grit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/grive2/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grive2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/grive2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grive2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/grizzly/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grizzly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/grizzly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grizzly/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grml-zsh-config/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grml-zsh-config/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/grobi/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grobi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/grobi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grobi/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/third_party/nixpkgs/pkgs/by-name/gr/grocy/0001-Define-configs-with-env-vars.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
rename to third_party/nixpkgs/pkgs/by-name/gr/grocy/0001-Define-configs-with-env-vars.patch
diff --git a/third_party/nixpkgs/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/third_party/nixpkgs/pkgs/by-name/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
rename to third_party/nixpkgs/pkgs/by-name/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
diff --git a/third_party/nixpkgs/pkgs/servers/grocy/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grocy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/grocy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grocy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/groff/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/groff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/groff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/groff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/groff/site.tmac b/third_party/nixpkgs/pkgs/by-name/gr/groff/site.tmac
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/groff/site.tmac
rename to third_party/nixpkgs/pkgs/by-name/gr/groff/site.tmac
diff --git a/third_party/nixpkgs/pkgs/development/tools/gron/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/gron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/gron/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/search/groonga/do-not-use-vendored-libraries.patch b/third_party/nixpkgs/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/search/groonga/do-not-use-vendored-libraries.patch
rename to third_party/nixpkgs/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch
diff --git a/third_party/nixpkgs/pkgs/servers/search/groonga/fix-cmake-install-path.patch b/third_party/nixpkgs/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/search/groonga/fix-cmake-install-path.patch
rename to third_party/nixpkgs/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch
diff --git a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/groonga/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/search/groonga/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/groonga/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/programming/groove/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/groove/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/programming/groove/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/groove/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/groovy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/groovy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grpc-client-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grpc-client-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grpc-gateway/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grpc-gateway/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grpc-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grpc-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grpc_cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grpc_cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grpcui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grpcui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpcurl/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grpcurl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/grpcurl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grpcurl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/grsync/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grsync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/grsync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grsync/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg b/third_party/nixpkgs/pkgs/by-name/gr/grub2_pvgrub_image/configs/grub-bootstrap.cfg
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg
rename to third_party/nixpkgs/pkgs/by-name/gr/grub2_pvgrub_image/configs/grub-bootstrap.cfg
diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg b/third_party/nixpkgs/pkgs/by-name/gr/grub2_pvgrub_image/configs/grub.cfg
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg
rename to third_party/nixpkgs/pkgs/by-name/gr/grub2_pvgrub_image/configs/grub.cfg
diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grub2_pvgrub_image/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/grub2_pvgrub_image/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/gruvbox-dark-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/gruvbox-dark-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsasl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsasl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch b/third_party/nixpkgs/pkgs/by-name/gs/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
rename to third_party/nixpkgs/pkgs/by-name/gs/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gscreenshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gscreenshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gsctl/go120-compatibility.patch b/third_party/nixpkgs/pkgs/by-name/gs/gsctl/go120-compatibility.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gsctl/go120-compatibility.patch
rename to third_party/nixpkgs/pkgs/by-name/gs/gsctl/go120-compatibility.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsimplecal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsimplecal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsl-lite/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsl-lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gsl-lite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsl-lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsl/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gsl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/gs/gsmartcontrol/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/gs/gsmartcontrol/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsmartcontrol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsmartcontrol/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsoap/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsoap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gsoap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsoap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/gsocket/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsocket/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/gsocket/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsocket/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gsound/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gsound/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gspeech/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gspeech/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gspell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gspell/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gss/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gst/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gst/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gst123/default.nix b/third_party/nixpkgs/pkgs/by-name/gs/gst123/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gst123/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gs/gst123/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gt/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/gt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gt5/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gt5/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gt5/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtdialog/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtdialog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtdialog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtdialog/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/third_party/nixpkgs/pkgs/by-name/gt/gtest/fix-cmake-config-includedir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch
rename to third_party/nixpkgs/pkgs/by-name/gt/gtest/fix-cmake-config-includedir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtest/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/gtg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gthree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gthree/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gthumb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gthumb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gti/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gti/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gti/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gti/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk-doc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk-doc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/third_party/nixpkgs/pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk-engine-bluecurve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk-engine-bluecurve/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk-engine-murrine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtk-engine-murrine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk-engine-murrine/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk-frdp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk-frdp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk-layer-shell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk-layer-shell/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk-mac-bundler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk-mac-bundler/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk-sharp-beans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk-sharp-beans/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk-vnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk-vnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk4-layer-shell/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk4-layer-shell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtk4-layer-shell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk4-layer-shell/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk_engines/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtk_engines/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtkdatabox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkdatabox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtkdialog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/gtkdialog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkdialog/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkextra/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtkextra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtkextra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkextra/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtkgnutella/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkgnutella/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtkimageview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkimageview/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gtkradiant/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtkradiant/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gtkradiant/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkradiant/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtkspellmm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkspellmm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gtkterm/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtkterm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/gtkterm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkterm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch b/third_party/nixpkgs/pkgs/by-name/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch b/third_party/nixpkgs/pkgs/by-name/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtkwave/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtkwave/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/gtop/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/gtop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/gtranslator/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtranslator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/gtranslator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtranslator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/gtree/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtree/package.nix
similarity index 83%
rename from third_party/nixpkgs/pkgs/tools/text/gtree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtree/package.nix
index e02eb363a1..f921aed386 100644
--- a/third_party/nixpkgs/pkgs/tools/text/gtree/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gt/gtree/package.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gtree";
- version = "1.10.11";
+ version = "1.10.12";
src = fetchFromGitHub {
owner = "ddddddO";
repo = "gtree";
rev = "v${version}";
- hash = "sha256-wxN4bvSSeCTPGjIIDLotr0XsiCf0u0GochEo1SPyopM=";
+ hash = "sha256-dtKT2T8GNcR5ux1whFrXgJ08XHJWS76M/wmAtBHDLUI=";
};
- vendorHash = "sha256-s3GsqrXd84VVGuxY18ielAt0BZGMyl1tNavlD66rWoA=";
+ vendorHash = "sha256-wiPHK5RjMBMLHx3Vv2zWoZc1wWJ1IVxu8dIbO9fPaPQ=";
subPackages = [
"cmd/gtree"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gts/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gts/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/gtypist/default.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtypist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gtypist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gt/gtypist/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/guacamole-client/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/guacamole-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/guacamole-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/guacamole-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/guacamole-server/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/guacamole-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/guacamole-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/guacamole-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch b/third_party/nixpkgs/pkgs/by-name/gu/guake/no-compile-schemas.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch
rename to third_party/nixpkgs/pkgs/by-name/gu/guake/no-compile-schemas.patch
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/guake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/guake/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/gubbi/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gubbi-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/gubbi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gubbi-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/gucci/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gucci/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/gucci/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gucci/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/guetzli/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/guetzli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/guetzli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/guetzli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/guff/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/guff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/guff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/guff/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/guilt/darwin-fix.patch b/third_party/nixpkgs/pkgs/by-name/gu/guilt/darwin-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/guilt/darwin-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/gu/guilt/darwin-fix.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/guilt/guilt-help-mandir.patch b/third_party/nixpkgs/pkgs/by-name/gu/guilt/guilt-help-mandir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/guilt/guilt-help-mandir.patch
rename to third_party/nixpkgs/pkgs/by-name/gu/guilt/guilt-help-mandir.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/guilt/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/guilt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/guilt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/guilt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gum/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gumbo/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gumbo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gumbo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gumbo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gummi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gummi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gupnp-av/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gupnp-av/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gupnp-dlna/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gupnp-dlna/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gupnp-igd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gupnp-igd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gupnp-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gupnp-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gurobi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gurobi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gusb/fix-python-path.patch b/third_party/nixpkgs/pkgs/by-name/gu/gusb/fix-python-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gusb/fix-python-path.patch
rename to third_party/nixpkgs/pkgs/by-name/gu/gusb/fix-python-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gusb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gusb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gut/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gu/gut/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gv/default.nix b/third_party/nixpkgs/pkgs/by-name/gv/gv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gv/gv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch b/third_party/nixpkgs/pkgs/by-name/gv/gvfs/hardcode-ssh-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch
rename to third_party/nixpkgs/pkgs/by-name/gv/gvfs/hardcode-ssh-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/third_party/nixpkgs/pkgs/by-name/gv/gvfs/package.nix
similarity index 97%
rename from third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gv/gvfs/package.nix
index 404a4d9291..046c1a59c9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gv/gvfs/package.nix
@@ -46,11 +46,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gvfs";
- version = "1.56.0";
+ version = "1.56.1";
src = fetchurl {
url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz";
- hash = "sha256-RB0jVscmFjZM20IK+WGZEToT7Z4UbyF1/jc5ia2to54=";
+ hash = "sha256-hnMczsZ5ZI+HNOI3sd4ZDr3ubkyMD1b0VMMViOUJqhA=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix b/third_party/nixpkgs/pkgs/by-name/gv/gvm-libs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gv/gvm-libs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/gvolicon/default.nix b/third_party/nixpkgs/pkgs/by-name/gv/gvolicon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/gvolicon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gv/gvolicon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/gvpe/default.nix b/third_party/nixpkgs/pkgs/by-name/gv/gvpe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/gvpe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gv/gvpe/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/gv/gvproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gv/gvproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gwc/default.nix b/third_party/nixpkgs/pkgs/by-name/gw/gwc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gwc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gw/gwc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/codegen.patch b/third_party/nixpkgs/pkgs/by-name/gw/gwyddion/codegen.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/codegen.patch
rename to third_party/nixpkgs/pkgs/by-name/gw/gwyddion/codegen.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix b/third_party/nixpkgs/pkgs/by-name/gw/gwyddion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gw/gwyddion/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/gx/go/default.nix b/third_party/nixpkgs/pkgs/by-name/gx/gx-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/gx/go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gx/gx-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix b/third_party/nixpkgs/pkgs/by-name/gx/gxkb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gx/gxkb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gxmatcheq-lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gxmessage/default.nix b/third_party/nixpkgs/pkgs/by-name/gx/gxmessage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/gxmessage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gx/gxmessage/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/gx/gxplugins-lv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gx/gxplugins-lv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/gyb/default.nix b/third_party/nixpkgs/pkgs/by-name/gy/gyb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/gyb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gy/gyb/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/gyre/default.nix b/third_party/nixpkgs/pkgs/by-name/gy/gyre-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/gyre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gy/gyre-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/gzrt/default.nix b/third_party/nixpkgs/pkgs/by-name/gz/gzrt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/gzrt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gz/gzrt/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/h2o/default.nix b/third_party/nixpkgs/pkgs/by-name/h2/h2o/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/h2o/default.nix
rename to third_party/nixpkgs/pkgs/by-name/h2/h2o/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ha/habitat/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ha/habitat/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/habitat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/habitat/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/hack/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hack-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/hack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hack-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hackertyper/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hackertyper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hackertyper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hackertyper/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/hackneyed/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hackneyed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/hackneyed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hackneyed/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/hackrf/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hackrf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/hackrf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hackrf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hacksaw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hacksaw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/hacpack/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hacpack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/hacpack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hacpack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/hactool/musl-compat.patch b/third_party/nixpkgs/pkgs/by-name/ha/hactool/musl-compat.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/hactool/musl-compat.patch
rename to third_party/nixpkgs/pkgs/by-name/ha/hactool/musl-compat.patch
diff --git a/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hactool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hactool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/haka/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/haka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/haka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/haka/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hakrawler/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hakrawler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hakrawler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hakrawler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hakuneko/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hakuneko/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hakuneko/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hakuneko/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/half/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/half/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/half/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/half/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/halfempty/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/halfempty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/halfempty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/halfempty/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/halftone/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/halftone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/halftone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/halftone/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/halibut/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/halibut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/halibut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/halibut/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix
index 2fc97ae6ad..678525c614 100644
--- a/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix
@@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec {
xorg.libX11
xorg.libXcursor
xorg.libXi
- xorg.libXrandr
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
diff --git a/third_party/nixpkgs/pkgs/tools/misc/halp/fix-target-dir.patch b/third_party/nixpkgs/pkgs/by-name/ha/halp/fix-target-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/halp/fix-target-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/ha/halp/fix-target-dir.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/halp/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/halp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/halp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/halp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hammer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hammer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hamsket/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hamsket/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hamsket/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hamsket/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hamster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hamster/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/hanazono/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hanazono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/hanazono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hanazono/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/handlr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/handlr/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/hannom/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hannom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/hannom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hannom/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/hans/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/hans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hans/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/haproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/haproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/hardinfo/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hardinfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/hardinfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hardinfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/harminv/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/harminv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/harminv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/harminv/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/harmonist/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/harmonist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/harmonist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/harmonist/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/harsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/harsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/has/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/has/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/has/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/has/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/hase/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hase/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/hase/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hase/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/hase/prefer-dynamic.patch b/third_party/nixpkgs/pkgs/by-name/ha/hase/prefer-dynamic.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/hase/prefer-dynamic.patch
rename to third_party/nixpkgs/pkgs/by-name/ha/hase/prefer-dynamic.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/hash-identifier/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hash-identifier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hash-identifier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hash-identifier/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hash-slinger/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hash-slinger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hash-slinger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hash-slinger/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hash_extender/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hash_extender/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hash_extender/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hash_extender/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hashcash/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashcash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hashcash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hashcash/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashcat-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hashcat-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hashdeep/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashdeep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hashdeep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hashdeep/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/hashi-ui/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashi-ui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/hashi-ui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hashi-ui/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hashi-up/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashi-up/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/hashi-up/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hashi-up/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hashit/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hashit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hashit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/hashlink/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashlink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/hashlink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hashlink/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hashpump/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashpump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hashpump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hashpump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hashrat/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashrat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hashrat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hashrat/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/hasklig/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hasklig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/hasklig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hasklig/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hasmail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hasmail/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/haste-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/haste-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/haste-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/haste-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/hatari/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hatari/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/hatari/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hatari/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/haveged/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/haveged/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/haveged/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/haveged/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hawknl/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hawknl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hawknl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hawknl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/haxor-news/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/haxor-news/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/hayagriva/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hayagriva/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/hayagriva/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ha/hayagriva/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/hblock/default.nix b/third_party/nixpkgs/pkgs/by-name/hb/hblock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/hblock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hb/hblock/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/hck/default.nix b/third_party/nixpkgs/pkgs/by-name/hc/hck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/hck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hc/hck/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix b/third_party/nixpkgs/pkgs/by-name/hc/hcl2json/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hc/hcl2json/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/hcledit/default.nix b/third_party/nixpkgs/pkgs/by-name/hc/hcledit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/hcledit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hc/hcledit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/by-name/hc/hcloud/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hc/hcloud/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix b/third_party/nixpkgs/pkgs/by-name/hc/hcxdumptool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hc/hcxdumptool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix b/third_party/nixpkgs/pkgs/by-name/hc/hcxtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hc/hcxtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hd-idle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hd-idle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hdaps-gl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hdaps-gl/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hdapsd/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hdapsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/hdapsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hdapsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hdapsd/postInstall.sh b/third_party/nixpkgs/pkgs/by-name/hd/hdapsd/postInstall.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/hdapsd/postInstall.sh
rename to third_party/nixpkgs/pkgs/by-name/hd/hdapsd/postInstall.sh
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hdate/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hdate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hdate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hdate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/hddfancontrol/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hddfancontrol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/hddfancontrol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hddfancontrol/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hddtemp/byteswap.patch b/third_party/nixpkgs/pkgs/by-name/hd/hddtemp/byteswap.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hddtemp/byteswap.patch
rename to third_party/nixpkgs/pkgs/by-name/hd/hddtemp/byteswap.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hddtemp/dontwake.patch b/third_party/nixpkgs/pkgs/by-name/hd/hddtemp/dontwake.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hddtemp/dontwake.patch
rename to third_party/nixpkgs/pkgs/by-name/hd/hddtemp/dontwake.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hddtemp/execinfo.patch b/third_party/nixpkgs/pkgs/by-name/hd/hddtemp/execinfo.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hddtemp/execinfo.patch
rename to third_party/nixpkgs/pkgs/by-name/hd/hddtemp/execinfo.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hddtemp/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hddtemp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hddtemp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hddtemp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hddtemp/satacmds.patch b/third_party/nixpkgs/pkgs/by-name/hd/hddtemp/satacmds.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hddtemp/satacmds.patch
rename to third_party/nixpkgs/pkgs/by-name/hd/hddtemp/satacmds.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdf4/darwin-aarch64.patch b/third_party/nixpkgs/pkgs/by-name/hd/hdf4/darwin-aarch64.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hdf4/darwin-aarch64.patch
rename to third_party/nixpkgs/pkgs/by-name/hd/hdf4/darwin-aarch64.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hdf4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hdf4/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in b/third_party/nixpkgs/pkgs/by-name/hd/hdf5-blosc/blosc_filter.pc.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in
rename to third_party/nixpkgs/pkgs/by-name/hd/hdf5-blosc/blosc_filter.pc.in
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch b/third_party/nixpkgs/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch
rename to third_party/nixpkgs/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hdf5-blosc/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hdf5-blosc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hdf5-blosc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hdf5-blosc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch b/third_party/nixpkgs/pkgs/by-name/hd/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch
rename to third_party/nixpkgs/pkgs/by-name/hd/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdfview/disable-mac-signing.patch b/third_party/nixpkgs/pkgs/by-name/hd/hdfview/disable-mac-signing.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hdfview/disable-mac-signing.patch
rename to third_party/nixpkgs/pkgs/by-name/hd/hdfview/disable-mac-signing.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hdfview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hdfview/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdfview/remove-properties-timestamp.patch b/third_party/nixpkgs/pkgs/by-name/hd/hdfview/remove-properties-timestamp.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hdfview/remove-properties-timestamp.patch
rename to third_party/nixpkgs/pkgs/by-name/hd/hdfview/remove-properties-timestamp.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hdhomerun-config-gui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hdhomerun-config-gui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hdl-dump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hdl-dump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hdl-dump/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hdparm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hdparm/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/hdt/default.nix b/third_party/nixpkgs/pkgs/by-name/hd/hdt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/hdt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hd/hdt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/headache/default.nix b/third_party/nixpkgs/pkgs/by-name/he/headache/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/headache/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/headache/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/headlines/default.nix b/third_party/nixpkgs/pkgs/by-name/he/headlines/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/headlines/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/headlines/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/headphones/default.nix b/third_party/nixpkgs/pkgs/by-name/he/headphones/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/headphones/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/headphones/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/headset-charge-indicator/default.nix b/third_party/nixpkgs/pkgs/by-name/he/headset-charge-indicator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/headset-charge-indicator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/headset-charge-indicator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/headset/default.nix b/third_party/nixpkgs/pkgs/by-name/he/headset/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/headset/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/headset/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix b/third_party/nixpkgs/pkgs/by-name/he/headsetcontrol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/headsetcontrol/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/health-check/default.nix b/third_party/nixpkgs/pkgs/by-name/he/health-check/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/health-check/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/health-check/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/health/default.nix b/third_party/nixpkgs/pkgs/by-name/he/health/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/health/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/health/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix b/third_party/nixpkgs/pkgs/by-name/he/healthchecks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/healthchecks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/heatseeker/default.nix b/third_party/nixpkgs/pkgs/by-name/he/heatseeker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/heatseeker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/heatseeker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/heatshrink/default.nix b/third_party/nixpkgs/pkgs/by-name/he/heatshrink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/heatshrink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/heatshrink/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hebcal/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hebcal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hebcal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hebcal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/hecate/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hecate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/hecate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hecate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/hedgedoc-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hedgedoc-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/hedgedoc-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hedgedoc-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hedgedoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hedgedoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix b/third_party/nixpkgs/pkgs/by-name/he/heisenbridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/heisenbridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix b/third_party/nixpkgs/pkgs/by-name/he/helio-workstation/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/helio-workstation/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/he/helix-gpt/pin.json b/third_party/nixpkgs/pkgs/by-name/he/helix-gpt/pin.json
index dd6dfb5d0a..c9b18a14ce 100644
--- a/third_party/nixpkgs/pkgs/by-name/he/helix-gpt/pin.json
+++ b/third_party/nixpkgs/pkgs/by-name/he/helix-gpt/pin.json
@@ -1,8 +1,8 @@
{
- "version": "0.31",
- "srcHash": "sha256-wDVeX1tHw9pTxYLRkr8BJlF5XIee0/e0f5hzes4ui/o=",
- "x86_64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8=",
- "x86_64-darwin": "sha256-Sjt/JkyPRCzRpAqJOmBKCBAGWSeV7RYOOokCLYCqg+8=",
- "aarch64-darwin": "sha256-Sjt/JkyPRCzRpAqJOmBKCBAGWSeV7RYOOokCLYCqg+8=",
- "aarch64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8="
+ "version": "0.34",
+ "srcHash": "sha256-F2E+B4kKLpX4g/iCv0i71hSx4xdV6fdkwksslELdZUQ=",
+ "x86_64-linux": "sha256-V/h1tAoKo4fLlR/QmzZb7LpeIab2lmE792rQpWDdMXw=",
+ "x86_64-darwin": "sha256-Pd/nC15uYjwZPvrIfcQRljAuGQiIBDAKSShB1C+eevY=",
+ "aarch64-darwin": "sha256-Pd/nC15uYjwZPvrIfcQRljAuGQiIBDAKSShB1C+eevY=",
+ "aarch64-linux": "sha256-V/h1tAoKo4fLlR/QmzZb7LpeIab2lmE792rQpWDdMXw="
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix b/third_party/nixpkgs/pkgs/by-name/he/helix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/helix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/helix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hello-unfree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hello-unfree/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hello-wayland/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hello-wayland/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm-dashboard/default.nix b/third_party/nixpkgs/pkgs/by-name/he/helm-dashboard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/helm-dashboard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/helm-dashboard/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix b/third_party/nixpkgs/pkgs/by-name/he/helm-docs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/helm-docs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/helm-ls/default.nix b/third_party/nixpkgs/pkgs/by-name/he/helm-ls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/helm-ls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/helm-ls/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/third_party/nixpkgs/pkgs/by-name/he/helmholtz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/helmholtz/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/by-name/he/helmsman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/helmsman/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch b/third_party/nixpkgs/pkgs/by-name/he/help2man/1.40.4-cygwin-nls.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch
rename to third_party/nixpkgs/pkgs/by-name/he/help2man/1.40.4-cygwin-nls.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix b/third_party/nixpkgs/pkgs/by-name/he/help2man/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/help2man/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/third_party/nixpkgs/pkgs/by-name/he/helvetica-neue-lt-std/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/helvetica-neue-lt-std/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix b/third_party/nixpkgs/pkgs/by-name/he/helvum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/helvum/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hepmc2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hepmc2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/herbe/default.nix b/third_party/nixpkgs/pkgs/by-name/he/herbe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/herbe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/herbe/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix b/third_party/nixpkgs/pkgs/by-name/he/herbstluftwm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/herbstluftwm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch b/third_party/nixpkgs/pkgs/by-name/he/herbstluftwm/test-path-environment.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch
rename to third_party/nixpkgs/pkgs/by-name/he/herbstluftwm/test-path-environment.patch
diff --git a/third_party/nixpkgs/pkgs/data/fonts/hermit/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hermit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/hermit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hermit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix b/third_party/nixpkgs/pkgs/by-name/he/heroku/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/heroku/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/heroku/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/third_party/nixpkgs/pkgs/by-name/he/herwig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/herwig/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch b/third_party/nixpkgs/pkgs/by-name/he/hetzner-kube/fix-home.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch
rename to third_party/nixpkgs/pkgs/by-name/he/hetzner-kube/fix-home.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hetzner-kube/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hetzner-kube/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/hevea/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hevea/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/hevea/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hevea/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/hex-a-hop/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hex-a-hop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/hex-a-hop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hex-a-hop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hex/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hex/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/hexcurse/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hexcurse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/hexcurse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hexcurse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hexd/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hexd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hexd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hexd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hexdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hexdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hexdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hexdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/hexdino/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hexdino/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/hexdino/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hexdino/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/hexfiend/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hexfiend/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/hexfiend/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hexfiend/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/hexgui/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hexgui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/hexgui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hexgui/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/hexio/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hexio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/hexio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hexio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/hexo-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hexo-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/hexo-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hexo-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/hey/default.nix b/third_party/nixpkgs/pkgs/by-name/he/hey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/hey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/hey/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/llm/heygpt/default.nix b/third_party/nixpkgs/pkgs/by-name/he/heygpt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/llm/heygpt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/he/heygpt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hfinger/default.nix b/third_party/nixpkgs/pkgs/by-name/hf/hfinger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hfinger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hf/hfinger/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix b/third_party/nixpkgs/pkgs/by-name/hf/hfsprogs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hf/hfsprogs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix b/third_party/nixpkgs/pkgs/by-name/hf/hfst-ospell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hf/hfst-ospell/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hfst/default.nix b/third_party/nixpkgs/pkgs/by-name/hf/hfst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hfst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hf/hfst/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/hheretic/default.nix b/third_party/nixpkgs/pkgs/by-name/hh/hheretic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/hheretic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hh/hheretic/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/hhexen/default.nix b/third_party/nixpkgs/pkgs/by-name/hh/hhexen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/hhexen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hh/hhexen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hhpc/default.nix b/third_party/nixpkgs/pkgs/by-name/hh/hhpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hhpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hh/hhpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/hiawatha/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hiawatha/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/hiawatha/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hiawatha/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/hiawatha/test.nix b/third_party/nixpkgs/pkgs/by-name/hi/hiawatha/test.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/hiawatha/test.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hiawatha/test.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hibernate/gen-manpages.patch b/third_party/nixpkgs/pkgs/by-name/hi/hibernate/gen-manpages.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/hibernate/gen-manpages.patch
rename to third_party/nixpkgs/pkgs/by-name/hi/hibernate/gen-manpages.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hibernate/hibernate.patch b/third_party/nixpkgs/pkgs/by-name/hi/hibernate/hibernate.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/hibernate/hibernate.patch
rename to third_party/nixpkgs/pkgs/by-name/hi/hibernate/hibernate.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hibernate/install.patch b/third_party/nixpkgs/pkgs/by-name/hi/hibernate/install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/hibernate/install.patch
rename to third_party/nixpkgs/pkgs/by-name/hi/hibernate/install.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hibernate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hibernate/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/hi/hickory-dns/package.nix b/third_party/nixpkgs/pkgs/by-name/hi/hickory-dns/package.nix
index 3c53faa425..34b93bd837 100644
--- a/third_party/nixpkgs/pkgs/by-name/hi/hickory-dns/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/hi/hickory-dns/package.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "hickory-dns";
- version = "0.25.0-alpha.2";
+ version = "0.25.0-alpha.3";
src = fetchFromGitHub {
owner = "hickory-dns";
repo = "hickory-dns";
rev = "refs/tags/v${version}";
- hash = "sha256-bEVApMM6/I3nF1lyRhd+7YtZuSAwiozRkMorRLhLOBY=";
+ hash = "sha256-P9H21X/lZ8U/yfCL/rCuP9A1wnL7UuTcX7GlCuwo5ZQ=";
};
- cargoHash = "sha256-Rq4l1iV70nlhBaJ02hc+dmNZ/Q7qrHoF0Kp0MTmu22A=";
+ cargoHash = "sha256-3hiMBwr6XT4M7J5KeH9bfGYMjZqOmYDda2Iml2emYMY=";
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];
@@ -26,7 +26,13 @@ rustPlatform.buildRustPackage rec {
# tests expect internet connectivity to query real nameservers like 8.8.8.8
doCheck = false;
- passthru.updateScript = nix-update-script { };
+ passthru.updateScript = nix-update-script {
+ # remove when 0.25.0 is released
+ extraArgs = [
+ "--version"
+ "unstable"
+ ];
+ };
meta = {
description = "Rust based DNS client, server, and resolver";
diff --git a/third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hicolor-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hicolor-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/hi/hicolor-icon-theme/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/hi/hicolor-icon-theme/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hid-listen/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hid-listen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hid-listen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hid-listen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hid-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hid-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hid-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hid-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hidrd/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hidrd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hidrd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hidrd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch b/third_party/nixpkgs/pkgs/by-name/hi/higan/001-include-cmath.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch
rename to third_party/nixpkgs/pkgs/by-name/hi/higan/001-include-cmath.patch
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch b/third_party/nixpkgs/pkgs/by-name/hi/higan/002-sips-to-png2icns.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch
rename to third_party/nixpkgs/pkgs/by-name/hi/higan/002-sips-to-png2icns.patch
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/higan/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/higan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/bsnes/higan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/higan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/highfive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/highfive/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/highlight-assertions/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/highlight-assertions/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/highlight-assertions/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/highlight-assertions/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/hikounomizu/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hikounomizu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/hikounomizu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hikounomizu/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/hilbish/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hilbish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/hilbish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hilbish/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/hime/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/hime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hime/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/himitsu-firefox/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/himitsu-firefox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/himitsu-firefox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/himitsu-firefox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/himitsu/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/himitsu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/himitsu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/himitsu/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/hiraeth/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hiraeth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/hiraeth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hiraeth/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hiredis-vip/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hiredis-vip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hiredis-vip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hiredis-vip/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hiredis/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hiredis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hiredis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hiredis/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hisat2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hisat2/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/hishtory/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hishtory/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/hishtory/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hishtory/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/hitch/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hitch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/hitch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hitch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/hivelytracker/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hivelytracker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/hivelytracker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hivelytracker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hivemind/default.nix b/third_party/nixpkgs/pkgs/by-name/hi/hivemind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hivemind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hi/hivemind/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/hledger-check-fancyassertions/default.nix b/third_party/nixpkgs/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/hledger-check-fancyassertions/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hmat-oss/default.nix b/third_party/nixpkgs/pkgs/by-name/hm/hmat-oss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hmat-oss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hm/hmat-oss/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/hmcl/default.nix b/third_party/nixpkgs/pkgs/by-name/hm/hmcl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/hmcl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hm/hmcl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hmm/default.nix b/third_party/nixpkgs/pkgs/by-name/hm/hmm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hmm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hm/hmm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/aw-watcher-window-wayland/rustc-serialize-fix.patch b/third_party/nixpkgs/pkgs/by-name/hm/hmm/rustc-serialize-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/aw-watcher-window-wayland/rustc-serialize-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/hm/hmm/rustc-serialize-fix.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix b/third_party/nixpkgs/pkgs/by-name/hm/hmmer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hm/hmmer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hnswlib/default.nix b/third_party/nixpkgs/pkgs/by-name/hn/hnswlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hnswlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hn/hnswlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hoard/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hoard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hoard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hoard/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/hobbes/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hobbes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/hobbes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hobbes/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/hol/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/hol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hol/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/holehe/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/holehe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/holehe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/holehe/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/holo-build/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/holo-build/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/holochain-launcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/holochain-launcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hologram/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hologram/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hologram/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/honcho/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/honcho/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/honcho/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch b/third_party/nixpkgs/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tracing/honeycomb/refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
rename to third_party/nixpkgs/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
diff --git a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/refinery/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/honeycomb-refinery/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tracing/honeycomb/refinery/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/honeycomb-refinery/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/honeytrap/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/honeytrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/honeytrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/honeytrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/honk/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/honk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/honk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/honk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/hop/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/hop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hoppet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hoppet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/base.nix b/third_party/nixpkgs/pkgs/by-name/ho/horizon-eda/base.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/base.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/horizon-eda/base.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/horizon-eda/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/horizon-eda/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/horst/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/horst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/horst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/horst/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/hostapd-mana/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hostapd-mana/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/hostapd-mana/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hostapd-mana/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hostapd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hostapd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hostctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hostctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/hostess/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hostess/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/hostess/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hostess/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hostmux/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hostmux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hostmux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hostmux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/hostname-debian/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hostname-debian/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/hostname-debian/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hostname-debian/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hostsblock/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hostsblock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hostsblock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hostsblock/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hotpatch/no-loader-test.patch b/third_party/nixpkgs/pkgs/by-name/ho/hotpatch/no-loader-test.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hotpatch/no-loader-test.patch
rename to third_party/nixpkgs/pkgs/by-name/ho/hotpatch/no-loader-test.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hotpatch/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hotpatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hotpatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hotpatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/houdini/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/houdini/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/houdini/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/houdini/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/houdini/runtime-build.nix b/third_party/nixpkgs/pkgs/by-name/ho/houdini/runtime-build.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/houdini/runtime-build.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/houdini/runtime-build.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/houdini/runtime.nix b/third_party/nixpkgs/pkgs/by-name/ho/houdini/runtime.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/houdini/runtime.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/houdini/runtime.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hound/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hound/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/hover/fix-assets-path.patch b/third_party/nixpkgs/pkgs/by-name/ho/hover/fix-assets-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/hover/fix-assets-path.patch
rename to third_party/nixpkgs/pkgs/by-name/ho/hover/fix-assets-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/hover/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/hover/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/hover/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/hover/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff b/third_party/nixpkgs/pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff
rename to third_party/nixpkgs/pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff
diff --git a/third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/howard-hinnant-date/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/howard-hinnant-date/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/howl/default.nix b/third_party/nixpkgs/pkgs/by-name/ho/howl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/howl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ho/howl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/hp2p/default.nix b/third_party/nixpkgs/pkgs/by-name/hp/hp2p/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/hp2p/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hp/hp2p/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix b/third_party/nixpkgs/pkgs/by-name/hp/hpe-ltfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hp/hpe-ltfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch b/third_party/nixpkgs/pkgs/by-name/hp/hpe-ltfs/remove-sysctl.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch
rename to third_party/nixpkgs/pkgs/by-name/hp/hpe-ltfs/remove-sysctl.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/hping/default.nix b/third_party/nixpkgs/pkgs/by-name/hp/hping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/hping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hp/hping/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hpl/default.nix b/third_party/nixpkgs/pkgs/by-name/hp/hpl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hpl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hp/hpl/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch b/third_party/nixpkgs/pkgs/by-name/hp/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch
rename to third_party/nixpkgs/pkgs/by-name/hp/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/hplip/hplip.state b/third_party/nixpkgs/pkgs/by-name/hp/hplip/hplip.state
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/hplip/hplip.state
rename to third_party/nixpkgs/pkgs/by-name/hp/hplip/hplip.state
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/third_party/nixpkgs/pkgs/by-name/hp/hplip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hp/hplip/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/hqplayerd/add-option-for-installation-sysconfdir.patch b/third_party/nixpkgs/pkgs/by-name/hq/hqplayerd/add-option-for-installation-sysconfdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/hqplayerd/add-option-for-installation-sysconfdir.patch
rename to third_party/nixpkgs/pkgs/by-name/hq/hqplayerd/add-option-for-installation-sysconfdir.patch
diff --git a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix b/third_party/nixpkgs/pkgs/by-name/hq/hqplayerd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hq/hqplayerd/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/hqplayerd/rygel.nix b/third_party/nixpkgs/pkgs/by-name/hq/hqplayerd/rygel.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/hqplayerd/rygel.nix
rename to third_party/nixpkgs/pkgs/by-name/hq/hqplayerd/rygel.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hr/default.nix b/third_party/nixpkgs/pkgs/by-name/hr/hr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hr/hr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix b/third_party/nixpkgs/pkgs/by-name/hs/hsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hs/hsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/hsetroot/default.nix b/third_party/nixpkgs/pkgs/by-name/hs/hsetroot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/hsetroot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hs/hsetroot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix b/third_party/nixpkgs/pkgs/by-name/hs/hsqldb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hs/hsqldb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/hss/default.nix b/third_party/nixpkgs/pkgs/by-name/hs/hss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/hss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hs/hss/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix b/third_party/nixpkgs/pkgs/by-name/hs/hstr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hs/hstr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/hstsparser/default.nix b/third_party/nixpkgs/pkgs/by-name/hs/hstsparser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/hstsparser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hs/hstsparser/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/ht/gcc7.patch b/third_party/nixpkgs/pkgs/by-name/ht/ht/gcc7.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/ht/gcc7.patch
rename to third_party/nixpkgs/pkgs/by-name/ht/ht/gcc7.patch
diff --git a/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/ht/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/ht/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/ht/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix
index 9c1742ebc7..60382597b7 100644
--- a/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix
@@ -20,14 +20,14 @@
stdenv.mkDerivation rec {
pname = "htcondor";
- version = "23.10.1";
+ version = "24.1.1";
src = fetchFromGitHub {
owner = "htcondor";
repo = "htcondor";
rev = "v${version}";
- hash = "sha256-5gxylfqG87dUEQT3e3vNgtTqWk0QTgWXwAdEAiIuc/E=";
+ hash = "sha256-k3GXaBSeRl6GJDm5+NRkV0E18RDUBYuoy2/u3ENsEyM=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/html-minifier/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/html-minifier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/html-minifier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/html-minifier/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/html-tidy/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/html-tidy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/html-tidy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/html-tidy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/html-xml-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/html-xml-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/html2text/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/html2text/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/html2text/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/html2text/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/c++17.patch b/third_party/nixpkgs/pkgs/by-name/ht/htmlcxx/c++17.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/htmlcxx/c++17.patch
rename to third_party/nixpkgs/pkgs/by-name/ht/htmlcxx/c++17.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/htmlcxx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/htmlcxx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/third_party/nixpkgs/pkgs/by-name/ht/htmlcxx/ptrdiff.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/htmlcxx/ptrdiff.patch
rename to third_party/nixpkgs/pkgs/by-name/ht/htmlcxx/ptrdiff.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/htmlhint/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/htmlhint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/htmlhint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/htmlhint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/htmltest/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/htmltest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/htmltest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/htmltest/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/htmlunit-driver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/htmlunit-driver/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/htpdate/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/htpdate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/htpdate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/htpdate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/htslib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/htslib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/http-parser/enable-static-shared.patch b/third_party/nixpkgs/pkgs/by-name/ht/http-parser/enable-static-shared.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/http-parser/enable-static-shared.patch
rename to third_party/nixpkgs/pkgs/by-name/ht/http-parser/enable-static-shared.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/http-parser/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/http-parser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/http-parser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/http-parser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/http2tcp/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/http2tcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/http2tcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/http2tcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/httpdump/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httpdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/httpdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httpdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httperf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httperf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httpfs2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httpfs2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplab/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httplab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/httplab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httplab/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httplz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httplz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/httpref/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httpref/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/httpref/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httpref/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/httprobe/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httprobe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/httprobe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httprobe/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dns/https-dns-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/https-dns-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/https-dns-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/https-dns-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httpstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httpstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/httptunnel/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httptunnel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/httptunnel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httptunnel/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/httpunit/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httpunit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/httpunit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httpunit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/by-name/ht/httpx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/httpx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ht/httpx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/hub/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/hub/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/hub/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/hub/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/hubble/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/hubble/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/hubicfuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/hubicfuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/hubot-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/hubot-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/hubot-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/hubot-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/hubstaff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/hubstaff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hueadm/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/hueadm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hueadm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/hueadm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/hugs/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/hugs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/hugs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/hugs/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/humanity-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/humanity-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/humanity-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/humanity-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/huniq/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/huniq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/huniq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/huniq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hunt/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/hunt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hunt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/hunt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/husky/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/husky/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/husky/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/husky/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/hut/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/hut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/hut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hu/hut/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hwatch/default.nix b/third_party/nixpkgs/pkgs/by-name/hw/hwatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hwatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hw/hwatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/third_party/nixpkgs/pkgs/by-name/hw/hwdata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hw/hwdata/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/third_party/nixpkgs/pkgs/by-name/hw/hwloc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hw/hwloc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hybridreverb2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hybridreverb2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hydra-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hydra-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hydraAntLogger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hydraAntLogger/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hydroxide/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hydroxide/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hyena/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyena/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hyena/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyena/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/hyenae/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyenae/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/hyenae/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyenae/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/hyp/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/hyp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/hyp2mat/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyp2mat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/hyp2mat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyp2mat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyperledger-fabric/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyperledger-fabric/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hyperpotamus/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyperpotamus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/hyperpotamus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyperpotamus/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyperrogue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/hyperrogue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyperrogue/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyperscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyperscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyperscrypt-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyperscrypt-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/hypnotix/libmpv-path.patch b/third_party/nixpkgs/pkgs/by-name/hy/hypnotix/libmpv-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/hypnotix/libmpv-path.patch
rename to third_party/nixpkgs/pkgs/by-name/hy/hypnotix/libmpv-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/hypnotix/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hypnotix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/hypnotix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hypnotix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/hyprland-per-window-layout/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/hyprland-per-window-layout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-protocols/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyprland-protocols/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/info.json b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/info.json
index 0f61f205b5..c7170f8c90 100644
--- a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/info.json
+++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/info.json
@@ -1,7 +1,7 @@
{
- "branch": "v0.44.1-b",
- "commit_hash": "4520b30d498daca8079365bdb909a8dea38e8d55",
- "commit_message": "version: bump to 0.44.1",
- "date": "2024-10-09",
- "tag": "v0.44.1"
+ "branch": "main",
+ "commit_hash": "a425fbebe4cf4238e48a42f724ef2208959d66cf",
+ "commit_message": "version: bump to 0.45.0",
+ "date": "2024-11-09",
+ "tag": "v0.45.0"
}
diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix
index 3364348a1d..7fdf15bf59 100644
--- a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix
@@ -82,14 +82,14 @@ assert assertMsg (!hidpiXWayland)
customStdenv.mkDerivation (finalAttrs: {
pname = "hyprland" + optionalString debug "-debug";
- version = "0.44.1";
+ version = "0.45.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprland";
fetchSubmodules = true;
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-hnoPoxMFetuoXQuAMgvopl1kCRQ33FYaVVBgV9FIFkM=";
+ hash = "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprpaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyprpaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprpicker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyprpicker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/hysteria/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hysteria/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/hysteria/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hysteria/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/hyx/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/hyx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hy/hyx/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix b/third_party/nixpkgs/pkgs/by-name/i-/i-dot-ming/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix
rename to third_party/nixpkgs/pkgs/by-name/i-/i-dot-ming/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/i2/i2c-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/i2/i2c-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/by-name/i2/i2pd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/i2/i2pd/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/i3a/default.nix b/third_party/nixpkgs/pkgs/by-name/i3/i3a/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/i3a/default.nix
rename to third_party/nixpkgs/pkgs/by-name/i3/i3a/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/third_party/nixpkgs/pkgs/by-name/i3/i3lock-pixeled/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix
rename to third_party/nixpkgs/pkgs/by-name/i3/i3lock-pixeled/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/i3minator/default.nix b/third_party/nixpkgs/pkgs/by-name/i3/i3minator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/i3minator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/i3/i3minator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/i3nator/default.nix b/third_party/nixpkgs/pkgs/by-name/i3/i3nator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/i3nator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/i3/i3nator/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/i810switch/default.nix b/third_party/nixpkgs/pkgs/by-name/i8/i810switch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/i810switch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/i8/i810switch/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix b/third_party/nixpkgs/pkgs/by-name/ia/ia-writer-duospace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ia/ia-writer-duospace/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix b/third_party/nixpkgs/pkgs/by-name/ia/iamb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ia/iamb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/iamy/default.nix b/third_party/nixpkgs/pkgs/by-name/ia/iamy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/iamy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ia/iamy/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix b/third_party/nixpkgs/pkgs/by-name/ia/iana-etc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ia/iana-etc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/iat/default.nix b/third_party/nixpkgs/pkgs/by-name/ia/iat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/iat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ia/iat/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix b/third_party/nixpkgs/pkgs/by-name/ib/ibm-plex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ib/ibm-plex/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix b/third_party/nixpkgs/pkgs/by-name/ib/ibm-sw-tpm2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ib/ibm-sw-tpm2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ibniz/default.nix b/third_party/nixpkgs/pkgs/by-name/ib/ibniz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/ibniz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ib/ibniz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ibus-theme-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ib/ibus-theme-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ibus-theme-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ib/ibus-theme-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ic-keysmith/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/ic-keysmith/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ic-keysmith/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/ic-keysmith/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ical2orgpy/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/ical2orgpy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ical2orgpy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/ical2orgpy/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/icbm3d/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icbm3d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/icbm3d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icbm3d/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/icebreaker/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icebreaker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/icebreaker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icebreaker/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/icecast/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icecast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/icecast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icecast/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/icecream/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icecream/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/icecream/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icecream/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/iceshelf/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/iceshelf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/iceshelf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/iceshelf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/icesl/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icesl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/icesl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icesl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/icestorm/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icestorm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/fpga/icestorm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icestorm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icmake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icmake/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icon-lang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icon-lang/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/icon-library/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icon-library/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/icon-library/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icon-library/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/icon-slicer/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icon-slicer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/icon-slicer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icon-slicer/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh b/third_party/nixpkgs/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
rename to third_party/nixpkgs/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme b/third_party/nixpkgs/pkgs/by-name/ic/iconConvTools/bin/icoFileToHiColorTheme
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme
rename to third_party/nixpkgs/pkgs/by-name/ic/iconConvTools/bin/icoFileToHiColorTheme
diff --git a/third_party/nixpkgs/pkgs/build-support/icon-conv-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/iconConvTools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/icon-conv-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/iconConvTools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/iconnamingutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/icon-naming-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/iconnamingutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/iconpack-jade/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/iconpack-jade/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/iconpack-obsidian/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/iconpack-obsidian/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icoutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icoutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/icr/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/icr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/icr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/icr/shards.nix b/third_party/nixpkgs/pkgs/by-name/ic/icr/shards.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/icr/shards.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/icr/shards.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ictree/default.nix b/third_party/nixpkgs/pkgs/by-name/ic/ictree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ictree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ic/ictree/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch b/third_party/nixpkgs/pkgs/by-name/id/id3lib/id3lib-3.8.3-gcc43-1.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch
rename to third_party/nixpkgs/pkgs/by-name/id/id3lib/id3lib-3.8.3-gcc43-1.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/id3lib/default.nix b/third_party/nixpkgs/pkgs/by-name/id/id3lib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/id3lib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/id/id3lib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/third_party/nixpkgs/pkgs/by-name/id/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
rename to third_party/nixpkgs/pkgs/by-name/id/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
diff --git a/third_party/nixpkgs/pkgs/applications/audio/id3v2/default.nix b/third_party/nixpkgs/pkgs/by-name/id/id3v2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/id3v2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/id/id3v2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ideogram/default.nix b/third_party/nixpkgs/pkgs/by-name/id/ideogram/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/ideogram/default.nix
rename to third_party/nixpkgs/pkgs/by-name/id/ideogram/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix b/third_party/nixpkgs/pkgs/by-name/id/ideviceinstaller/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix
rename to third_party/nixpkgs/pkgs/by-name/id/ideviceinstaller/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix b/third_party/nixpkgs/pkgs/by-name/id/idevicerestore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/id/idevicerestore/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix b/third_party/nixpkgs/pkgs/by-name/id/idle3tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/id/idle3tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/idnkit/default.nix b/third_party/nixpkgs/pkgs/by-name/id/idnkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/idnkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/id/idnkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/idutils/nix-mapping.patch b/third_party/nixpkgs/pkgs/by-name/id/idutils/nix-mapping.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/idutils/nix-mapping.patch
rename to third_party/nixpkgs/pkgs/by-name/id/idutils/nix-mapping.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/idutils/default.nix b/third_party/nixpkgs/pkgs/by-name/id/idutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/idutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/id/idutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ifdnfc/default.nix b/third_party/nixpkgs/pkgs/by-name/if/ifdnfc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ifdnfc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/if/ifdnfc/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ifenslave/default.nix b/third_party/nixpkgs/pkgs/by-name/if/ifenslave/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ifenslave/default.nix
rename to third_party/nixpkgs/pkgs/by-name/if/ifenslave/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/iferr/default.nix b/third_party/nixpkgs/pkgs/by-name/if/iferr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/iferr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/if/iferr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ifm/default.nix b/third_party/nixpkgs/pkgs/by-name/if/ifm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/ifm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/if/ifm/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ifmetric/default.nix b/third_party/nixpkgs/pkgs/by-name/if/ifmetric/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ifmetric/default.nix
rename to third_party/nixpkgs/pkgs/by-name/if/ifmetric/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix b/third_party/nixpkgs/pkgs/by-name/if/ifstat-legacy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/if/ifstat-legacy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/iftop/default.nix b/third_party/nixpkgs/pkgs/by-name/if/iftop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/iftop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/if/iftop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix b/third_party/nixpkgs/pkgs/by-name/if/ifuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/if/ifuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/ig/igmpproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ig/igmpproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/igprof/default.nix b/third_party/nixpkgs/pkgs/by-name/ig/igprof/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/igprof/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ig/igprof/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/by-name/ig/igraph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ig/igraph/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix b/third_party/nixpkgs/pkgs/by-name/ig/igv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ig/igv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix b/third_party/nixpkgs/pkgs/by-name/ih/ihp-new/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ih/ihp-new/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/ii/iio-sensor-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ii/iio-sensor-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ijs/default.nix b/third_party/nixpkgs/pkgs/by-name/ij/ijs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ijs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ij/ijs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ike-scan/default.nix b/third_party/nixpkgs/pkgs/by-name/ik/ike-scan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ike-scan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ik/ike-scan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ikill/default.nix b/third_party/nixpkgs/pkgs/by-name/ik/ikill/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ikill/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ik/ikill/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ilbc/CMakeLists.txt b/third_party/nixpkgs/pkgs/by-name/il/ilbc/CMakeLists.txt
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ilbc/CMakeLists.txt
rename to third_party/nixpkgs/pkgs/by-name/il/ilbc/CMakeLists.txt
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ilbc/extract-cfile.awk b/third_party/nixpkgs/pkgs/by-name/il/ilbc/extract-cfile.awk
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ilbc/extract-cfile.awk
rename to third_party/nixpkgs/pkgs/by-name/il/ilbc/extract-cfile.awk
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ilbc/default.nix b/third_party/nixpkgs/pkgs/by-name/il/ilbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ilbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/il/ilbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch b/third_party/nixpkgs/pkgs/by-name/il/ili2c/dont-use-build-timestamp.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch
rename to third_party/nixpkgs/pkgs/by-name/il/ili2c/dont-use-build-timestamp.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ili2c/default.nix b/third_party/nixpkgs/pkgs/by-name/il/ili2c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ili2c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/il/ili2c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/illum/default.nix b/third_party/nixpkgs/pkgs/by-name/il/illum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/illum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/il/illum/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix b/third_party/nixpkgs/pkgs/by-name/il/ilmbase/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix
rename to third_party/nixpkgs/pkgs/by-name/il/ilmbase/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ima-evm-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/im/ima-evm-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ima-evm-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/ima-evm-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/image-roll/default.nix b/third_party/nixpkgs/pkgs/by-name/im/image-roll/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/image-roll/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/image-roll/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imagej/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imagej/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imagelol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imagelol/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/imaginary/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imaginary/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/imaginary/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imaginary/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/imagination/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imagination/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/imagination/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imagination/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/imaginer/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imaginer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/imaginer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imaginer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/imapsync/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imapsync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/imapsync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imapsync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/imath/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/imath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imath/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/imdshift/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imdshift/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/imdshift/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imdshift/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/img-cat/default.nix b/third_party/nixpkgs/pkgs/by-name/im/img-cat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/img-cat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/img-cat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/img/default.nix b/third_party/nixpkgs/pkgs/by-name/im/img/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/img/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/img/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imgcat/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imgcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/imgcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imgcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imgcrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imgcrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imgpatchtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imgpatchtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imgproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/imgproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imgproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imgur-screenshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imgur-screenshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imgurbash2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imgurbash2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/iml/default.nix b/third_party/nixpkgs/pkgs/by-name/im/iml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/iml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/iml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imlib2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imlib2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/immer/default.nix b/third_party/nixpkgs/pkgs/by-name/im/immer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/immer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/immer/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix
index a018bee46c..bb1778ee20 100644
--- a/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix
@@ -3,6 +3,7 @@
stdenvNoCC,
buildNpmPackage,
fetchFromGitHub,
+ fetchpatch2,
python3,
nodejs,
node-gyp,
@@ -17,12 +18,12 @@
cacert,
unzip,
# runtime deps
+ exiftool,
jellyfin-ffmpeg, # Immich depends on the jellyfin customizations, see https://github.com/NixOS/nixpkgs/issues/351943
imagemagick,
libraw,
libheif,
vips,
- perl,
}:
let
buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
@@ -146,6 +147,13 @@ buildNpmPackage' {
src = "${src}/server";
inherit (sources.components.server) npmDepsHash;
+ postPatch = ''
+ # pg_dumpall fails without database root access
+ # see https://github.com/immich-app/immich/issues/13971
+ substituteInPlace src/services/backup.service.ts \
+ --replace-fail '`pg_dumpall`' '`pg_dump`'
+ '';
+
nativeBuildInputs = [
pkg-config
python3
@@ -166,7 +174,7 @@ buildNpmPackage' {
makeCacheWritable = true;
preBuild = ''
- cd node_modules/sharp
+ pushd node_modules/sharp
mkdir node_modules
ln -s ${node-addon-api} node_modules/node-addon-api
@@ -175,8 +183,13 @@ buildNpmPackage' {
rm -r node_modules
- cd ../..
+ popd
rm -r node_modules/@img/sharp*
+
+ # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH
+ rm -r node_modules/exiftool-vendored.*
+ substituteInPlace node_modules/exiftool-vendored/dist/DefaultExifToolOptions.js \
+ --replace-fail "checkPerl: !(0, IsWin32_1.isWin32)()," "checkPerl: false,"
'';
installPhase = ''
@@ -197,7 +210,7 @@ buildNpmPackage' {
--set IMMICH_BUILD_DATA $out/build --set NODE_ENV production \
--suffix PATH : "${
lib.makeBinPath [
- perl
+ exiftool
jellyfin-ffmpeg
]
}"
diff --git a/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json b/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json
index 3c4bdf53f7..f58bc75177 100644
--- a/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json
+++ b/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json
@@ -1,22 +1,22 @@
{
- "version": "1.119.1",
- "hash": "sha256-T+bIL2LaVNgFT3xBUxiEzhyDiLpw/WU7mxttuJD39SQ=",
+ "version": "1.120.1",
+ "hash": "sha256-FKPs6BHOXmqnHh2yH+PPBFQoK5ykP716dNvES/45t4g=",
"components": {
"cli": {
- "npmDepsHash": "sha256-kTBlo6eIPswZC0GQG7IoqQZ5b7wPEXFaD/SuuaEQMEg=",
- "version": "2.2.28"
+ "npmDepsHash": "sha256-5JmcDjLAVXhF3TH0M88dKLYPDsSctcOGPz9nV1n3k9c=",
+ "version": "2.2.30"
},
"server": {
- "npmDepsHash": "sha256-zgzqh3TyafPKuk5RZ2I/haYFzMVlI4jGnwD5XLqTBdg=",
- "version": "1.119.1"
+ "npmDepsHash": "sha256-u2ZQv+z8uyn7z52V+7hNRWgnHVm4xMdhjspPqsLHYek=",
+ "version": "1.120.1"
},
"web": {
- "npmDepsHash": "sha256-LPtsMzF7yYGrrpDoYoba6OQphKY7AvGbJpPc5pS4eFU=",
- "version": "1.119.1"
+ "npmDepsHash": "sha256-EAFUOhcmE1TfUBN0uxzuNkHibdaDRn8Lxvma70UJqDE=",
+ "version": "1.120.1"
},
"open-api/typescript-sdk": {
- "npmDepsHash": "sha256-dyKmDez8jO6p+cmSa2KMe9zzhXn4on3aFUMdep+gjzU=",
- "version": "1.119.1"
+ "npmDepsHash": "sha256-AJcK5NE+ZNAK2FJblY32jtYxY0Z9npH92A3htcPes4A=",
+ "version": "1.120.1"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/immudb/default.nix b/third_party/nixpkgs/pkgs/by-name/im/immudb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/immudb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/immudb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/impl/default.nix b/third_party/nixpkgs/pkgs/by-name/im/impl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/impl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/impl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/impy/default.nix b/third_party/nixpkgs/pkgs/by-name/im/impy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/impy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/impy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/imtui/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imtui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/imtui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imtui/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/imwheel/default.nix b/third_party/nixpkgs/pkgs/by-name/im/imwheel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/imwheel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/im/imwheel/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inadyn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inadyn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/inav-blackbox-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inav-blackbox-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/inav-blackbox-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inav-blackbox-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/inav-configurator/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inav-configurator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/robotics/inav-configurator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inav-configurator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/inchi/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inchi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/inchi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inchi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/incron/default_path.patch b/third_party/nixpkgs/pkgs/by-name/in/incron/default_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/incron/default_path.patch
rename to third_party/nixpkgs/pkgs/by-name/in/incron/default_path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/incron/default.nix b/third_party/nixpkgs/pkgs/by-name/in/incron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/incron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/incron/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/indent/default.nix b/third_party/nixpkgs/pkgs/by-name/in/indent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/indent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/indent/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/indicator-sound-switcher/default.nix b/third_party/nixpkgs/pkgs/by-name/in/indicator-sound-switcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/indicator-sound-switcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/indicator-sound-switcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/industrializer/default.nix b/third_party/nixpkgs/pkgs/by-name/in/industrializer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/industrializer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/industrializer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch b/third_party/nixpkgs/pkgs/by-name/in/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch
rename to third_party/nixpkgs/pkgs/by-name/in/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inetutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inetutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix b/third_party/nixpkgs/pkgs/by-name/in/infamousPlugins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/infamousPlugins/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inferno/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/inferno/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inferno/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/infnoise/makefile.patch b/third_party/nixpkgs/pkgs/by-name/in/infnoise/makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/infnoise/makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/in/infnoise/makefile.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/infnoise/default.nix b/third_party/nixpkgs/pkgs/by-name/in/infnoise/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/infnoise/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/infnoise/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/inform7/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inform7/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/inform7/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inform7/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/infra-arcana/default.nix b/third_party/nixpkgs/pkgs/by-name/in/infra-arcana/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/infra-arcana/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/infra-arcana/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/infra/default.nix b/third_party/nixpkgs/pkgs/by-name/in/infra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/infra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/infra/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/inframap/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inframap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/inframap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inframap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ingen/default.nix b/third_party/nixpkgs/pkgs/by-name/in/ingen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ingen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/ingen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/inih/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inih/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/inih/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inih/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/iniparser/default.nix b/third_party/nixpkgs/pkgs/by-name/in/iniparser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/iniparser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/iniparser/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch b/third_party/nixpkgs/pkgs/by-name/in/iniparser/remove-fetchcontent-usage.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch
rename to third_party/nixpkgs/pkgs/by-name/in/iniparser/remove-fetchcontent-usage.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/initool/default.nix b/third_party/nixpkgs/pkgs/by-name/in/initool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/initool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/initool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ink/default.nix b/third_party/nixpkgs/pkgs/by-name/in/ink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/ink/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps.nix b/third_party/nixpkgs/pkgs/by-name/in/inklecate/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/inklecate/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inklecate/deps.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inklecate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inklecate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/inklingreader/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inklingreader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/inklingreader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inklingreader/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix b/third_party/nixpkgs/pkgs/by-name/in/innoextract/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/innoextract/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/inormalize/lgmask-interp.patch b/third_party/nixpkgs/pkgs/by-name/in/inormalize/lgmask-interp.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/inormalize/lgmask-interp.patch
rename to third_party/nixpkgs/pkgs/by-name/in/inormalize/lgmask-interp.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch b/third_party/nixpkgs/pkgs/by-name/in/inormalize/nu_correct_norm-interp.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch
rename to third_party/nixpkgs/pkgs/by-name/in/inormalize/nu_correct_norm-interp.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inormalize/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inormalize/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inotify-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inotify-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/inputplug/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inputplug/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/inputplug/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inputplug/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/inql/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/inql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inql/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/inriafonts/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inriafonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/inriafonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inriafonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/by-name/in/insomnia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/insomnia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/insomnia/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/inspectrum/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inspectrum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/inspectrum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inspectrum/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/irc/inspircd/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inspircd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/irc/inspircd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inspircd/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/instead/default.nix b/third_party/nixpkgs/pkgs/by-name/in/instead/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/instead/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/instead/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/insulator2/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/in/insulator2/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/insulator2/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/in/insulator2/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch b/third_party/nixpkgs/pkgs/by-name/in/insulator2/fix-rust-1.80.0.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch
rename to third_party/nixpkgs/pkgs/by-name/in/insulator2/fix-rust-1.80.0.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/insulator2/default.nix b/third_party/nixpkgs/pkgs/by-name/in/insulator2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/insulator2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/insulator2/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intel-cmt-cat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/intel-cmt-cat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intel-cmt-cat/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intel-compute-runtime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intel-compute-runtime/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intel-gmmlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intel-gmmlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intel-gpu-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intel-gpu-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intel-graphics-compiler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intel-graphics-compiler/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intel-media-driver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intel-media-driver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch b/third_party/nixpkgs/pkgs/by-name/in/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch
rename to third_party/nixpkgs/pkgs/by-name/in/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intel-media-sdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intel-media-sdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-ocl/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intel-ocl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/intel-ocl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intel-ocl/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/intel-one-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intel-one-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/intel-one-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intel-one-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intel2200BGFirmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intel2200BGFirmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/inter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/interactsh/default.nix b/third_party/nixpkgs/pkgs/by-name/in/interactsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/interactsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/interactsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/interlock/default.nix b/third_party/nixpkgs/pkgs/by-name/in/interlock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/interlock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/interlock/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intermodal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intermodal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix b/third_party/nixpkgs/pkgs/by-name/in/intltool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/intltool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/invoice/default.nix b/third_party/nixpkgs/pkgs/by-name/in/invoice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/invoice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/invoice/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/invoice2data/default.nix b/third_party/nixpkgs/pkgs/by-name/in/invoice2data/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/invoice2data/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/invoice2data/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/invoiceplane/default.nix b/third_party/nixpkgs/pkgs/by-name/in/invoiceplane/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/invoiceplane/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/invoiceplane/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix b/third_party/nixpkgs/pkgs/by-name/in/inxi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/inxi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/in/inxi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/io/default.nix b/third_party/nixpkgs/pkgs/by-name/io/io/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/io/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/io/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ioc-scan/default.nix b/third_party/nixpkgs/pkgs/by-name/io/ioc-scan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ioc-scan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/ioc-scan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix b/third_party/nixpkgs/pkgs/by-name/io/ioccheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/ioccheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch b/third_party/nixpkgs/pkgs/by-name/io/iodash/0001-Add-cmake-install-directives.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch
rename to third_party/nixpkgs/pkgs/by-name/io/iodash/0001-Add-cmake-install-directives.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/iodash/default.nix b/third_party/nixpkgs/pkgs/by-name/io/iodash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/iodash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/iodash/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/iodine/default.nix b/third_party/nixpkgs/pkgs/by-name/io/iodine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/iodine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/iodine/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iomelt/default.nix b/third_party/nixpkgs/pkgs/by-name/io/iomelt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/iomelt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/iomelt/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/ion/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/io/ion/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/ion/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/io/ion/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/shells/ion/build-script.patch b/third_party/nixpkgs/pkgs/by-name/io/ion/build-script.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/ion/build-script.patch
rename to third_party/nixpkgs/pkgs/by-name/io/ion/build-script.patch
diff --git a/third_party/nixpkgs/pkgs/shells/ion/default.nix b/third_party/nixpkgs/pkgs/by-name/io/ion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/ion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/ion/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ioping/default.nix b/third_party/nixpkgs/pkgs/by-name/io/ioping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ioping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/ioping/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ioport/default.nix b/third_party/nixpkgs/pkgs/by-name/io/ioport/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ioport/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/ioport/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/quake3/ioquake/Makefile.local b/third_party/nixpkgs/pkgs/by-name/io/ioquake3/Makefile.local
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/quake3/ioquake/Makefile.local
rename to third_party/nixpkgs/pkgs/by-name/io/ioquake3/Makefile.local
diff --git a/third_party/nixpkgs/pkgs/games/quake3/ioquake/default.nix b/third_party/nixpkgs/pkgs/by-name/io/ioquake3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/quake3/ioquake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/ioquake3/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ior/default.nix b/third_party/nixpkgs/pkgs/by-name/io/ior/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ior/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/ior/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/iotas/default.nix b/third_party/nixpkgs/pkgs/by-name/io/iotas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/iotas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/iotas/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix b/third_party/nixpkgs/pkgs/by-name/io/iotop-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/iotop-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iotop/default.nix b/third_party/nixpkgs/pkgs/by-name/io/iotop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/iotop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/iotop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/iozone/default.nix b/third_party/nixpkgs/pkgs/by-name/io/iozone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/iozone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/iozone/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ioztat/default.nix b/third_party/nixpkgs/pkgs/by-name/io/ioztat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/ioztat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/io/ioztat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ip2location-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ip2location-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ip2location/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ip2location/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ip2location/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ip2location/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ip2unix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ip2unix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipad_charge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipad_charge/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipaexfont/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipaexfont/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ipafont/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipafont/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ipafont/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipafont/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ipatool/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipatool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ipatool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipatool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ipbt/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipbt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ipbt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipbt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipcalc/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipcalc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ipcalc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipcalc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipcalc/sandbox_tests.patch b/third_party/nixpkgs/pkgs/by-name/ip/ipcalc/sandbox_tests.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ipcalc/sandbox_tests.patch
rename to third_party/nixpkgs/pkgs/by-name/ip/ipcalc/sandbox_tests.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/iperf3d/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/iperf3d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/iperf3d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/iperf3d/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipfetch/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipfetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ipfetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipfetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipfs-cluster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipfs-cluster/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-upload-client/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipfs-upload-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/ipfs-upload-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipfs-upload-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipget/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipget/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/ipget/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipget/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipgrep/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipgrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ipgrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipgrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipinfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipinfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipmicfg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipmicfg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipmitool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipmitool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ipmiutil/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipmiutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ipmiutil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipmiutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ipmiview/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipmiview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ipmiview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipmiview/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipopt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipopt/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipp-usb/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipp-usb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ipp-usb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipp-usb/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/iproute2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/iproute2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/iprover/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/iprover/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/iprover/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/iprover/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipset/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipset/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/iptraf-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/iptraf-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/iptsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/iptsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/iptstate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/iptstate/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipu6-camera-bins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipu6-camera-bins/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipv6calc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipv6calc/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipvsadm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ip/ipvsadm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix b/third_party/nixpkgs/pkgs/by-name/iq/iqtree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/iq/iqtree/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/iqueue/default.nix b/third_party/nixpkgs/pkgs/by-name/iq/iqueue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/iqueue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/iq/iqueue/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/ir/ir-standard-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ir/ir-standard-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/irc/irccat/default.nix b/third_party/nixpkgs/pkgs/by-name/ir/irccat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/irc/irccat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ir/irccat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/irccloud/default.nix b/third_party/nixpkgs/pkgs/by-name/ir/irccloud/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/irccloud/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ir/irccloud/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix b/third_party/nixpkgs/pkgs/by-name/ir/ircdHybrid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ir/ircdHybrid/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/ircdog/default.nix b/third_party/nixpkgs/pkgs/by-name/ir/ircdog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/ircdog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ir/ircdog/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/irker/default.nix b/third_party/nixpkgs/pkgs/by-name/ir/irker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/irker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ir/irker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix b/third_party/nixpkgs/pkgs/by-name/ir/iroh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ir/iroh/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/ironwail/default.nix b/third_party/nixpkgs/pkgs/by-name/ir/ironwail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/ironwail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ir/ironwail/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix b/third_party/nixpkgs/pkgs/by-name/ir/irqbalance/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ir/irqbalance/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ised/default.nix b/third_party/nixpkgs/pkgs/by-name/is/ised/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ised/default.nix
rename to third_party/nixpkgs/pkgs/by-name/is/ised/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/iso-flags/default.nix b/third_party/nixpkgs/pkgs/by-name/is/iso-flags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/iso-flags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/is/iso-flags/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/iso-codes/default.nix b/third_party/nixpkgs/pkgs/by-name/is/isocodes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/iso-codes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/is/isocodes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/isolate/default.nix b/third_party/nixpkgs/pkgs/by-name/is/isolate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/isolate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/is/isolate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/isolate/take-config-file-from-env.patch b/third_party/nixpkgs/pkgs/by-name/is/isolate/take-config-file-from-env.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/isolate/take-config-file-from-env.patch
rename to third_party/nixpkgs/pkgs/by-name/is/isolate/take-config-file-from-env.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/isolyzer/default.nix b/third_party/nixpkgs/pkgs/by-name/is/isolyzer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/isolyzer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/is/isolyzer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix b/third_party/nixpkgs/pkgs/by-name/is/isomd5sum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/is/isomd5sum/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix b/third_party/nixpkgs/pkgs/by-name/is/ispell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/ispell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/is/ispell/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix b/third_party/nixpkgs/pkgs/by-name/is/ispike/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix
rename to third_party/nixpkgs/pkgs/by-name/is/ispike/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix b/third_party/nixpkgs/pkgs/by-name/is/isrcsubmit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/is/isrcsubmit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/by-name/is/istioctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/is/istioctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/itchiodl/default.nix b/third_party/nixpkgs/pkgs/by-name/it/itchiodl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/itchiodl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/it/itchiodl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/itd/default.nix b/third_party/nixpkgs/pkgs/by-name/it/itd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/itd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/it/itd/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/ite-backlight/default.nix b/third_party/nixpkgs/pkgs/by-name/it/ite-backlight/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/ite-backlight/default.nix
rename to third_party/nixpkgs/pkgs/by-name/it/ite-backlight/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix b/third_party/nixpkgs/pkgs/by-name/it/iterm2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/it/iterm2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/it/itm-tools/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/it/itm-tools/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/it/itm-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/it/itm-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/third_party/nixpkgs/pkgs/by-name/it/itpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/it/itpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/itstool/default.nix b/third_party/nixpkgs/pkgs/by-name/it/itstool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/itstool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/it/itstool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/itsx/default.nix b/third_party/nixpkgs/pkgs/by-name/it/itsx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/itsx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/it/itsx/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/ivan/default.nix b/third_party/nixpkgs/pkgs/by-name/iv/ivan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/ivan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/iv/ivan/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/third_party/nixpkgs/pkgs/by-name/iv/ivsc-firmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/iv/ivsc-firmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix b/third_party/nixpkgs/pkgs/by-name/iv/ivy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/iv/ivy/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/by-name/iw/iwd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/iw/iwd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/iwgtk/default.nix b/third_party/nixpkgs/pkgs/by-name/iw/iwgtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/iwgtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/iw/iwgtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/iwgtk/systemd-service.patch b/third_party/nixpkgs/pkgs/by-name/iw/iwgtk/systemd-service.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/iwgtk/systemd-service.patch
rename to third_party/nixpkgs/pkgs/by-name/iw/iwgtk/systemd-service.patch
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix b/third_party/nixpkgs/pkgs/by-name/iw/iwona/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix
rename to third_party/nixpkgs/pkgs/by-name/iw/iwona/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ix/default.nix b/third_party/nixpkgs/pkgs/by-name/ix/ix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ix/ix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/j4/j4-dmenu-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/j4/j4-dmenu-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jaaa/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jaaa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jaaa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jaaa/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jack-passthrough/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jack-passthrough/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jack-passthrough/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jack-passthrough/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jack-capture/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jack_capture/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jack-capture/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jack_capture/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jack-oscrolloscope/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jack_oscrolloscope/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jack-oscrolloscope/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jack_oscrolloscope/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jack-rack/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jack_rack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jack-rack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jack_rack/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jackmeter/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jackmeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jackmeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jackmeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jacktrip/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jacktrip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jacktrip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jacktrip/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/jacoco/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jacoco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/jacoco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jacoco/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/jade/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jade/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sgml/jade/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jade/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/jadx/deps.json b/third_party/nixpkgs/pkgs/by-name/ja/jadx/deps.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/jadx/deps.json
rename to third_party/nixpkgs/pkgs/by-name/ja/jadx/deps.json
diff --git a/third_party/nixpkgs/pkgs/tools/security/jadx/no-native-deps.diff b/third_party/nixpkgs/pkgs/by-name/ja/jadx/no-native-deps.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/jadx/no-native-deps.diff
rename to third_party/nixpkgs/pkgs/by-name/ja/jadx/no-native-deps.diff
diff --git a/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jadx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/jadx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jadx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/jaeles/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jaeles/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/jaeles/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jaeles/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/jags/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/jags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jags/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jake/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jake/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jama/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jama/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jama/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jama/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamin/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jamin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jamin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jamin/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix
index 5121f4af97..df90ff0fba 100644
--- a/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix
@@ -5,10 +5,10 @@
let
pname = "jan";
- version = "0.5.6";
+ version = "0.5.7";
src = fetchurl {
url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";
- hash = "sha256-PkRizjF4RVhCH7YOPABb+SpZlO3aKT5W6b0YBuKTNWk=";
+ hash = "sha256-mWmqvyX9n79uCtCZimU7B1jFE+0Ucwe+RGw0oSQaSB4=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/janusgraph/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/janusgraph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/janusgraph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/janusgraph/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/japa/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/japa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/japa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/japa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jaq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jaq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jaq/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jarowinkler-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jarowinkler-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jarowinkler-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jarowinkler-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/jasmin-compiler/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jasmin-compiler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/jasmin-compiler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jasmin-compiler/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/jasmin/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jasmin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/jasmin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jasmin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j b/third_party/nixpkgs/pkgs/by-name/ja/jasmin/test-assemble-hello-world/HelloWorld.j
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j
rename to third_party/nixpkgs/pkgs/by-name/ja/jasmin/test-assemble-hello-world/HelloWorld.j
diff --git a/third_party/nixpkgs/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jasmin/test-assemble-hello-world/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jasmin/test-assemble-hello-world/default.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ja/jasp-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jasp-desktop/package.nix
index 08fd1425fc..2fb25136e5 100644
--- a/third_party/nixpkgs/pkgs/by-name/ja/jasp-desktop/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ja/jasp-desktop/package.nix
@@ -2,9 +2,10 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
buildEnv,
linkFarm,
- substituteAll,
+ replaceVars,
R,
rPackages,
cmake,
@@ -58,10 +59,15 @@ stdenv.mkDerivation {
patches = [
# remove unused cmake deps, ensure boost is dynamically linked, patch readstat path
- (substituteAll {
- src = ./cmake.patch;
+ (replaceVars ./cmake.patch {
inherit readstat;
})
+
+ (fetchpatch {
+ name = "fix-qt-6.8-crash.patch";
+ url = "https://github.com/jasp-stats/jasp-desktop/commit/d96a35d262312f72081ac3f96ae8c2ae7c796b0.patch";
+ hash = "sha256-KcsFy1ImPTHwDKN5Umfoa9CbtQn7B3FNu/Srr0dEJGA=";
+ })
];
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/java/java-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/java-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/java/java-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/java-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/java-service-wrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/java-service-wrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/javascript-typescript-langserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/javascript-typescript-langserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/jay/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/jay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ja/jay/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jbake/default.nix b/third_party/nixpkgs/pkgs/by-name/jb/jbake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jbake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jb/jbake/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/by-name/jb/jbang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jbang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jb/jbang/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix b/third_party/nixpkgs/pkgs/by-name/jb/jbig2dec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jb/jbig2dec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix b/third_party/nixpkgs/pkgs/by-name/jb/jbig2enc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jb/jbig2enc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jbigkit/default.nix b/third_party/nixpkgs/pkgs/by-name/jb/jbigkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jbigkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jb/jbigkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/jbofihe/default.nix b/third_party/nixpkgs/pkgs/by-name/jb/jbofihe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/jbofihe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jb/jbofihe/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/third_party/nixpkgs/pkgs/by-name/jb/jboss_mysql_jdbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/jboss/jdbc/mysql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jb/jboss_mysql_jdbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix b/third_party/nixpkgs/pkgs/by-name/jb/jbrowse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jb/jbrowse/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jcal/default.nix b/third_party/nixpkgs/pkgs/by-name/jc/jcal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jcal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jc/jcal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jconvolver/default.nix b/third_party/nixpkgs/pkgs/by-name/jc/jconvolver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jconvolver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jc/jconvolver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jd-diff-patch/default.nix b/third_party/nixpkgs/pkgs/by-name/jd/jd-diff-patch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jd-diff-patch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jd/jd-diff-patch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix b/third_party/nixpkgs/pkgs/by-name/jd/jdiskreport/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jd/jdiskreport/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/jdom/default.nix b/third_party/nixpkgs/pkgs/by-name/jd/jdom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/jdom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jd/jdom/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/third_party/nixpkgs/pkgs/by-name/jd/jdupes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jd/jdupes/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jed/default.nix b/third_party/nixpkgs/pkgs/by-name/je/jed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/jed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/je/jed/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix b/third_party/nixpkgs/pkgs/by-name/je/jedit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/je/jedit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/jefferson/default.nix b/third_party/nixpkgs/pkgs/by-name/je/jefferson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/jefferson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/je/jefferson/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jelly/default.nix b/third_party/nixpkgs/pkgs/by-name/je/jelly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/jelly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/je/jelly/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jellycli/fix-test-dir.patch b/third_party/nixpkgs/pkgs/by-name/je/jellycli/fix-test-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jellycli/fix-test-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/je/jellycli/fix-test-dir.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jellycli/default.nix b/third_party/nixpkgs/pkgs/by-name/je/jellycli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jellycli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/je/jellycli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/jen/default.nix b/third_party/nixpkgs/pkgs/by-name/je/jen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/jen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/je/jen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/by-name/je/jenkins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/je/jenkins/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jet/default.nix b/third_party/nixpkgs/pkgs/by-name/je/jet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/je/jet/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/je/jetbrains-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/je/jetbrains-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jf/default.nix b/third_party/nixpkgs/pkgs/by-name/jf/jf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jf/jf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/jffi/default.nix b/third_party/nixpkgs/pkgs/by-name/jf/jffi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/jffi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jf/jffi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/engineering/jflap/default.nix b/third_party/nixpkgs/pkgs/by-name/jf/jflap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/engineering/jflap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jf/jflap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/jflex/default.nix b/third_party/nixpkgs/pkgs/by-name/jf/jflex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/jflex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jf/jflex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/jf/jfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jf/jfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/jf/jfrog-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jf/jfrog-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/ar-fix.patch b/third_party/nixpkgs/pkgs/by-name/jf/jfsutils/ar-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/ar-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/jf/jfsutils/ar-fix.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/hardening-format.patch b/third_party/nixpkgs/pkgs/by-name/jf/jfsutils/hardening-format.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/hardening-format.patch
rename to third_party/nixpkgs/pkgs/by-name/jf/jfsutils/hardening-format.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix b/third_party/nixpkgs/pkgs/by-name/jf/jfsutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jf/jfsutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/types.patch b/third_party/nixpkgs/pkgs/by-name/jf/jfsutils/types.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/jfsutils/types.patch
rename to third_party/nixpkgs/pkgs/by-name/jf/jfsutils/types.patch
diff --git a/third_party/nixpkgs/pkgs/games/jfsw/default.nix b/third_party/nixpkgs/pkgs/by-name/jf/jfsw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/jfsw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jf/jfsw/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix b/third_party/nixpkgs/pkgs/by-name/jf/jftui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/jftui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jf/jftui/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jgmenu/default.nix b/third_party/nixpkgs/pkgs/by-name/jg/jgmenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/jgmenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jg/jgmenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/jhead/default.nix b/third_party/nixpkgs/pkgs/by-name/jh/jhead/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/jhead/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jh/jhead/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix b/third_party/nixpkgs/pkgs/by-name/jh/jhiccup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jh/jhiccup/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jid/go-mod.patch b/third_party/nixpkgs/pkgs/by-name/ji/jid/go-mod.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jid/go-mod.patch
rename to third_party/nixpkgs/pkgs/by-name/ji/jid/go-mod.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/jid/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jid/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/jigasi/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jigasi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/jigasi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jigasi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jikespg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jikespg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jimtcl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jimtcl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jiq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jiq/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jirafeau/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/jirafeau/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jirafeau/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jiten/cookie-fix.patch b/third_party/nixpkgs/pkgs/by-name/ji/jiten/cookie-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/jiten/cookie-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/ji/jiten/cookie-fix.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jiten/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jiten/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/jiten/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jiten/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/jitsi-excalidraw/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jitsi-excalidraw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/jitsi-excalidraw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jitsi-excalidraw/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jitsi-meet-electron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jitsi-meet-electron/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/third_party/nixpkgs/pkgs/by-name/ji/jitsi/jitsi.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
rename to third_party/nixpkgs/pkgs/by-name/ji/jitsi/jitsi.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jitsi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jitsi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix b/third_party/nixpkgs/pkgs/by-name/ji/jitterentropy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ji/jitterentropy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jmespath/default.nix b/third_party/nixpkgs/pkgs/by-name/jm/jmespath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jmespath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jm/jmespath/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix b/third_party/nixpkgs/pkgs/by-name/jm/jmeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jm/jmeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix b/third_party/nixpkgs/pkgs/by-name/jm/jmtpfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jm/jmtpfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix b/third_party/nixpkgs/pkgs/by-name/jm/jmusicbot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jm/jmusicbot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/java-modules/jna/default.nix b/third_party/nixpkgs/pkgs/by-name/jn/jna/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/java-modules/jna/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jn/jna/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/jnetmap/default.nix b/third_party/nixpkgs/pkgs/by-name/jn/jnetmap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/jnetmap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jn/jnetmap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/jnettop/no-dns-resolution.patch b/third_party/nixpkgs/pkgs/by-name/jn/jnettop/no-dns-resolution.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/jnettop/no-dns-resolution.patch
rename to third_party/nixpkgs/pkgs/by-name/jn/jnettop/no-dns-resolution.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/jnettop/default.nix b/third_party/nixpkgs/pkgs/by-name/jn/jnettop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/jnettop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jn/jnettop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jo/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/jo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/jo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/jobber/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/jobber/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/jobber/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/jobber/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/john/opencl.patch b/third_party/nixpkgs/pkgs/by-name/jo/john/opencl.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/john/opencl.patch
rename to third_party/nixpkgs/pkgs/by-name/jo/john/opencl.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/john/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/john/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/john/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/john/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/johnny/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/johnny/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/johnny/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/johnny/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/joincap/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/joincap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/joincap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/joincap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/joker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/joker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/joomscan/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/joomscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/joomscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/joomscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/joplin-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/joplin-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jose/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/jose/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jose/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/jose/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/josh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/josh/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix b/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix
index 35f395b69d..3242b6e109 100644
--- a/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/jo/josm/package.nix
@@ -3,21 +3,21 @@
}:
let
pname = "josm";
- version = "19230";
+ version = "19253";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- hash = "sha256-d2KyTPIw7N+ZveNUa5W3yiV6pCouigTq+GICSEkTiis=";
+ hash = "sha256-GnN+XtGzhLZ2PKAGHv+GMMh0FpilwET7EfKI4CAwYgg=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
- hash = "sha256-IrFtRlNdXZI6ucfZC6yEancV4E5lEP7+VNhaZ6p9t4I=";
+ hash = "sha256-bcCl+w+pvsR+8QXKjM9bVyTAgzp+wre71tZMp5+VJTA=";
};
pkg = fetchFromGitHub {
owner = "JOSM";
repo = "josm";
rev = "refs/tags/${version}-tested";
- hash = "sha256-s6vc09qdQbJb2b0j4t7CVPmbfWpjc5Pl3JBCPgGVZMY=";
+ hash = "sha256-I1mMtNzFkBoU0qcx2rVd9nmDK91ccVyaKwPft72M3r0=";
};
};
diff --git a/third_party/nixpkgs/pkgs/data/fonts/jost/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/jost/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/jost/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/jost/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jot/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/jot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/jot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/jot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/jotdown/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/jotdown/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/jotdown/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/jotdown/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/jotta-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/jotta-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/journaldriver/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/journaldriver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/journaldriver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/journaldriver/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/joycond/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/joycond/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/joycond/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/joycond/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix b/third_party/nixpkgs/pkgs/by-name/jo/joystickwake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jo/joystickwake/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jp/default.nix b/third_party/nixpkgs/pkgs/by-name/jp/jp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jp/jp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jp2a/default.nix b/third_party/nixpkgs/pkgs/by-name/jp/jp2a/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/jp2a/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jp/jp2a/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jpcre2/default.nix b/third_party/nixpkgs/pkgs/by-name/jp/jpcre2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jpcre2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jp/jpcre2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix b/third_party/nixpkgs/pkgs/by-name/jp/jpeg-archive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jp/jpeg-archive/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/jpegexiforient/default.nix b/third_party/nixpkgs/pkgs/by-name/jp/jpegexiforient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/jpegexiforient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jp/jpegexiforient/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/jpeginfo/default.nix b/third_party/nixpkgs/pkgs/by-name/jp/jpeginfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/jpeginfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jp/jpeginfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix b/third_party/nixpkgs/pkgs/by-name/jp/jpegoptim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jp/jpegoptim/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/jpegrescan/default.nix b/third_party/nixpkgs/pkgs/by-name/jp/jpegrescan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/jpegrescan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jp/jpegrescan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix b/third_party/nixpkgs/pkgs/by-name/jp/jpexs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jp/jpexs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/jpsxdec/default.nix b/third_party/nixpkgs/pkgs/by-name/jp/jpsxdec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/jpsxdec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jp/jpsxdec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix b/third_party/nixpkgs/pkgs/by-name/jq/jq-lsp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jq/jq-lsp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix b/third_party/nixpkgs/pkgs/by-name/jq/jql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jq/jql/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jqp/default.nix b/third_party/nixpkgs/pkgs/by-name/jq/jqp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jqp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jq/jqp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jquake/default.nix b/third_party/nixpkgs/pkgs/by-name/jq/jquake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/jquake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jq/jquake/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/third_party/nixpkgs/pkgs/by-name/jr/jrnl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jr/jrnl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/jrsonnet/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/jr/jrsonnet/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/jrsonnet/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/jr/jrsonnet/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/compilers/jrsonnet/default.nix b/third_party/nixpkgs/pkgs/by-name/jr/jrsonnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/jrsonnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jr/jrsonnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch b/third_party/nixpkgs/pkgs/by-name/js/jscoverage/jsfalse_to_null.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch
rename to third_party/nixpkgs/pkgs/by-name/js/jscoverage/jsfalse_to_null.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jscoverage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jscoverage/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jsduck/Gemfile b/third_party/nixpkgs/pkgs/by-name/js/jsduck/Gemfile
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jsduck/Gemfile
rename to third_party/nixpkgs/pkgs/by-name/js/jsduck/Gemfile
diff --git a/third_party/nixpkgs/pkgs/development/tools/jsduck/Gemfile.lock b/third_party/nixpkgs/pkgs/by-name/js/jsduck/Gemfile.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jsduck/Gemfile.lock
rename to third_party/nixpkgs/pkgs/by-name/js/jsduck/Gemfile.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/jsduck/gemset.nix b/third_party/nixpkgs/pkgs/by-name/js/jsduck/gemset.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jsduck/gemset.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsduck/gemset.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jsduck/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jsduck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jsduck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsduck/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/jshon/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jshon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/jshon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jshon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/jsluice/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jsluice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/jsluice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsluice/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-fortran/default.nix b/third_party/nixpkgs/pkgs/by-name/js/json-fortran/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/json-fortran/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/json-fortran/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch b/third_party/nixpkgs/pkgs/by-name/js/json-glib/meson-add-installed-tests-prefix-option.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch
rename to third_party/nixpkgs/pkgs/by-name/js/json-glib/meson-add-installed-tests-prefix-option.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/js/json-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/json-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/json-plot/default.nix b/third_party/nixpkgs/pkgs/by-name/js/json-plot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/json-plot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/json-plot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/json2hcl/default.nix b/third_party/nixpkgs/pkgs/by-name/js/json2hcl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/json2hcl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/json2hcl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-c/default.nix b/third_party/nixpkgs/pkgs/by-name/js/json_c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/json-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/json_c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jsoncpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsoncpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jsonfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jsonfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/jsonfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsonfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jsonnet-bundler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsonnet-bundler/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jsonnet-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsonnet-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch b/third_party/nixpkgs/pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch
rename to third_party/nixpkgs/pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jsonnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsonnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jsonrpc-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsonrpc-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/jstest-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jstest-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/jstest-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jstest-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/jsubfinder/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jsubfinder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/jsubfinder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsubfinder/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/jsvc/default.nix b/third_party/nixpkgs/pkgs/by-name/js/jsvc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/jsvc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/js/jsvc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/jtag-remote-server/default.nix b/third_party/nixpkgs/pkgs/by-name/jt/jtag-remote-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/jtag-remote-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jt/jtag-remote-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/jtc/default.nix b/third_party/nixpkgs/pkgs/by-name/jt/jtc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/jtc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jt/jtc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/judy/cross.patch b/third_party/nixpkgs/pkgs/by-name/ju/judy/cross.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/judy/cross.patch
rename to third_party/nixpkgs/pkgs/by-name/ju/judy/cross.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/judy/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/judy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/judy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/judy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/jugglinglab/fix-default-maven-plugin-versions.patch b/third_party/nixpkgs/pkgs/by-name/ju/jugglinglab/fix-default-maven-plugin-versions.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/jugglinglab/fix-default-maven-plugin-versions.patch
rename to third_party/nixpkgs/pkgs/by-name/ju/jugglinglab/fix-default-maven-plugin-versions.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/jugglinglab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/jugglinglab/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/juicity/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/juicity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/juicity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/juicity/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/juju/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/juju/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/juju/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/jujuutils/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/jujuutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/jujuutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/jujuutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/julia-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/julia-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/julius/darwin-fixes.patch b/third_party/nixpkgs/pkgs/by-name/ju/julius/darwin-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/julius/darwin-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/ju/julius/darwin-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/games/julius/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/julius/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/julius/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/julius/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch b/third_party/nixpkgs/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch
rename to third_party/nixpkgs/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/jumanpp/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/jumanpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/jumanpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/jumanpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/jump/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/jump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/jump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/jump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/jumpapp/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/jumpapp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/jumpapp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/jumpapp/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/jumpnbump/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/jumpnbump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/jumpnbump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/jumpnbump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/jumppad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/jumppad/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/jumpy/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ju/jumpy/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/jumpy/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ju/jumpy/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/games/jumpy/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/jumpy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/jumpy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/jumpy/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/junction/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/junction-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/junction/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/junction-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/junction/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/junction/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/junction/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/junction/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/junicode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/junicode/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/junicode/test-vf.tex b/third_party/nixpkgs/pkgs/by-name/ju/junicode/test-vf.tex
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/junicode/test-vf.tex
rename to third_party/nixpkgs/pkgs/by-name/ju/junicode/test-vf.tex
diff --git a/third_party/nixpkgs/pkgs/data/fonts/junicode/test.tex b/third_party/nixpkgs/pkgs/by-name/ju/junicode/test.tex
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/junicode/test.tex
rename to third_party/nixpkgs/pkgs/by-name/ju/junicode/test.tex
diff --git a/third_party/nixpkgs/pkgs/data/fonts/junicode/tests.nix b/third_party/nixpkgs/pkgs/by-name/ju/junicode/tests.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/junicode/tests.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/junicode/tests.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/junicode/tex-font-path.patch b/third_party/nixpkgs/pkgs/by-name/ju/junicode/tex-font-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/junicode/tex-font-path.patch
rename to third_party/nixpkgs/pkgs/by-name/ju/junicode/tex-font-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/juniper/deps.nix b/third_party/nixpkgs/pkgs/by-name/ju/juniper/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/juniper/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/juniper/deps.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/juniper/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/juniper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/juniper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/juniper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/junkie/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/junkie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/junkie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/junkie/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/juno/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/juno-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/juno/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/juno-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/justify/default.nix b/third_party/nixpkgs/pkgs/by-name/ju/justify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/justify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ju/justify/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/jwhois/connect.patch b/third_party/nixpkgs/pkgs/by-name/jw/jwhois/connect.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/jwhois/connect.patch
rename to third_party/nixpkgs/pkgs/by-name/jw/jwhois/connect.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/jwhois/default.nix b/third_party/nixpkgs/pkgs/by-name/jw/jwhois/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/jwhois/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jw/jwhois/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/jwhois/service-name.patch b/third_party/nixpkgs/pkgs/by-name/jw/jwhois/service-name.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/jwhois/service-name.patch
rename to third_party/nixpkgs/pkgs/by-name/jw/jwhois/service-name.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/jwt-hack/default.nix b/third_party/nixpkgs/pkgs/by-name/jw/jwt-hack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/jwt-hack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jw/jwt-hack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/jwx/default.nix b/third_party/nixpkgs/pkgs/by-name/jw/jwx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/jwx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jw/jwx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix b/third_party/nixpkgs/pkgs/by-name/jx/jx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jx/jx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/jxplorer/default.nix b/third_party/nixpkgs/pkgs/by-name/jx/jxplorer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/jxplorer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jx/jxplorer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix b/third_party/nixpkgs/pkgs/by-name/jx/jxrlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jx/jxrlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jython/default.nix b/third_party/nixpkgs/pkgs/by-name/jy/jython/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/jython/default.nix
rename to third_party/nixpkgs/pkgs/by-name/jy/jython/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix b/third_party/nixpkgs/pkgs/by-name/k0/k0sctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/k0/k0sctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch b/third_party/nixpkgs/pkgs/by-name/k2/k2pdfopt/0001-Fix-CMakeLists.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch
rename to third_party/nixpkgs/pkgs/by-name/k2/k2pdfopt/0001-Fix-CMakeLists.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix b/third_party/nixpkgs/pkgs/by-name/k2/k2pdfopt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/k2/k2pdfopt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix b/third_party/nixpkgs/pkgs/by-name/k2/k2tf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/k2/k2tf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix b/third_party/nixpkgs/pkgs/by-name/k3/k3d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/k3/k3d/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix b/third_party/nixpkgs/pkgs/by-name/k3/k3sup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/k3/k3sup/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix b/third_party/nixpkgs/pkgs/by-name/k4/k40-whisperer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/k4/k40-whisperer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix b/third_party/nixpkgs/pkgs/by-name/k6/k6/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/k6/default.nix
rename to third_party/nixpkgs/pkgs/by-name/k6/k6/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/by-name/k9/k9s/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix
rename to third_party/nixpkgs/pkgs/by-name/k9/k9s/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/kabeljau/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kabeljau/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/kabeljau/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kabeljau/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/kacst/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kacst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/kacst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kacst/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kaf/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kaf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kaf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kaf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ka/kafka-delta-ingest/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ka/kafka-delta-ingest/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kafka-delta-ingest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kafka-delta-ingest/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kafkactl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kafkactl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/kail/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/kail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kail/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/kaitai-struct-compiler/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kaitai-struct-compiler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/kaitai-struct-compiler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kaitai-struct-compiler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/kakasi/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kakasi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/kakasi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kakasi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kalibrate-hackrf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/kalibrate-hackrf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kalibrate-hackrf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kalibrate-rtl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/kalibrate-rtl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kalibrate-rtl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/kalign/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kalign/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/kalign/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kalign/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kalker/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kalker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/kalker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kalker/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sip/kamailio/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kamailio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sip/kamailio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kamailio/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kamailio/test-kamailio-bin/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kamailio/test-kamailio-bin/default.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ftp/kamid/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kamid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ftp/kamid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kamid/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/kamilalisp/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kamilalisp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/kamilalisp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kamilalisp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/kanata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kanata/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kanif/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kanif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kanif/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kaniko/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kaniko/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/kanit/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanit-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/kanit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kanit-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanji-stroke-order-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kanji-stroke-order-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kanjidraw/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanjidraw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kanjidraw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kanjidraw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/kanshi/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanshi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/kanshi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kanshi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kapowbang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/kapowbang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kapowbang/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kapp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kapp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/kappanhang/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kappanhang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/kappanhang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kappanhang/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/karabiner-elements/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/karabiner-elements/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/karabiner-elements/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/karabiner-elements/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/karate/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/karate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/karate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/karate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/karma-runner/fix-package-lock.patch b/third_party/nixpkgs/pkgs/by-name/ka/karma-runner/fix-package-lock.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/karma-runner/fix-package-lock.patch
rename to third_party/nixpkgs/pkgs/by-name/ka/karma-runner/fix-package-lock.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/karma-runner/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/karma-runner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/karma-runner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/karma-runner/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/karma/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/karma/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/karma/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/karma/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/kasmweb/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kasmweb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/kasmweb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kasmweb/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/katago/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/katago/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/katago/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/katago/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/katana/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/katana/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/katana/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/katana/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/katawa-shoujo/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/katawa-shoujo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/katawa-shoujo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/katawa-shoujo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kati/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kati/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/kati/version.patch b/third_party/nixpkgs/pkgs/by-name/ka/kati/version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/kati/version.patch
rename to third_party/nixpkgs/pkgs/by-name/ka/kati/version.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kaufkauflist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kaufkauflist/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kawkab-mono-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kawkab-mono-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/kazam/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/ka/kazam/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/kazam/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/ka/kazam/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kazam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/kazam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ka/kazam/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kb/default.nix b/third_party/nixpkgs/pkgs/by-name/kb/kb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/kb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kb/kb/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/default.nix b/third_party/nixpkgs/pkgs/by-name/kb/kbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kb/kbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch b/third_party/nixpkgs/pkgs/by-name/kb/kbd/search-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/kb/kbd/search-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix b/third_party/nixpkgs/pkgs/by-name/kb/kbdd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kb/kbdd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kbdlight/default.nix b/third_party/nixpkgs/pkgs/by-name/kb/kbdlight/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kbdlight/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kb/kbdlight/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kbst/default.nix b/third_party/nixpkgs/pkgs/by-name/kb/kbst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kbst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kb/kbst/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix b/third_party/nixpkgs/pkgs/by-name/kb/kbt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kb/kbt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kcat/default.nix b/third_party/nixpkgs/pkgs/by-name/kc/kcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kc/kcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/kcgi/default.nix b/third_party/nixpkgs/pkgs/by-name/kc/kcgi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/kcgi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kc/kcgi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kcli/default.nix b/third_party/nixpkgs/pkgs/by-name/kc/kcli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kcli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kc/kcli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix b/third_party/nixpkgs/pkgs/by-name/kc/kcov/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kc/kcov/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kcp/default.nix b/third_party/nixpkgs/pkgs/by-name/kc/kcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/kcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kc/kcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/kde-gruvbox/default.nix b/third_party/nixpkgs/pkgs/by-name/kd/kde-gruvbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/kde-gruvbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kd/kde-gruvbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kdigger/default.nix b/third_party/nixpkgs/pkgs/by-name/kd/kdigger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kdigger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kd/kdigger/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kdoctor/default.nix b/third_party/nixpkgs/pkgs/by-name/kd/kdoctor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kdoctor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kd/kdoctor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/kea/dont-create-var.patch b/third_party/nixpkgs/pkgs/by-name/ke/kea/dont-create-var.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/kea/dont-create-var.patch
rename to third_party/nixpkgs/pkgs/by-name/ke/kea/dont-create-var.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/kea/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/kea/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/kea/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/keama/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keama/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/keama/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keama/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/keen4/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keen4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/keen4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keen4/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepalived/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepalived/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/charactercopy/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepass-charactercopy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/charactercopy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepass-charactercopy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass-diff/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepass-diff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keepass-diff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepass-diff/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepass-keeagent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepass-keeagent/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepass-keepasshttp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepass-keepasshttp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepass-keepassrpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepass-keepassrpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepass-keetraytotp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepass-keetraytotp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepass-otpkeyprov/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepass-otpkeyprov/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepass-qrcodeview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepass-qrcodeview/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/keeperrl/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keeperrl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/keeperrl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keeperrl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepmenu/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepmenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keepmenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepmenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/keepwn/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keepwn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/keepwn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keepwn/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/keet/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/keet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/keka/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/keka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keka/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/kent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/kent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kepler/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/kepler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kepler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/kepler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/kepubify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/kepubify/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kerbrute/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/kerbrute/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kerbrute/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/kerbrute/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kermit/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/kermit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/kermit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/kermit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kestrel/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/kestrel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kestrel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/kestrel/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch b/third_party/nixpkgs/pkgs/by-name/ke/kexec-tools/fix-purgatory-llvm-libunwind.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch
rename to third_party/nixpkgs/pkgs/by-name/ke/kexec-tools/fix-purgatory-llvm-libunwind.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/kexec-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/kexec-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/key/deps.json b/third_party/nixpkgs/pkgs/by-name/ke/key/deps.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/key/deps.json
rename to third_party/nixpkgs/pkgs/by-name/ke/key/deps.json
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/key/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/key/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/keychain/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keychain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/keychain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keychain/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/all-plugins.nix b/third_party/nixpkgs/pkgs/by-name/ke/keycloak/all-plugins.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/keycloak/all-plugins.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keycloak/all-plugins.nix
diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/config_vars.patch b/third_party/nixpkgs/pkgs/by-name/ke/keycloak/config_vars.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/keycloak/config_vars.patch
rename to third_party/nixpkgs/pkgs/by-name/ke/keycloak/config_vars.patch
diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/keycloak-discord/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/keycloak/keycloak-discord/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix
diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix
diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keycloak/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/keycloak/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keycloak/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix
diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keycloak/scim-keycloak-user-storage-spi/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keycloak/scim-keycloak-user-storage-spi/default.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keyd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keyd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keyfinder-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keyfinder-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keyfuzz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keyfuzz/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keyleds/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keyleds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keyleds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keyleds/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/keylight-controller-mschneider82/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/keymapper/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keymapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/keymapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keymapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/keymapviz/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keymapviz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/keymapviz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keymapviz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/keynav/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keynav/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/keynav/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keynav/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/keystone/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keystone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/keystone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keystone/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch b/third_party/nixpkgs/pkgs/by-name/ke/keyutils/0001-Remove-unused-function-after_eq.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch
rename to third_party/nixpkgs/pkgs/by-name/ke/keyutils/0001-Remove-unused-function-after_eq.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/conf-symlink.patch b/third_party/nixpkgs/pkgs/by-name/ke/keyutils/conf-symlink.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/keyutils/conf-symlink.patch
rename to third_party/nixpkgs/pkgs/by-name/ke/keyutils/conf-symlink.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keyutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keyutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/pkg-config-static.patch b/third_party/nixpkgs/pkgs/by-name/ke/keyutils/pkg-config-static.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/keyutils/pkg-config-static.patch
rename to third_party/nixpkgs/pkgs/by-name/ke/keyutils/pkg-config-static.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kfilt/default.nix b/third_party/nixpkgs/pkgs/by-name/kf/kfilt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kfilt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kf/kfilt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix b/third_party/nixpkgs/pkgs/by-name/kh/khal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/khal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kh/khal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/khard/default.nix b/third_party/nixpkgs/pkgs/by-name/kh/khard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/khard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kh/khard/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/khmeros/default.nix b/third_party/nixpkgs/pkgs/by-name/kh/khmeros/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/khmeros/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kh/khmeros/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/search/khoj/default.nix b/third_party/nixpkgs/pkgs/by-name/kh/khoj/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/search/khoj/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kh/khoj/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/third_party/nixpkgs/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/khronos/default.nix b/third_party/nixpkgs/pkgs/by-name/kh/khronos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/khronos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kh/khronos/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kibi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kibi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kickoff/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kickoff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kickoff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kickoff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kicli/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kicli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/kicli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kicli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kics/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/kics/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kics/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ki/kile-wl/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kile-wl/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ki/kile-wl/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kile-wl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kile-wl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kile/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kile/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/kile/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kile/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kiln/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kiln/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kiln/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kiln/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kime/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kind/kernel-module-path.patch b/third_party/nixpkgs/pkgs/by-name/ki/kind/kernel-module-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kind/kernel-module-path.patch
rename to third_party/nixpkgs/pkgs/by-name/ki/kind/kernel-module-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kind/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kine/package.nix b/third_party/nixpkgs/pkgs/by-name/ki/kine/package.nix
index 938adb99f7..2e28d92f7e 100644
--- a/third_party/nixpkgs/pkgs/by-name/ki/kine/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ki/kine/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "kine";
- version = "0.13.2";
+ version = "0.13.3";
src = fetchFromGitHub {
owner = "k3s-io";
repo = "kine";
rev = "v${version}";
- hash = "sha256-KMyO9zZvQFyRaMtQ/d2Zgg6pG1SFIYWkzZgSZIqhiOQ=";
+ hash = "sha256-xct2CkU+EeEfyhZNp1UiLY7kJnv4pbWMA4xgHGQI898=";
};
- vendorHash = "sha256-kbMwLNBPJwFbUSZdYiWWdIZM8fclHDnRnxTTIXTIuHU=";
+ vendorHash = "sha256-EYtkhB8MZKKh6Rf91Ru/ldnP/iQsAw6W2U82mO/7L+g=";
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch b/third_party/nixpkgs/pkgs/by-name/ki/kinect-audio-setup/libusb-1-import-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch
rename to third_party/nixpkgs/pkgs/by-name/ki/kinect-audio-setup/libusb-1-import-path.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kinect-audio-setup/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kinect-audio-setup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kinect-audio-setup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kinect-audio-setup/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch b/third_party/nixpkgs/pkgs/by-name/ki/kinect-audio-setup/udev-rules-extra-devices.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch
rename to third_party/nixpkgs/pkgs/by-name/ki/kinect-audio-setup/udev-rules-extra-devices.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kingstvis/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kingstvis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/kingstvis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kingstvis/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kismet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kismet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kissat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kissat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch b/third_party/nixpkgs/pkgs/by-name/ki/kissat/writable-passwd-is-ok.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch
rename to third_party/nixpkgs/pkgs/by-name/ki/kissat/writable-passwd-is-ok.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kisslicer/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kisslicer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/kisslicer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kisslicer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kiterunner/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kiterunner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kiterunner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kiterunner/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kitty-img/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kitty-img/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/kitty-img/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ki/kitty-img/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/klavaro/default.nix b/third_party/nixpkgs/pkgs/by-name/kl/klavaro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/klavaro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kl/klavaro/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/klick/default.nix b/third_party/nixpkgs/pkgs/by-name/kl/klick/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/klick/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kl/klick/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/klipperscreen/default.nix b/third_party/nixpkgs/pkgs/by-name/kl/klipperscreen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/klipperscreen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kl/klipperscreen/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/klystrack/default.nix b/third_party/nixpkgs/pkgs/by-name/kl/klystrack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/klystrack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kl/klystrack/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/third_party/nixpkgs/pkgs/by-name/km/kmod-debian-aliases/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
rename to third_party/nixpkgs/pkgs/by-name/km/kmod-debian-aliases/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/kmon/default.nix b/third_party/nixpkgs/pkgs/by-name/km/kmon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/kmon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/km/kmon/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmscon/default.nix b/third_party/nixpkgs/pkgs/by-name/km/kmscon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kmscon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/km/kmscon/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix b/third_party/nixpkgs/pkgs/by-name/km/kmscube/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix
rename to third_party/nixpkgs/pkgs/by-name/km/kmscube/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix b/third_party/nixpkgs/pkgs/by-name/km/kmsxx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/km/kmsxx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/kn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/kn/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/knewave/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knewave/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/knewave/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knewave/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knightos-genkfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knightos-genkfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knightos-kcc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knightos-kcc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knightos-kimg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knightos-kimg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knightos-kpack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knightos-kpack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knightos-mkrom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knightos-mkrom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knightos-patchrom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knightos-patchrom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knightos-scas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knightos-scas/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knightos-z80e/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knightos-z80e/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/knit/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/knit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knockpy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knockpy/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch b/third_party/nixpkgs/pkgs/by-name/kn/knot-dns/dont-create-run-time-dirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch
rename to third_party/nixpkgs/pkgs/by-name/kn/knot-dns/dont-create-run-time-dirs.patch
diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knot-dns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knot-dns/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/runtime-deps.patch b/third_party/nixpkgs/pkgs/by-name/kn/knot-dns/runtime-deps.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/knot-dns/runtime-deps.patch
rename to third_party/nixpkgs/pkgs/by-name/kn/knot-dns/runtime-deps.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/knowsmore/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/knowsmore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/knowsmore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/knowsmore/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kns/default.nix b/third_party/nixpkgs/pkgs/by-name/kn/kns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kn/kns/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/ko/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ko/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/ko/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/kobodeluxe/glibc29.patch b/third_party/nixpkgs/pkgs/by-name/ko/kobodeluxe/glibc29.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/kobodeluxe/glibc29.patch
rename to third_party/nixpkgs/pkgs/by-name/ko/kobodeluxe/glibc29.patch
diff --git a/third_party/nixpkgs/pkgs/games/kobodeluxe/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kobodeluxe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/kobodeluxe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kobodeluxe/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kochi-substitute-naga10/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kochi-substitute-naga10/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kochi-substitute/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kochi-substitute/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/kode-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kode-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/kode-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kode-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kodi-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kodi-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/komga/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/komga/package.nix
similarity index 89%
rename from third_party/nixpkgs/pkgs/servers/komga/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/komga/package.nix
index a371e97033..93a8730472 100644
--- a/third_party/nixpkgs/pkgs/servers/komga/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ko/komga/package.nix
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "komga";
- version = "1.14.0";
+ version = "1.14.1";
src = fetchurl {
url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
- sha256 = "sha256-kn1sjz6sbvoTMB9eEUaDqa+JhgV1Kd/s6muS04VGwsk=";
+ sha256 = "sha256-KUNF6TPqr85rm9XOcoaCGtK8VHfevRFgkl+lTfJEdbA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/komorebi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/komorebi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kompose/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kompose/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/kona/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kona/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/kona/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kona/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kondo/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kondo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kondo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kondo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/konsave/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/konsave/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/konsave/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/konsave/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/konstraint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/konstraint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/kool/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/kool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kopia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kopia/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kord/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ko/kord/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kord/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ko/kord/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kord/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kord/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kord/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kord/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/kore/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/kore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kore/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/koreader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/koreader/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/kotlin-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/kotlin-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/kotlin-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/koules/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/koules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/koules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ko/koules/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix b/third_party/nixpkgs/pkgs/by-name/kp/kpcli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kp/kpcli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix b/third_party/nixpkgs/pkgs/by-name/kp/kpt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kp/kpt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/krabby/default.nix b/third_party/nixpkgs/pkgs/by-name/kr/krabby/package.nix
similarity index 75%
rename from third_party/nixpkgs/pkgs/applications/misc/krabby/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kr/krabby/package.nix
index f44a44523a..b846d81e02 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/krabby/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/kr/krabby/package.nix
@@ -4,14 +4,14 @@
}:
rustPlatform.buildRustPackage rec {
pname = "krabby";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchCrate {
inherit pname version;
- hash = "sha256-R4GW0e0tjLiCXQMf8iA+yYyMp43/28GeNsjs+QNQMSM=";
+ hash = "sha256-YEY4bUZV9BpyVXzEGvnLyfG0GdE3xMN9tHlsg6RqMkk=";
};
- cargoHash = "sha256-eQyU0sMfecOjX5k1qYeetrAhk41FIMcg9QmhhTYOxWc=";
+ cargoHash = "sha256-6NV+kqnloEFTygE5LLuCsgMYXGiDwOTnP6/CK2c9DOs=";
meta = with lib; {
description = "Print pokemon sprites in your terminal";
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/kraft/default.nix b/third_party/nixpkgs/pkgs/by-name/kr/kraft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/kraft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kr/kraft/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/krakenx/default.nix b/third_party/nixpkgs/pkgs/by-name/kr/krakenx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/krakenx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kr/krakenx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/krankerl/default.nix b/third_party/nixpkgs/pkgs/by-name/kr/krankerl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/krankerl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kr/krankerl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix b/third_party/nixpkgs/pkgs/by-name/kr/krapslog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kr/krapslog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix b/third_party/nixpkgs/pkgs/by-name/kr/kratos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kr/kratos/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/kr/kreative-square-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kr/kreative-square-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/krew/default.nix b/third_party/nixpkgs/pkgs/by-name/kr/krew/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/krew/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kr/krew/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix b/third_party/nixpkgs/pkgs/by-name/kr/kronosnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kr/kronosnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krop/default.nix b/third_party/nixpkgs/pkgs/by-name/kr/krop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/krop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kr/krop/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/ksh/default.nix b/third_party/nixpkgs/pkgs/by-name/ks/ksh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/ksh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ks/ksh/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch b/third_party/nixpkgs/pkgs/by-name/ks/ksmbd-tools/0001-skip-installing-example-configuration.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch
rename to third_party/nixpkgs/pkgs/by-name/ks/ksmbd-tools/0001-skip-installing-example-configuration.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ks/ksmbd-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ks/ksmbd-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/kssd/default.nix b/third_party/nixpkgs/pkgs/by-name/ks/kssd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/kssd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ks/kssd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kstart/default.nix b/third_party/nixpkgs/pkgs/by-name/ks/kstart/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kstart/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ks/kstart/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix b/third_party/nixpkgs/pkgs/by-name/ks/ksuperkey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ks/ksuperkey/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kt/default.nix b/third_party/nixpkgs/pkgs/by-name/kt/kt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/kt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kt/kt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix b/third_party/nixpkgs/pkgs/by-name/kt/ktlint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kt/ktlint/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ktop/default.nix b/third_party/nixpkgs/pkgs/by-name/kt/ktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/ktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kt/ktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ktunnel/default.nix b/third_party/nixpkgs/pkgs/by-name/kt/ktunnel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/ktunnel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kt/ktunnel/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kube-bench/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kube-bench/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kube-bench/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kube-bench/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kube-capacity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kube-capacity/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kube-hunter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kube-hunter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kube-linter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kube-linter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kube-prompt/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kube-prompt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kube-prompt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kube-prompt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kube-router/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kube-router/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kube-score/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kube-score/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ku/kube-state-metrics/package.nix b/third_party/nixpkgs/pkgs/by-name/ku/kube-state-metrics/package.nix
index ec7c3f59c8..f44df084eb 100644
--- a/third_party/nixpkgs/pkgs/by-name/ku/kube-state-metrics/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ku/kube-state-metrics/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "kube-state-metrics";
- version = "2.13.0";
+ version = "2.14.0";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kube-state-metrics";
rev = "v${version}";
- hash = "sha256-7lI1RRC/Lw3OcYs3RA3caNvLYS7xEaCoxCM/ioa0goY=";
+ hash = "sha256-qLn+2znmfIdBkoVkCJ0tFAPVRYc+qAJWKbDP2FqMocg=";
};
- vendorHash = "sha256-Db7GTIC594yfp9gNn+hochpafqiRkLQIM/MTkX2S6E0=";
+ vendorHash = "sha256-KyEGmtSQO0EERLb0I7NBmxv1Jz+bYMrCZVwjJ1Jt+Ik=";
excludedPackages = [
"./tests/e2e"
diff --git a/third_party/nixpkgs/pkgs/tools/security/kubeaudit/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubeaudit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kubeaudit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubeaudit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubebuilder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubebuilder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubecfg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubecfg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kubeclarity/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubeclarity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kubeclarity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubeclarity/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecm/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubecm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubecm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubecm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubeconform/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubeconform/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubectl-cnpg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubectl-cnpg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubectl-example/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubectl-example/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubectl-explore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubectl-explore/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ku/kubectl-graph/package.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubectl-graph/package.nix
new file mode 100644
index 0000000000..f0bbb4906e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ku/kubectl-graph/package.nix
@@ -0,0 +1,28 @@
+{
+ lib,
+ fetchFromGitHub,
+ buildGoModule,
+}:
+
+buildGoModule rec {
+ pname = "kubectl-graph";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "steveteuber";
+ repo = "kubectl-graph";
+ rev = "v${version}";
+ hash = "sha256-5N1eC8J0nHEgFUCHEn5b3kUDj6MWejouQBKkdJKsaAo=";
+ };
+
+ vendorHash = "sha256-fvn+CoOyMRjsIemMRXitMjTlbbhjrlDIHu398b4/ZZ0=";
+
+ meta = {
+ description = "Kubectl plugin to visualize Kubernetes resources and relationships";
+ homepage = "https://github.com/steveteuber/kubectl-graph";
+ changelog = "https://github.com/steveteuber/kubectl-graph/releases/tag/v${version}";
+ mainProgram = "kubectl-graph";
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.rksm ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubectl-klock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubectl-klock/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubectl-node-shell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubectl-node-shell/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubectl-view-secret/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubectl-view-secret/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubectx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubectx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubedb-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubedb-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubedock/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubedock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kubedock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubedock/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedog/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubedog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubedog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubedog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubefirst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubefirst/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ku/kubelogin-oidc/package.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubelogin-oidc/package.nix
index efc658aae6..a5fde3f9f3 100644
--- a/third_party/nixpkgs/pkgs/by-name/ku/kubelogin-oidc/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ku/kubelogin-oidc/package.nix
@@ -1,18 +1,18 @@
{
lib,
- buildGo123Module,
+ buildGoModule,
fetchFromGitHub,
}:
-buildGo123Module rec {
+buildGoModule rec {
pname = "kubelogin";
- version = "1.30.1";
+ version = "1.31.0";
src = fetchFromGitHub {
owner = "int128";
repo = "kubelogin";
rev = "v${version}";
- hash = "sha256-aoLPT3lX+q426QlxAPsjeQyTZMnmqMGh85jJPU7lQVU=";
+ hash = "sha256-IEKP5mHxJyGzlxNL4h0MR/Ge7g1kKidIjinYr+bL6as=";
};
subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGo123Module rec {
"-X main.version=v${version}"
];
- vendorHash = "sha256-gr+SsC7MiLj/MZ8kca5Hcfge+7Pm4y963TfwyKHEhBY=";
+ vendorHash = "sha256-3hNc16zpazm9YqDx2M/RafCBLev2S8TzJzClGRkKydg=";
# test all packages
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubelogin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubelogin/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/kubemq-community/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubemq-community/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/kubemq-community/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubemq-community/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/go.sum b/third_party/nixpkgs/pkgs/by-name/ku/kubemqctl/go.sum
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/go.sum
rename to third_party/nixpkgs/pkgs/by-name/ku/kubemqctl/go.sum
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubemqctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubemqctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubeone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubeone/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubeprompt/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubeprompt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kubeprompt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubeprompt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubepug/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubepug/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubergrunt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubergrunt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubernetes-code-generator/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubernetes-code-generator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kubernetes-code-generator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubernetes-code-generator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubernetes-controller-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubernetes-controller-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubernetes-metrics-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubernetes-metrics-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubernetes-polaris/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubernetes-polaris/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernix/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ku/kubernix/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubernix/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ku/kubernix/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernix/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubernix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubernix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubernix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubescape/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubescape/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubeseal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubeseal/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kubesec/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubesec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kubesec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubesec/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubeshark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubeshark/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubespy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubespy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/kubestroyer/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubestroyer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/kubestroyer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubestroyer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubeswitch/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubeswitch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kubeswitch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubeswitch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubetail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubetail/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevela/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubevela/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubevela/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubevela/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubevirt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubevirt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubevpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubevpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubexit/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubexit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubexit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubexit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kupfer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kupfer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kuro/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kuro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/kuro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kuro/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kuttl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kuttl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/kvmtool/default.nix b/third_party/nixpkgs/pkgs/by-name/kv/kvmtool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/kvmtool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kv/kvmtool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/kvmtool/strlcpy-glibc-2.38-fix.patch b/third_party/nixpkgs/pkgs/by-name/kv/kvmtool/strlcpy-glibc-2.38-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/kvmtool/strlcpy-glibc-2.38-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/kv/kvmtool/strlcpy-glibc-2.38-fix.patch
diff --git a/third_party/nixpkgs/pkgs/servers/kwakd/default.nix b/third_party/nixpkgs/pkgs/by-name/kw/kwakd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/kwakd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kw/kwakd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist b/third_party/nixpkgs/pkgs/by-name/kw/kwm/org.nixos.kwm.plist
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist
rename to third_party/nixpkgs/pkgs/by-name/kw/kwm/org.nixos.kwm.plist
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/kwm/default.nix b/third_party/nixpkgs/pkgs/by-name/kw/kwm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/kwm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/kw/kwm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix b/third_party/nixpkgs/pkgs/by-name/ky/kyotocabinet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ky/kyotocabinet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/kytea/gcc-O3.patch b/third_party/nixpkgs/pkgs/by-name/ky/kytea/gcc-O3.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/kytea/gcc-O3.patch
rename to third_party/nixpkgs/pkgs/by-name/ky/kytea/gcc-O3.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/kytea/default.nix b/third_party/nixpkgs/pkgs/by-name/ky/kytea/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/kytea/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ky/kytea/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/kythe/default.nix b/third_party/nixpkgs/pkgs/by-name/ky/kythe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/kythe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ky/kythe/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix b/third_party/nixpkgs/pkgs/by-name/ky/kyverno/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ky/kyverno/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/l2md/default.nix b/third_party/nixpkgs/pkgs/by-name/l2/l2md/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/l2md/default.nix
rename to third_party/nixpkgs/pkgs/by-name/l2/l2md/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/LAStools/drop-64-suffix.patch b/third_party/nixpkgs/pkgs/by-name/la/LAStools/drop-64-suffix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/LAStools/drop-64-suffix.patch
rename to third_party/nixpkgs/pkgs/by-name/la/LAStools/drop-64-suffix.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/LAStools/default.nix b/third_party/nixpkgs/pkgs/by-name/la/LAStools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/LAStools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/LAStools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lab/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix b/third_party/nixpkgs/pkgs/by-name/la/labelImg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/labelImg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/lact/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lact/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/lact/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lact/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lalezar-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lalezar-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/lalrpop/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lalrpop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/lalrpop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lalrpop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/lalrpop/use-correct-binary-path-in-tests.patch b/third_party/nixpkgs/pkgs/by-name/la/lalrpop/use-correct-binary-path-in-tests.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/lalrpop/use-correct-binary-path-in-tests.patch
rename to third_party/nixpkgs/pkgs/by-name/la/lalrpop/use-correct-binary-path-in-tests.patch
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/lambda-delta/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lambda-delta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/lambda-delta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lambda-delta/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lambda-lisp/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lambda-lisp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/lambda-lisp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lambda-lisp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lambda-lisp/sources.nix b/third_party/nixpkgs/pkgs/by-name/la/lambda-lisp/sources.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/lambda-lisp/sources.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lambda-lisp/sources.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lambda-mod-zsh-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lambda-mod-zsh-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lame/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lame/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lame/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix b/third_party/nixpkgs/pkgs/by-name/la/laminar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/laminar/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/third_party/nixpkgs/pkgs/by-name/la/laminar/patches/no-network.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch
rename to third_party/nixpkgs/pkgs/by-name/la/laminar/patches/no-network.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix b/third_party/nixpkgs/pkgs/by-name/la/languagetool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/languagetool/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/lao/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lao/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/lao/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lao/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lapack-reference/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lapack-reference/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/alternatives/lapack/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lapack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/alternatives/lapack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lapack/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/la/laravel/composer.lock b/third_party/nixpkgs/pkgs/by-name/la/laravel/composer.lock
index e0c1899880..4c83c1ad59 100644
--- a/third_party/nixpkgs/pkgs/by-name/la/laravel/composer.lock
+++ b/third_party/nixpkgs/pkgs/by-name/la/laravel/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "bbbf9f75876816a919d068f10bce5fcc",
+ "content-hash": "399626345cd7b56932f01477c0ed926e",
"packages": [
{
"name": "carbonphp/carbon-doctrine-types",
@@ -168,16 +168,16 @@
},
{
"name": "illuminate/collections",
- "version": "v11.11.0",
+ "version": "v11.30.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/collections.git",
- "reference": "176f39271b5f85bee3c4bf797d1e95102d55e12b"
+ "reference": "2d99ccbb19e34450508ff3ab2f62ba90aa2e9793"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/illuminate/collections/zipball/176f39271b5f85bee3c4bf797d1e95102d55e12b",
- "reference": "176f39271b5f85bee3c4bf797d1e95102d55e12b",
+ "url": "https://api.github.com/repos/illuminate/collections/zipball/2d99ccbb19e34450508ff3ab2f62ba90aa2e9793",
+ "reference": "2d99ccbb19e34450508ff3ab2f62ba90aa2e9793",
"shasum": ""
},
"require": {
@@ -219,20 +219,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2024-06-11T13:32:31+00:00"
+ "time": "2024-10-10T19:23:07+00:00"
},
{
"name": "illuminate/conditionable",
- "version": "v11.11.0",
+ "version": "v11.30.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/conditionable.git",
- "reference": "8a558fec063b6a63da1c3af1d219c0f998edffeb"
+ "reference": "362dd761b9920367bca1427a902158225e9e3a23"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/illuminate/conditionable/zipball/8a558fec063b6a63da1c3af1d219c0f998edffeb",
- "reference": "8a558fec063b6a63da1c3af1d219c0f998edffeb",
+ "url": "https://api.github.com/repos/illuminate/conditionable/zipball/362dd761b9920367bca1427a902158225e9e3a23",
+ "reference": "362dd761b9920367bca1427a902158225e9e3a23",
"shasum": ""
},
"require": {
@@ -265,20 +265,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2024-04-04T17:36:49+00:00"
+ "time": "2024-06-28T20:10:30+00:00"
},
{
"name": "illuminate/contracts",
- "version": "v11.11.0",
+ "version": "v11.30.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
- "reference": "86c1331d0b06c59ca21723d8bfc9faaa19430b46"
+ "reference": "56312862af937bd6da8e6dc8bbd88188dfb478f8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/illuminate/contracts/zipball/86c1331d0b06c59ca21723d8bfc9faaa19430b46",
- "reference": "86c1331d0b06c59ca21723d8bfc9faaa19430b46",
+ "url": "https://api.github.com/repos/illuminate/contracts/zipball/56312862af937bd6da8e6dc8bbd88188dfb478f8",
+ "reference": "56312862af937bd6da8e6dc8bbd88188dfb478f8",
"shasum": ""
},
"require": {
@@ -313,20 +313,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2024-05-21T17:42:34+00:00"
+ "time": "2024-09-22T15:08:08+00:00"
},
{
"name": "illuminate/filesystem",
- "version": "v11.11.0",
+ "version": "v11.30.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/filesystem.git",
- "reference": "3a09c14df1085de6e81cecb8b5df2031c8872ca2"
+ "reference": "ce7013a350fb06bc65e8a2cf15fd2015f49e476d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/illuminate/filesystem/zipball/3a09c14df1085de6e81cecb8b5df2031c8872ca2",
- "reference": "3a09c14df1085de6e81cecb8b5df2031c8872ca2",
+ "url": "https://api.github.com/repos/illuminate/filesystem/zipball/ce7013a350fb06bc65e8a2cf15fd2015f49e476d",
+ "reference": "ce7013a350fb06bc65e8a2cf15fd2015f49e476d",
"shasum": ""
},
"require": {
@@ -380,20 +380,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2024-05-30T15:47:53+00:00"
+ "time": "2024-09-22T15:10:50+00:00"
},
{
"name": "illuminate/macroable",
- "version": "v11.11.0",
+ "version": "v11.30.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/macroable.git",
- "reference": "5b6c7c7c5951e6e8fc22dd7e4363602df8294dfa"
+ "reference": "e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/illuminate/macroable/zipball/5b6c7c7c5951e6e8fc22dd7e4363602df8294dfa",
- "reference": "5b6c7c7c5951e6e8fc22dd7e4363602df8294dfa",
+ "url": "https://api.github.com/repos/illuminate/macroable/zipball/e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed",
+ "reference": "e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed",
"shasum": ""
},
"require": {
@@ -426,20 +426,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2024-05-16T21:43:47+00:00"
+ "time": "2024-06-28T20:10:30+00:00"
},
{
"name": "illuminate/support",
- "version": "v11.11.0",
+ "version": "v11.30.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
- "reference": "142c5f8a3931b7a7021ab63175ae1948743fac04"
+ "reference": "69453485fa4c76589b5a1a98ebef0e8fee749220"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/illuminate/support/zipball/142c5f8a3931b7a7021ab63175ae1948743fac04",
- "reference": "142c5f8a3931b7a7021ab63175ae1948743fac04",
+ "url": "https://api.github.com/repos/illuminate/support/zipball/69453485fa4c76589b5a1a98ebef0e8fee749220",
+ "reference": "69453485fa4c76589b5a1a98ebef0e8fee749220",
"shasum": ""
},
"require": {
@@ -463,6 +463,7 @@
},
"suggest": {
"illuminate/filesystem": "Required to use the composer class (^11.0).",
+ "laravel/serializable-closure": "Required to use the once function (^1.3).",
"league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).",
"ramsey/uuid": "Required to use Str::uuid() (^4.7).",
"symfony/process": "Required to use the composer class (^7.0).",
@@ -478,6 +479,7 @@
},
"autoload": {
"files": [
+ "functions.php",
"helpers.php"
],
"psr-4": {
@@ -500,25 +502,25 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2024-06-18T17:23:00+00:00"
+ "time": "2024-10-29T20:21:52+00:00"
},
{
"name": "laravel/prompts",
- "version": "v0.1.24",
+ "version": "v0.3.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/prompts.git",
- "reference": "409b0b4305273472f3754826e68f4edbd0150149"
+ "reference": "0f3848a445562dac376b27968f753c65e7e1036e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149",
- "reference": "409b0b4305273472f3754826e68f4edbd0150149",
+ "url": "https://api.github.com/repos/laravel/prompts/zipball/0f3848a445562dac376b27968f753c65e7e1036e",
+ "reference": "0f3848a445562dac376b27968f753c65e7e1036e",
"shasum": ""
},
"require": {
+ "composer-runtime-api": "^2.2",
"ext-mbstring": "*",
- "illuminate/collections": "^10.0|^11.0",
"php": "^8.1",
"symfony/console": "^6.2|^7.0"
},
@@ -527,6 +529,7 @@
"laravel/framework": ">=10.17.0 <10.25.0"
},
"require-dev": {
+ "illuminate/collections": "^10.0|^11.0",
"mockery/mockery": "^1.5",
"pestphp/pest": "^2.3",
"phpstan/phpstan": "^1.11",
@@ -538,7 +541,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "0.1.x-dev"
+ "dev-main": "0.3.x-dev"
}
},
"autoload": {
@@ -556,26 +559,26 @@
"description": "Add beautiful and user-friendly forms to your command-line applications.",
"support": {
"issues": "https://github.com/laravel/prompts/issues",
- "source": "https://github.com/laravel/prompts/tree/v0.1.24"
+ "source": "https://github.com/laravel/prompts/tree/v0.3.1"
},
- "time": "2024-06-17T13:58:22+00:00"
+ "time": "2024-10-09T19:42:26+00:00"
},
{
"name": "nesbot/carbon",
- "version": "3.5.0",
+ "version": "3.8.2",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "415782b7e48223342f1a616c16c45a95b15b2318"
+ "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/415782b7e48223342f1a616c16c45a95b15b2318",
- "reference": "415782b7e48223342f1a616c16c45a95b15b2318",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
+ "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
"shasum": ""
},
"require": {
- "carbonphp/carbon-doctrine-types": "*",
+ "carbonphp/carbon-doctrine-types": "<100.0",
"ext-json": "*",
"php": "^8.1",
"psr/clock": "^1.0",
@@ -664,7 +667,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-03T17:25:54+00:00"
+ "time": "2024-11-07T17:46:48+00:00"
},
{
"name": "psr/clock",
@@ -820,16 +823,16 @@
},
{
"name": "symfony/clock",
- "version": "v7.1.1",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/clock.git",
- "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7"
+ "reference": "97bebc53548684c17ed696bc8af016880f0f098d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/clock/zipball/3dfc8b084853586de51dd1441c6242c76a28cbe7",
- "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7",
+ "url": "https://api.github.com/repos/symfony/clock/zipball/97bebc53548684c17ed696bc8af016880f0f098d",
+ "reference": "97bebc53548684c17ed696bc8af016880f0f098d",
"shasum": ""
},
"require": {
@@ -874,7 +877,7 @@
"time"
],
"support": {
- "source": "https://github.com/symfony/clock/tree/v7.1.1"
+ "source": "https://github.com/symfony/clock/tree/v7.1.6"
},
"funding": [
{
@@ -890,20 +893,20 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:57:53+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/console",
- "version": "v7.1.1",
+ "version": "v7.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3"
+ "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3",
- "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3",
+ "url": "https://api.github.com/repos/symfony/console/zipball/3284aafcac338b6e86fd955ee4d794cbe434151a",
+ "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a",
"shasum": ""
},
"require": {
@@ -967,7 +970,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.1.1"
+ "source": "https://github.com/symfony/console/tree/v7.1.7"
},
"funding": [
{
@@ -983,7 +986,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:57:53+00:00"
+ "time": "2024-11-05T15:34:55+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -1054,16 +1057,16 @@
},
{
"name": "symfony/finder",
- "version": "v7.1.1",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6"
+ "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
- "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8",
+ "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8",
"shasum": ""
},
"require": {
@@ -1098,7 +1101,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v7.1.1"
+ "source": "https://github.com/symfony/finder/tree/v7.1.6"
},
"funding": [
{
@@ -1114,24 +1117,24 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:57:53+00:00"
+ "time": "2024-10-01T08:31:23+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-ctype": "*"
@@ -1177,7 +1180,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
},
"funding": [
{
@@ -1193,24 +1196,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+ "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
- "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+ "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"suggest": {
"ext-intl": "For best performance"
@@ -1255,7 +1258,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
},
"funding": [
{
@@ -1271,24 +1274,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
- "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"suggest": {
"ext-intl": "For best performance"
@@ -1336,7 +1339,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
},
"funding": [
{
@@ -1352,24 +1355,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
@@ -1416,7 +1419,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
},
"funding": [
{
@@ -1432,105 +1435,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
- },
- {
- "name": "symfony/polyfill-php80",
- "version": "v1.29.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
- "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "library",
- "extra": {
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php80\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ion Bazan",
- "email": "ion.bazan@gmail.com"
- },
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-php83",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php83.git",
- "reference": "86fcae159633351e5fd145d1c47de6c528f8caff"
+ "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff",
- "reference": "86fcae159633351e5fd145d1c47de6c528f8caff",
+ "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491",
+ "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491",
"shasum": ""
},
"require": {
- "php": ">=7.1",
- "symfony/polyfill-php80": "^1.14"
+ "php": ">=7.2"
},
"type": "library",
"extra": {
@@ -1573,7 +1495,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0"
},
"funding": [
{
@@ -1589,20 +1511,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/process",
- "version": "v7.1.1",
+ "version": "v7.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "febf90124323a093c7ee06fdb30e765ca3c20028"
+ "reference": "9b8a40b7289767aa7117e957573c2a535efe6585"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028",
- "reference": "febf90124323a093c7ee06fdb30e765ca3c20028",
+ "url": "https://api.github.com/repos/symfony/process/zipball/9b8a40b7289767aa7117e957573c2a535efe6585",
+ "reference": "9b8a40b7289767aa7117e957573c2a535efe6585",
"shasum": ""
},
"require": {
@@ -1634,7 +1556,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v7.1.1"
+ "source": "https://github.com/symfony/process/tree/v7.1.7"
},
"funding": [
{
@@ -1650,7 +1572,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:57:53+00:00"
+ "time": "2024-11-06T09:25:12+00:00"
},
{
"name": "symfony/service-contracts",
@@ -1737,16 +1659,16 @@
},
{
"name": "symfony/string",
- "version": "v7.1.1",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "60bc311c74e0af215101235aa6f471bcbc032df2"
+ "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2",
- "reference": "60bc311c74e0af215101235aa6f471bcbc032df2",
+ "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626",
+ "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626",
"shasum": ""
},
"require": {
@@ -1804,7 +1726,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v7.1.1"
+ "source": "https://github.com/symfony/string/tree/v7.1.6"
},
"funding": [
{
@@ -1820,20 +1742,20 @@
"type": "tidelift"
}
],
- "time": "2024-06-04T06:40:14+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/translation",
- "version": "v7.1.1",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3"
+ "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3",
- "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/b9f72ab14efdb6b772f85041fa12f820dee8d55f",
+ "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f",
"shasum": ""
},
"require": {
@@ -1898,7 +1820,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v7.1.1"
+ "source": "https://github.com/symfony/translation/tree/v7.1.6"
},
"funding": [
{
@@ -1914,7 +1836,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:57:53+00:00"
+ "time": "2024-09-28T12:35:13+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -2072,16 +1994,16 @@
"packages-dev": [
{
"name": "myclabs/deep-copy",
- "version": "1.12.0",
+ "version": "1.12.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
+ "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
- "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
+ "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
"shasum": ""
},
"require": {
@@ -2120,7 +2042,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
},
"funding": [
{
@@ -2128,20 +2050,20 @@
"type": "tidelift"
}
],
- "time": "2024-06-12T14:39:25+00:00"
+ "time": "2024-11-08T17:47:46+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v5.0.2",
+ "version": "v5.3.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
- "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
"shasum": ""
},
"require": {
@@ -2152,7 +2074,7 @@
},
"require-dev": {
"ircmaxell/php-yacc": "^0.0.7",
- "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+ "phpunit/phpunit": "^9.0"
},
"bin": [
"bin/php-parse"
@@ -2184,9 +2106,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
},
- "time": "2024-03-05T20:51:40+00:00"
+ "time": "2024-10-08T18:51:32+00:00"
},
{
"name": "phar-io/manifest",
@@ -2308,16 +2230,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.11.5",
+ "version": "1.12.8",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "490f0ae1c92b082f154681d7849aee776a7c1443"
+ "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/490f0ae1c92b082f154681d7849aee776a7c1443",
- "reference": "490f0ae1c92b082f154681d7849aee776a7c1443",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c",
+ "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c",
"shasum": ""
},
"require": {
@@ -2362,36 +2284,36 @@
"type": "github"
}
],
- "time": "2024-06-17T15:10:54+00:00"
+ "time": "2024-11-06T19:06:49+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "10.1.14",
+ "version": "10.1.16",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
+ "reference": "7e308268858ed6baedc8704a304727d20bc07c77"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
- "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77",
+ "reference": "7e308268858ed6baedc8704a304727d20bc07c77",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^4.18 || ^5.0",
+ "nikic/php-parser": "^4.19.1 || ^5.1.0",
"php": ">=8.1",
- "phpunit/php-file-iterator": "^4.0",
- "phpunit/php-text-template": "^3.0",
- "sebastian/code-unit-reverse-lookup": "^3.0",
- "sebastian/complexity": "^3.0",
- "sebastian/environment": "^6.0",
- "sebastian/lines-of-code": "^2.0",
- "sebastian/version": "^4.0",
- "theseer/tokenizer": "^1.2.0"
+ "phpunit/php-file-iterator": "^4.1.0",
+ "phpunit/php-text-template": "^3.0.1",
+ "sebastian/code-unit-reverse-lookup": "^3.0.0",
+ "sebastian/complexity": "^3.2.0",
+ "sebastian/environment": "^6.1.0",
+ "sebastian/lines-of-code": "^2.0.2",
+ "sebastian/version": "^4.0.1",
+ "theseer/tokenizer": "^1.2.3"
},
"require-dev": {
"phpunit/phpunit": "^10.1"
@@ -2403,7 +2325,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "10.1-dev"
+ "dev-main": "10.1.x-dev"
}
},
"autoload": {
@@ -2432,7 +2354,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16"
},
"funding": [
{
@@ -2440,7 +2362,7 @@
"type": "github"
}
],
- "time": "2024-03-12T15:33:41+00:00"
+ "time": "2024-08-22T04:31:57+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -2687,16 +2609,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "10.5.22",
+ "version": "10.5.38",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "8afb89b399b17c2ce2618015bdc9f81a117c5ee1"
+ "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8afb89b399b17c2ce2618015bdc9f81a117c5ee1",
- "reference": "8afb89b399b17c2ce2618015bdc9f81a117c5ee1",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132",
+ "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132",
"shasum": ""
},
"require": {
@@ -2706,26 +2628,26 @@
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.10.1",
- "phar-io/manifest": "^2.0.3",
- "phar-io/version": "^3.0.2",
+ "myclabs/deep-copy": "^1.12.0",
+ "phar-io/manifest": "^2.0.4",
+ "phar-io/version": "^3.2.1",
"php": ">=8.1",
- "phpunit/php-code-coverage": "^10.1.5",
- "phpunit/php-file-iterator": "^4.0",
- "phpunit/php-invoker": "^4.0",
- "phpunit/php-text-template": "^3.0",
- "phpunit/php-timer": "^6.0",
- "sebastian/cli-parser": "^2.0",
- "sebastian/code-unit": "^2.0",
- "sebastian/comparator": "^5.0",
- "sebastian/diff": "^5.0",
- "sebastian/environment": "^6.0",
- "sebastian/exporter": "^5.1",
- "sebastian/global-state": "^6.0.1",
- "sebastian/object-enumerator": "^5.0",
- "sebastian/recursion-context": "^5.0",
- "sebastian/type": "^4.0",
- "sebastian/version": "^4.0"
+ "phpunit/php-code-coverage": "^10.1.16",
+ "phpunit/php-file-iterator": "^4.1.0",
+ "phpunit/php-invoker": "^4.0.0",
+ "phpunit/php-text-template": "^3.0.1",
+ "phpunit/php-timer": "^6.0.0",
+ "sebastian/cli-parser": "^2.0.1",
+ "sebastian/code-unit": "^2.0.0",
+ "sebastian/comparator": "^5.0.3",
+ "sebastian/diff": "^5.1.1",
+ "sebastian/environment": "^6.1.0",
+ "sebastian/exporter": "^5.1.2",
+ "sebastian/global-state": "^6.0.2",
+ "sebastian/object-enumerator": "^5.0.0",
+ "sebastian/recursion-context": "^5.0.0",
+ "sebastian/type": "^4.0.0",
+ "sebastian/version": "^4.0.1"
},
"suggest": {
"ext-soap": "To be able to generate mocks based on WSDL files"
@@ -2768,7 +2690,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.22"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38"
},
"funding": [
{
@@ -2784,7 +2706,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-19T05:29:34+00:00"
+ "time": "2024-10-28T13:06:21+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -2956,16 +2878,16 @@
},
{
"name": "sebastian/comparator",
- "version": "5.0.1",
+ "version": "5.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
+ "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
- "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
+ "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
"shasum": ""
},
"require": {
@@ -2976,7 +2898,7 @@
"sebastian/exporter": "^5.0"
},
"require-dev": {
- "phpunit/phpunit": "^10.3"
+ "phpunit/phpunit": "^10.5"
},
"type": "library",
"extra": {
@@ -3021,7 +2943,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
"security": "https://github.com/sebastianbergmann/comparator/security/policy",
- "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
+ "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3"
},
"funding": [
{
@@ -3029,7 +2951,7 @@
"type": "github"
}
],
- "time": "2023-08-14T13:18:12+00:00"
+ "time": "2024-10-18T14:56:07+00:00"
},
{
"name": "sebastian/complexity",
@@ -3755,12 +3677,12 @@
],
"aliases": [],
"minimum-stability": "dev",
- "stability-flags": [],
+ "stability-flags": {},
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": "^8.2"
},
- "platform-dev": [],
+ "platform-dev": {},
"plugin-api-version": "2.6.0"
}
diff --git a/third_party/nixpkgs/pkgs/by-name/la/laravel/package.nix b/third_party/nixpkgs/pkgs/by-name/la/laravel/package.nix
index 61d2a3f88d..47aeb62108 100644
--- a/third_party/nixpkgs/pkgs/by-name/la/laravel/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/la/laravel/package.nix
@@ -4,21 +4,21 @@
makeWrapper,
php,
}:
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
pname = "laravel";
- version = "5.8.3";
+ version = "5.9.2";
src = fetchFromGitHub {
owner = "laravel";
repo = "installer";
rev = "v${finalAttrs.version}";
- hash = "sha256-a7DbpjIcT1JbhuzpzQVQ/iiWLAVF/XisrTUsDbR78XQ=";
+ hash = "sha256-XE1KYOlWehj1peSNj3sKNr6CKchCxRNpIjXHq7slVME=";
};
nativeBuildInputs = [ makeWrapper ];
composerLock = ./composer.lock;
- vendorHash = "sha256-NyD/kyqGyE+yO7wCitMipTWnKbGSd/FSQ3iGcXvCv5Y=";
+ vendorHash = "sha256-jUg0hmkShzK1CAO3+Btqe3/5GFKVxRKDtIxmUuU3EdU=";
postInstall = ''
wrapProgram $out/bin/laravel \
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/larswm/default.nix b/third_party/nixpkgs/pkgs/by-name/la/larswm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/larswm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/larswm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lasem/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lasem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lasem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lasem/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lash/gcc-47.patch b/third_party/nixpkgs/pkgs/by-name/la/lash/gcc-47.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/lash/gcc-47.patch
rename to third_party/nixpkgs/pkgs/by-name/la/lash/gcc-47.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lash/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/lash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lash/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lash/socket.patch b/third_party/nixpkgs/pkgs/by-name/la/lash/socket.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/lash/socket.patch
rename to third_party/nixpkgs/pkgs/by-name/la/lash/socket.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lasso/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lasso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lasso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lasso/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix b/third_party/nixpkgs/pkgs/by-name/la/last-resort/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/last-resort/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/by-name/la/last/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/last/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lastpass-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lastpass-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix b/third_party/nixpkgs/pkgs/by-name/la/latencytop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/latencytop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/latex2html/default.nix b/third_party/nixpkgs/pkgs/by-name/la/latex2html/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/latex2html/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/latex2html/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix b/third_party/nixpkgs/pkgs/by-name/la/latexrun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/latexrun/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/lato/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lato/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/lato/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lato/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/lattice-diamond/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lattice-diamond/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/fpga/lattice-diamond/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lattice-diamond/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lavat/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lavat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lavat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lavat/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/layan-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/la/layan-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/layan-gtk-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/layan-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lazycli/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lazycli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lazycli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lazycli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lazydocker/default.nix b/third_party/nixpkgs/pkgs/by-name/la/lazydocker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lazydocker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/la/lazydocker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lbdb/add-methods-to-rc.patch b/third_party/nixpkgs/pkgs/by-name/lb/lbdb/add-methods-to-rc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lbdb/add-methods-to-rc.patch
rename to third_party/nixpkgs/pkgs/by-name/lb/lbdb/add-methods-to-rc.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/third_party/nixpkgs/pkgs/by-name/lb/lbdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lb/lbdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix b/third_party/nixpkgs/pkgs/by-name/lb/lbry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/lbry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lb/lbry/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lbzip2/default.nix b/third_party/nixpkgs/pkgs/by-name/lb/lbzip2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lbzip2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lb/lbzip2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/lc3tools/0001-mangle-configure.patch b/third_party/nixpkgs/pkgs/by-name/lc/lc3tools/0001-mangle-configure.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/lc3tools/0001-mangle-configure.patch
rename to third_party/nixpkgs/pkgs/by-name/lc/lc3tools/0001-mangle-configure.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/lc3tools/0002-lc3os-path.patch b/third_party/nixpkgs/pkgs/by-name/lc/lc3tools/0002-lc3os-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/lc3tools/0002-lc3os-path.patch
rename to third_party/nixpkgs/pkgs/by-name/lc/lc3tools/0002-lc3os-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch b/third_party/nixpkgs/pkgs/by-name/lc/lc3tools/0003-lc3sim-tk-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch
rename to third_party/nixpkgs/pkgs/by-name/lc/lc3tools/0003-lc3sim-tk-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch b/third_party/nixpkgs/pkgs/by-name/lc/lc3tools/0004-configure-use-cc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch
rename to third_party/nixpkgs/pkgs/by-name/lc/lc3tools/0004-configure-use-cc.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/lc3tools/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lc3tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/lc3tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lc3tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lcalc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lcalc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lcdf-typetools/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lcdf-typetools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lcdf-typetools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lcdf-typetools/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch b/third_party/nixpkgs/pkgs/by-name/lc/lcdproc/hardcode_mtab.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch
rename to third_party/nixpkgs/pkgs/by-name/lc/lcdproc/hardcode_mtab.patch
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lcdproc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lcdproc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lci/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lci/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/lci/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lci/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lcm/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lcm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lcm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lcm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lcms/cve-2013-4276.patch b/third_party/nixpkgs/pkgs/by-name/lc/lcms1/cve-2013-4276.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lcms/cve-2013-4276.patch
rename to third_party/nixpkgs/pkgs/by-name/lc/lcms1/cve-2013-4276.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lcms/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lcms1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lcms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lcms1/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lcms2/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lcms2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lcms2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lcms2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lcov/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lcov/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lcrq/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lcrq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lcrq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lcrq/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/lcsync/default.nix b/third_party/nixpkgs/pkgs/by-name/lc/lcsync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sync/lcsync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lc/lcsync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldacbt/default.nix b/third_party/nixpkgs/pkgs/by-name/ld/ldacbt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ld/ldacbt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ldapmonitor/default.nix b/third_party/nixpkgs/pkgs/by-name/ld/ldapmonitor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ldapmonitor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ld/ldapmonitor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ldapnomnom/default.nix b/third_party/nixpkgs/pkgs/by-name/ld/ldapnomnom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ldapnomnom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ld/ldapnomnom/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ldapvi/default.nix b/third_party/nixpkgs/pkgs/by-name/ld/ldapvi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ldapvi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ld/ldapvi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix b/third_party/nixpkgs/pkgs/by-name/ld/ldb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ld/ldb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix b/third_party/nixpkgs/pkgs/by-name/ld/ldeep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ld/ldeep/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ldm/default.nix b/third_party/nixpkgs/pkgs/by-name/ld/ldm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ldm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ld/ldm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ldmtool/default.nix b/third_party/nixpkgs/pkgs/by-name/ld/ldmtool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ldmtool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ld/ldmtool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldns/default.nix b/third_party/nixpkgs/pkgs/by-name/ld/ldns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ldns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ld/ldns/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/ldtk/default.nix b/third_party/nixpkgs/pkgs/by-name/ld/ldtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/ldtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ld/ldtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/league-gothic/default.nix b/third_party/nixpkgs/pkgs/by-name/le/league-gothic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/league-gothic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/league-gothic/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix b/third_party/nixpkgs/pkgs/by-name/le/league-of-moveable-type/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/league-of-moveable-type/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/league-of-moveable-type/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/league-script-number-one/default.nix b/third_party/nixpkgs/pkgs/by-name/le/league-script-number-one/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/league-script-number-one/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/league-script-number-one/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/league-spartan/default.nix b/third_party/nixpkgs/pkgs/by-name/le/league-spartan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/league-spartan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/league-spartan/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lean/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lean/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean2/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lean2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/lean2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lean2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lean4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lean4/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/leanify/default.nix b/third_party/nixpkgs/pkgs/by-name/le/leanify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/leanify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/leanify/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/leaps/default.nix b/third_party/nixpkgs/pkgs/by-name/le/leaps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/leaps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/leaps/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/third_party/nixpkgs/pkgs/by-name/le/leatherman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/leatherman/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ledfx/default.nix b/third_party/nixpkgs/pkgs/by-name/le/ledfx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ledfx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/ledfx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/le/ledger-live-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/ledger-live-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/le/ledger-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ledger-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/ledger-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix b/third_party/nixpkgs/pkgs/by-name/le/ledger2beancount/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/ledger2beancount/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ledit/default.nix b/third_party/nixpkgs/pkgs/by-name/le/ledit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ledit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/ledit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ledmon/default.nix b/third_party/nixpkgs/pkgs/by-name/le/ledmon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ledmon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/ledmon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/leela/default.nix b/third_party/nixpkgs/pkgs/by-name/le/leela/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/leela/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/leela/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/le/leetcode-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/leetcode-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/left4gore/default.nix b/third_party/nixpkgs/pkgs/by-name/le/left4gore-bin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/left4gore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/left4gore-bin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix b/third_party/nixpkgs/pkgs/by-name/le/leftwm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/leftwm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/update-time-crate.patch b/third_party/nixpkgs/pkgs/by-name/le/leftwm/update-time-crate.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/leftwm/update-time-crate.patch
rename to third_party/nixpkgs/pkgs/by-name/le/leftwm/update-time-crate.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/legit-web/default.nix b/third_party/nixpkgs/pkgs/by-name/le/legit-web/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/legit-web/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/legit-web/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/legit/default.nix b/third_party/nixpkgs/pkgs/by-name/le/legit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/legit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/legit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/legitify/default.nix b/third_party/nixpkgs/pkgs/by-name/le/legitify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/legitify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/legitify/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lego/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/lego/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lego/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lektor/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lektor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lektor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lektor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lemmeknow/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lemmeknow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lemmeknow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lemmeknow/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lemmy-help/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lemmy-help/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lemmy-help/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lemmy-help/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lemon-graph/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lemon-graph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lemon-graph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lemon-graph/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lemon-graph/remove-register.patch b/third_party/nixpkgs/pkgs/by-name/le/lemon-graph/remove-register.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lemon-graph/remove-register.patch
rename to third_party/nixpkgs/pkgs/by-name/le/lemon-graph/remove-register.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lemonade/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lemonade/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/lemonade/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lemonade/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/0001-fix-static-lifetime-string.patch b/third_party/nixpkgs/pkgs/by-name/le/lemurs/0001-fix-static-lifetime-string.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/display-managers/lemurs/0001-fix-static-lifetime-string.patch
rename to third_party/nixpkgs/pkgs/by-name/le/lemurs/0001-fix-static-lifetime-string.patch
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lemurs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lemurs/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/lenpaste/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lenpaste/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/lenpaste/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lenpaste/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/darwin.nix b/third_party/nixpkgs/pkgs/by-name/le/lens/darwin.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/lens/darwin.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lens/darwin.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix b/third_party/nixpkgs/pkgs/by-name/le/lens/linux.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lens/linux.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lens/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lens/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lensfun/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lensfun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lensfun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lensfun/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/lepton-eda/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lepton-eda/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/lepton-eda/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lepton-eda/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/lepton/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lepton/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/lepton/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lepton/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix b/third_party/nixpkgs/pkgs/by-name/le/leptonica/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/leptonica/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/le/leptosfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/leptosfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lerc/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lerc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lerc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lerc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lerpn/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lerpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lerpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lerpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/lesbar/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lesbar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/lesbar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lesbar/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/lesscpy/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lesscpy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/lesscpy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lesscpy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lesspass-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lesspass-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lesspipe/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lesspipe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lesspipe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lesspipe/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lesstif/c-missing_xm_h.patch b/third_party/nixpkgs/pkgs/by-name/le/lesstif/c-missing_xm_h.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lesstif/c-missing_xm_h.patch
rename to third_party/nixpkgs/pkgs/by-name/le/lesstif/c-missing_xm_h.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lesstif/c-render_table_crash.patch b/third_party/nixpkgs/pkgs/by-name/le/lesstif/c-render_table_crash.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lesstif/c-render_table_crash.patch
rename to third_party/nixpkgs/pkgs/by-name/le/lesstif/c-render_table_crash.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch b/third_party/nixpkgs/pkgs/by-name/le/lesstif/c-xpmpipethrough.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch
rename to third_party/nixpkgs/pkgs/by-name/le/lesstif/c-xpmpipethrough.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lesstif/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lesstif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lesstif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lesstif/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix b/third_party/nixpkgs/pkgs/by-name/le/levant/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/levant/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/third_party/nixpkgs/pkgs/by-name/le/level-zero/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/level-zero/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/third_party/nixpkgs/pkgs/by-name/le/leveldb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/leveldb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/levmar/default.nix b/third_party/nixpkgs/pkgs/by-name/le/levmar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/levmar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/levmar/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/lexend/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lexend/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/lexend/default.nix
rename to third_party/nixpkgs/pkgs/by-name/le/lexend/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix b/third_party/nixpkgs/pkgs/by-name/lf/lftp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lf/lftp/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/lguf-brightness/default.nix b/third_party/nixpkgs/pkgs/by-name/lg/lguf-brightness/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/lguf-brightness/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lg/lguf-brightness/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/lha/default.nix b/third_party/nixpkgs/pkgs/by-name/lh/lha/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/lha/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lh/lha/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lhasa/default.nix b/third_party/nixpkgs/pkgs/by-name/lh/lhasa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lhasa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lh/lhasa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib3ds/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lib3ds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lib3ds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lib3ds/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lib3mf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lib3mf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch b/third_party/nixpkgs/pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch
rename to third_party/nixpkgs/pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libGDSII/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libGDSII/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libGDSII/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libGDSII/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libHX/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libHX/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libHX/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libHX/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libLAS/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libLAS/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libaacs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libaacs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaal/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libaal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libaal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libaal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libabigail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libabigail/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libabw/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libabw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libabw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libabw/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libaccounts-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libaccounts-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libad9361/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libad9361/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libad9361/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libad9361/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaec/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libaec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libaec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libaec/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libaio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libaio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libajantv2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libajantv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libajantv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libajantv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch b/third_party/nixpkgs/pkgs/by-name/li/libamplsolver/libamplsolver-sharedlib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libamplsolver/libamplsolver-sharedlib.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libamplsolver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libamplsolver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch b/third_party/nixpkgs/pkgs/by-name/li/libamqpcpp/libamqpcpp-darwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libamqpcpp/libamqpcpp-darwin.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libamqpcpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libamqpcpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libantlr3c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libantlr3c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaom/outputs.patch b/third_party/nixpkgs/pkgs/by-name/li/libaom/outputs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libaom/outputs.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libaom/outputs.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libaom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libaom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaosd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libaosd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libaosd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libaosd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libappindicator/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libappindicator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libappindicator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libappindicator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libargon2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libargon2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libargon2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libargon2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libargs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libargs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libasr/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libasr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libasr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libasr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libass/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libassuan/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libassuan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libassuan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libassuan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libasyncns/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libasyncns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libasyncns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libasyncns/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libatasmart/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libatasmart/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libatomic_ops/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libatomic_ops/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaudclient/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libaudclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libaudclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libaudclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaudec/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libaudec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libaudec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libaudec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libavc1394/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libavc1394/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libavc1394/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libavc1394/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libavif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libavif/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libax25/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libax25/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libax25/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libax25/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libayatana-appindicator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libayatana-appindicator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libayatana-common/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libayatana-common/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libb2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libb2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libb2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libb2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libb64/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libb64/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch b/third_party/nixpkgs/pkgs/by-name/li/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch b/third_party/nixpkgs/pkgs/by-name/li/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch b/third_party/nixpkgs/pkgs/by-name/li/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch b/third_party/nixpkgs/pkgs/by-name/li/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libbacktrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libbacktrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libbaseencode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libbaseencode/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbdplus/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libbdplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbdplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libbdplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libbladeRF/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libbladeRF/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libblockdev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libblockdev/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libblocksruntime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libblocksruntime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libblocksruntime/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbpkg/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libbpkg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbpkg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libbpkg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libbraiding/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libbraiding/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libbs2b/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libbs2b/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch b/third_party/nixpkgs/pkgs/by-name/li/libbsd/darwin-enable-strtonum.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libbsd/darwin-enable-strtonum.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbsd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libbsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libbsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libbsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcacard/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcacard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcacard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcacard/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcangjie/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcangjie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcangjie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcangjie/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcap/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcap_ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcap_ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcaption/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcaption/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcaption/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcaption/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/libcardiacarrest/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcardiacarrest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/libcardiacarrest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcardiacarrest/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcbor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcbor/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libccd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libccd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libccd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libccd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcdada/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcdada/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcdaudio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcdaudio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcddb/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcddb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcddb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcddb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcello/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcello/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcello/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcello/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcerf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcerf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcerf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcerf/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcgroup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcgroup/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libchamplain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libchamplain/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchardet/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libchardet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libchardet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libchardet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch b/third_party/nixpkgs/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchop/gets-undeclared.patch b/third_party/nixpkgs/pkgs/by-name/li/libchop/gets-undeclared.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libchop/gets-undeclared.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libchop/gets-undeclared.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchop/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libchop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libchop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libchop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchop/size_t.patch b/third_party/nixpkgs/pkgs/by-name/li/libchop/size_t.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libchop/size_t.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libchop/size_t.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcifpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcifpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libck/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libck/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcli/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcloudproviders/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcloudproviders/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libclthreads/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libclthreads/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libclthreads/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libclthreads/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libclxclient/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libclxclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libclxclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libclxclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcmis/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcmis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcmis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcmis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcollectdclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcollectdclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libconfuse/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libconfuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libconfuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libconfuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcork/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcork/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcork/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcork/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcotp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcotp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcotp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcotp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcouchbase/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcouchbase/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcrafter/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcrafter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcrafter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcrafter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcredis/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcredis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcredis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcredis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcrossguid/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcrossguid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcrossguid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcrossguid/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcs50/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcs50/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcs50/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcs50/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcsptr/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcsptr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcsptr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcsptr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libctb/include-kbhit.patch b/third_party/nixpkgs/pkgs/by-name/li/libctb/include-kbhit.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libctb/include-kbhit.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libctb/include-kbhit.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libctb/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libctb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libctb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libctb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libctemplate/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libctemplate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libctemplate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libctemplate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libctl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcue/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libcue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libcue/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdaemon/fix-includes.patch b/third_party/nixpkgs/pkgs/by-name/li/libdaemon/fix-includes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdaemon/fix-includes.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libdaemon/fix-includes.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdaemon/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdaemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdaemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdaemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdatachannel/package.nix
similarity index 93%
rename from third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdatachannel/package.nix
index bc831d354e..c36dda9707 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/libdatachannel/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "libdatachannel";
- version = "0.21.2";
+ version = "0.22.2";
src = fetchFromGitHub {
owner = "paullouisageneau";
repo = "libdatachannel";
rev = "v${version}";
- hash = "sha256-3fax57oaJvOgbTDPCiiUdtsfAGhICfPkuMihawq06SA=";
+ hash = "sha256-ZGxv4JfJ3b0S7zacIHBlBtCbChADCQG1CfxStA1lKKE=";
};
outputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch b/third_party/nixpkgs/pkgs/by-name/li/libdatovka/libdatovka-deprecated-fn-curl.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libdatovka/libdatovka-deprecated-fn-curl.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdatovka/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdatovka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdatovka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdatovka/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdatrie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdatrie/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdazzle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdazzle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdbi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdbi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdbi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdbi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch b/third_party/nixpkgs/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-buffer_overflow.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-buffer_overflow.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdbiDrivers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdbiDrivers/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdbusmenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdbusmenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdbusmenu/requires-glib.patch b/third_party/nixpkgs/pkgs/by-name/li/libdbusmenu/requires-glib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdbusmenu/requires-glib.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libdbusmenu/requires-glib.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libde265/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libde265/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libde265/test-corpus-decode.nix b/third_party/nixpkgs/pkgs/by-name/li/libde265/test-corpus-decode.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libde265/test-corpus-decode.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libde265/test-corpus-decode.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdecor/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdecor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdecor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdecor/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdex/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdicom/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdicom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdicom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdicom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdigidocpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdigidocpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdiscid/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdiscid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdiscid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdiscid/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdisplay-info/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdisplay-info/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdisplay-info/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdisplay-info/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdivecomputer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdivecomputer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdivsufsort/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdivsufsort/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdivsufsort/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdivsufsort/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdmapsharing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdmapsharing/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdmtx/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdmtx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdmtx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdmtx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdnet/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdovi/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/li/libdovi/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdovi/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/li/libdovi/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdovi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdovi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdovi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdovi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdrm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdrm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/libdsk/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdsk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/libdsk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdsk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdv/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdvbcsa/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdvbcsa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdvbcsa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdvbcsa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdvbpsi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdvbpsi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdwarf/common.nix b/third_party/nixpkgs/pkgs/by-name/li/libdwarf/common.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdwarf/common.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdwarf/common.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdwarf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdwarf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdwarf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdwg/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdwg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdwg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdwg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libdynd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libdynd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libe-book/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libe-book/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libe-book/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libe-book/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libe57format/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libe57format/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libe57format/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libe57format/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libeatmydata/LFS64.patch b/third_party/nixpkgs/pkgs/by-name/li/libeatmydata/LFS64.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libeatmydata/LFS64.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libeatmydata/LFS64.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libeatmydata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libeatmydata/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libeb/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libeb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libeb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libeb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libebml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libebml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libebur128/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libebur128/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libebur128/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libebur128/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libee/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libee/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libee/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libee/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libei/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libei/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libei/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libei/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libelf/dont-hardcode-ar.patch b/third_party/nixpkgs/pkgs/by-name/li/libelf/dont-hardcode-ar.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libelf/dont-hardcode-ar.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libelf/dont-hardcode-ar.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libelf/fix-configure-main.patch b/third_party/nixpkgs/pkgs/by-name/li/libelf/fix-configure-main.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libelf/fix-configure-main.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libelf/fix-configure-main.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libelf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libelf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libelf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libelf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libelf/preprocessor-warnings.patch b/third_party/nixpkgs/pkgs/by-name/li/libelf/preprocessor-warnings.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libelf/preprocessor-warnings.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libelf/preprocessor-warnings.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch b/third_party/nixpkgs/pkgs/by-name/li/libelfin/0001-Don-t-detect-package-version-with-Git.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libelfin/0001-Don-t-detect-package-version-with-Git.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libelfin/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libelfin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libelfin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libelfin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libemf2svg/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libemf2svg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libemf2svg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libemf2svg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libepc/no-avahi-ui.patch b/third_party/nixpkgs/pkgs/by-name/li/libepc/no-avahi-ui.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libepc/no-avahi-ui.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libepc/no-avahi-ui.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libepc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libepc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libepc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libepc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/liberal-crime-squad/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liberal-crime-squad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/liberal-crime-squad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liberal-crime-squad/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/liberastika/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liberastika/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/liberastika/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liberastika/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/liberation-circuit/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liberation-circuit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/liberation-circuit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liberation-circuit/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/liberation-sans-narrow/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liberation-sans-narrow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/liberation-sans-narrow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liberation-sans-narrow/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liberfa/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liberfa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liberfa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liberfa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liberio/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liberio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liberio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liberio/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/libertine/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libertine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/libertine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libertine/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/libertinus/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libertinus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/libertinus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libertinus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libesmtp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libesmtp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libesmtp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libesmtp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libestr/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libestr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libestr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libestr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libetpan/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libetpan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libetpan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libetpan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libev/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libev/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libevdev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libevdev/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libevdevc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libevdevc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch b/third_party/nixpkgs/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libevdevplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libevdevplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libevent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libevent/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libewf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libewf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch b/third_party/nixpkgs/pkgs/by-name/li/libexecinfo/30-linux-makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libexecinfo/30-linux-makefile.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libexecinfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libexecinfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libexif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libexif/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/exosip/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libexosip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/exosip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libexosip/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexsid/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libexsid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libexsid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libexsid/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libexttextcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libexttextcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libexttextcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libf2c/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libf2c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libf2c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libf2c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfabric/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfabric/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfakekey/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfakekey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfakekey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfakekey/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/third_party/nixpkgs/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch b/third_party/nixpkgs/pkgs/by-name/li/libfaketime/nix-store-date.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libfaketime/nix-store-date.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfaketime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfaketime/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfann/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfann/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfann/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfann/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libff/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libffcall/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libffcall/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libffcall/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libffcall/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfido2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfido2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfishsound/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfishsound/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfishsound/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfishsound/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfixposix/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfixposix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfixposix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfixposix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-elan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-elan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-goodix-550a/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-goodix-550a/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-goodix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-goodix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch b/third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch b/third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint-tod/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfprint-tod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfprint-tod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfprint-tod/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfpx/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfpx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfpx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfpx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfreeaptx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfreeaptx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfsm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfsm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfsm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfsm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libfyaml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libfyaml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgadu/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgadu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgadu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgadu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgaminggear/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgaminggear/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgbinder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgbinder/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdamm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgdamm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgdamm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgdamm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdata/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/li/libgdata/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgdata/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libgdata/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgdata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgdata/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgee/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgee/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgen-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgen-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgeotiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgeotiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgepub/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgepub/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgepub/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgepub/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libgestures/include-fix.patch b/third_party/nixpkgs/pkgs/by-name/li/libgestures/include-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libgestures/include-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libgestures/include-fix.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgestures/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgestures/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgflow/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgflow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgflow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgflow/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgig/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgig/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgit2-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgit2-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libglibutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libglibutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libglvnd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libglvnd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgmpris/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgmpris/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgmpris/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgmpris/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgnomekbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgnomekbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnt/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgnt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgnt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgnt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgnurl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgnurl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgourou/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgourou/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgourou/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgourou/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch b/third_party/nixpkgs/pkgs/by-name/li/libgovirt/auto-disable-incompatible-compiler-warnings.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libgovirt/auto-disable-incompatible-compiler-warnings.patch
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgovirt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgovirt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgpg-error/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgpg-error/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgphoto2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgphoto2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgpiod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgpiod/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgringotts/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgringotts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgringotts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgringotts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgsf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgsf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgssglue/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgssglue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgssglue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgssglue/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgtkflow3/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgtkflow3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgtkflow3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgtkflow3/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgtkflow4/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgtkflow4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgtkflow4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgtkflow4/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgtop/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgtop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgtop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgtop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgudev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgudev/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgudev/tests-skip-double-test-on-stub-locale-impls.patch b/third_party/nixpkgs/pkgs/by-name/li/libgudev/tests-skip-double-test-on-stub-locale-impls.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgudev/tests-skip-double-test-on-stub-locale-impls.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libgudev/tests-skip-double-test-on-stub-locale-impls.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgumath/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgumath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgumath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgumath/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgweather/fix-pkgconfig.patch b/third_party/nixpkgs/pkgs/by-name/li/libgweather/fix-pkgconfig.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgweather/fix-pkgconfig.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libgweather/fix-pkgconfig.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgweather/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgweather/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgxps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libgxps/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhangul/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libhangul/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libhangul/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libhangul/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libharu/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libharu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libharu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libharu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch b/third_party/nixpkgs/pkgs/by-name/li/libhdhomerun/nixos-darwin-no-fat-dylib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libhdhomerun/nixos-darwin-no-fat-dylib.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libhdhomerun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libhdhomerun/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libheif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libheif/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libhomfly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libhomfly/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhsts/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libhsts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libhsts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libhsts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhsts/update.sh b/third_party/nixpkgs/pkgs/by-name/li/libhsts/update.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libhsts/update.sh
rename to third_party/nixpkgs/pkgs/by-name/li/libhsts/update.sh
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libhttpseverywhere/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libhttpseverywhere/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libhugetlbfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libhugetlbfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhwy/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libhwy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libhwy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libhwy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiberty/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libiberty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libiberty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libiberty/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libibmad/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libibmad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libibmad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libibmad/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libibumad/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libibumad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libibumad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libibumad/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libical/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libical/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libical/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/respect-env-tzdir.patch b/third_party/nixpkgs/pkgs/by-name/li/libical/respect-env-tzdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libical/respect-env-tzdir.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libical/respect-env-tzdir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libicns/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libicns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libicns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libicns/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/third_party/nixpkgs/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libid3tag/debian-patches.patch b/third_party/nixpkgs/pkgs/by-name/li/libid3tag/debian-patches.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libid3tag/debian-patches.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libid3tag/debian-patches.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libid3tag/id3tag.pc b/third_party/nixpkgs/pkgs/by-name/li/libid3tag/id3tag.pc
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libid3tag/id3tag.pc
rename to third_party/nixpkgs/pkgs/by-name/li/libid3tag/id3tag.pc
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libid3tag/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libid3tag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libid3tag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libid3tag/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libidn/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libidn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libidn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libidn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiec61883/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libiec61883/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libiec61883/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libiec61883/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libieee1284/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libieee1284/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libieee1284/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libieee1284/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/li/libimagequant/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/li/libimagequant/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libimagequant/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libimagequant/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libime/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libimobiledevice-glue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libimobiledevice-glue/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libindicator/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libindicator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libindicator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libindicator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinfinity/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libinfinity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libinfinity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libinfinity/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinjection/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libinjection/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libinjection/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libinjection/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinklevel/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libinklevel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libinklevel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libinklevel/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libinotify-kqueue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libinotify-kqueue/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/third_party/nixpkgs/pkgs/by-name/li/libinput-gestures/0001-hardcode-name.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libinput-gestures/0001-hardcode-name.patch
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/third_party/nixpkgs/pkgs/by-name/li/libinput-gestures/0002-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libinput-gestures/0002-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libinput-gestures/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libinput-gestures/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinsane/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libinsane/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libinsane/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libinsane/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libinstpatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libinstpatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libipfix/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libipfix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libipfix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libipfix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libipt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libipt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libiptcdata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libiptcdata/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libircclient/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libircclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libircclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libircclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libirecovery/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libirecovery/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libirecovery/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libirecovery/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libiscsi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libiscsi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libisds/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libisds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libisds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libisds/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libite/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libivykis/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libivykis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libivykis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libivykis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libixp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libixp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libixp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libixp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjcat/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/li/libjcat/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjcat/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libjcat/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libjcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libjcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjpeg/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libjpeg_original/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjpeg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libjpeg_original/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch b/third_party/nixpkgs/pkgs/by-name/li/libjpeg_turbo/0001-Compile-transupp.c-as-part-of-the-library.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libjpeg_turbo/0001-Compile-transupp.c-as-part-of-the-library.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch b/third_party/nixpkgs/pkgs/by-name/li/libjpeg_turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libjpeg_turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch b/third_party/nixpkgs/pkgs/by-name/li/libjpeg_turbo/mingw-boolean.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libjpeg_turbo/mingw-boolean.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libjpeg_turbo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libjpeg_turbo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libjson-rpc-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libjson-rpc-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjson/install-fix.patch b/third_party/nixpkgs/pkgs/by-name/li/libjson/install-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjson/install-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libjson/install-fix.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjson/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libjson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libjson/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libjwt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libjwt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libjxl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libjxl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkate/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libkate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libkate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libkate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkcapi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libkcapi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libkcapi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libkcapi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libkeyfinder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libkeyfinder/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/libkkc-data/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libkkc-data/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/libkkc-data/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libkkc-data/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libkkc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libkkc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkqueue/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libkqueue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libkqueue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libkqueue/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkrun/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libkrun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libkrun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libkrun/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libkrunfw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libkrunfw/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libks/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libksba/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libksba/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libksi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libksi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libksi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libksi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblangtag/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblangtag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblangtag/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblastfmSF/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblastfmSF/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblastfmSF/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblaxjson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblaxjson/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblbfgs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/liblbfgs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblbfgs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblc3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblc3/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblcf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblcf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblinear/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblinear/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/backport-cpp17.patch b/third_party/nixpkgs/pkgs/by-name/li/liblinphone/backport-cpp17.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblinphone/backport-cpp17.patch
rename to third_party/nixpkgs/pkgs/by-name/li/liblinphone/backport-cpp17.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblinphone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblinphone/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblo/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblockfile/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblockfile/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblockfile/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblockfile/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblogging/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblogging/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblogging/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblogging/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblognorm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblognorm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblognorm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblognorm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblouis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblouis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblscp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblscp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblscp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblscp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libltc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libltc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libltc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libltc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblxi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liblxi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liblxi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liblxi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmad/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmad/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmanette/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmanette/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmatchbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmatchbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmatheval/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmatheval/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmatheval/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmatheval/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmaxminddb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmaxminddb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmbim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmbim/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmcfp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmcfp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmcfp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmcfp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmcrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmcrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmediaart/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmediaart/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmediaart/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmediaart/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch b/third_party/nixpkgs/pkgs/by-name/li/libmemcached/libmemcached-fix-linking-with-libpthread.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libmemcached/libmemcached-fix-linking-with-libpthread.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmemcached/musl-fixes.patch b/third_party/nixpkgs/pkgs/by-name/li/libmemcached/musl-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmemcached/musl-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libmemcached/musl-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmemcached/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmemcached/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmemcached/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmemcached/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmesode/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmesode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmesode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmesode/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch b/third_party/nixpkgs/pkgs/by-name/li/libmhash/autotools-define-conflict-debian-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libmhash/autotools-define-conflict-debian-fix.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmhash/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmhash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmhash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmhash/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmicrodns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmicrodns/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmilter/darwin.patch b/third_party/nixpkgs/pkgs/by-name/li/libmilter/darwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmilter/darwin.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libmilter/darwin.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmilter/install.patch b/third_party/nixpkgs/pkgs/by-name/li/libmilter/install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmilter/install.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libmilter/install.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmilter/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmilter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmilter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmilter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmilter/sharedlib.patch b/third_party/nixpkgs/pkgs/by-name/li/libmilter/sharedlib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmilter/sharedlib.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libmilter/sharedlib.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libminc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libminc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmkv/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmkv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmkv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmkv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmms/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmms/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmng/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmnl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmnl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmnl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmnl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodbus/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmodbus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmodbus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmodbus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmodplug/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmodplug/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodule/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmodule/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmodule/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmodule/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmodulemd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmodulemd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmowgli/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmowgli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmowgli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmowgli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmp3splt/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmp3splt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmp3splt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmp3splt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmpack/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmpack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmpack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmpack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmpcdec/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmpcdec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmpcdec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmpcdec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmpeg2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmpeg2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmspack/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmspack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmspack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmspack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libmsym/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmsym/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libmsym/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmsym/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmtp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmtp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmtp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmtp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmwaw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmwaw/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmx/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmypaint/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmypaint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmypaint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmypaint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmysofa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmysofa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnabo/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnabo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnabo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnabo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnatpmp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnatpmp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnats-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnats-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnatspec/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnatspec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnatspec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnatspec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libndctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libndctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libndctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libndp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libndp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libndtypes/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libndtypes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libndtypes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libndtypes/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnest2d/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnest2d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnest2d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnest2d/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnet/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnetfilter_acct/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnetfilter_acct/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnetfilter_conntrack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnetfilter_conntrack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnetfilter_cthelper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnetfilter_cthelper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnetfilter_cttimeout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnetfilter_cttimeout/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnetfilter_log/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnetfilter_log/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnetfilter_queue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnetfilter_queue/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnfc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnfc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnfc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnfc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnfnetlink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnfnetlink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnfnetlink/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnfs/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnftnl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnftnl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libngspice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libngspice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libngspice/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnice/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnice/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/libnids/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnids/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/libnids/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnids/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnitrokey/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnitrokey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnitrokey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnitrokey/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnixxml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnixxml/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libnl-tiny/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnl-tiny/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libnl-tiny/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnl-tiny/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnotify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnotify/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libnova/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnova/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libnova/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnova/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnsl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnsl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnsl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnsl/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libnss-mysql/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnss-mysql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libnss-mysql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnss-mysql/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnut/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libnut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnut/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libnvme/package.nix
similarity index 94%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libnvme/package.nix
index 3209539f02..2cc11d9515 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/libnvme/package.nix
@@ -18,7 +18,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libnvme";
- version = "1.10";
+ version = "1.11";
outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "linux-nvme";
repo = "libnvme";
rev = "v${finalAttrs.version}";
- hash = "sha256-guNABLpDKdWDE79gxoNq0ukAUE7CnMw5QRXA3rl3Dk4=";
+ hash = "sha256-c7+vNUTU0J1e8aWl49C7rEbFAQZ3X53PKtv7r8CcheE=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboauth/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liboauth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liboauth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liboauth/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libodb-sqlite/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libodb-sqlite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libodb-sqlite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libodb-sqlite/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libodb/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libodb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libodb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libodb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libodfgen/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libodfgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libodfgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libodfgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libofa/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libofa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libofa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libofa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libofx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libofx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libogg/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libogg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libogg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libogg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboggz/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liboggz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liboggz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liboggz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboil/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liboil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liboil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liboil/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboil/x86_64-cpuid.patch b/third_party/nixpkgs/pkgs/by-name/li/liboil/x86_64-cpuid.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liboil/x86_64-cpuid.patch
rename to third_party/nixpkgs/pkgs/by-name/li/liboil/x86_64-cpuid.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch b/third_party/nixpkgs/pkgs/by-name/li/libomxil-bellagio/fedora-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libomxil-bellagio/fedora-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/fno-common.patch b/third_party/nixpkgs/pkgs/by-name/li/libomxil-bellagio/fno-common.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/fno-common.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libomxil-bellagio/fno-common.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libomxil-bellagio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libomxil-bellagio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libopenaptx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libopenaptx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopenglrecorder/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libopenglrecorder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libopenglrecorder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libopenglrecorder/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libopenmpt-modplug/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libopenmpt-modplug/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/libopensmtpd/no-chown-while-installing.patch b/third_party/nixpkgs/pkgs/by-name/li/libopensmtpd/no-chown-while-installing.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/opensmtpd/libopensmtpd/no-chown-while-installing.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libopensmtpd/no-chown-while-installing.patch
diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libopensmtpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libopensmtpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboping/ncurses-6.3.patch b/third_party/nixpkgs/pkgs/by-name/li/liboping/ncurses-6.3.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liboping/ncurses-6.3.patch
rename to third_party/nixpkgs/pkgs/by-name/li/liboping/ncurses-6.3.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboping/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liboping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liboping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liboping/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopusenc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libopusenc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libopusenc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libopusenc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch b/third_party/nixpkgs/pkgs/by-name/li/libosinfo/osinfo-db-data-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libosinfo/osinfo-db-data-dir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libosinfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libosinfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libosip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/osip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libosip/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libosmium/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libosmium/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/libosmo-netif/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libosmo-netif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/libosmo-netif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libosmo-netif/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/libosmo-sccp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libosmo-sccp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/libosmo-sccp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libosmo-sccp/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/libosmoabis/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libosmoabis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/libosmoabis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libosmoabis/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/libosmocore/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libosmocore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/libosmocore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libosmocore/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libossp_uuid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libossp_uuid/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/shtool.patch b/third_party/nixpkgs/pkgs/by-name/li/libossp_uuid/shtool.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/shtool.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libossp_uuid/shtool.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libotr/fix-regtest-client.patch b/third_party/nixpkgs/pkgs/by-name/li/libotr/fix-regtest-client.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libotr/fix-regtest-client.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libotr/fix-regtest-client.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libotr/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libotr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libotr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libotr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libow/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libow/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libowfat/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libowfat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libowfat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libowfat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libowlevelzs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libowlevelzs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libp11/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libp11/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libp11/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libp11/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpam-wrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpam-wrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpam-wrapper/python.patch b/third_party/nixpkgs/pkgs/by-name/li/libpam-wrapper/python.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpam-wrapper/python.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libpam-wrapper/python.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpanel/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpanel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpanel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpanel/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpaper/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch b/third_party/nixpkgs/pkgs/by-name/li/libpar2/libpar2-0.4-external-verification.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libpar2/libpar2-0.4-external-verification.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpar2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpar2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpar2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpar2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpcap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpcap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/libpff/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/libpff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpff/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpfm/fix-windows.patch b/third_party/nixpkgs/pkgs/by-name/li/libpfm/fix-windows.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpfm/fix-windows.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libpfm/fix-windows.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpfm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpfm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpfm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpfm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpg_query/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpg_query/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpgf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpgf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpgf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpgf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpinyin/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpinyin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpinyin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpinyin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpipeline/fix-on-osx.patch b/third_party/nixpkgs/pkgs/by-name/li/libpipeline/fix-on-osx.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpipeline/fix-on-osx.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libpipeline/fix-on-osx.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpipeline/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpipeline/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libplacebo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libplacebo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libplctag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libplctag/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplist/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libplist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libplist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libplist/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpointmatcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpointmatcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/poly/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpoly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/poly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpoly/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libportal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libportal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch b/third_party/nixpkgs/pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpostal/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpostal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpostal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpostal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpqxx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpqxx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpseudo/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpseudo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpseudo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpseudo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpsl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpsl/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpsm2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpsm2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpst/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libpst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libpst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libpst/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libptytty/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libptytty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libptytty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libptytty/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libqalculate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libqalculate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libqb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libqb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libqmi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libqmi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libqrtr-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libqrtr-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libr3/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libr3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libr3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libr3/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraqm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libraqm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libraqm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libraqm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libraspberrypi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libraspberrypi/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libratbag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libratbag/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libraw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libraw/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraw1394/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libraw1394/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libraw1394/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libraw1394/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librclone/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librclone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librclone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librclone/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libre-baskerville/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libre-baskerville/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/libre-bodoni/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libre-bodoni/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/libre-bodoni/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libre-bodoni/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libre-caslon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libre-caslon/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libre-franklin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libre-franklin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librecast/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librecast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librecast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librecast/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/libredirect/libredirect.c b/third_party/nixpkgs/pkgs/by-name/li/libredirect/libredirect.c
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/libredirect/libredirect.c
rename to third_party/nixpkgs/pkgs/by-name/li/libredirect/libredirect.c
diff --git a/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libredirect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/libredirect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libredirect/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/libredirect/test.c b/third_party/nixpkgs/pkgs/by-name/li/libredirect/test.c
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/libredirect/test.c
rename to third_party/nixpkgs/pkgs/by-name/li/libredirect/test.c
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libredwg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libredwg/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libreelec-dvb-firmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libreelec-dvb-firmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librelp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librelp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librelp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librelp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librem/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librem/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/librenms/broken-binary-paths.diff b/third_party/nixpkgs/pkgs/by-name/li/librenms/broken-binary-paths.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/librenms/broken-binary-paths.diff
rename to third_party/nixpkgs/pkgs/by-name/li/librenms/broken-binary-paths.diff
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/librenms/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librenms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/librenms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librenms/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librespeed-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librespeed-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libreswan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libreswan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librevenge/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librevenge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librevenge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librevenge/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librime/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librist/darwin.patch b/third_party/nixpkgs/pkgs/by-name/li/librist/darwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librist/darwin.patch
rename to third_party/nixpkgs/pkgs/by-name/li/librist/darwin.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librist/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librist/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libroxml/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libroxml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libroxml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libroxml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librseq/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librseq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librseq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librseq/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsync/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librsync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librsync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librsync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librtprocess/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librtprocess/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librtprocess/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librtprocess/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librttopo/default.nix b/third_party/nixpkgs/pkgs/by-name/li/librttopo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/librttopo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/librttopo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsass/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsass/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libschrift/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libschrift/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libschrift/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libschrift/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsciter/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsciter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsciter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsciter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libscrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libscrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libscrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libscrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsearpc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsearpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsearpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsearpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libseccomp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libseccomp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsecret/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsecret/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsegfault/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsegfault/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsegfault/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsegfault/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libselinux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libselinux/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsepol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsepol/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libserdes/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libserdes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libserdes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libserdes/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libserialport/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libserialport/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libserialport/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libserialport/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libshout/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libshout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libshout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libshout/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libshumate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libshumate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsidplayfp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsidplayfp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsieve/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsieve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsieve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsieve/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsignal-protocol-c/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsignal-protocol-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsignal-protocol-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsignal-protocol-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsignon-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsignon-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsigrokdecode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsigrokdecode/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsigsegv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsigsegv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigsegv/sigbus_fix.patch b/third_party/nixpkgs/pkgs/by-name/li/libsigsegv/sigbus_fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsigsegv/sigbus_fix.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libsigsegv/sigbus_fix.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsixel/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsixel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsixel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsixel/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libskk/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libskk/package.nix
similarity index 83%
rename from third_party/nixpkgs/pkgs/development/libraries/libskk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libskk/package.nix
index 88b1991c54..219a71447e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libskk/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/libskk/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub,
+{ lib, stdenv, fetchFromGitHub, fetchpatch,
libtool, gettext, pkg-config,
vala, gnome-common, gobject-introspection,
libgee, json-glib, skkDictionaries, libxkbcommon }:
@@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
sha256 = "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5";
};
+ patches = [
+ # fix parse error in default.json
+ # https://github.com/ueno/libskk/pull/90
+ (fetchpatch {
+ url = "https://github.com/ueno/libskk/commit/2382ebedc8dca88e745d223ad7badb8b73bbb0de.diff";
+ hash = "sha256-e1bKVteNjqmr40XI82Qar63LXPWYIfnUVlo5zQSkPNw=";
+ })
+ ];
+
buildInputs = [ libxkbcommon ];
nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ];
propagatedBuildInputs = [ libgee json-glib ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libslirp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libslirp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libslirp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libslirp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsmartcols/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsmartcols/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsmbios/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsmbios/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsmf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsmf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsmi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsmi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsmi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsmi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsodium/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsodium/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsolv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsolv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspatialaudio/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libspatialaudio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libspatialaudio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libspatialaudio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libspatialite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libspatialite/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch b/third_party/nixpkgs/pkgs/by-name/li/libspatialite/xmlNanoHTTPCleanup.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libspatialite/xmlNanoHTTPCleanup.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libspecbleach/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libspecbleach/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/libspecbleach/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libspecbleach/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspectre/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libspectre/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libspectre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libspectre/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libspectrum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libspectrum/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspelling/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libspelling/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libspelling/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libspelling/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libspf2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libspf2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspiro/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libspiro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libspiro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libspiro/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libspnav/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libspnav/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspng/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libspng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libspng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libspng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsrs2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsrs2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsrs2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsrs2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libssh/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libssh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libssh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libssh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libssh2/CVE-2023-48795.patch b/third_party/nixpkgs/pkgs/by-name/li/libssh2/CVE-2023-48795.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libssh2/CVE-2023-48795.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libssh2/CVE-2023-48795.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libssh2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libssh2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libssh2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libssh2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/startup-notification/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libstartup_notification/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/startup-notification/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libstartup_notification/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libstemmer/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libstemmer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libstemmer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libstemmer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libstroke/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libstroke/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libstroke/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libstroke/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsurvive/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsurvive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsurvive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsurvive/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsvm/openmp.patch b/third_party/nixpkgs/pkgs/by-name/li/libsvm/openmp.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsvm/openmp.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libsvm/openmp.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsvm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsvm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsvm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsvm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libsystemtap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libsystemtap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtar/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtar/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtasn1/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtasn1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtasn1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtasn1/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtelnet/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtelnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtelnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtelnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtermkey/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtermkey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtermkey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtermkey/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libthai/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libthai/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libthai/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libthai/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libthreadar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libthreadar/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libticables2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libticables2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libticables2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libticables2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch b/third_party/nixpkgs/pkgs/by-name/li/libtickit/001-skip-test-18term-builder-on-macos.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libtickit/001-skip-test-18term-builder-on-macos.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtickit/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtickit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtickit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtickit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libticonv/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libticonv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libticonv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libticonv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtifiles2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtifiles2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtifiles2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtifiles2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiger/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtiger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtiger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtiger/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch b/third_party/nixpkgs/pkgs/by-name/li/libtiger/pkg-config.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libtiger/pkg-config.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtins/0001-force-cpp-14.patch b/third_party/nixpkgs/pkgs/by-name/li/libtins/0001-force-cpp-14.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtins/0001-force-cpp-14.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libtins/0001-force-cpp-14.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtins/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtirpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtirpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtomcrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtomcrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtommath/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtommath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtommath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtommath/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtpms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtpms/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtraceevent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtraceevent/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtracefs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtracefs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/libtree/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/libtree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtree/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libtsm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libtsm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libu2f-host/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libu2f-host/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libu2f-host/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libu2f-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libu2f-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libuchardet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libuchardet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libucl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libucl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libucl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libucl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libucontext/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libucontext/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libucontext/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libucontext/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libudev-zero/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libudev-zero/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libudev-zero/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libudev-zero/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libudev0-shim/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libudev0-shim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libudev0-shim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libudev0-shim/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libudfread/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libudfread/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libudfread/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libudfread/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuecc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libuecc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libuecc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libuecc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuev/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libuev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libuev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libuev/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch b/third_party/nixpkgs/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libuinputplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libuinputplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuldaq/0001-uldaq.patch b/third_party/nixpkgs/pkgs/by-name/li/libuldaq/0001-uldaq.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libuldaq/0001-uldaq.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libuldaq/0001-uldaq.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuldaq/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libuldaq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libuldaq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libuldaq/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunarr/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libunarr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libunarr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libunarr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libunibreak/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libunibreak/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libuninameslist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libuninameslist/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunity/fix-vala.patch b/third_party/nixpkgs/pkgs/by-name/li/libunity/fix-vala.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libunity/fix-vala.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libunity/fix-vala.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunity/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libunity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libunity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libunity/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libupnp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libupnp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liburcu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liburcu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liburing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liburing/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libusbgx/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libusbgx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libusbgx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libusbgx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libusbsio/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libusbsio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libusbsio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libusbsio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libutempter/exec_path.patch b/third_party/nixpkgs/pkgs/by-name/li/libutempter/exec_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libutempter/exec_path.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libutempter/exec_path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libutempter/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libutempter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libutempter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libutempter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuvc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libuvc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libuvc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libuvc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva-vdpau-driver/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libva-vdpau-driver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libva-vdpau-driver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libva-vdpau-driver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvarlink/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvarlink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvarlink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvarlink/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvdpau-va-gl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvdpau-va-gl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvdpau/installdir.patch b/third_party/nixpkgs/pkgs/by-name/li/libvdpau/installdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvdpau/installdir.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libvdpau/installdir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvdpau/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvdpau/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvdpau/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvdpau/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvdwxc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvdwxc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libversion/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libversion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libversion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libversion/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libviper/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libviper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libviper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libviper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libviperfx/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libviperfx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libviperfx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libviperfx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvirt-glib/package.nix
similarity index 87%
rename from third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvirt-glib/package.nix
index c750d2a255..472812e27d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/libvirt-glib/package.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
+, fetchpatch
, meson
, ninja
, pkg-config
@@ -28,6 +29,14 @@ stdenv.mkDerivation rec {
sha256 = "m/7DRjgkFqNXXYcpm8ZBsqRkqlGf2bEofjGKpDovO4s=";
};
+ patches = [
+ (fetchpatch {
+ name = "relax-max-stack-size-limit.patch";
+ url = "https://gitlab.com/libvirt/libvirt-glib/-/commit/062f21ccaa810087637ae24e0eb69f1a0f0a45f5.patch";
+ hash = "sha256-6mvINDd1HYS7oZsyNiyEwdNJfK5I5nPx86TRMq2RevA=";
+ })
+ ];
+
nativeBuildInputs = [
meson
ninja
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvisio/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvisio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvisio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvisio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvisio2svg/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvisio2svg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvisio2svg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvisio2svg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvisual/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvisual/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvisual/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvisual/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvmaf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvmaf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvoikko/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvoikko/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvoikko/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvoikko/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvolume_id/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvolume_id/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvorbis/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvorbis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvorbis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvorbis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvori/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvori/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvori/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvori/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvpx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvpx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvterm-neovim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvterm-neovim/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvterm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libvterm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libvterm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libvterm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libwbxml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libwbxml/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libwebcam/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libwebcam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libwebcam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libwebcam/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch b/third_party/nixpkgs/pkgs/by-name/li/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libwebp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libwebp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libwebsockets/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libwebsockets/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwhereami/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libwhereami/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libwhereami/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libwhereami/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libwhich/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libwhich/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwmf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libwmf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libwmf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libwmf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwpg/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libwpg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libwpg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libwpg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwps/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libwps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libwps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libwps/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwtk-sdl2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libwtk-sdl2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libwtk-sdl2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libwtk-sdl2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libx86/constants.patch b/third_party/nixpkgs/pkgs/by-name/li/libx86/constants.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libx86/constants.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libx86/constants.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libx86/non-x86.patch b/third_party/nixpkgs/pkgs/by-name/li/libx86/non-x86.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libx86/non-x86.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libx86/non-x86.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libx86/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libx86/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libx86/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libx86/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libx86/src-for-default.nix b/third_party/nixpkgs/pkgs/by-name/li/libx86/src-for-default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libx86/src-for-default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libx86/src-for-default.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libx86/src-info-for-default.nix b/third_party/nixpkgs/pkgs/by-name/li/libx86/src-info-for-default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libx86/src-info-for-default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libx86/src-info-for-default.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libx86emu/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libx86emu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libx86emu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libx86emu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxcomp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxcomp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxcomp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxcomp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxdg_basedir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxdg_basedir/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch b/third_party/nixpkgs/pkgs/by-name/li/libxisf/0001-Fix-pkg-config-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libxisf/0001-Fix-pkg-config-paths.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxisf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxisf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/disable-x11com.patch b/third_party/nixpkgs/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/disable-x11com.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxkbcommon_8/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxkbcommon_8/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch b/third_party/nixpkgs/pkgs/by-name/li/libxklavier/honor-XKB_CONFIG_ROOT.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libxklavier/honor-XKB_CONFIG_ROOT.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxklavier/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxklavier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxklavier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxklavier/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxls/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxlsxwriter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxlsxwriter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmi/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxmi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxmi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxmi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/li/libxmlb/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libxmlb/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxmlb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxmlb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxmp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxmp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxmp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxnd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxnd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxnd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxnd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libxsmm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libxsmm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxsmm/rpath.patch b/third_party/nixpkgs/pkgs/by-name/li/libxsmm/rpath.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libxsmm/rpath.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libxsmm/rpath.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/libyafaray/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libyafaray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/libyafaray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libyafaray/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyaml/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libyaml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libyaml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libyaml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libykclient/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libykclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libykclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libykclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libykneomgr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libykneomgr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libykneomgr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libytnef/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libytnef/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libytnef/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libytnef/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyubikey/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libyubikey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libyubikey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libyubikey/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch b/third_party/nixpkgs/pkgs/by-name/li/libyuv/link-library-against-libjpeg.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libyuv/link-library-against-libjpeg.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyuv/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libyuv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libyuv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libyuv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyuv/yuv.pc b/third_party/nixpkgs/pkgs/by-name/li/libyuv/yuv.pc
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libyuv/yuv.pc
rename to third_party/nixpkgs/pkgs/by-name/li/libyuv/yuv.pc
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzapojit/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libzapojit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libzapojit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libzapojit/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libzbc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libzbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libzbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libzbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libzbd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libzbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/libzbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libzbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzdb/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libzdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libzdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libzdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzen/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libzen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libzen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libzen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libzim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libzim/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libzip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libzip/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzmf/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libzmf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libzmf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libzmf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzra/fix-pkg-config.patch b/third_party/nixpkgs/pkgs/by-name/li/libzra/fix-pkg-config.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libzra/fix-pkg-config.patch
rename to third_party/nixpkgs/pkgs/by-name/li/libzra/fix-pkg-config.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzra/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libzra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libzra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/libzra/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/license-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/li/license-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/license-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/license-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/license-scanner/default.nix b/third_party/nixpkgs/pkgs/by-name/li/license-scanner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/license-scanner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/license-scanner/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/licenseclassifier/default.nix b/third_party/nixpkgs/pkgs/by-name/li/licenseclassifier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/licenseclassifier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/licenseclassifier/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/licensor/default.nix b/third_party/nixpkgs/pkgs/by-name/li/licensor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/licensor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/licensor/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/LiE/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/LiE/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lie/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lieer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lieer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lifecycled/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lifecycled/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lifecycled/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lifecycled/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lifelines/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lifelines/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/lifelines/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lifelines/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lifeograph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lifeograph/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liferea/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liferea/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightdm-mini-greeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightdm-mini-greeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mobile-greeter/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/li/lightdm-mobile-greeter/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mobile-greeter/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/li/lightdm-mobile-greeter/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightdm-mobile-greeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightdm-mobile-greeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightdm-slick-greeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightdm-slick-greeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightdm-tiny-greeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightdm-tiny-greeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightgbm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightgbm/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightlocker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightlocker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightning-loop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightning-loop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-pool/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightning-pool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/lightning-pool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightning-pool/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/lightspark/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightspark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/lightspark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightspark/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lighttpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lighttpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lightum/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/lightum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightum/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightwalletd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightwalletd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lightworks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lightworks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/li/ligolo-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/ligolo-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/lil-pwny/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lil-pwny/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/lil-pwny/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lil-pwny/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lilo/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lilo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lilo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lilo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lilv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lilv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lime/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/limesctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/limesctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix b/third_party/nixpkgs/pkgs/by-name/li/limesurvey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/limesurvey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/limesurvey/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/limitcpu/default.nix b/third_party/nixpkgs/pkgs/by-name/li/limitcpu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/limitcpu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/limitcpu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/linden-hill/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linden-hill/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/linden-hill/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linden-hill/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/line-awesome/default.nix b/third_party/nixpkgs/pkgs/by-name/li/line-awesome/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/line-awesome/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/line-awesome/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/linearicons-free/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linearicons-free/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/linearicons-free/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linearicons-free/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linenoise-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linenoise-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/linenoise/linenoise.pc.in b/third_party/nixpkgs/pkgs/by-name/li/linenoise/linenoise.pc.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/linenoise/linenoise.pc.in
rename to third_party/nixpkgs/pkgs/by-name/li/linenoise/linenoise.pc.in
diff --git a/third_party/nixpkgs/pkgs/development/libraries/linenoise/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linenoise/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/linenoise/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linenoise/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lineselect/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lineselect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lineselect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lineselect/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lingeling/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lingeling/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lingot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lingot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/lingua-franca/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lingua-franca/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/lingua-franca/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lingua-franca/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/linja-pi-pu-lukin/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linja-pi-pu-lukin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/linja-pi-pu-lukin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linja-pi-pu-lukin/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/linja-sike/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linja-sike/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/linja-sike/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linja-sike/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/link-grammar/default.nix b/third_party/nixpkgs/pkgs/by-name/li/link-grammar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/link-grammar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/link-grammar/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linkchecker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linkchecker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix b/third_party/nixpkgs/pkgs/by-name/li/links2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/links2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/linux-exploit-suggester/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linux-exploit-suggester/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/linux-exploit-suggester/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linux-exploit-suggester/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/documentation/linux-manual/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linux-manual/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/linux-manual/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linux-manual/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linux-pam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linux-pam/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/third_party/nixpkgs/pkgs/by-name/li/linux-pam/suid-wrapper-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam/suid-wrapper-path.patch
rename to third_party/nixpkgs/pkgs/by-name/li/linux-pam/suid-wrapper-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/linux-router/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linux-router/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/linux-router/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linux-router/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/consoletools/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linuxConsoleTools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/consoletools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linuxConsoleTools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/linux-logo/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linux_logo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/linux-logo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linux_logo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/linuxdoc-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linuxdoc-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sgml/linuxdoc-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linuxdoc-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linuxptp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linuxptp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/linuxquota/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linuxquota/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/linuxquota/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linuxquota/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linuxsampler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linuxsampler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/linuxwave/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linuxwave/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/linuxwave/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linuxwave/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/linx-server/default.nix b/third_party/nixpkgs/pkgs/by-name/li/linx-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/linx-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/linx-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/linx-server/test.patch b/third_party/nixpkgs/pkgs/by-name/li/linx-server/test.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/linx-server/test.patch
rename to third_party/nixpkgs/pkgs/by-name/li/linx-server/test.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lipl/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/li/lipl/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lipl/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/li/lipl/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lipl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lipl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lipl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lipl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liquibase/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liquibase/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/java-modules/liquibase_redshift_extension/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liquibase_redshift_extension/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/java-modules/liquibase_redshift_extension/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liquibase_redshift_extension/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liquidfun/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liquidfun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/liquidfun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liquidfun/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/liquidprompt/default.nix b/third_party/nixpkgs/pkgs/by-name/li/liquidprompt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/liquidprompt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/liquidprompt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lirc/linux-headers-5.18.patch b/third_party/nixpkgs/pkgs/by-name/li/lirc/linux-headers-5.18.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lirc/linux-headers-5.18.patch
rename to third_party/nixpkgs/pkgs/by-name/li/lirc/linux-headers-5.18.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lirc/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lirc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lirc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lirc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lisgd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lisgd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/listadmin/default.nix b/third_party/nixpkgs/pkgs/by-name/li/listadmin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/listadmin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/listadmin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/lite/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/lite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/litebrowser/default.nix b/third_party/nixpkgs/pkgs/by-name/li/litebrowser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/litebrowser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/litebrowser/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix b/third_party/nixpkgs/pkgs/by-name/li/litecli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/litecli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/litefs/default.nix b/third_party/nixpkgs/pkgs/by-name/li/litefs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/litefs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/litefs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/litehtml/default.nix b/third_party/nixpkgs/pkgs/by-name/li/litehtml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/litehtml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/litehtml/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/litemdview/default.nix b/third_party/nixpkgs/pkgs/by-name/li/litemdview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/litemdview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/litemdview/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/litestream/default.nix b/third_party/nixpkgs/pkgs/by-name/li/litestream/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/litestream/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/litestream/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix b/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix
index c218628eb1..932569f8d6 100644
--- a/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "live-server";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "lomirus";
repo = "live-server";
rev = "v${version}";
- hash = "sha256-VsM77cEAjX12qCHS9fvImloY05b+swg7mabPd655C+s=";
+ hash = "sha256-0XZ7ABR2xSVbixXbjdKiUTcQ7TqAZGyVpWqzMx5kR2g=";
};
- cargoHash = "sha256-a4yDHZm9LBNuwOrxra4da7u/2RNXry4UYPVDGu9eGxo=";
+ cargoHash = "sha256-lMRj+8D5jigCNXld4QfXy3QpRQo4ecCByqoDGC8no1w=";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/livedl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/livedl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/livedl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/livedl/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix b/third_party/nixpkgs/pkgs/by-name/li/livepeer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/livepeer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/livepeer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix b/third_party/nixpkgs/pkgs/by-name/li/lizardfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/li/lizardfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/lklug-sinhala/default.nix b/third_party/nixpkgs/pkgs/by-name/lk/lklug-sinhala/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/lklug-sinhala/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lk/lklug-sinhala/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix b/third_party/nixpkgs/pkgs/by-name/lk/lkproof/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lk/lkproof/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/lk/lksctp-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lk/lksctp-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ldap/lldap/0001-parameterize-frontend-location.patch b/third_party/nixpkgs/pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ldap/lldap/0001-parameterize-frontend-location.patch
rename to third_party/nixpkgs/pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch
diff --git a/third_party/nixpkgs/pkgs/servers/ldap/lldap/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ll/lldap/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ldap/lldap/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ll/lldap/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/servers/ldap/lldap/default.nix b/third_party/nixpkgs/pkgs/by-name/ll/lldap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ldap/lldap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ll/lldap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/llhttp/default.nix b/third_party/nixpkgs/pkgs/by-name/ll/llhttp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/llhttp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ll/llhttp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix b/third_party/nixpkgs/pkgs/by-name/ll/llpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ll/llpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/lls/default.nix b/third_party/nixpkgs/pkgs/by-name/ll/lls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/lls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ll/lls/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix b/third_party/nixpkgs/pkgs/by-name/lm/lm_sensors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lm/lm_sensors/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lmdb/bin-ext.patch b/third_party/nixpkgs/pkgs/by-name/lm/lmdb/bin-ext.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lmdb/bin-ext.patch
rename to third_party/nixpkgs/pkgs/by-name/lm/lmdb/bin-ext.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/third_party/nixpkgs/pkgs/by-name/lm/lmdb/hardcoded-compiler.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lmdb/hardcoded-compiler.patch
rename to third_party/nixpkgs/pkgs/by-name/lm/lmdb/hardcoded-compiler.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lm/lmdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmdbxx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lm/lmdbxx/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/lmmath/default.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmmath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/lmmath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lm/lmmath/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/lmodern/default.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmodern/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/lmodern/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lm/lmodern/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/lmp/default.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/lmp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lm/lmp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix b/third_party/nixpkgs/pkgs/by-name/ln/lnav/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ln/lnav/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix b/third_party/nixpkgs/pkgs/by-name/ln/lnch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ln/lnch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix b/third_party/nixpkgs/pkgs/by-name/ln/lnd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ln/lnd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndconnect/default.nix b/third_party/nixpkgs/pkgs/by-name/ln/lndconnect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/lndconnect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ln/lndconnect/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix b/third_party/nixpkgs/pkgs/by-name/ln/lndhub-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ln/lndhub-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndinit/default.nix b/third_party/nixpkgs/pkgs/by-name/ln/lndinit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/lndinit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ln/lndinit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix b/third_party/nixpkgs/pkgs/by-name/ln/lndmanage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ln/lndmanage/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/loadlibrary/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/loadlibrary/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/loadwatch/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/loadwatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/loadwatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/loadwatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/misc/loc/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/loc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/misc/loc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/loc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/localproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/localproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/localtime/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/localtime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/localtime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/localtime/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/locate-dominating-file/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/locate-dominating-file/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/locate-dominating-file/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/locate-dominating-file/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/loccount/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/loccount/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/loccount/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/loccount/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/lockdep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/lockdep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/lockfileProgs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/lockfileProgs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/log4cplus/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/log4cplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/log4cplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/log4cplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/log4cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/log4cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/log4cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/log4cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/log4cxx/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/log4cxx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/log4cxx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/log4cxx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/log4j-detect/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/log4j-detect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/log4j-detect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/log4j-detect/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/log4j-scan/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/log4j-scan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/log4j-scan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/log4j-scan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/log4j-sniffer/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/log4j-sniffer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/log4j-sniffer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/log4j-sniffer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/log4j-vuln-scanner/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/log4j-vuln-scanner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/log4jcheck/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/log4jcheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/log4jcheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/log4jcheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/log4shell-detector/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/log4shell-detector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/log4shell-detector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/log4shell-detector/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/log4shib/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/log4shib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/log4shib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/log4shib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/logcheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/logcheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/logisim-evolution/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/logisim-evolution/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/logisim-evolution/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/logisim-evolution/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/logisim/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/logisim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/logisim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/logisim/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/logkeys/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/logkeys/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/logkeys/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/logkeys/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/logmap/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/logmap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/logmap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/logmap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/logmein-hamachi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/logmein-hamachi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/logrotate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/logrotate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/logstalgia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/logstalgia/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/logtop/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/logtop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/logtop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/logtop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/lokalise2-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/lokalise2-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/loki/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/loki/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/loki/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/loki/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/lokinet/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/lokinet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/lokinet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/lokinet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/lombok/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/lombok/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/long-shebang/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/long-shebang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/long-shebang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/long-shebang/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/longview/log-stdout.patch b/third_party/nixpkgs/pkgs/by-name/lo/longview/log-stdout.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/longview/log-stdout.patch
rename to third_party/nixpkgs/pkgs/by-name/lo/longview/log-stdout.patch
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/longview/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/longview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/longview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/longview/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/looking-glass-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/looking-glass-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/loop/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/loop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/loop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/loop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lorien/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/lorien/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/lorien/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/lorien/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/losslessaudiochecker/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/losslessaudiochecker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/losslessaudiochecker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/losslessaudiochecker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/third_party/nixpkgs/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix b/third_party/nixpkgs/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-windows.nix b/third_party/nixpkgs/pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-windows.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/losslesscut-bin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/losslesscut-bin/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lottieconverter/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/lottieconverter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lottieconverter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/lottieconverter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/loudmouth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/loudmouth/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/lounge/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/lounge-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/lounge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/lounge-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lout/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/lout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/lout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/lout/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/lowdown/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/lowdown/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/loxodo/default.nix b/third_party/nixpkgs/pkgs/by-name/lo/loxodo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/loxodo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lo/loxodo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/loxodo/wxpython.patch b/third_party/nixpkgs/pkgs/by-name/lo/loxodo/wxpython.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/loxodo/wxpython.patch
rename to third_party/nixpkgs/pkgs/by-name/lo/loxodo/wxpython.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lpcnetfreedv/default.nix b/third_party/nixpkgs/pkgs/by-name/lp/lpcnetfreedv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lpcnetfreedv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lp/lpcnetfreedv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/lr/default.nix b/third_party/nixpkgs/pkgs/by-name/lr/lr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/lr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lr/lr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix b/third_party/nixpkgs/pkgs/by-name/lr/lrcalc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lr/lrcalc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lrdf/default.nix b/third_party/nixpkgs/pkgs/by-name/lr/lrdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lrdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lr/lrdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix b/third_party/nixpkgs/pkgs/by-name/lr/lrs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lr/lrs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix b/third_party/nixpkgs/pkgs/by-name/lr/lrzip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lr/lrzip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lrzsz/default.nix b/third_party/nixpkgs/pkgs/by-name/lr/lrzsz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lrzsz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lr/lrzsz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ls-lint/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/ls-lint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ls-lint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/ls-lint/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsb-release/lsb_release.sh b/third_party/nixpkgs/pkgs/by-name/ls/lsb-release/lsb_release.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/lsb-release/lsb_release.sh
rename to third_party/nixpkgs/pkgs/by-name/ls/lsb-release/lsb_release.sh
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsb-release/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/lsb-release/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/lsb-release/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/lsb-release/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/lscolors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/lscolors/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/lsdvd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/lsdvd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsirec/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/lsirec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/lsirec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/lsirec/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/lsiutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/lsiutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/lsix/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/lsix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/lsix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/lsix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/lsof/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/lsof/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/lsscsi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/lsscsi/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/lssecret/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/lssecret/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/lssecret/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/lssecret/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lswt/default.nix b/third_party/nixpkgs/pkgs/by-name/ls/lswt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/lswt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ls/lswt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/lt/ltc-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lt/ltc-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/ltex-ls/default.nix b/third_party/nixpkgs/pkgs/by-name/lt/ltex-ls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/ltex-ls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lt/ltex-ls/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix b/third_party/nixpkgs/pkgs/by-name/lt/ltl2ba/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lt/ltl2ba/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix b/third_party/nixpkgs/pkgs/by-name/lt/ltrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lt/ltrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/sysdeps-x86.patch b/third_party/nixpkgs/pkgs/by-name/lt/ltrace/sysdeps-x86.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/ltrace/sysdeps-x86.patch
rename to third_party/nixpkgs/pkgs/by-name/lt/ltrace/sysdeps-x86.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch b/third_party/nixpkgs/pkgs/by-name/lt/ltrace/testsuite-newfstatat.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch
rename to third_party/nixpkgs/pkgs/by-name/lt/ltrace/testsuite-newfstatat.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/lt/lttng-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lt/lttng-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lttoolbox/default.nix b/third_party/nixpkgs/pkgs/by-name/lt/lttoolbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/lttoolbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lt/lttoolbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lttv/default.nix b/third_party/nixpkgs/pkgs/by-name/lt/lttv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/lttv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lt/lttv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ltunify/default.nix b/third_party/nixpkgs/pkgs/by-name/lt/ltunify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ltunify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lt/ltunify/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix b/third_party/nixpkgs/pkgs/by-name/lt/ltwheelconf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lt/ltwheelconf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/luabridge/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/luabridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/luabridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/luabridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/updater.py
index 91194879b8..2471e46f5f 100755
--- a/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/updater.py
+++ b/third_party/nixpkgs/pkgs/by-name/lu/luarocks-packages-updater/updater.py
@@ -1,26 +1,26 @@
#!/usr/bin/env python
# format:
-# $ nix run nixpkgs#python3Packages.black -- update.py
+# $ nix run nixpkgs#python3Packages.ruff -- update.py
# type-check:
# $ nix run nixpkgs#python3Packages.mypy -- update.py
# linted:
# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py
-import inspect
-import os
-import tempfile
-import shutil
-from dataclasses import dataclass
-import subprocess
import csv
+import inspect
import logging
+import os
+import shutil
+import subprocess
+import tempfile
import textwrap
+from dataclasses import dataclass
from multiprocessing.dummy import Pool
-import pluginupdate
-from pluginupdate import update_plugins, FetchConfig
-
-from typing import List, Tuple, Optional
from pathlib import Path
+from typing import List, Optional, Tuple
+
+import pluginupdate
+from pluginupdate import FetchConfig, update_plugins
log = logging.getLogger()
log.addHandler(logging.StreamHandler())
@@ -35,9 +35,7 @@ HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
Regenerate it with: nix run nixpkgs#luarocks-packages-updater
You can customize the generated packages in pkgs/development/lua-modules/overrides.nix
*/
-""".format(
- GENERATED_NIXFILE=GENERATED_NIXFILE
-)
+""".format(GENERATED_NIXFILE=GENERATED_NIXFILE)
FOOTER = """
}
@@ -71,7 +69,6 @@ class LuaPlugin:
# rename Editor to LangUpdate/ EcosystemUpdater
class LuaEditor(pluginupdate.Editor):
-
def create_parser(self):
parser = super().create_parser()
parser.set_defaults(proc=1)
@@ -173,10 +170,7 @@ def generate_pkg_nix(plug: LuaPlugin):
if plug.rockspec != "":
if plug.ref or plug.version:
- msg = (
- "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s"
- % plug.name
- )
+ msg = "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s" % plug.name
log.warning(msg)
log.debug("Updating from rockspec %s", plug.rockspec)
@@ -193,7 +187,7 @@ def generate_pkg_nix(plug: LuaPlugin):
if plug.luaversion:
cmd.append(f"--lua-version={plug.luaversion}")
- luaver = plug.luaversion.replace('.', '')
+ luaver = plug.luaversion.replace(".", "")
if luaver := os.getenv(f"LUA_{luaver}"):
cmd.append(f"--lua-dir={luaver}")
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/luau/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/luau/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/lucene/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lucene/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/lucene/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lucene/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lucene++/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lucenepp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lucene++/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lucenepp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lucky-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lucky-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock b/third_party/nixpkgs/pkgs/by-name/lu/lucky-cli/shard.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock
rename to third_party/nixpkgs/pkgs/by-name/lu/lucky-cli/shard.lock
diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix b/third_party/nixpkgs/pkgs/by-name/lu/lucky-cli/shards.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lucky-cli/shards.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/luculent/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/luculent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/luculent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/luculent/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/ludusavi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/ludusavi/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/lugaru/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lugaru/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/lugaru/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lugaru/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/luigi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/luigi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff b/third_party/nixpkgs/pkgs/by-name/lu/lukesmithxyz-st/0000-makefile-fix-install.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff
rename to third_party/nixpkgs/pkgs/by-name/lu/lukesmithxyz-st/0000-makefile-fix-install.diff
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lukesmithxyz-st/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lukesmithxyz-st/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/lunarml/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lunarml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/lunarml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lunarml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lunatic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lunatic/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lune/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lune/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/luppp/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/luppp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/luppp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/luppp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lurk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/lurk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lurk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/lux/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/lux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lu/lux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/lv/default.nix b/third_party/nixpkgs/pkgs/by-name/lv/lv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/lv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lv/lv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lv2-cpp-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/lv/lv2-cpp-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/lv2-cpp-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lv/lv2-cpp-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/lv/lv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lv/lv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lv2bm/default.nix b/third_party/nixpkgs/pkgs/by-name/lv/lv2bm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/lv2bm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lv/lv2bm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile b/third_party/nixpkgs/pkgs/by-name/lv/lvmsync/Gemfile
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile
rename to third_party/nixpkgs/pkgs/by-name/lv/lvmsync/Gemfile
diff --git a/third_party/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile.lock b/third_party/nixpkgs/pkgs/by-name/lv/lvmsync/Gemfile.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile.lock
rename to third_party/nixpkgs/pkgs/by-name/lv/lvmsync/Gemfile.lock
diff --git a/third_party/nixpkgs/pkgs/tools/backup/lvmsync/gemset.nix b/third_party/nixpkgs/pkgs/by-name/lv/lvmsync/gemset.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/lvmsync/gemset.nix
rename to third_party/nixpkgs/pkgs/by-name/lv/lvmsync/gemset.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/lvmsync/default.nix b/third_party/nixpkgs/pkgs/by-name/lv/lvmsync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/lvmsync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lv/lvmsync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix b/third_party/nixpkgs/pkgs/by-name/lv/lvtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lv/lvtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/lwan/default.nix b/third_party/nixpkgs/pkgs/by-name/lw/lwan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/lwan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lw/lwan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lwc/default.nix b/third_party/nixpkgs/pkgs/by-name/lw/lwc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/lwc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lw/lwc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/lxd-image-server/default.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxd-image-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/lxd-image-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lx/lxd-image-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/lxd-image-server/run.patch b/third_party/nixpkgs/pkgs/by-name/lx/lxd-image-server/run.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/lxd-image-server/run.patch
rename to third_party/nixpkgs/pkgs/by-name/lx/lxd-image-server/run.patch
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/lxd-image-server/state.patch b/third_party/nixpkgs/pkgs/by-name/lx/lxd-image-server/state.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/lxd-image-server/state.patch
rename to third_party/nixpkgs/pkgs/by-name/lx/lxd-image-server/state.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/lxdvdrip/default.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxdvdrip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/lxdvdrip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lx/lxdvdrip/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxterminal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lx/lxterminal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch b/third_party/nixpkgs/pkgs/by-name/lx/lxterminal/respect-xml-catalog-files-var.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch
rename to third_party/nixpkgs/pkgs/by-name/lx/lxterminal/respect-xml-catalog-files-var.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/lynis/default.nix b/third_party/nixpkgs/pkgs/by-name/ly/lynis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/lynis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ly/lynis/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix b/third_party/nixpkgs/pkgs/by-name/ly/lynx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ly/lynx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix b/third_party/nixpkgs/pkgs/by-name/ly/lyra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ly/lyra/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix b/third_party/nixpkgs/pkgs/by-name/ly/lyrebird/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ly/lyrebird/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lz4/default.nix b/third_party/nixpkgs/pkgs/by-name/lz/lz4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lz4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lz/lz4/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzbench/default.nix b/third_party/nixpkgs/pkgs/by-name/lz/lzbench/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lzbench/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lz/lzbench/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzfse/default.nix b/third_party/nixpkgs/pkgs/by-name/lz/lzfse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lzfse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lz/lzfse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzham/default.nix b/third_party/nixpkgs/pkgs/by-name/lz/lzham/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lzham/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lz/lzham/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzip/lzip-setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/lz/lzip/lzip-setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lzip/lzip-setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/lz/lzip/lzip-setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzip/mingw-install-exe-file.patch b/third_party/nixpkgs/pkgs/by-name/lz/lzip/mingw-install-exe-file.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lzip/mingw-install-exe-file.patch
rename to third_party/nixpkgs/pkgs/by-name/lz/lzip/mingw-install-exe-file.patch
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzip/default.nix b/third_party/nixpkgs/pkgs/by-name/lz/lzip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lzip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lz/lzip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lziprecover/default.nix b/third_party/nixpkgs/pkgs/by-name/lz/lziprecover/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lziprecover/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lz/lziprecover/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lzo/default.nix b/third_party/nixpkgs/pkgs/by-name/lz/lzo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/lzo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lz/lzo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzop/default.nix b/third_party/nixpkgs/pkgs/by-name/lz/lzop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/lzop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/lz/lzop/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/m-/m-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/m-/m-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/m17-cxx-demod/default.nix b/third_party/nixpkgs/pkgs/by-name/m1/m17-cxx-demod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/m17-cxx-demod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/m1/m17-cxx-demod/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix b/third_party/nixpkgs/pkgs/by-name/m1/m17n_db/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix
rename to third_party/nixpkgs/pkgs/by-name/m1/m17n_db/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix b/third_party/nixpkgs/pkgs/by-name/m3/m33-linux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/m3/m33-linux/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/m4acut/default.nix b/third_party/nixpkgs/pkgs/by-name/m4/m4acut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/m4acut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/m4/m4acut/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix b/third_party/nixpkgs/pkgs/by-name/m4/m4ri/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix
rename to third_party/nixpkgs/pkgs/by-name/m4/m4ri/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix b/third_party/nixpkgs/pkgs/by-name/m4/m4rie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/m4/m4rie/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/mac-fdisk/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mac-fdisk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/mac-fdisk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mac-fdisk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mac/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mac/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/macchanger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/macchanger/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/macchina/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/macchina/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/macdylibbundler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/macdylibbundler/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mackerel-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mackerel-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/macs2/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/macs2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/macs2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/macs2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/macse/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/macse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/macse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/macse/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/maddy/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maddy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/maddy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maddy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/madonctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/madonctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/maelstrom/c++17-fixes.diff b/third_party/nixpkgs/pkgs/by-name/ma/maelstrom/c++17-fixes.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/maelstrom/c++17-fixes.diff
rename to third_party/nixpkgs/pkgs/by-name/ma/maelstrom/c++17-fixes.diff
diff --git a/third_party/nixpkgs/pkgs/games/maelstrom/fix-compilation.patch b/third_party/nixpkgs/pkgs/by-name/ma/maelstrom/fix-compilation.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/maelstrom/fix-compilation.patch
rename to third_party/nixpkgs/pkgs/by-name/ma/maelstrom/fix-compilation.patch
diff --git a/third_party/nixpkgs/pkgs/games/maelstrom/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maelstrom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/maelstrom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maelstrom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/maeparser/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maeparser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/maeparser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maeparser/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mafft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mafft/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mage/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/magic-enum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/magic-enum/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/magnetico/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/magnetico/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/maiko/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maiko/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/maiko/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maiko/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/mailcap/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mailcap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/mailcap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mailcap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch b/third_party/nixpkgs/pkgs/by-name/ma/mailcheck/mailcheck-Makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/ma/mailcheck/mailcheck-Makefile.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mailcheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mailcheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch b/third_party/nixpkgs/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch
rename to third_party/nixpkgs/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/maildrop/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maildrop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/maildrop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maildrop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mailsend/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mailsend/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mailsend/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mailsend/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/darwin.nix b/third_party/nixpkgs/pkgs/by-name/ma/mailspring/darwin.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/darwin.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mailspring/darwin.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/linux.nix b/third_party/nixpkgs/pkgs/by-name/ma/mailspring/linux.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/linux.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mailspring/linux.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mailspring/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mailspring/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/maim/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/maim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maim/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mainsail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mainsail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mairix/mmap.patch b/third_party/nixpkgs/pkgs/by-name/ma/mairix/mmap.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mairix/mmap.patch
rename to third_party/nixpkgs/pkgs/by-name/ma/mairix/mmap.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/mairix/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mairix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mairix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mairix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/maizzle/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maizzle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/maizzle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maizzle/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh b/third_party/nixpkgs/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh
rename to third_party/nixpkgs/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/makeBinaryWrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/makeBinaryWrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/makebootfat/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/makebootfat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/makebootfat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/makebootfat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/makefile2graph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/makefile2graph/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/maker-panel/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maker-panel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/maker-panel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maker-panel/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch b/third_party/nixpkgs/pkgs/by-name/ma/maker-panel/update-gerber-types-to-0.3.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch
rename to third_party/nixpkgs/pkgs/by-name/ma/maker-panel/update-gerber-types-to-0.3.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/makerpm/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/makerpm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/makerpm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/makerpm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/makeself/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/makeself/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/makeself/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/makeself/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/malt/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/malt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/profiling/malt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/malt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mamba/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mamba/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/man-db/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/man-db/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch b/third_party/nixpkgs/pkgs/by-name/ma/man-db/systemwide-man-db-conf.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch
rename to third_party/nixpkgs/pkgs/by-name/ma/man-db/systemwide-man-db-conf.patch
diff --git a/third_party/nixpkgs/pkgs/data/documentation/man-pages-posix/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/man-pages-posix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/man-pages-posix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/man-pages-posix/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/man-pages/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/man-pages/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mandoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mandoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mandown/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mandown/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mandown/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mandown/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/manga-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/manga-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/manga-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/manga-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mani/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mani/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mani/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mani/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/manifest-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/manifest-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/manifest-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/manifest-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/manrope/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/manrope/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/manrope/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/manrope/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/manta/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/manta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/manta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/manta/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/manticore/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/manticore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/manticore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/manticore/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mantra/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mantra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mantra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mantra/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/map/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/map-cmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/map/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/map-cmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mapcidr/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mapcidr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mapcidr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mapcidr/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/mar1d/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mar1d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/mar1d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mar1d/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/marathi-cursive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/marathi-cursive/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/marathonctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/marathonctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/marble-marcher-ce/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/marble-marcher-ce/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/marble-marcher-ce/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/marble-marcher-ce/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/mari0/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mari0/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/mari0/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mari0/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/marisa/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/marisa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/marisa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/marisa/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mark/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/markdown-anki-decks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/markdown-anki-decks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/markdownlint-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/markdownlint-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/markdownlint-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/markdownlint-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/markdownlint-cli2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/markdownlint-cli2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/marker/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/marker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/marker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/marker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/markets/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/markets/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/markets/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/markscribe/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/markscribe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/markscribe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/markscribe/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/marktext/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/marktext/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/marl/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/marl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/marl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/marl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/marlin-calc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/marlin-calc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/marp/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/marp-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/marp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/marp-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mars-mips/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mars-mips/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mars-mips/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mars-mips/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/mars/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mars/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/mars/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mars/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/martian-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/martian-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/martian-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/martian-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ma/marwaita-red/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/marwaita-red/package.nix
index 685d0df7d8..262ed50161 100644
--- a/third_party/nixpkgs/pkgs/by-name/ma/marwaita-red/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ma/marwaita-red/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "marwaita-red";
- version = "22";
+ version = "22.2";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
- hash = "sha256-oUJ74MNAFbbM123v7i+b29UEFFumswPI3DmqeeahMd4=";
+ hash = "sha256-MxGjJLPjvLc1kPDc9ib6hIxgbMrF8Cm+HCm2CGSrf+s=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/mas/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/mas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mas/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mask/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mask/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mask/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mask/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/masscan/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/masscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/masscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/masscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/massren/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/massren/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/massren/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/mastodon-archive/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mastodon-archive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/mastodon-archive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mastodon-archive/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mastotool/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mastotool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mastotool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mastotool/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/matcha-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/matcha/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/matcha-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/matcha-rss-digest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/matcha-rss-digest/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/matchbox/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/matchbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/matchbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/matchbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/materia-kde/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/materia-kde-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/materia-kde/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/materia-kde-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/materia-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/materia-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/materia-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/materia-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/material-design-icons/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/material-design-icons/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/material-icons/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/material-icons/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/material-icons/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/material-icons/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/material-symbols/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/material-symbols/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/material-symbols/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/material-symbols/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/math-review/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/math-preview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/math-review/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/math-preview/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mathgl/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mathgl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mathgl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mathgl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mathpix-snipping-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mathpix-snipping-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mathpix-snipping-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mathpix-snipping-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/matio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/matio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/matio/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/matrix-alertmanager/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-alertmanager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/matrix-alertmanager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/matrix-alertmanager/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-appservice-irc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/matrix-appservice-irc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-conduit/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ma/matrix-conduit/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/matrix-conduit/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ma/matrix-conduit/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-conduit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/matrix-conduit/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-corporal/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-corporal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/matrix-corporal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/matrix-corporal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-dl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/matrix-dl/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/third_party/nixpkgs/pkgs/by-name/ma/matrix-hookshot/package.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
rename to third_party/nixpkgs/pkgs/by-name/ma/matrix-hookshot/package.json
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-hookshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/matrix-hookshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/third_party/nixpkgs/pkgs/by-name/ma/matrix-hookshot/pin.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
rename to third_party/nixpkgs/pkgs/by-name/ma/matrix-hookshot/pin.json
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh b/third_party/nixpkgs/pkgs/by-name/ma/matrix-hookshot/update.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh
rename to third_party/nixpkgs/pkgs/by-name/ma/matrix-hookshot/update.sh
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mattermost-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mattermost-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/maude/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maude/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/maude/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maude/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mautrix-discord/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mautrix-discord/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mautrix-facebook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mautrix-facebook/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mautrix-googlechat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mautrix-googlechat/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mautrix-whatsapp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/mautrix-whatsapp/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix
index d48e0448ea..f7d88548f3 100644
--- a/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix
@@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
license = lib.licenses.asl20;
mainProgram = "mvn";
- maintainers = [ ];
+ maintainers = [ ] ++ lib.teams.java.members;
inherit (jdk_headless.meta) platforms;
};
})
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/maxcso/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maxcso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/maxcso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maxcso/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/maxflow/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maxflow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/maxflow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maxflow/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/maxlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pd-plugins/maxlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ma/maxlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mb2md/default.nix b/third_party/nixpkgs/pkgs/by-name/mb/mb2md/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mb2md/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mb/mb2md/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mbed-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/mb/mbed-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mbed-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mb/mbed-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix b/third_party/nixpkgs/pkgs/by-name/mb/mbelib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mb/mbelib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mbidled/default.nix b/third_party/nixpkgs/pkgs/by-name/mb/mbidled/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mbidled/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mb/mbidled/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix b/third_party/nixpkgs/pkgs/by-name/mb/mblaze/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mb/mblaze/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mblock-mlink/default.nix b/third_party/nixpkgs/pkgs/by-name/mb/mblock-mlink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mblock-mlink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mb/mblock-mlink/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix b/third_party/nixpkgs/pkgs/by-name/mb/mbpfan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mb/mbpfan/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcabber/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mc/mcabber/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mceinject/default.nix b/third_party/nixpkgs/pkgs/by-name/mc/mceinject/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/mceinject/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mc/mceinject/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/mchprs/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/mc/mchprs/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/mchprs/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/mc/mchprs/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/games/mchprs/default.nix b/third_party/nixpkgs/pkgs/by-name/mc/mchprs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/mchprs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mc/mchprs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mcrcon/default.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcrcon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mcrcon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mc/mcrcon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcrl2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mc/mcrl2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/mcron/default.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/mcron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mc/mcron/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch b/third_party/nixpkgs/pkgs/by-name/mc/mcrypt/format-string_CVE-2012-4426.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch
rename to third_party/nixpkgs/pkgs/by-name/mc/mcrypt/format-string_CVE-2012-4426.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch b/third_party/nixpkgs/pkgs/by-name/mc/mcrypt/malloc_to_stdlib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch
rename to third_party/nixpkgs/pkgs/by-name/mc/mcrypt/malloc_to_stdlib.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch b/third_party/nixpkgs/pkgs/by-name/mc/mcrypt/overflow_CVE-2012-4409.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch
rename to third_party/nixpkgs/pkgs/by-name/mc/mcrypt/overflow_CVE-2012-4409.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mcrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mc/mcrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/segv.patch b/third_party/nixpkgs/pkgs/by-name/mc/mcrypt/segv.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mcrypt/segv.patch
rename to third_party/nixpkgs/pkgs/by-name/mc/mcrypt/segv.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch b/third_party/nixpkgs/pkgs/by-name/mc/mcrypt/sprintf_CVE-2012-4527.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch
rename to third_party/nixpkgs/pkgs/by-name/mc/mcrypt/sprintf_CVE-2012-4527.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix b/third_party/nixpkgs/pkgs/by-name/mc/mctc-lib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mc/mctc-lib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/mcy/default.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/mcy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mc/mcy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mda_lv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mda_lv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mdadm/fix-hardcoded-mapdir.patch b/third_party/nixpkgs/pkgs/by-name/md/mdadm4/fix-hardcoded-mapdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/mdadm/fix-hardcoded-mapdir.patch
rename to third_party/nixpkgs/pkgs/by-name/md/mdadm4/fix-hardcoded-mapdir.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mdadm/no-self-references.patch b/third_party/nixpkgs/pkgs/by-name/md/mdadm4/no-self-references.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/mdadm/no-self-references.patch
rename to third_party/nixpkgs/pkgs/by-name/md/mdadm4/no-self-references.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mdadm/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdadm4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/mdadm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdadm4/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-cmdrun/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-cmdrun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mdbook-cmdrun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdbook-cmdrun/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-emojicodes/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-emojicodes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mdbook-emojicodes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdbook-emojicodes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mdbook-i18n-helpers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-man/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-man/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mdbook-man/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdbook-man/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-open-on-gh/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-open-on-gh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mdbook-open-on-gh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdbook-open-on-gh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-pagetoc/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-pagetoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mdbook-pagetoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdbook-pagetoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdbtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/mdctags/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdctags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/mdctags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdctags/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mdevctl/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdevctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/mdevctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdevctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/mdf2iso/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdf2iso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/mdf2iso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdf2iso/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdhtml/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdhtml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mdhtml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdhtml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdk-sdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdk-sdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mdk4/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdk4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mdk4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdk4/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mdp/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mdp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mdr/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mdr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mdslides/default.nix b/third_party/nixpkgs/pkgs/by-name/md/mdslides/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mdslides/default.nix
rename to third_party/nixpkgs/pkgs/by-name/md/mdslides/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix b/third_party/nixpkgs/pkgs/by-name/me/me_cleaner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/me_cleaner/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/media-player-info/default.nix b/third_party/nixpkgs/pkgs/by-name/me/media-player-info/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/media-player-info/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/media-player-info/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/mediathekview/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mediathekview/package.nix
similarity index 96%
rename from third_party/nixpkgs/pkgs/applications/video/mediathekview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/mediathekview/package.nix
index 454b02923e..d83cd57b31 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mediathekview/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/me/mediathekview/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl3Plus;
mainProgram = "mediathek";
- maintainers = with maintainers; [ moredread ];
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mediawiki/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/mediawiki/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/mediawriter/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mediawriter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/mediawriter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/mediawriter/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/medio/default.nix b/third_party/nixpkgs/pkgs/by-name/me/medio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/medio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/medio/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/medusa/default.nix b/third_party/nixpkgs/pkgs/by-name/me/medusa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/medusa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/medusa/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/meek/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meek/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/meek/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meek/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/megacli/default.nix b/third_party/nixpkgs/pkgs/by-name/me/megacli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/megacli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/megacli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix b/third_party/nixpkgs/pkgs/by-name/me/megacmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/megacmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/megaglest/default.nix b/third_party/nixpkgs/pkgs/by-name/me/megaglest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/megaglest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/megaglest/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/megahit/default.nix b/third_party/nixpkgs/pkgs/by-name/me/megahit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/megahit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/megahit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meh/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/meh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/mela/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mela/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/mela/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/mela/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/melange/default.nix b/third_party/nixpkgs/pkgs/by-name/me/melange/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/melange/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/melange/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meld/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meld/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/melete/default.nix b/third_party/nixpkgs/pkgs/by-name/me/melete/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/melete/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/melete/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/melody/default.nix b/third_party/nixpkgs/pkgs/by-name/me/melody/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/melody/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/melody/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/melt/default.nix b/third_party/nixpkgs/pkgs/by-name/me/melt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/melt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/melt/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/by-name/me/memcached/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/memcached/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/memcached/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/meme-bingo-web/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meme-bingo-web/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/meme-bingo-web/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meme-bingo-web/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meme-image-generator/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meme-image-generator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/meme-image-generator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meme-image-generator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/meme-suite/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meme-suite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/meme-suite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meme-suite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/memo/default.nix b/third_party/nixpkgs/pkgs/by-name/me/memo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/memo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/memo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/memray/default.nix b/third_party/nixpkgs/pkgs/by-name/me/memray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/memray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/memray/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix b/third_party/nixpkgs/pkgs/by-name/me/memtest86-efi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/memtest86-efi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix b/third_party/nixpkgs/pkgs/by-name/me/memtest86plus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/memtest86plus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/memtester/default.nix b/third_party/nixpkgs/pkgs/by-name/me/memtester/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/memtester/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/memtester/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix b/third_party/nixpkgs/pkgs/by-name/me/memtier-benchmark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/memtier-benchmark/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mencal/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mencal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mencal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/mencal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/menu-cache/default.nix b/third_party/nixpkgs/pkgs/by-name/me/menu-cache/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/menu-cache/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/menu-cache/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/menumaker/default.nix b/third_party/nixpkgs/pkgs/by-name/me/menumaker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/menumaker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/menumaker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mepo/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mepo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mepo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/mepo/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/merecat/default.nix b/third_party/nixpkgs/pkgs/by-name/me/merecat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/merecat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/merecat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mermaid-filter/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mermaid-filter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mermaid-filter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/mermaid-filter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/mermerd/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mermerd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/mermerd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/mermerd/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/merriweather-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/me/merriweather-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/merriweather-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/merriweather-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/merriweather/default.nix b/third_party/nixpkgs/pkgs/by-name/me/merriweather/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/merriweather/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/merriweather/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mesa-demos/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mesa-demos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/mesa-demos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/mesa-demos/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/third_party/nixpkgs/pkgs/by-name/me/mesa_glu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/mesa_glu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/meshoptimizer/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meshoptimizer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/meshoptimizer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meshoptimizer/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meslo-lg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meslo-lg/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meslo-lgs-nf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meslo-lgs-nf/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/meson-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meson-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/meson-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meson-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix
index e1e0a3b771..bd8c307910 100644
--- a/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix
@@ -1,6 +1,7 @@
{
lib,
stdenv,
+ llvmPackages_19,
fetchFromGitHub,
gtest,
@@ -23,15 +24,18 @@
testers,
}:
-stdenv.mkDerivation (finalAttrs: {
+let
+ stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv;
+in
+stdenv'.mkDerivation (finalAttrs: {
pname = "mesonlsp";
- version = "4.3.5";
+ version = "4.3.7";
src = fetchFromGitHub {
owner = "JCWasmx86";
repo = "mesonlsp";
rev = "v${finalAttrs.version}";
- hash = "sha256-E2XKnvARq45AjAc0iBVyb2ssNyJOUye4MWOofZV2ahs=";
+ hash = "sha256-QhZv4PTcf1jzSOcp1+bPZWf5COugCIMq1zkhc0PJjUQ=";
};
patches = [ ./disable-tests-that-require-network-access.patch ];
@@ -163,5 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "mesonlsp";
maintainers = with maintainers; [ paveloom ];
platforms = platforms.unix;
+ # ../src/liblog/log.cpp:41:7: error: call to 'format' is ambiguous
+ broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
};
})
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix b/third_party/nixpkgs/pkgs/by-name/me/messer-slim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/messer-slim/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metaBuildEnv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metaBuildEnv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/metabigor/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metabigor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/metabigor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metabigor/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metadata-cleaner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metadata-cleaner/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metal-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metal-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metals/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metals/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metamath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metamath/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metamorphose2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metamorphose2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/metapixel/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metapixel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/metapixel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metapixel/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/metar/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/metar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metar/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/metastore/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metastore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/metastore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metastore/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meteo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meteo/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/meteor/main.patch b/third_party/nixpkgs/pkgs/by-name/me/meteor/main.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/meteor/main.patch
rename to third_party/nixpkgs/pkgs/by-name/me/meteor/main.patch
diff --git a/third_party/nixpkgs/pkgs/servers/meteor/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meteor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/meteor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meteor/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/meterbridge/buf_rect.patch b/third_party/nixpkgs/pkgs/by-name/me/meterbridge/buf_rect.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/meterbridge/buf_rect.patch
rename to third_party/nixpkgs/pkgs/by-name/me/meterbridge/buf_rect.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch b/third_party/nixpkgs/pkgs/by-name/me/meterbridge/fix_build_with_gcc-5.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch
rename to third_party/nixpkgs/pkgs/by-name/me/meterbridge/fix_build_with_gcc-5.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/meterbridge/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meterbridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/meterbridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/meterbridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/meters_lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metersLv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/meters_lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metersLv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/methane/default.nix b/third_party/nixpkgs/pkgs/by-name/me/methane/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/methane/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/methane/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metis-prover/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metis-prover/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix b/third_party/nixpkgs/pkgs/by-name/me/metis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/me/metis/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/brother/mfc465cncupswrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfc465cncupswrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/brother/mfc465cncupswrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfc465cncupswrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfc465cnlpr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfc465cnlpr/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfc5890cncupswrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfc5890cncupswrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfc5890cnlpr/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfc5890cnlpr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfc5890cnlpr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfc5890cnlpr/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfc9140cdncupswrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfc9140cdncupswrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfc9140cdnlpr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfc9140cdnlpr/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfcj470dw-cupswrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfcj470dw-cupswrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfcj6510dw-cupswrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfcj6510dw-cupswrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfcl2700dncupswrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfcl2700dncupswrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfcl2720dwcupswrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfcl2720dwcupswrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfcl2720dwlpr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfcl2720dwlpr/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfcl2740dwcupswrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfcl2740dwcupswrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfcl2740dwlpr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfcl2740dwlpr/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfcl8690cdwcupswrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfcl8690cdwcupswrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfcl8690cdwlpr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfcl8690cdwlpr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mfcuk/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfcuk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mfcuk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfcuk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mfoc/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mfoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mfoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mfoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/mftrace/default.nix b/third_party/nixpkgs/pkgs/by-name/mf/mftrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/tex/mftrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mf/mftrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/mg/default.nix b/third_party/nixpkgs/pkgs/by-name/mg/mg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/mg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mg/mg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/system/mgmt/default.nix b/third_party/nixpkgs/pkgs/by-name/mg/mgmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/system/mgmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mg/mgmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch b/third_party/nixpkgs/pkgs/by-name/mh/mhddfs/fix-format-security-error.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch
rename to third_party/nixpkgs/pkgs/by-name/mh/mhddfs/fix-format-security-error.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix b/third_party/nixpkgs/pkgs/by-name/mh/mhddfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mh/mhddfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mi2ly/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mi2ly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mi2ly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mi2ly/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/micro-httpd/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/micro-httpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/micro-httpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/micro-httpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/microbin/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/microbin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/microbin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/microbin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/microcom/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/microcom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/microcom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/microcom/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/micromamba/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/micromamba/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/micronaut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/micronaut/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/micronucleus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/micronucleus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/microplane/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/microplane/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/micropython/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/micropython/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/microscheme/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/microscheme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/microscheme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/microscheme/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/microserver/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/microserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/microserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/microserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/microsoft-gsl/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/microsoft-gsl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/microsoft-gsl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/microsoft-gsl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mictray/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mictray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/mictray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mictray/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mid2key/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mid2key/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mid2key/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mid2key/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/midi-trigger/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/midi-trigger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/midi-trigger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/midi-trigger/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/midicsv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/midicsv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/midimonster/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/midimonster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/midimonster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/midimonster/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/midisheetmusic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/midisheetmusic/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/midori-unwrapped/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/midori-unwrapped/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/migmix/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/migmix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/migmix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/migmix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/migrate/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/migrate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/migrate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/migrate/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/migu/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/migu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/migu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/migu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mikmod/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mikmod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mikmod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mikmod/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mill/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mill/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miller/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/miller/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miller/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/mi/millet/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/mi/millet/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/millet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/millet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/milu/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/milu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/milu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/milu/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mimalloc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mimalloc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mimeo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mimeo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimetic/narrowing.patch b/third_party/nixpkgs/pkgs/by-name/mi/mimetic/narrowing.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mimetic/narrowing.patch
rename to third_party/nixpkgs/pkgs/by-name/mi/mimetic/narrowing.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimetic/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mimetic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mimetic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mimetic/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mimic/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mimic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mimic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mimic/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/minc-widgets/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minc_widgets/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/minc-widgets/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minc_widgets/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/minder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minder/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minecraft-server-hibernation/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minecraft-server-hibernation/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/minesweep-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minesweep-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/minesweep-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minesweep-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mingetty/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mingetty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/mingetty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mingetty/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/mini-httpd/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miniHttpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/mini-httpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miniHttpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/minia/no-bundle.patch b/third_party/nixpkgs/pkgs/by-name/mi/minia/no-bundle.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/minia/no-bundle.patch
rename to third_party/nixpkgs/pkgs/by-name/mi/minia/no-bundle.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/minia/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/minia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minia/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/miniaudio/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miniaudio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/miniaudio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miniaudio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/miniball/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miniball/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/miniball/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miniball/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/minica/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minica/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/minica/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minica/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minidjvu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minidjvu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/minidlna/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minidlna/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/minidlna/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minidlna/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/minify/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/minify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minify/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff b/third_party/nixpkgs/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff
rename to third_party/nixpkgs/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff
diff --git a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minigalaxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minigalaxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/minilibx/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minilibx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/minilibx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minilibx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minimacy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minimacy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minimap2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minimap2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/minimodem/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minimodem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/minimodem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minimodem/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/mininet/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mininet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/mininet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mininet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/minio-certgen/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minio-certgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/minio-certgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minio-certgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minio-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minio-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/miniplayer/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miniplayer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/miniplayer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miniplayer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/minipro/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minipro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/minipro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minipro/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/minisat/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minisat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/minisat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minisat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miniscript/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miniscript/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miniserve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miniserve/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/minisign/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minisign/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/minisign/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minisign/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/minissdpd/makefile-install-dir.patch b/third_party/nixpkgs/pkgs/by-name/mi/minissdpd/makefile-install-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/minissdpd/makefile-install-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/mi/minissdpd/makefile-install-dir.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/minissdpd/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minissdpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/minissdpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minissdpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ministat/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/ministat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ministat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/ministat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miniupnpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miniupnpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minixml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minixml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/miniz/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miniz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/miniz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miniz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/minizign/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minizign/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/minizign/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minizign/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minizip-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minizip-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/minizip/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/minizip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/minizip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/minizip/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miraclecast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miraclecast/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/mirakurun/fix-musl-detection.patch b/third_party/nixpkgs/pkgs/by-name/mi/mirakurun/fix-musl-detection.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/mirakurun/fix-musl-detection.patch
rename to third_party/nixpkgs/pkgs/by-name/mi/mirakurun/fix-musl-detection.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/mirakurun/mirakurun.1 b/third_party/nixpkgs/pkgs/by-name/mi/mirakurun/mirakurun.1
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/mirakurun/mirakurun.1
rename to third_party/nixpkgs/pkgs/by-name/mi/mirakurun/mirakurun.1
diff --git a/third_party/nixpkgs/pkgs/applications/video/mirakurun/nix-filesystem.patch b/third_party/nixpkgs/pkgs/by-name/mi/mirakurun/nix-filesystem.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/mirakurun/nix-filesystem.patch
rename to third_party/nixpkgs/pkgs/by-name/mi/mirakurun/nix-filesystem.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/mirakurun/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mirakurun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/mirakurun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mirakurun/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miranda/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miranda/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/miredo/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miredo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/miredo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miredo/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/mi/miriway/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/miriway/package.nix
index 9ae59bf053..fe41c1b313 100644
--- a/third_party/nixpkgs/pkgs/by-name/mi/miriway/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/mi/miriway/package.nix
@@ -4,35 +4,55 @@
fetchFromGitHub,
gitUpdater,
nixosTests,
+ bash,
cmake,
+ inotify-tools,
pkg-config,
mir,
libxkbcommon,
+ swaybg,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "miriway";
- version = "24.09";
+ version = "24.10.1";
src = fetchFromGitHub {
owner = "Miriway";
repo = "Miriway";
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-/0txc9ynC3rj9tbHwYNlDe2C1DlmjoE2Q2/uoBz2GFg=";
+ hash = "sha256-jpXsvr2HnfMCJh851oS+IiQLSmL9C1bnaG6IPSq5xrA=";
};
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'DESTINATION /usr/lib/systemd' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}/systemd'
+ '';
+
strictDeps = true;
+ # Source has a path "systemd/usr/{libexec,lib}/...", don't break references to that
+ dontFixCmake = true;
+
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
+ bash
mir
libxkbcommon
];
+ postInstall = ''
+ substituteInPlace $out/bin/miriway-background \
+ --replace-fail 'exec swaybg' 'exec ${lib.getExe swaybg}'
+
+ substituteInPlace $out/bin/miriway-run \
+ --replace-fail 'inotifywait -qq' '${lib.getExe' inotify-tools "inotifywait"} -qq'
+ '';
+
passthru = {
updateScript = gitUpdater { rev-prefix = "v"; };
providedSessions = [ "miriway" ];
diff --git a/third_party/nixpkgs/pkgs/servers/mirrorbits/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mirrorbits/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mirrorbits/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mirrorbits/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/miscfiles/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/miscfiles/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/miscfiles/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/miscfiles/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mission-planner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mission-planner/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mitama-cpp-result/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mitama-cpp-result/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mitama-cpp-result/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mitama-cpp-result/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mitm6/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mitm6/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mitm6/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mitm6/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mitmproxy2swagger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mitmproxy2swagger/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mix2nix/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mix2nix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mix2nix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mi/mix2nix/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mjolnir/001-disable-nsfwprotection.patch b/third_party/nixpkgs/pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mjolnir/001-disable-nsfwprotection.patch
rename to third_party/nixpkgs/pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch
diff --git a/third_party/nixpkgs/pkgs/servers/mjolnir/package.json b/third_party/nixpkgs/pkgs/by-name/mj/mjolnir/package.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mjolnir/package.json
rename to third_party/nixpkgs/pkgs/by-name/mj/mjolnir/package.json
diff --git a/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix b/third_party/nixpkgs/pkgs/by-name/mj/mjolnir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mjolnir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mj/mjolnir/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/mjpegtools/c++-17-fixes.patch b/third_party/nixpkgs/pkgs/by-name/mj/mjpegtools/c++-17-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/mjpegtools/c++-17-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/mj/mjpegtools/c++-17-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/tools/video/mjpegtools/default.nix b/third_party/nixpkgs/pkgs/by-name/mj/mjpegtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/mjpegtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mj/mjpegtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix b/third_party/nixpkgs/pkgs/by-name/mj/mjpg-streamer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mj/mjpg-streamer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkcert/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mk/mkcert/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/mkclean/default.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkclean/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/mkclean/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mk/mkclean/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkcue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mk/mkcue/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mk/mkl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkl/test/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mk/mkl/test/default.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/test/test.c b/third_party/nixpkgs/pkgs/by-name/mk/mkl/test/test.c
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/test/test.c
rename to third_party/nixpkgs/pkgs/by-name/mk/mkl/test/test.c
diff --git a/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkp224o/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mk/mkp224o/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mkrand/default.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkrand/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mkrand/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mk/mkrand/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mktemp/default.nix b/third_party/nixpkgs/pkgs/by-name/mk/mktemp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mktemp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mk/mktemp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mktorrent/default.nix b/third_party/nixpkgs/pkgs/by-name/mk/mktorrent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mktorrent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mk/mktorrent/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlarchive2maildir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mlarchive2maildir/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/mlc/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/mlc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mlc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/mle/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/mle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mle/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mlflow-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlflow-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mlflow-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mlflow-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlib/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mlkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/mlmmj/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlmmj/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/mlmmj/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mlmmj/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mloader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mloader/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mlocate/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlocate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mlocate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mlocate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/mlvwm/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlvwm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/mlvwm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mlvwm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mlxbf-bootctl/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlxbf-bootctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mlxbf-bootctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mlxbf-bootctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/mlxbf-bootimages/default.nix b/third_party/nixpkgs/pkgs/by-name/ml/mlxbf-bootimages/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/mlxbf-bootimages/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ml/mlxbf-bootimages/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/MMA/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/MMA/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/MMA/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/MMA/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mm-common/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mm-common/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mm-common/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mm-common/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mmake/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mmake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmake/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/mmark/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/mmark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmark/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmc-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmc-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mmctl/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mmctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mmdoc/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmdoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mmdoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmdoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mmh/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mmh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mmixware/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmixware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mmixware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmixware/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mmsd-tng/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmsd-tng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mmsd-tng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmsd-tng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mmsd/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mmsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmtc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmtc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmtf-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmtf-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/mmutils/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/mmutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mmv-go/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmv-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mmv-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmv-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mmv/default.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mmv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mm/mmv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mnamer/default.nix b/third_party/nixpkgs/pkgs/by-name/mn/mnamer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mnamer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mn/mnamer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mnamer/remove_requirements.patch b/third_party/nixpkgs/pkgs/by-name/mn/mnamer/remove_requirements.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mnamer/remove_requirements.patch
rename to third_party/nixpkgs/pkgs/by-name/mn/mnamer/remove_requirements.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mnamer/update_hack.patch b/third_party/nixpkgs/pkgs/by-name/mn/mnamer/update_hack.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mnamer/update_hack.patch
rename to third_party/nixpkgs/pkgs/by-name/mn/mnamer/update_hack.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mnc/default.nix b/third_party/nixpkgs/pkgs/by-name/mn/mnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mn/mnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/mnemonicode/default.nix b/third_party/nixpkgs/pkgs/by-name/mn/mnemonicode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/mnemonicode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mn/mnemonicode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix b/third_party/nixpkgs/pkgs/by-name/mn/mni_autoreg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mn/mni_autoreg/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/machine-learning/mnist/default.nix b/third_party/nixpkgs/pkgs/by-name/mn/mnist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/machine-learning/mnist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mn/mnist/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/mno16/default.nix b/third_party/nixpkgs/pkgs/by-name/mn/mno16/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/mno16/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mn/mno16/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/moar/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/moar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moar/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mob/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mob/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mob/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mobile-broadband-provider-info/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mobile-broadband-provider-info/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mobilecoin-wallet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mobilecoin-wallet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mockgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mockgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mockobjects/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mockobjects/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mockoon/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mockoon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mockoon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mockoon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mod-arpeggiator-lv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mod-arpeggiator-lv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mod-distortion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mod-distortion/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mod/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mod/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/modd/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/modd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/modd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/modd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/modem-manager-gui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/modem-manager-gui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/modemmanager/no-dummy-dirs-in-sysconfdir.patch b/third_party/nixpkgs/pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/modemmanager/no-dummy-dirs-in-sysconfdir.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/modemmanager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/modemmanager/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/modsecurity-crs/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/modsecurity-crs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/modsecurity-crs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/modsecurity-crs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/modsecurity/Makefile.am.patch b/third_party/nixpkgs/pkgs/by-name/mo/modsecurity_standalone/Makefile.am.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/modsecurity/Makefile.am.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/modsecurity_standalone/Makefile.am.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/modsecurity/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/modsecurity_standalone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/modsecurity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/modsecurity_standalone/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/mojave/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mojave-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/mojave/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mojave-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moka-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moka-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mokutil/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mokutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mokutil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mokutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch b/third_party/nixpkgs/pkgs/by-name/mo/molden/dont_register_file_types.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/molden/dont_register_file_types.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/molden/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/molden/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mole/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mole/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mole/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mole/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/gemini/molly-brown/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/molly-brown/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/gemini/molly-brown/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/molly-brown/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/molly-guard/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/molly-guard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/molly-guard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/molly-guard/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/molot-lite/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/molot-lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/molot-lite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/molot-lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/molotov/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/molotov/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/molotov/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/molotov/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moltengamepad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moltengamepad/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/mona-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mona-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/mona-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mona-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monetdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monetdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mongoaudit/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mongoaudit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mongoaudit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mongoaudit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mongodb-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mongodb-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mongoose/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mongoose/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/monica/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monica/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/monica/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monica/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/monit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/monitorcontrol/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monitorcontrol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/monitorcontrol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monitorcontrol/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monitoring-plugins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monitoring-plugins/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/buildfix.diff b/third_party/nixpkgs/pkgs/by-name/mo/monkeysAudio/buildfix.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/buildfix.diff
rename to third_party/nixpkgs/pkgs/by-name/mo/monkeysAudio/buildfix.diff
diff --git a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monkeysAudio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monkeysAudio/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/monkeysphere/monkeysphere.patch b/third_party/nixpkgs/pkgs/by-name/mo/monkeysphere/monkeysphere.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/monkeysphere/monkeysphere.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/monkeysphere/monkeysphere.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch b/third_party/nixpkgs/pkgs/by-name/mo/monkeysphere/openssh-nixos-sandbox.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/monkeysphere/openssh-nixos-sandbox.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/monkeysphere/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monkeysphere/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/monkeysphere/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monkeysphere/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mono-addins/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mono-addins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mono-addins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mono-addins/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/mono-dll-fixer/dll-fixer.pl b/third_party/nixpkgs/pkgs/by-name/mo/monoDLLFixer/dll-fixer.pl
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/mono-dll-fixer/dll-fixer.pl
rename to third_party/nixpkgs/pkgs/by-name/mo/monoDLLFixer/dll-fixer.pl
diff --git a/third_party/nixpkgs/pkgs/build-support/mono-dll-fixer/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monoDLLFixer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/mono-dll-fixer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monoDLLFixer/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/monocraft/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monocraft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/monocraft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monocraft/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/monocypher/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monocypher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/monocypher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monocypher/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/monoid/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monoid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/monoid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monoid/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mononoki/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mononoki/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/monosat/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monosat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/monosat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monosat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mons/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mons/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mons/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mons/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/monsoon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/monsoon/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/montserrat/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/montserrat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/montserrat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/montserrat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mooSpace/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mooSpace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mooSpace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mooSpace/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/moodle-dl/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moodle-dl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/moodle-dl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moodle-dl/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/moon-buggy/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moon-buggy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/moon-buggy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moon-buggy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/moon-phases/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moon-phases/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/moon-phases/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moon-phases/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/moonfire-nvr/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/mo/moonfire-nvr/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/moonfire-nvr/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/mo/moonfire-nvr/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/misc/moonfire-nvr/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moonfire-nvr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/moonfire-nvr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moonfire-nvr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moonlight-embedded/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moonlight-embedded/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/moonraker/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moonraker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/moonraker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moonraker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moosefs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moosefs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mop/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/mopac/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mopac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/mopac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mopac/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/moq/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/moq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/morph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/morph/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/morsel/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/morsel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/morsel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/morsel/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/morty/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/morty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/morty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/morty/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/moserial/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/moserial/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/moserial/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/moserial/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mosh/bash_completion_datadir.patch b/third_party/nixpkgs/pkgs/by-name/mo/mosh/bash_completion_datadir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mosh/bash_completion_datadir.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/mosh/bash_completion_datadir.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mosh/mosh-client_path.patch b/third_party/nixpkgs/pkgs/by-name/mo/mosh/mosh-client_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mosh/mosh-client_path.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/mosh/mosh-client_path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mosh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mosh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mosh/ssh_path.patch b/third_party/nixpkgs/pkgs/by-name/mo/mosh/ssh_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mosh/ssh_path.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/mosh/ssh_path.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mosml/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mosml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/mosml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mosml/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mosquitto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mosquitto/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/most/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/most/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/most/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/most/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch b/third_party/nixpkgs/pkgs/by-name/mo/motif/Add-X.Org-to-bindings-file.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/motif/Add-X.Org-to-bindings-file.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch b/third_party/nixpkgs/pkgs/by-name/mo/motif/Remove-unsupported-weak-refs-on-darwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/motif/Remove-unsupported-weak-refs-on-darwin.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/motif/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/motif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/motif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/motif/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/motion/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/motion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/motion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/motion/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/motrix/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/motrix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/motrix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/motrix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mount-zip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mount-zip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mountain-duck/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mountain-duck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/mountain-duck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mountain-duck/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mousetweaks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mousetweaks/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/movine/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/movine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/movine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/movine/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/movit/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/movit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/movit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/movit/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/mox/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/mox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mox/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/mox/version.patch b/third_party/nixpkgs/pkgs/by-name/mo/mox/version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/mox/version.patch
rename to third_party/nixpkgs/pkgs/by-name/mo/mox/version.patch
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozjpeg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mozjpeg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozlz4a/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mozlz4a/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozphab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mo/mozphab/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mp3blaster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mp3blaster/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mp3cat/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mp3cat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/mp3cat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mp3cat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mp3fs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mp3fs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mp3gain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mp3gain/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mp3splt/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mp3splt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mp3splt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mp3splt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mp3val/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mp3val/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mp3val/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mp3val/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mp4v2/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mp4v2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mp4v2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mp4v2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mpage/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mpage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpage/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpc123/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpc123/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mpc123/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpc123/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpd-discord-rpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpd-discord-rpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpd-mpris/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpd-mpris/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-notification/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpd-notification/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/mpd-notification/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpd-notification/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpd-touch-screen-gui/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mpd-touch-screen-gui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpdas/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpdas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/mpdas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpdas/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpdecimal/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpdecimal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mpdecimal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpdecimal/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpdris2/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpdris2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/mpdris2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpdris2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpdscribble/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpdscribble/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpfi/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpfi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mpfi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpfi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpfr/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpfr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mpfr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpfr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mpfshell/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpfshell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mpfshell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpfshell/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/mph-2b-damase/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mph_2b_damase/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/mph-2b-damase/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mph_2b_damase/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/third_party/nixpkgs/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml b/third_party/nixpkgs/pkgs/by-name/mp/mpiCheckPhaseHook/topology.xml
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml
rename to third_party/nixpkgs/pkgs/by-name/mp/mpiCheckPhaseHook/topology.xml
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpir/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mprime/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mprime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mprime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mprime/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpris-scrobbler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpris-scrobbler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mprocs/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mprocs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mprocs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mprocs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mps/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mps/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv-shim-default-shaders/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/mpv-shim-default-shaders/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpvpaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpvpaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mpw/default.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mpw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mp/mpw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/mq-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/mq/mq-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/mq-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mq/mq-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mqtt-benchmark/default.nix b/third_party/nixpkgs/pkgs/by-name/mq/mqtt-benchmark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mqtt-benchmark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mq/mqtt-benchmark/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mqtt_cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/mq/mqtt_cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mqtt_cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mq/mqtt_cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mqttmultimeter/deps.nix b/third_party/nixpkgs/pkgs/by-name/mq/mqttmultimeter/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mqttmultimeter/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/mq/mqttmultimeter/deps.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mqttmultimeter/default.nix b/third_party/nixpkgs/pkgs/by-name/mq/mqttmultimeter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mqttmultimeter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mq/mqttmultimeter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mr/default.nix b/third_party/nixpkgs/pkgs/by-name/mr/mr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/mr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mr/mr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mrbayes/default.nix b/third_party/nixpkgs/pkgs/by-name/mr/mrbayes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/mrbayes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mr/mrbayes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mrkd/default.nix b/third_party/nixpkgs/pkgs/by-name/mr/mrkd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mrkd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mr/mrkd/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/mro-unicode/default.nix b/third_party/nixpkgs/pkgs/by-name/mr/mro-unicode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/mro-unicode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mr/mro-unicode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/third_party/nixpkgs/pkgs/by-name/mr/mrpeach/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mr/mrpeach/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/mrsh/default.nix b/third_party/nixpkgs/pkgs/by-name/mr/mrsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/mrsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mr/mrsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mrtg/default.nix b/third_party/nixpkgs/pkgs/by-name/mr/mrtg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mrtg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mr/mrtg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix b/third_party/nixpkgs/pkgs/by-name/mr/mruby/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mr/mruby/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mrxvt/default.nix b/third_party/nixpkgs/pkgs/by-name/mr/mrxvt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/mrxvt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mr/mrxvt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch b/third_party/nixpkgs/pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch
rename to third_party/nixpkgs/pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ms-sys/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/ms-sys/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ms-sys/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/ms-sys/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/msat/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/msat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/deps.nix b/third_party/nixpkgs/pkgs/by-name/ms/msbuild/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msbuild/deps.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msbuild/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msbuild/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mscgen/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/mscgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/mscgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/mscgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/msfpc/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msfpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/msfpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msfpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msgpack-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msgpack-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msgpack-cxx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msgpack-cxx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msgpack-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msgpack-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/msgpack/generic.nix b/third_party/nixpkgs/pkgs/by-name/ms/msgpack/generic.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/msgpack/generic.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msgpack/generic.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/msgpack/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msgpack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/msgpack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msgpack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/msgpuck/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msgpuck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/msgpuck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msgpuck/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msgviewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/msgviewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msgviewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/msieve/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msieve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/msieve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msieve/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/msilbc/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msilbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/msilbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msilbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msitools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msitools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/msldapdump/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msldapdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/msldapdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msldapdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mslink/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/mslink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mslink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/mslink/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/msr-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/msr-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/mstflint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/mstflint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/mstore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/mstore/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mstpd/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/mstpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/mstpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/mstpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mswatch/default.nix b/third_party/nixpkgs/pkgs/by-name/ms/mswatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mswatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ms/mswatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/mt-st/default.nix b/third_party/nixpkgs/pkgs/by-name/mt/mt-st/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/mt-st/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mt/mt-st/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix b/third_party/nixpkgs/pkgs/by-name/mt/mtail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mt/mtail/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtdev/default.nix b/third_party/nixpkgs/pkgs/by-name/mt/mtdev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mtdev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mt/mtdev/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mtm/default.nix b/third_party/nixpkgs/pkgs/by-name/mt/mtm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mtm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mt/mtm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix b/third_party/nixpkgs/pkgs/by-name/mt/mtpaint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mt/mtpaint/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix b/third_party/nixpkgs/pkgs/by-name/mt/mtpfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mt/mtpfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mtr-exporter/default.nix b/third_party/nixpkgs/pkgs/by-name/mt/mtr-exporter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mtr-exporter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mt/mtr-exporter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/mtx/default.nix b/third_party/nixpkgs/pkgs/by-name/mt/mtx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/mtx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mt/mtx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mubeng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mubeng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/mueval/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mueval/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/haskell/mueval/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mueval/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/muffet/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/muffet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/muffet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/muffet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mujs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mujs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/multicharge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/multicharge/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/multilockscreen/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/multilockscreen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/multilockscreen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/multilockscreen/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/multimon-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/multimon-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/multipart-parser-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/multipart-parser-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/multipath-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/multipath-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/multitail/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/multitail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/multitail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/multitail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/multitime/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/multitime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/multitime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/multitime/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/multiviewer-for-f1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/multiviewer-for-f1/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/multus-cni/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/multus-cni/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/munge/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/munge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/munge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/munge/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch b/third_party/nixpkgs/pkgs/by-name/mu/munin/adding_sconfdir_munin-node.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch
rename to third_party/nixpkgs/pkgs/by-name/mu/munin/adding_sconfdir_munin-node.patch
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/adding_servicedir_munin-node.patch b/third_party/nixpkgs/pkgs/by-name/mu/munin/adding_servicedir_munin-node.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/munin/adding_servicedir_munin-node.patch
rename to third_party/nixpkgs/pkgs/by-name/mu/munin/adding_servicedir_munin-node.patch
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/dont_preserve_source_dir_permissions.patch b/third_party/nixpkgs/pkgs/by-name/mu/munin/dont_preserve_source_dir_permissions.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/munin/dont_preserve_source_dir_permissions.patch
rename to third_party/nixpkgs/pkgs/by-name/mu/munin/dont_preserve_source_dir_permissions.patch
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/munin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/munin/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/preserve_environment.patch b/third_party/nixpkgs/pkgs/by-name/mu/munin/preserve_environment.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/munin/preserve_environment.patch
rename to third_party/nixpkgs/pkgs/by-name/mu/munin/preserve_environment.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/muonlang/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/muonlang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/muonlang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/muonlang/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/muparserx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/muparserx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/fix-cpp-build.patch b/third_party/nixpkgs/pkgs/by-name/mu/mupdf/fix-cpp-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mupdf/fix-cpp-build.patch
rename to third_party/nixpkgs/pkgs/by-name/mu/mupdf/fix-cpp-build.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/fix-darwin-system-deps.patch b/third_party/nixpkgs/pkgs/by-name/mu/mupdf/fix-darwin-system-deps.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mupdf/fix-darwin-system-deps.patch
rename to third_party/nixpkgs/pkgs/by-name/mu/mupdf/fix-darwin-system-deps.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mupdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mupdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mupen64plus/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mupen64plus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/mupen64plus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mupen64plus/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/murex/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/murex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/murex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/murex/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch b/third_party/nixpkgs/pkgs/by-name/mu/muscle/muscle-darwin-g++.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch
rename to third_party/nixpkgs/pkgs/by-name/mu/muscle/muscle-darwin-g++.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/muscle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/muscle/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/museeks/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/museeks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/museeks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/museeks/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/musl-fts/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/musl-fts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/musl-fts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/musl-fts/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/musl-obstack/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/musl-obstack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/musl-obstack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/musl-obstack/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/musl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/musl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mustache-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mustache-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mustache-hpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mustache-hpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/documentation/mustache-spec/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mustache-spec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/mustache-spec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mustache-spec/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mutagen-compose/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mutagen-compose/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mutagen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mutagen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mutest/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mutest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mutest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mutest/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/mutmut/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mutmut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/mutmut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mutmut/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mutt-ics/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mutt-ics/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/mutt-ics/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mutt-ics/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mutt-wizard/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mutt-wizard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mutt-wizard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mutt-wizard/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/no-build-only-refs.patch b/third_party/nixpkgs/pkgs/by-name/mu/mutt/no-build-only-refs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/no-build-only-refs.patch
rename to third_party/nixpkgs/pkgs/by-name/mu/mutt/no-build-only-refs.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mutt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mutt/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/mu/mutter/package.nix b/third_party/nixpkgs/pkgs/by-name/mu/mutter/package.nix
index d34ca82690..ea00dd2b3f 100644
--- a/third_party/nixpkgs/pkgs/by-name/mu/mutter/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/mu/mutter/package.nix
@@ -1,5 +1,6 @@
{
fetchurl,
+ fetchpatch,
runCommand,
lib,
stdenv,
@@ -68,7 +69,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mutter";
- version = "47.0";
+ version = "47.1";
outputs = [
"out"
@@ -79,9 +80,18 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
- hash = "sha256-LQ6pAVCsbNAhnQB42wXW4VFNauIb+fP3QNT7A5EpAWs=";
+ hash = "sha256-kFR0oyzZmzQ0LNaedLsBlxs4fi+iI2G22ZrdEJQJ3ck=";
};
+ patches = [
+ # Fix cursor positioning
+ # https://gitlab.gnome.org/GNOME/mutter/-/issues/3696
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/5bcaa7c80b7640e2da6135cdff83eba77c202407.patch";
+ hash = "sha256-+LDTZRagBltarGvHtTI94mA70DrkonuqA+ibLkjvZ50=";
+ })
+ ];
+
mesonFlags = [
"-Degl_device=true"
"-Dinstalled_tests=false" # TODO: enable these
diff --git a/third_party/nixpkgs/pkgs/by-name/mu/mutter/43/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/mutter43/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/by-name/mu/mutter/43/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/mutter43/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/muzika/default.nix b/third_party/nixpkgs/pkgs/by-name/mu/muzika/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/muzika/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mu/muzika/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mvapich/default.nix b/third_party/nixpkgs/pkgs/by-name/mv/mvapich/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mvapich/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mv/mvapich/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mvebu64boot/default.nix b/third_party/nixpkgs/pkgs/by-name/mv/mvebu64boot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mvebu64boot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mv/mvebu64boot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/mw/default.nix b/third_party/nixpkgs/pkgs/by-name/mw/mw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/mw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mw/mw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/mx-takeover/default.nix b/third_party/nixpkgs/pkgs/by-name/mx/mx-takeover/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/mx-takeover/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mx/mx-takeover/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/mxt-app/default.nix b/third_party/nixpkgs/pkgs/by-name/mx/mxt-app/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/mxt-app/default.nix
rename to third_party/nixpkgs/pkgs/by-name/mx/mxt-app/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mya/argp.patch b/third_party/nixpkgs/pkgs/by-name/my/mya/argp.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mya/argp.patch
rename to third_party/nixpkgs/pkgs/by-name/my/mya/argp.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mya/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mya/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mya/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mya/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mycli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mycli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mycorrhiza/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mycorrhiza/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mycorrhiza/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mycorrhiza/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mycrypto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mycrypto/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/mydumper/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mydumper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/mydumper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mydumper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/mylvmbackup/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mylvmbackup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/mylvmbackup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mylvmbackup/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mympd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mympd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mynewt-newt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mynewt-newt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mynewt-newtmgr/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mynewt-newtmgr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mynewt-newtmgr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mynewt-newtmgr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mypaint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mypaint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/myrddin/default.nix b/third_party/nixpkgs/pkgs/by-name/my/myrddin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/myrddin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/myrddin/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/myrica/default.nix b/third_party/nixpkgs/pkgs/by-name/my/myrica/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/myrica/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/myrica/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/mysides/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mysides/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/mysides/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mysides/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mysql2pgsql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mysql2pgsql/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mysql_jdbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mysql_jdbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mysqltuner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mysqltuner/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mystem/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mystem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/mystem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mystem/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mythes/default.nix b/third_party/nixpkgs/pkgs/by-name/my/mythes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/mythes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/my/mythes/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/n2048/default.nix b/third_party/nixpkgs/pkgs/by-name/n2/n2048/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/n2048/default.nix
rename to third_party/nixpkgs/pkgs/by-name/n2/n2048/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/n2n/default.nix b/third_party/nixpkgs/pkgs/by-name/n2/n2n/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/n2n/default.nix
rename to third_party/nixpkgs/pkgs/by-name/n2/n2n/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/N3/default.nix b/third_party/nixpkgs/pkgs/by-name/n3/n3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/N3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/n3/n3/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun/default.nix b/third_party/nixpkgs/pkgs/by-name/n9/n98-magerun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/n9/n98-magerun/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix b/third_party/nixpkgs/pkgs/by-name/na/naabu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/naabu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/naabu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nabi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nabi/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/nacelle/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nacelle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/nacelle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nacelle/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/naev/default.nix b/third_party/nixpkgs/pkgs/by-name/na/naev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/naev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/naev/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/nafees/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nafees/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/nafees/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nafees/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/nagelfar/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nagelfar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/nagelfar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nagelfar/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/nagios.patch b/third_party/nixpkgs/pkgs/by-name/na/nagios/nagios.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/nagios/nagios.patch
rename to third_party/nixpkgs/pkgs/by-name/na/nagios/nagios.patch
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nagios/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nagios/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nahid-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nahid-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/nailgun/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nailgun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/nailgun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nailgun/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nali/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/nali/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nali/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/namaka/default.nix b/third_party/nixpkgs/pkgs/by-name/na/namaka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/namaka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/namaka/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/namazu/default.nix b/third_party/nixpkgs/pkgs/by-name/na/namazu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/namazu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/namazu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix b/third_party/nixpkgs/pkgs/by-name/na/namecoind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/namecoind/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanoblogger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nanoblogger/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanodbc/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanodbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nanodbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nanodbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/na/nanoflann/package.nix b/third_party/nixpkgs/pkgs/by-name/na/nanoflann/package.nix
index b10121d239..f2f883d650 100644
--- a/third_party/nixpkgs/pkgs/by-name/na/nanoflann/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/na/nanoflann/package.nix
@@ -6,14 +6,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
- version = "1.6.1";
+ version = "1.6.2";
pname = "nanoflann";
src = fetchFromGitHub {
owner = "jlblancoc";
repo = "nanoflann";
rev = "v${finalAttrs.version}";
- hash = "sha256-likFHzaP/1yYfr6+rDWM2+YEKOk5G5P8UFC3xb2bEOo=";
+ hash = "sha256-8zqxTC11DauuJqDsUa3dhWhOC8pq/1aIwtKKTeD5pJo=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanomsg/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanomsg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nanomsg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nanomsg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanorc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nanorc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/nanosaur/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanosaur/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/nanosaur/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nanosaur/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/nanosaur2/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanosaur2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/nanosaur2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nanosaur2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanosvg/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanosvg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nanosvg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nanosvg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/nanotts/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanotts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/nanotts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nanotts/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanum-gothic-coding/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nanum-gothic-coding/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/nanum/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/nanum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nanum/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/nap/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/nap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/napi-rs-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/na/napi-rs-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/napi-rs-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/napi-rs-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/narrowlink/default.nix b/third_party/nixpkgs/pkgs/by-name/na/narrowlink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/narrowlink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/narrowlink/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nas/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nas/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nasc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nasc/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/nasin-nanpa/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nasin-nanpa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/nasin-nanpa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nasin-nanpa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/nasm/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nasm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/nasm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nasm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/nasmfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nasmfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/nasmfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nasmfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/nasty/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nasty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/nasty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nasty/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nat-traverse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nat-traverse/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix b/third_party/nixpkgs/pkgs/by-name/na/national-park-typeface/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/national-park-typeface/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/natls/default.nix b/third_party/nixpkgs/pkgs/by-name/na/natls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/natls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/natls/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nats-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nats-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nats-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nats-streaming-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nats-streaming-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/nats-top/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nats-top/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/nats-top/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nats-top/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix b/third_party/nixpkgs/pkgs/by-name/na/natscli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/natscli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/natscli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/natural-docs/default.nix b/third_party/nixpkgs/pkgs/by-name/na/natural-docs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/natural-docs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/natural-docs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch b/third_party/nixpkgs/pkgs/by-name/na/nautilus-open-any-terminal/hardcode-gsettings.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch
rename to third_party/nixpkgs/pkgs/by-name/na/nautilus-open-any-terminal/hardcode-gsettings.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nautilus-open-any-terminal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nautilus-open-any-terminal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nauty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nauty/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix b/third_party/nixpkgs/pkgs/by-name/na/navi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/navi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/navi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix b/third_party/nixpkgs/pkgs/by-name/nb/nb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nb/nb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix b/third_party/nixpkgs/pkgs/by-name/nb/nbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nb/nbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nbench/default.nix b/third_party/nixpkgs/pkgs/by-name/nb/nbench/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nbench/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nb/nbench/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/nbutools/default.nix b/third_party/nixpkgs/pkgs/by-name/nb/nbutools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/nbutools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nb/nbutools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/third_party/nixpkgs/pkgs/by-name/nb/nbxplorer/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/nb/nbxplorer/deps.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/by-name/nb/nbxplorer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nb/nbxplorer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/update.sh b/third_party/nixpkgs/pkgs/by-name/nb/nbxplorer/update.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/update.sh
rename to third_party/nixpkgs/pkgs/by-name/nb/nbxplorer/update.sh
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/third_party/nixpkgs/pkgs/by-name/nb/nbxplorer/util/update-common.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
rename to third_party/nixpkgs/pkgs/by-name/nb/nbxplorer/util/update-common.sh
diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/fix-tpl-path.patch b/third_party/nixpkgs/pkgs/by-name/nc/ncdns/fix-tpl-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/ncdns/fix-tpl-path.patch
rename to third_party/nixpkgs/pkgs/by-name/nc/ncdns/fix-tpl-path.patch
diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/ncdns-go.mod b/third_party/nixpkgs/pkgs/by-name/nc/ncdns/ncdns-go.mod
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/ncdns/ncdns-go.mod
rename to third_party/nixpkgs/pkgs/by-name/nc/ncdns/ncdns-go.mod
diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/ncdns-go.sum b/third_party/nixpkgs/pkgs/by-name/nc/ncdns/ncdns-go.sum
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/ncdns/ncdns-go.sum
rename to third_party/nixpkgs/pkgs/by-name/nc/ncdns/ncdns-go.sum
diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncdns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/ncdns/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/x509-go.mod b/third_party/nixpkgs/pkgs/by-name/nc/ncdns/x509-go.mod
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/ncdns/x509-go.mod
rename to third_party/nixpkgs/pkgs/by-name/nc/ncdns/x509-go.mod
diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/x509-go.sum b/third_party/nixpkgs/pkgs/by-name/nc/ncdns/x509-go.sum
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/ncdns/x509-go.sum
rename to third_party/nixpkgs/pkgs/by-name/nc/ncdns/x509-go.sum
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ncftp/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncftp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ncftp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/ncftp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncgopher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/ncgopher/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncmpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/ncmpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncmpcpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/ncmpcpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch b/third_party/nixpkgs/pkgs/by-name/nc/ncnn/cmakelists.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ncnn/cmakelists.patch
rename to third_party/nixpkgs/pkgs/by-name/nc/ncnn/cmakelists.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncnn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/ncnn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/nco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/nco/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/ncompress/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncompress/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/ncompress/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/ncompress/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncpamixer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/ncpamixer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncpamixer/remove_dynamic_download.patch b/third_party/nixpkgs/pkgs/by-name/nc/ncpamixer/remove_dynamic_download.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ncpamixer/remove_dynamic_download.patch
rename to third_party/nixpkgs/pkgs/by-name/nc/ncpamixer/remove_dynamic_download.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/ncrack/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncrack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ncrack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/ncrack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/ncview/default.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/ncview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nc/ncview/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ndisc6/default.nix b/third_party/nixpkgs/pkgs/by-name/nd/ndisc6/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ndisc6/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nd/ndisc6/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix b/third_party/nixpkgs/pkgs/by-name/nd/ndjbdns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nd/ndjbdns/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ndpi/default.nix b/third_party/nixpkgs/pkgs/by-name/nd/ndpi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ndpi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nd/ndpi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ndppd/default.nix b/third_party/nixpkgs/pkgs/by-name/nd/ndppd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/ndppd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nd/ndppd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/ndstool/default.nix b/third_party/nixpkgs/pkgs/by-name/nd/ndstool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/ndstool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nd/ndstool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/ne/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/ne/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/ne/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/ne/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/near-cli/package.json b/third_party/nixpkgs/pkgs/by-name/ne/near-cli/package.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/near-cli/package.json
rename to third_party/nixpkgs/pkgs/by-name/ne/near-cli/package.json
diff --git a/third_party/nixpkgs/pkgs/tools/misc/near-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/near-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/near-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/near-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch b/third_party/nixpkgs/pkgs/by-name/ne/nearcore/0001-make-near-test-contracts-optional.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/nearcore/0001-make-near-test-contracts-optional.patch
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nearcore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/nearcore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nearcore/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/neard/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/neard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neard/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/neardal/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neardal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/neardal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neardal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch b/third_party/nixpkgs/pkgs/by-name/ne/neatvnc/fix-ffmpeg.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/neatvnc/fix-ffmpeg.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neatvnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neatvnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nebula/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nebula/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/nedit/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nedit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/nedit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nedit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/neil/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/neil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neil/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/neko/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neko/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/neko/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neko/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nelua/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nelua/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/nemiver/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nemiver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/nemiver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nemiver/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/nengo-gui/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nengo-gui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/machine-learning/nengo-gui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nengo-gui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neo-cowsay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neo-cowsay/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/neo/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/neo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neo4j-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neo4j-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/neo4j/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neo4j/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/neo4j/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neo4j/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neocmakelsp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neocmakelsp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neocomp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neocomp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neofetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neofetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/neon/darwin-fix-configure.patch b/third_party/nixpkgs/pkgs/by-name/ne/neon/darwin-fix-configure.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/neon/darwin-fix-configure.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/neon/darwin-fix-configure.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/neon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neosay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neosay/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nerd-font-patcher/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nerd-font-patcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nerd-font-patcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nerd-font-patcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nerdctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nerdctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/nerdfix/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nerdfix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/nerdfix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nerdfix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nest-cli/package.nix
similarity index 80%
rename from third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nest-cli/package.nix
index c9d4227818..99a3f53c6d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ne/nest-cli/package.nix
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "nest-cli";
- version = "10.4.5";
+ version = "10.4.7";
src = fetchFromGitHub {
owner = "nestjs";
repo = pname;
rev = version;
- hash = "sha256-F/Oi7ra+UE4YKXHZalH5qFk4coaGfHRpWaxamYunRuw=";
+ hash = "sha256-DVLmB4WE+8p2i2l2aq7u/YefeEykKd3B7ekaq5vKUjI=";
};
- npmDepsHash = "sha256-6yh8TKfq3fuq4QcnA4uM49/G0Kp1sccRyTcV5s9dVck=";
+ npmDepsHash = "sha256-bgnbf2YyjndJQ4jX08gW6htGPLV+znARuaJBuh8Kwa8=";
env = {
npm_config_build_from_source = true;
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/net-snmp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/net-snmp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netassert/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netassert/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netassert/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netassert/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/000-no-suid.patch b/third_party/nixpkgs/pkgs/by-name/ne/netatalk/000-no-suid.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/netatalk/000-no-suid.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/netatalk/000-no-suid.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch b/third_party/nixpkgs/pkgs/by-name/ne/netatalk/001-omit-localstatedir-creation.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/netatalk/001-omit-localstatedir-creation.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netatalk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netatalk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netavark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netavark/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netboot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netboot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/netbootxyz-efi/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netbootxyz-efi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/netbootxyz-efi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netbootxyz-efi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/netbox2netshot/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netbox2netshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/netbox2netshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netbox2netshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netcat/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netcat-gnu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netcat-gnu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netcat-openbsd/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netcat-openbsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netcat-openbsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netcat-openbsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/netcdf/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netcdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/netcdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netcdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch b/third_party/nixpkgs/pkgs/by-name/ne/netcdfcxx4/cmake-h5free.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/netcdfcxx4/cmake-h5free.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netcdfcxx4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netcdfcxx4/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix
index 5ac4e9f7a4..66a2bae71f 100644
--- a/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "netclient";
- version = "0.25.0";
+ version = "0.26.0";
src = fetchFromGitHub {
owner = "gravitl";
repo = "netclient";
rev = "v${version}";
- hash = "sha256-cc0OBDDyg+egnQWPoteGVVHtg8vfYC9RVIpe7A+ZJPQ=";
+ hash = "sha256-vGiOVAulqngodUSOmpqMs5ZNHtUhx5TGhpihSaAo164=";
};
- vendorHash = "sha256-DzTTESPxYuZYNGjEG3PufLoS02+R9275arVcUzImpBU=";
+ vendorHash = "sha256-ENrBJ0XbCfLfzTVZEVtDBjGxupdiLI7USGVImkYWDdY=";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa
++ lib.optional stdenv.hostPlatform.isLinux libX11;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/deps.nix b/third_party/nixpkgs/pkgs/by-name/ne/netcoredbg/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netcoredbg/deps.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netcoredbg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netcoredbg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netdiscover/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netdiscover/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netdiscover/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netdiscover/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/netevent/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netevent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/netevent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netevent/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/netflix/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netflix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/netflix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netflix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nethogs/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nethogs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nethogs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nethogs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nethoscope/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nethoscope/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nethoscope/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nethoscope/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netifd/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netifd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netifd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netifd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netkittftp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netkittftp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/package-lock.json b/third_party/nixpkgs/pkgs/by-name/ne/netlistsvg/package-lock.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/package-lock.json
rename to third_party/nixpkgs/pkgs/by-name/ne/netlistsvg/package-lock.json
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netlistsvg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netlistsvg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/test.v b/third_party/nixpkgs/pkgs/by-name/ne/netlistsvg/test.v
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/test.v
rename to third_party/nixpkgs/pkgs/by-name/ne/netlistsvg/test.v
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netlogo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netlogo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netmask/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netmask/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netmask/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netmask/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/netperf/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netperf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/netperf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netperf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/netplan/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netplan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/netplan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netplan/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/netris/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netris/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/netris/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netris/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netrw/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netrw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netrw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netrw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netselect/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netselect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netselect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netselect/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/netsniff-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/netsniff-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/networkaudiod/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkaudiod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/networkaudiod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkaudiod/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkd-dispatcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkd-dispatcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch b/third_party/nixpkgs/pkgs/by-name/ne/networkd-dispatcher/support_nix_store_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/networkd-dispatcher/support_nix_store_path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in b/third_party/nixpkgs/pkgs/by-name/ne/networking-ts-cxx/networking_ts.pc.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in
rename to third_party/nixpkgs/pkgs/by-name/ne/networking-ts-cxx/networking_ts.pc.in
diff --git a/third_party/nixpkgs/pkgs/development/libraries/networking-ts-cxx/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networking-ts-cxx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/networking-ts-cxx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networking-ts-cxx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-fortisslvpn/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-fortisslvpn/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/support-ppp-2.5.0.patch b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-fortisslvpn/support-ppp-2.5.0.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/support-ppp-2.5.0.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-fortisslvpn/support-ppp-2.5.0.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-iodine/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-iodine/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-iodine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-iodine/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-l2tp/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-l2tp/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-l2tp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-l2tp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-openconnect/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-openconnect/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-openconnect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-openconnect/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-openvpn/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-openvpn/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-openvpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-openvpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-sstp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-sstp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-vpnc/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-vpnc/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager-vpnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager-vpnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager_dmenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager_dmenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkmanager_strongswan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanager_strongswan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkmanagerapplet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkmanagerapplet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/networkminer/deps.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkminer/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/networkminer/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkminer/deps.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/networkminer/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/networkminer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/networkminer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/networkminer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/networkminer/xdg-dirs.patch b/third_party/nixpkgs/pkgs/by-name/ne/networkminer/xdg-dirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/networkminer/xdg-dirs.patch
rename to third_party/nixpkgs/pkgs/by-name/ne/networkminer/xdg-dirs.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neuron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neuron/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/neverball/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neverball/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/neverball/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/neverball/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/new-session-manager/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/new-session-manager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/new-session-manager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/new-session-manager/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/newman/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/newman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/newman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/newman/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/newrelic-sysmond/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/newrelic-sysmond/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ne/newsflash/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ne/newsflash/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/newsflash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/newsflash/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/newtonwars/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/newtonwars/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/newtonwars/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/newtonwars/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/nex/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/nex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nex/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nextdns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nextdns/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nextflow/deps.json b/third_party/nixpkgs/pkgs/by-name/ne/nextflow/deps.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/nextflow/deps.json
rename to third_party/nixpkgs/pkgs/by-name/ne/nextflow/deps.json
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nextflow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nextflow/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nexttrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nexttrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/nexuiz/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/nexuiz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/nexuiz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ne/nexuiz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nfdump/default.nix b/third_party/nixpkgs/pkgs/by-name/nf/nfdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nfdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nf/nfdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/nflz/default.nix b/third_party/nixpkgs/pkgs/by-name/nf/nflz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/nflz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nf/nflz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/by-name/nf/nfpm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nf/nfpm/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/third_party/nixpkgs/pkgs/by-name/nf/nfs-ganesha/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nf/nfs-ganesha/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/nf/nfs-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nf/nfs-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nfstrace/default.nix b/third_party/nixpkgs/pkgs/by-name/nf/nfstrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nfstrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nf/nfstrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ngadmin/default.nix b/third_party/nixpkgs/pkgs/by-name/ng/ngadmin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/ngadmin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ng/ngadmin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/third_party/nixpkgs/pkgs/by-name/ng/nghttp2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ng/nghttp2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix b/third_party/nixpkgs/pkgs/by-name/ng/nginx-config-formatter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ng/nginx-config-formatter/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/documentation/nginx-doc/exclude-google-analytics.patch b/third_party/nixpkgs/pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/nginx-doc/exclude-google-analytics.patch
rename to third_party/nixpkgs/pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch
diff --git a/third_party/nixpkgs/pkgs/data/documentation/nginx-doc/default.nix b/third_party/nixpkgs/pkgs/by-name/ng/nginx-doc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/nginx-doc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ng/nginx-doc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/irc/ngircd/default.nix b/third_party/nixpkgs/pkgs/by-name/ng/ngircd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/irc/ngircd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ng/ngircd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ngn-k/default.nix b/third_party/nixpkgs/pkgs/by-name/ng/ngn-k/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/ngn-k/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ng/ngn-k/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ngn-k/repl-license-path.patch b/third_party/nixpkgs/pkgs/by-name/ng/ngn-k/repl-license-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/ngn-k/repl-license-path.patch
rename to third_party/nixpkgs/pkgs/by-name/ng/ngn-k/repl-license-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ngrep/default.nix b/third_party/nixpkgs/pkgs/by-name/ng/ngrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ngrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ng/ngrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngt/default.nix b/third_party/nixpkgs/pkgs/by-name/ng/ngt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ngt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ng/ngt/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix
index 8e36a02cb2..d9146815bb 100644
--- a/third_party/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "nhost-cli";
- version = "1.24.5";
+ version = "1.27.0";
src = fetchFromGitHub {
owner = "nhost";
repo = "cli";
- rev = "v${version}";
- hash = "sha256-/NkegGp+JoJWPIkO3YKp/aZ6Yp5tcjnRCONY0GHe+HI=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-XYa7dCAeWS6sc2MovOUnG9j6Bd09JMHzCFpGdvo2nmI=";
};
vendorHash = null;
@@ -27,6 +27,7 @@ buildGoModule rec {
mv $out/bin/cli $out/bin/nhost
'';
+ # require network access
checkFlags = [ "-skip=^TestMakeJSONRequest$" ];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nice-dcv-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/remote/nice-dcv-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nice-dcv-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/niff/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/niff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/niff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/niff/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/nifi/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nifi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/nifi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nifi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nifticlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nifticlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/niftyreg/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/niftyreg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/niftyreg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/niftyreg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/niftyseg/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/niftyseg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/niftyseg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/niftyseg/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nika-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nika-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nikto/nix-wrapper-fix.patch b/third_party/nixpkgs/pkgs/by-name/ni/nikto/nix-wrapper-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nikto/nix-wrapper-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/ni/nikto/nix-wrapper-fix.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nikto/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nikto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nikto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nikto/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nilfs-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nilfs-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ninjas2/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/ninjas2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ninjas2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/ninjas2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ninka/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/ninka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/ninka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/ninka/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/ninvaders/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/ninvaders/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/ninvaders/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/ninvaders/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/nip2/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nip2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/nip2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nip2/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ni/niri/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ni/niri/Cargo.lock
index 00bedd343d..3534b4e95a 100644
--- a/third_party/nixpkgs/pkgs/by-name/ni/niri/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/by-name/ni/niri/Cargo.lock
@@ -4,19 +4,13 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
[[package]]
name = "adler2"
version = "2.0.0"
@@ -90,9 +84,9 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.6.15"
+version = "0.6.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -105,43 +99,43 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
[[package]]
name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
dependencies = [
"anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "anyhow"
-version = "1.0.88"
+version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
[[package]]
name = "appendlist"
@@ -209,7 +203,7 @@ checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
dependencies = [
"async-task",
"concurrent-queue",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
"futures-lite 2.3.0",
"slab",
]
@@ -259,7 +253,7 @@ dependencies = [
"futures-lite 2.3.0",
"parking",
"polling 3.7.3",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"slab",
"tracing",
"windows-sys 0.59.0",
@@ -298,7 +292,7 @@ dependencies = [
"cfg-if",
"event-listener 3.1.0",
"futures-lite 1.13.0",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"windows-sys 0.48.0",
]
@@ -310,7 +304,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -325,7 +319,7 @@ dependencies = [
"cfg-if",
"futures-core",
"futures-io",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"signal-hook-registry",
"slab",
"windows-sys 0.59.0",
@@ -339,13 +333,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -365,9 +359,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "backtrace"
@@ -378,7 +372,7 @@ dependencies = [
"addr2line",
"cfg-if",
"libc",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
"object",
"rustc-demangle",
"windows-targets 0.52.6",
@@ -401,9 +395,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
[[package]]
name = "bindgen"
-version = "0.69.4"
+version = "0.69.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
dependencies = [
"annotate-snippets",
"bitflags 2.6.0",
@@ -417,7 +411,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -492,22 +486,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
-version = "1.18.0"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
-version = "1.7.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -518,9 +512,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.7.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
[[package]]
name = "cairo-rs"
@@ -542,7 +536,7 @@ checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f"
dependencies = [
"glib-sys",
"libc",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
@@ -554,7 +548,7 @@ dependencies = [
"bitflags 2.6.0",
"log",
"polling 3.7.3",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"slab",
"thiserror",
]
@@ -569,7 +563,7 @@ dependencies = [
"bitflags 2.6.0",
"futures-io",
"polling 3.7.3",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"slab",
"tracing",
]
@@ -581,16 +575,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
dependencies = [
"calloop 0.13.0",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"wayland-backend",
"wayland-client",
]
[[package]]
name = "cc"
-version = "1.1.18"
+version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
dependencies = [
"jobserver",
"libc",
@@ -624,9 +618,9 @@ dependencies = [
[[package]]
name = "cfg-expr"
-version = "0.16.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345c78335be0624ed29012dc10c49102196c6882c12dde65d9f35b02da2aada8"
+checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c"
dependencies = [
"smallvec",
"target-lexicon",
@@ -660,7 +654,7 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
]
[[package]]
@@ -676,9 +670,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.17"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -686,9 +680,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.17"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
dependencies = [
"anstream",
"anstyle",
@@ -698,14 +692,14 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -716,9 +710,9 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
[[package]]
name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
[[package]]
name = "colored"
@@ -940,6 +934,17 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.86",
+]
+
[[package]]
name = "dlib"
version = "0.5.2"
@@ -963,25 +968,26 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
[[package]]
name = "drm"
-version = "0.12.0"
+version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1"
+checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f"
dependencies = [
"bitflags 2.6.0",
"bytemuck",
"drm-ffi",
"drm-fourcc",
- "rustix 0.38.37",
+ "libc",
+ "rustix 0.38.38",
]
[[package]]
name = "drm-ffi"
-version = "0.8.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53"
+checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b"
dependencies = [
"drm-sys",
- "rustix 0.38.37",
+ "rustix 0.38.38",
]
[[package]]
@@ -992,9 +998,9 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
[[package]]
name = "drm-sys"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986"
+checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c"
dependencies = [
"libc",
"linux-raw-sys 0.6.5",
@@ -1030,7 +1036,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -1098,15 +1104,15 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
[[package]]
name = "fdeflate"
-version = "0.3.4"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb"
dependencies = [
"simd-adler32",
]
@@ -1123,12 +1129,12 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
]
[[package]]
@@ -1155,7 +1161,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -1175,9 +1181,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [
"futures-channel",
"futures-core",
@@ -1190,9 +1196,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [
"futures-core",
"futures-sink",
@@ -1200,15 +1206,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [
"futures-core",
"futures-task",
@@ -1217,9 +1223,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-lite"
@@ -1242,7 +1248,7 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
dependencies = [
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
"futures-core",
"futures-io",
"parking",
@@ -1251,32 +1257,32 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-channel",
"futures-core",
@@ -1292,9 +1298,9 @@ dependencies = [
[[package]]
name = "gbm"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a"
+checksum = "c724107aa10444b1d2709aae4727c18a33c16b3e15ea8a46cc4ae226c084c88a"
dependencies = [
"bitflags 2.6.0",
"drm",
@@ -1307,18 +1313,18 @@ dependencies = [
[[package]]
name = "gbm-sys"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58"
+checksum = "a9cc2f64de9fa707b5c6b2d2f10d7a7e49e845018a9f5685891eb40d3bab2538"
dependencies = [
"libc",
]
[[package]]
name = "gdk-pixbuf"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f"
+checksum = "c4c29071a9e92337d8270a85cb0510cda4ac478be26d09ad027cc1d081911b19"
dependencies = [
"gdk-pixbuf-sys",
"gio",
@@ -1328,22 +1334,22 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c"
+checksum = "687343b059b91df5f3fbd87b4307038fa9e647fcc0461d0d3f93e94fee20bf3d"
dependencies = [
"gio-sys",
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
name = "gdk4"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea"
+checksum = "c121aeeb0cf7545877ae615dac6bfd088b739d8abee4d55e7143b06927d16a31"
dependencies = [
"cairo-rs",
"gdk-pixbuf",
@@ -1356,9 +1362,9 @@ dependencies = [
[[package]]
name = "gdk4-sys"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878"
+checksum = "7d3c03d1ea9d5199f14f060890fde68a3b5ec5699144773d1fa6abf337bfbc9c"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1368,7 +1374,7 @@ dependencies = [
"libc",
"pango-sys",
"pkg-config",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
@@ -1417,15 +1423,15 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "gio"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52"
+checksum = "b8d999e8fb09583e96080867e364bc1e701284ad206c76a5af480d63833ad43c"
dependencies = [
"futures-channel",
"futures-core",
@@ -1440,14 +1446,14 @@ dependencies = [
[[package]]
name = "gio-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38"
+checksum = "4f7efc368de04755344f0084104835b6bb71df2c1d41e37d863947392a894779"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
"windows-sys 0.52.0",
]
@@ -1468,7 +1474,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -1484,15 +1490,15 @@ dependencies = [
[[package]]
name = "glam"
-version = "0.29.0"
+version = "0.29.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28091a37a5d09b555cb6628fd954da299b536433834f5b8e59eba78e0cbbf8a"
+checksum = "dc46dd3ec48fdd8e693a98d2b8bafae273a2d54c1de02a2a7e3d57d501f39677"
[[package]]
name = "glib"
-version = "0.20.3"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4"
+checksum = "adcf1ec6d3650bf9fdbc6cee242d4fcebc6f6bfd9bea5b929b6a8b7344eb85ff"
dependencies = [
"bitflags 2.6.0",
"futures-channel",
@@ -1511,25 +1517,25 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.20.3"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab"
+checksum = "a6bf88f70cd5720a6197639dcabcb378dd528d0cb68cb1f45e3b358bcb841cd7"
dependencies = [
"heck 0.5.0",
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
name = "glib-sys"
-version = "0.20.2"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163"
+checksum = "5f9eca5d88cfa6a453b00d203287c34a2b7cac3a7831779aa2bb0b3c7233752b"
dependencies = [
"libc",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
@@ -1540,20 +1546,20 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "gobject-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a"
+checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462"
dependencies = [
"glib-sys",
"libc",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
name = "graphene-rs"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69"
+checksum = "1f53144c7fe78292705ff23935f1477d511366fb2f73c43d63b37be89076d2fe"
dependencies = [
"glib",
"graphene-sys",
@@ -1562,21 +1568,21 @@ dependencies = [
[[package]]
name = "graphene-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca"
+checksum = "e741797dc5081e59877a4d72c442c72d61efdd99161a0b1c1b29b6b988934b99"
dependencies = [
"glib-sys",
"libc",
"pkg-config",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
name = "gsk4"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8"
+checksum = "aa21a2f7c51ee1c6cc1242c2faf3aae2b7566138f182696759987bde8219e922"
dependencies = [
"cairo-rs",
"gdk4",
@@ -1589,9 +1595,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde"
+checksum = "0f9fb607554f9f4e8829eb7ea301b0fde051e1dbfd5d16b143a8a9c2fac6c01b"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -1600,14 +1606,14 @@ dependencies = [
"graphene-sys",
"libc",
"pango-sys",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
name = "gtk4"
-version = "0.9.1"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1"
+checksum = "d34465497f5a4c182c9c94a582a187db7d6af0863f28e87ccf4379f21f0e2a22"
dependencies = [
"cairo-rs",
"field-offset",
@@ -1633,14 +1639,14 @@ dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
name = "gtk4-sys"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666"
+checksum = "cbe4325908b1c1642dbb48e9f49c07a73185babf43e8b2065b0f881a589f55b8"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1652,7 +1658,7 @@ dependencies = [
"gsk4-sys",
"libc",
"pango-sys",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
@@ -1665,6 +1671,12 @@ dependencies = [
"allocator-api2",
]
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
[[package]]
name = "heck"
version = "0.4.1"
@@ -1699,34 +1711,162 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.86",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
]
[[package]]
name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown",
+ "hashbrown 0.15.0",
]
[[package]]
name = "input"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7911ce3db9c10c5ab4a35c49af778a5f9a827bd0f7371d9be56175d8dd2740d0"
+checksum = "fbdc09524a91f9cacd26f16734ff63d7dc650daffadd2b6f84d17a285bd875a9"
dependencies = [
"bitflags 2.6.0",
"input-sys",
- "io-lifetimes 1.0.11",
"libc",
"log",
"udev",
@@ -1835,9 +1975,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
dependencies = [
"wasm-bindgen",
]
@@ -1855,7 +1995,7 @@ dependencies = [
"libc",
"proc-macro2",
"regex",
- "syn 2.0.77",
+ "syn 2.0.86",
"terminal_size 0.2.6",
]
@@ -1915,9 +2055,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libadwaita"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878"
+checksum = "8611ee9fb85e7606c362b513afcaf5b59853f79e4d98caaaf581d99465014247"
dependencies = [
"gdk4",
"gio",
@@ -1941,14 +2081,14 @@ dependencies = [
"gtk4-sys",
"libc",
"pango-sys",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
[[package]]
name = "libdisplay-info"
@@ -1971,7 +2111,7 @@ checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -1987,25 +2127,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [
"cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
]
[[package]]
name = "libm"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-
-[[package]]
-name = "libredox"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
- "redox_syscall",
-]
+checksum = "a00419de735aac21d53b0de5ce2c03bd3627277cf471300f27ebc89f7d828047"
[[package]]
name = "libredox"
@@ -2015,6 +2144,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.6.0",
"libc",
+ "redox_syscall 0.5.7",
]
[[package]]
@@ -2040,7 +2170,7 @@ dependencies = [
[[package]]
name = "libspa"
version = "0.8.0"
-source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#016e554768ae251c8de3724ea4b06f4749a8dd00"
+source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#86df39190c0ab67444666a42908f7e8c1344e24a"
dependencies = [
"bitflags 2.6.0",
"cc",
@@ -2056,7 +2186,7 @@ dependencies = [
[[package]]
name = "libspa-sys"
version = "0.8.0"
-source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#016e554768ae251c8de3724ea4b06f4749a8dd00"
+source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#86df39190c0ab67444666a42908f7e8c1344e24a"
dependencies = [
"bindgen",
"cc",
@@ -2091,6 +2221,12 @@ version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
[[package]]
name = "log"
version = "0.4.22"
@@ -2149,9 +2285,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
dependencies = [
"libc",
]
@@ -2203,7 +2339,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -2212,16 +2348,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.8.0"
@@ -2229,6 +2355,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
"adler2",
+ "simd-adler32",
]
[[package]]
@@ -2263,7 +2390,7 @@ dependencies = [
[[package]]
name = "niri"
-version = "0.1.9"
+version = "0.1.10"
dependencies = [
"anyhow",
"approx 0.5.1",
@@ -2277,7 +2404,7 @@ dependencies = [
"clap",
"directories",
"drm-ffi",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
"futures-util",
"git-version",
"glam",
@@ -2317,7 +2444,7 @@ dependencies = [
[[package]]
name = "niri-config"
-version = "0.1.9"
+version = "0.1.10"
dependencies = [
"bitflags 2.6.0",
"csscolorparser",
@@ -2334,7 +2461,7 @@ dependencies = [
[[package]]
name = "niri-ipc"
-version = "0.1.9"
+version = "0.1.10"
dependencies = [
"clap",
"schemars",
@@ -2344,7 +2471,7 @@ dependencies = [
[[package]]
name = "niri-visual-tests"
-version = "0.1.9"
+version = "0.1.10"
dependencies = [
"anyhow",
"gtk4",
@@ -2443,10 +2570,10 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -2683,18 +2810,18 @@ dependencies = [
[[package]]
name = "object"
-version = "0.36.4"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "option-ext"
@@ -2704,18 +2831,18 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "orbclient"
-version = "0.3.47"
+version = "0.3.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
+checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43"
dependencies = [
- "libredox 0.0.2",
+ "libredox",
]
[[package]]
name = "ordered-float"
-version = "4.2.2"
+version = "4.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6"
+checksum = "c65ee1f9701bf938026630b455d5315f490640234259037edb259798b3bcf85e"
dependencies = [
"num-traits",
]
@@ -2744,9 +2871,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
[[package]]
name = "pango"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3"
+checksum = "aa26aa54b11094d72141a754901cd71d9356432bb8147f9cace8d9c7ba95f356"
dependencies = [
"gio",
"glib",
@@ -2756,21 +2883,21 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d"
+checksum = "84fd65917bf12f06544ae2bbc200abf9fc0a513a5a88a0fa81013893aef2b838"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
name = "pangocairo"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e67bf91c19fccbf9394049d98c67cccec183dd73cbe54a0205da983d4174e7"
+checksum = "4291ca8cdd05e4330752bf8a450d3a4e701ca48fd9aad2b3566e92849ee4055e"
dependencies = [
"cairo-rs",
"glib",
@@ -2781,15 +2908,15 @@ dependencies = [
[[package]]
name = "pangocairo-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025f26935d210969dda291fa21afee60da792c4976269581170ea715e00f09c0"
+checksum = "be0ed959258ea648a49bde7dfdbaa98310717cb15159b421fa76510c45ec306e"
dependencies = [
"cairo-sys-rs",
"glib-sys",
"libc",
"pango-sys",
- "system-deps 7.0.2",
+ "system-deps 7.0.3",
]
[[package]]
@@ -2840,7 +2967,7 @@ dependencies = [
"phf_shared",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -2854,29 +2981,29 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
[[package]]
name = "pin-utils"
@@ -2891,14 +3018,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
dependencies = [
"atomic-waker",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
"futures-io",
]
[[package]]
name = "pipewire"
version = "0.8.0"
-source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#016e554768ae251c8de3724ea4b06f4749a8dd00"
+source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#86df39190c0ab67444666a42908f7e8c1344e24a"
dependencies = [
"anyhow",
"bitflags 2.6.0",
@@ -2914,7 +3041,7 @@ dependencies = [
[[package]]
name = "pipewire-sys"
version = "0.8.0"
-source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#016e554768ae251c8de3724ea4b06f4749a8dd00"
+source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#86df39190c0ab67444666a42908f7e8c1344e24a"
dependencies = [
"bindgen",
"libspa-sys",
@@ -2941,21 +3068,21 @@ checksum = "a1a0483e89e81d7915defe83c51f23f6800594d64f6f4a21253ce87fd8444ada"
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "png"
-version = "0.17.13"
+version = "0.17.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
dependencies = [
"bitflags 1.3.2",
"crc32fast",
"fdeflate",
"flate2",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
]
[[package]]
@@ -2984,16 +3111,16 @@ dependencies = [
"concurrent-queue",
"hermit-abi 0.4.0",
"pin-project-lite",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"tracing",
"windows-sys 0.59.0",
]
[[package]]
name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "powerfmt"
@@ -3012,9 +3139,9 @@ dependencies = [
[[package]]
name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
dependencies = [
"diff",
"yansi",
@@ -3036,7 +3163,7 @@ version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
dependencies = [
- "toml_edit 0.22.20",
+ "toml_edit 0.22.22",
]
[[package]]
@@ -3065,18 +3192,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "profiling"
-version = "1.0.15"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
+checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
dependencies = [
"profiling-procmacros",
"tracy-client",
@@ -3084,12 +3211,12 @@ dependencies = [
[[package]]
name = "profiling-procmacros"
-version = "1.0.15"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
+checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
dependencies = [
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -3106,7 +3233,7 @@ dependencies = [
"rand",
"rand_chacha",
"rand_xorshift",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
"rusty-fork",
"tempfile",
"unarray",
@@ -3120,7 +3247,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -3140,9 +3267,9 @@ dependencies = [
[[package]]
name = "quick-xml"
-version = "0.36.1"
+version = "0.36.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
dependencies = [
"memchr",
]
@@ -3210,6 +3337,15 @@ dependencies = [
"bitflags 1.3.2",
]
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
[[package]]
name = "redox_users"
version = "0.4.6"
@@ -3217,20 +3353,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
dependencies = [
"getrandom",
- "libredox 0.1.3",
+ "libredox",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.10.6"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -3244,13 +3380,13 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -3261,9 +3397,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "rustc-demangle"
@@ -3302,9 +3438,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.37"
+version = "0.38.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
dependencies = [
"bitflags 2.6.0",
"errno",
@@ -3315,9 +3451,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
[[package]]
name = "rusty-fork"
@@ -3346,12 +3482,6 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "scan_fmt"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248"
-
[[package]]
name = "schemars"
version = "0.8.21"
@@ -3373,7 +3503,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -3384,9 +3514,9 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
[[package]]
name = "sd-notify"
-version = "0.4.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4646d6f919800cd25c50edb49438a1381e2cd4833c027e75e8897981c50b8b5e"
+checksum = "1be20c5f7f393ee700f8b2f28ea35812e4e212f40774b550cd2a93ea91684451"
[[package]]
name = "semver"
@@ -3396,22 +3526,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
-version = "1.0.210"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.210"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -3422,14 +3552,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
"memchr",
@@ -3445,14 +3575,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
@@ -3528,7 +3658,7 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
[[package]]
name = "smithay"
version = "0.3.0"
-source = "git+https://github.com/Smithay/smithay.git#f364c73cae953aebfa189075e9f118f9008e100b"
+source = "git+https://github.com/Smithay/smithay.git#5e137dcebc9f2de4d026180dfc4ce81282f7f14f"
dependencies = [
"appendlist",
"bitflags 2.6.0",
@@ -3545,7 +3675,6 @@ dependencies = [
"gl_generator",
"indexmap",
"input",
- "lazy_static",
"libc",
"libloading",
"libseat",
@@ -3554,8 +3683,7 @@ dependencies = [
"pkg-config",
"profiling",
"rand",
- "rustix 0.38.37",
- "scan_fmt",
+ "rustix 0.38.38",
"smallvec",
"tempfile",
"thiserror",
@@ -3587,7 +3715,7 @@ dependencies = [
"libc",
"log",
"memmap2",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"thiserror",
"wayland-backend",
"wayland-client",
@@ -3602,7 +3730,7 @@ dependencies = [
[[package]]
name = "smithay-drm-extras"
version = "0.1.0"
-source = "git+https://github.com/Smithay/smithay.git#f364c73cae953aebfa189075e9f118f9008e100b"
+source = "git+https://github.com/Smithay/smithay.git#5e137dcebc9f2de4d026180dfc4ce81282f7f14f"
dependencies = [
"drm",
"libdisplay-info",
@@ -3627,6 +3755,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
[[package]]
name = "static_assertions"
version = "1.1.0"
@@ -3680,15 +3814,26 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.77"
+version = "2.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.86",
+]
+
[[package]]
name = "system-deps"
version = "6.2.2"
@@ -3704,11 +3849,11 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "7.0.2"
+version = "7.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031"
+checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005"
dependencies = [
- "cfg-expr 0.16.0",
+ "cfg-expr 0.17.0",
"heck 0.5.0",
"pkg-config",
"toml",
@@ -3733,14 +3878,14 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
"once_cell",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"windows-sys 0.59.0",
]
@@ -3777,22 +3922,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.63"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -3825,20 +3970,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
]
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
[[package]]
name = "toml"
version = "0.8.19"
@@ -3848,7 +3988,7 @@ dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit 0.22.22",
]
[[package]]
@@ -3873,15 +4013,15 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.22.20"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
- "winnow 0.6.18",
+ "winnow 0.6.20",
]
[[package]]
@@ -3904,7 +4044,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -3948,9 +4088,9 @@ dependencies = [
[[package]]
name = "tracy-client"
-version = "0.17.3"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373db47331c3407b343538df77eea2516884a0b126cdfb4b135acfd400015dd7"
+checksum = "746b078c6a09ebfd5594609049e07116735c304671eaab06ce749854d23435bc"
dependencies = [
"loom",
"once_cell",
@@ -3959,9 +4099,9 @@ dependencies = [
[[package]]
name = "tracy-client-sys"
-version = "0.24.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49cf0064dcb31c99aa1244c1b93439359e53f72ed217eef5db50abd442241e9a"
+checksum = "68613466112302fdbeabc5fa55f7d57462a0b247d5a6b7d7e09401fb471a144d"
dependencies = [
"cc",
]
@@ -3974,9 +4114,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "udev"
-version = "0.8.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1"
+checksum = "e3d5c197b95f1769931c89f85c33c407801d1fb7a311113bc0b39ad036f1bd81"
dependencies = [
"io-lifetimes 1.0.11",
"libc",
@@ -4001,12 +4141,6 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
[[package]]
name = "unicode-ident"
version = "1.0.13"
@@ -4019,38 +4153,41 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
[[package]]
name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "url"
-version = "2.5.2"
+version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
dependencies = [
"form_urlencoded",
"idna",
"percent-encoding",
]
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
[[package]]
name = "utf8parse"
version = "0.2.2"
@@ -4108,9 +4245,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
dependencies = [
"cfg-if",
"once_cell",
@@ -4119,24 +4256,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
dependencies = [
"cfg-if",
"js-sys",
@@ -4146,9 +4283,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -4156,22 +4293,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
[[package]]
name = "wayland-backend"
@@ -4181,7 +4318,7 @@ checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
dependencies = [
"cc",
"downcast-rs",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"scoped-tls",
"smallvec",
"wayland-sys",
@@ -4189,12 +4326,12 @@ dependencies = [
[[package]]
name = "wayland-client"
-version = "0.31.6"
+version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d"
+checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280"
dependencies = [
"bitflags 2.6.0",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"wayland-backend",
"wayland-scanner",
]
@@ -4212,11 +4349,11 @@ dependencies = [
[[package]]
name = "wayland-cursor"
-version = "0.31.6"
+version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb"
+checksum = "32b08bc3aafdb0035e7fe0fdf17ba0c09c268732707dca4ae098f60cb28c9e4c"
dependencies = [
- "rustix 0.38.37",
+ "rustix 0.38.38",
"wayland-client",
"xcursor",
]
@@ -4233,9 +4370,9 @@ dependencies = [
[[package]]
name = "wayland-protocols"
-version = "0.32.4"
+version = "0.32.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0"
+checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
@@ -4246,9 +4383,9 @@ dependencies = [
[[package]]
name = "wayland-protocols-misc"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40dd9d2f7f2713724d84b920d6f73ff878f6a353712942f75f78f4dadb72886"
+checksum = "da2e42969764e469a115d4bb1c16e9588ef8b75b127ba7a2c9ddf1e140b25ca7"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
@@ -4259,9 +4396,9 @@ dependencies = [
[[package]]
name = "wayland-protocols-plasma"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff"
+checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
@@ -4272,9 +4409,9 @@ dependencies = [
[[package]]
name = "wayland-protocols-wlr"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109"
+checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
@@ -4291,20 +4428,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
dependencies = [
"proc-macro2",
- "quick-xml 0.36.1",
+ "quick-xml 0.36.2",
"quote",
]
[[package]]
name = "wayland-server"
-version = "0.31.5"
+version = "0.31.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f18d47038c0b10479e695d99ed073e400ccd9bdbb60e6e503c96f62adcb12b6"
+checksum = "c89532cc712a2adb119eb4d09694b402576052254d0bb284f82ac1c47fb786ad"
dependencies = [
"bitflags 2.6.0",
"downcast-rs",
"io-lifetimes 2.0.3",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"wayland-backend",
"wayland-scanner",
]
@@ -4325,9 +4462,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4424,7 +4561,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -4435,7 +4572,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
]
[[package]]
@@ -4702,8 +4839,8 @@ dependencies = [
"percent-encoding",
"pin-project",
"raw-window-handle",
- "redox_syscall",
- "rustix 0.38.37",
+ "redox_syscall 0.4.1",
+ "rustix 0.38.38",
"smithay-client-toolkit",
"smol_str",
"tracing",
@@ -4733,13 +4870,25 @@ dependencies = [
[[package]]
name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
[[package]]
name = "x11-dl"
version = "2.21.0"
@@ -4762,7 +4911,7 @@ dependencies = [
"libc",
"libloading",
"once_cell",
- "rustix 0.38.37",
+ "rustix 0.38.38",
"x11rb-protocol",
]
@@ -4841,9 +4990,9 @@ checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852"
[[package]]
name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
[[package]]
name = "yansi-term"
@@ -4854,6 +5003,30 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.86",
+ "synstructure",
+]
+
[[package]]
name = "zbus"
version = "3.15.2"
@@ -4938,7 +5111,50 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.86",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.86",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.86",
]
[[package]]
diff --git a/third_party/nixpkgs/pkgs/by-name/ni/niri/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/niri/package.nix
index e854c1a4fc..f607197858 100644
--- a/third_party/nixpkgs/pkgs/by-name/ni/niri/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ni/niri/package.nix
@@ -4,6 +4,7 @@
dbus,
eudev,
fetchFromGitHub,
+ fetchpatch,
libdisplay-info,
libglvnd,
libinput,
@@ -25,15 +26,23 @@
rustPlatform.buildRustPackage rec {
pname = "niri";
- version = "0.1.9";
+ version = "0.1.10";
src = fetchFromGitHub {
owner = "YaLTeR";
repo = "niri";
rev = "refs/tags/v${version}";
- hash = "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=";
+ hash = "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=";
};
+ patches = [
+ # Fix scrolling not working with missing mouse config
+ (fetchpatch {
+ url = "https://github.com/YaLTeR/niri/commit/1951d2a9f262196a706f2645efb18dac3c4d6839.patch";
+ hash = "sha256-P/0LMYZ4HD0iG264BMnK4sLNNLmtbefF230GyC+t6qg=";
+ })
+ ];
+
postPatch = ''
patchShebangs resources/niri-session
substituteInPlace resources/niri.service \
@@ -43,8 +52,8 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "smithay-0.3.0" = "sha256-/3BO66yVoo63+5rwrZzoxhSTncvLyHdvtSaApFj3fBg=";
- "libspa-0.8.0" = "sha256-R68TkFbzDFA/8Btcar+0omUErLyBMm4fsmQlCvfqR9o=";
+ "smithay-0.3.0" = "sha256-nSM7LukWHO2n2eWz5ipFNkTCYDvx/VvPXnKVngJFU0U=";
+ "libspa-0.8.0" = "sha256-kp5x5QhmgEqCrt7xDRfMFGoTK5IXOuvW2yOW02B8Ftk=";
};
};
@@ -86,9 +95,14 @@ rustPlatform.buildRustPackage rec {
+ lib.optionalString withDbus ''
install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal
''
- + lib.optionalString withSystemd ''
+ + lib.optionalString (withSystemd || withDinit) ''
install -Dm0755 resources/niri-session -t $out/bin
+ ''
+ + lib.optionalString withSystemd ''
install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/lib/systemd/user
+ ''
+ + lib.optionalString withDinit ''
+ install -Dm0644 resources/dinit/niri{-shutdown,} -t $out/lib/dinit.d/user
'';
env = {
diff --git a/third_party/nixpkgs/pkgs/tools/X11/nitrogen/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nitrogen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/nitrogen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nitrogen/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nitrokey-udev-rules/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nitrokey-udev-rules/package.nix
new file mode 100644
index 0000000000..91a5595036
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ni/nitrokey-udev-rules/package.nix
@@ -0,0 +1,31 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "nitrokey-udev-rules";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "Nitrokey";
+ repo = "nitrokey-udev-rules";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-uq1+YQg+oe5UFphpy1AdxEYaPFyRle6ffYOPoU6Li28=";
+ };
+
+ installPhase = ''
+ install -D 41-nitrokey.rules -t $out/etc/udev/rules.d
+ '';
+
+ meta = with lib; {
+ description = "udev rules for Nitrokey devices";
+ homepage = "https://github.com/Nitrokey/nitrokey-udev-rules";
+ license = [ licenses.cc0 ];
+ maintainers = with maintainers; [
+ frogamic
+ robinkrahl
+ ];
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-bash-completions/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-bash-completions/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in b/third_party/nixpkgs/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in
diff --git a/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in b/third_party/nixpkgs/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache.cgi.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache.cgi.in
diff --git a/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-binary-cache/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-binary-cache/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nix-bisect/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-bisect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/nix-bisect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-bisect/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-build-uncached/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-build-uncached/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-bundle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-bundle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-doc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-doc/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-forecast/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-forecast/package.nix
new file mode 100644
index 0000000000..1d0899a5f3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-forecast/package.nix
@@ -0,0 +1,55 @@
+{
+ lib,
+ fetchFromGitHub,
+ installShellFiles,
+ makeBinaryWrapper,
+ nix,
+ rustPlatform,
+ versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "nix-forecast";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "getchoo";
+ repo = "nix-forecast";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-jfS7DXEIVHihC0/kH9W8ZJDOjoWuxdRvLMfzknElvrg=";
+ };
+
+ cargoHash = "sha256-EHqHdcMI1K7DqhmFfr0ipfAsyM7cP9/22bMs4uIV2To=";
+
+ nativeBuildInputs = [
+ installShellFiles
+ makeBinaryWrapper
+ ];
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+
+ # NOTE: Yes, we specifically need Nix. Lix does not have the newer
+ # `path-info --json` output used internally
+ postInstall = ''
+ wrapProgram $out/bin/nix-forecast --prefix PATH : ${lib.makeBinPath [ nix ]}
+
+ installShellCompletion --cmd nix-forecast \
+ --bash completions/nix-forecast.bash \
+ --fish completions/nix-forecast.fish \
+ --zsh completions/_nix-forecast
+ '';
+
+ env = {
+ COMPLETION_DIR = "completions";
+ };
+
+ meta = {
+ description = "Check the forecast for today's Nix builds";
+ homepage = "https://github.com/getchoo/nix-forecast";
+ changelog = "https://github.com/getchoo/nix-forecast/releases/tag/${version}";
+ license = lib.licenses.mpl20;
+ maintainers = with lib.maintainers; [ getchoo ];
+ mainProgram = "nix-forecast";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-init/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ni/nix-init/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nix-init/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-init/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-init/get_nix_license.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-init/get_nix_license.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nix-init/get_nix_license.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-init/get_nix_license.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-init/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-init/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-melt/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-melt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nix-melt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-melt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-plugins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-plugins/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-prefetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-prefetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-script/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-script/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nix-script/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-script/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-serve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-serve/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nix-tour/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-tour/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nix-tour/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-tour/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-unit/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-unit/package.nix
index f7e6d22911..aefeb2d63e 100644
--- a/third_party/nixpkgs/pkgs/by-name/ni/nix-unit/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-unit/package.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nix-unit";
- version = "2.24.0";
+ version = "2.24.1";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-unit";
rev = "v${finalAttrs.version}";
- hash = "sha256-6O4Q51PSUbr/ODVbfEfAAcoRdID3fqn0lAuHERHq+h4=";
+ hash = "sha256-PcT0jtv2QFaht5eSs1Vq4XGDqtMLdPC49ao9uwGYclE=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-update/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-update/package.nix
index c7212f1a31..35f20048b9 100644
--- a/third_party/nixpkgs/pkgs/by-name/ni/nix-update/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-update/package.nix
@@ -11,14 +11,14 @@
let
self = python3Packages.buildPythonApplication {
pname = "nix-update";
- version = "1.5.2";
+ version = "1.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Mic92";
repo = "nix-update";
rev = "refs/tags/${self.version}";
- hash = "sha256-6kR4UEBZvbQNoR3l8/It5ZTCC+mB14jzj7MNnFoQJwE=";
+ hash = "sha256-CpvLZ5cXNkIbAZjO1HebFaOiLyeesnkQxJ95V0anaII=";
};
build-system = [ python3Packages.setuptools ];
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-zsh-completions/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-zsh-completions/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixdoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixdoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixel/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixel/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/nixos-bgrt-plymouth/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-bgrt-plymouth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/nixos-bgrt-plymouth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-bgrt-plymouth/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh b/third_party/nixpkgs/pkgs/by-name/ni/nixos-container/nixos-container-completion.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-container/nixos-container-completion.sh
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/third_party/nixpkgs/pkgs/by-name/ni/nixos-container/nixos-container.pl
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-container/nixos-container.pl
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-container/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-container/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-generators/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-generators/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-install-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-install-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/__init__.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/__init__.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/asciidoc.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/asciidoc.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manpage.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manpage.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual_structure.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual_structure.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual_structure.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual_structure.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/md.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/md.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/options.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/options.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/parallel.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/parallel.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/types.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/types.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/utils.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/utils.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/utils.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/utils.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/pyproject.toml
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/pyproject.toml
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/sample_md.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/sample_md.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_asciidoc.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_asciidoc.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_auto_id_prefix.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_auto_id_prefix.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_auto_id_prefix.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_auto_id_prefix.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_commonmark.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_commonmark.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_headings.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_headings.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_html.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_html.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_lists.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_lists.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_manpage.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_manpage.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_options.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_options.py
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py b/third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_plugins.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-render-docs/src/tests/test_plugins.py
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-shell/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-shell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/nixos-shell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixos-shell/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixpacks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixpacks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-hammering/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixpkgs-hammering/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixpkgs-hammering/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixpkgs-hammering/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-lint/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nixpkgs-lint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixpkgs-review/package.nix
similarity index 95%
rename from third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixpkgs-review/package.nix
index a0036d6fa7..e7aebeff60 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
[
"--prefix PATH : ${lib.makeBinPath binPath}"
"--set-default NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt"
- # we don't have any runtime deps but nix-review shells might inject unwanted dependencies
+ # we don't have any runtime deps but nixpkgs-review shells might inject unwanted dependencies
"--unset PYTHONPATH"
];
diff --git a/third_party/nixpkgs/pkgs/games/njam/logfile.patch b/third_party/nixpkgs/pkgs/by-name/nj/njam/logfile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/njam/logfile.patch
rename to third_party/nixpkgs/pkgs/by-name/nj/njam/logfile.patch
diff --git a/third_party/nixpkgs/pkgs/games/njam/default.nix b/third_party/nixpkgs/pkgs/by-name/nj/njam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/njam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nj/njam/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/nkeys/default.nix b/third_party/nixpkgs/pkgs/by-name/nk/nkeys/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/nkeys/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nk/nkeys/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/nkf/default.nix b/third_party/nixpkgs/pkgs/by-name/nk/nkf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/nkf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nk/nkf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix b/third_party/nixpkgs/pkgs/by-name/nl/nload/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/nload/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nl/nload/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/third_party/nixpkgs/pkgs/by-name/nl/nlohmann_json/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nl/nlohmann_json/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch b/third_party/nixpkgs/pkgs/by-name/nl/nlojet/nlojet_clang_fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch
rename to third_party/nixpkgs/pkgs/by-name/nl/nlojet/nlojet_clang_fix.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix b/third_party/nixpkgs/pkgs/by-name/nl/nlojet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nl/nlojet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/nmap-formatter/default.nix b/third_party/nixpkgs/pkgs/by-name/nm/nmap-formatter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/nmap-formatter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nm/nmap-formatter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nmh/default.nix b/third_party/nixpkgs/pkgs/by-name/nm/nmh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nmh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nm/nmh/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nmon/default.nix b/third_party/nixpkgs/pkgs/by-name/nm/nmon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/nmon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nm/nmon/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/nmrpflash/default.nix b/third_party/nixpkgs/pkgs/by-name/nm/nmrpflash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/nmrpflash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nm/nmrpflash/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nms/default.nix b/third_party/nixpkgs/pkgs/by-name/nm/nms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nm/nms/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix b/third_party/nixpkgs/pkgs/by-name/nn/nng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nn/nng/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch b/third_party/nixpkgs/pkgs/by-name/nn/nnn/darwin-fix-file-mime-opts.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch
rename to third_party/nixpkgs/pkgs/by-name/nn/nnn/darwin-fix-file-mime-opts.patch
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix b/third_party/nixpkgs/pkgs/by-name/nn/nnn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nn/nnn/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/nnpdf/default.nix b/third_party/nixpkgs/pkgs/by-name/nn/nnpdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/nnpdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nn/nnpdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/nn/nntp-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nn/nntp-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/no/noaa-apt/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/noaa-apt/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/no/noaa-apt/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix b/third_party/nixpkgs/pkgs/by-name/no/noaa-apt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/noaa-apt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/node-glob/default.nix b/third_party/nixpkgs/pkgs/by-name/no/node-glob/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/node-glob/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/node-glob/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/manta/default.nix b/third_party/nixpkgs/pkgs/by-name/no/node-manta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/manta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/node-manta/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/by-name/no/node-problem-detector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/node-problem-detector/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/nodehun/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nodehun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/nodehun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nodehun/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/nodehun/update-nan.patch b/third_party/nixpkgs/pkgs/by-name/no/nodehun/update-nan.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/nodehun/update-nan.patch
rename to third_party/nixpkgs/pkgs/by-name/no/nodehun/update-nan.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/nodenv/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nodenv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/nodenv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nodenv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/noice/default.nix b/third_party/nixpkgs/pkgs/by-name/no/noice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/noice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/noice/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/noip/default.nix b/third_party/nixpkgs/pkgs/by-name/no/noip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/noip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/noip/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/noise-repellent/default.nix b/third_party/nixpkgs/pkgs/by-name/no/noise-repellent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/noise-repellent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/noise-repellent/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/noisetorch/default.nix b/third_party/nixpkgs/pkgs/by-name/no/noisetorch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/noisetorch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/noisetorch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nomachine-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nomachine-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nomad-autoscaler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nomad-autoscaler/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nomad-driver-podman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nomad-driver-podman/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nomino/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nomino/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nomino/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nomino/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/nordzy-cursor-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nordzy-cursor-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/nordzy-cursor-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nordzy-cursor-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nordzy-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nordzy-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/normalize/default.nix b/third_party/nixpkgs/pkgs/by-name/no/normalize/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/normalize/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/normalize/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/norminette/default.nix b/third_party/nixpkgs/pkgs/by-name/no/norminette/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/norminette/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/norminette/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/norouter/default.nix b/third_party/nixpkgs/pkgs/by-name/no/norouter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/norouter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/norouter/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/norwester/default.nix b/third_party/nixpkgs/pkgs/by-name/no/norwester-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/norwester/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/norwester-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/noseyparker/default.nix b/third_party/nixpkgs/pkgs/by-name/no/noseyparker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/noseyparker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/noseyparker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/nosqli/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nosqli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/nosqli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nosqli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nostr-rs-relay/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nostr-rs-relay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nostr-rs-relay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nostr-rs-relay/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notable/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/notable/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notable/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/notemap/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notemap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/notemap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notemap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notes-up/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notes-up/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/noteshrink/default.nix b/third_party/nixpkgs/pkgs/by-name/no/noteshrink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/noteshrink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/noteshrink/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notesnook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notesnook/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notify-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notify-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notify-osd-customizable/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notify-osd-customizable/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/notify-osd/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notify-osd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/notify-osd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notify-osd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notify-sharp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notify-sharp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/notify/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/notify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notify/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/notifymuch/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notifymuch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/notifymuch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notifymuch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/notion-app-enhanced/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notion-app-enhanced/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/notion-app-enhanced/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notion-app-enhanced/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notmuch-addrlookup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notmuch-addrlookup/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notmuch-bower/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/notmuch-bower/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/nova-filters/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nova-filters/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/nova-filters/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nova-filters/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nova/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nova/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/novnc/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/no/novnc/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/novnc/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/no/novnc/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/novnc/default.nix b/third_party/nixpkgs/pkgs/by-name/no/novnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/novnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/novnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/novnc/websockify.patch b/third_party/nixpkgs/pkgs/by-name/no/novnc/websockify.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/novnc/websockify.patch
rename to third_party/nixpkgs/pkgs/by-name/no/novnc/websockify.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/third_party/nixpkgs/pkgs/by-name/no/noweb/no-FAQ.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
rename to third_party/nixpkgs/pkgs/by-name/no/noweb/no-FAQ.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix b/third_party/nixpkgs/pkgs/by-name/no/noweb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/noweb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nox/nox-review-wip.patch b/third_party/nixpkgs/pkgs/by-name/no/nox/nox-review-wip.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/nox/nox-review-wip.patch
rename to third_party/nixpkgs/pkgs/by-name/no/nox/nox-review-wip.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nox/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/nox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/no/nox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/np2kai/default.nix b/third_party/nixpkgs/pkgs/by-name/np/np2kai/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/np2kai/default.nix
rename to third_party/nixpkgs/pkgs/by-name/np/np2kai/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix b/third_party/nixpkgs/pkgs/by-name/np/npapi_sdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/np/npapi_sdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix b/third_party/nixpkgs/pkgs/by-name/np/npins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/npins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/np/npins/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/npins/source.nix b/third_party/nixpkgs/pkgs/by-name/np/npins/source.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/npins/source.nix
rename to third_party/nixpkgs/pkgs/by-name/np/npins/source.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/npins/sources.json b/third_party/nixpkgs/pkgs/by-name/np/npins/sources.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/npins/sources.json
rename to third_party/nixpkgs/pkgs/by-name/np/npins/sources.json
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/npm-check-updates/default.nix b/third_party/nixpkgs/pkgs/by-name/np/npm-check-updates/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/npm-check-updates/default.nix
rename to third_party/nixpkgs/pkgs/by-name/np/npm-check-updates/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/npm-check/default.nix b/third_party/nixpkgs/pkgs/by-name/np/npm-check/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/npm-check/default.nix
rename to third_party/nixpkgs/pkgs/by-name/np/npm-check/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/npth/default.nix b/third_party/nixpkgs/pkgs/by-name/np/npth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/npth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/np/npth/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/nq/default.nix b/third_party/nixpkgs/pkgs/by-name/nq/nq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/nq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nq/nq/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/nqc/nqc-unistd.patch b/third_party/nixpkgs/pkgs/by-name/nq/nqc/nqc-unistd.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/nqc/nqc-unistd.patch
rename to third_party/nixpkgs/pkgs/by-name/nq/nqc/nqc-unistd.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/nqc/default.nix b/third_party/nixpkgs/pkgs/by-name/nq/nqc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/nqc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nq/nqc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nqptp/default.nix b/third_party/nixpkgs/pkgs/by-name/nq/nqptp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nqptp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nq/nqptp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nqptp/remove-setcap.patch b/third_party/nixpkgs/pkgs/by-name/nq/nqptp/remove-setcap.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nqptp/remove-setcap.patch
rename to third_party/nixpkgs/pkgs/by-name/nq/nqptp/remove-setcap.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nqptp/systemd-service-capability.patch b/third_party/nixpkgs/pkgs/by-name/nq/nqptp/systemd-service-capability.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nqptp/systemd-service-capability.patch
rename to third_party/nixpkgs/pkgs/by-name/nq/nqptp/systemd-service-capability.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nrf5-sdk/default.nix b/third_party/nixpkgs/pkgs/by-name/nr/nrf5-sdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nrf5-sdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nr/nrf5-sdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch b/third_party/nixpkgs/pkgs/by-name/nr/nrg2iso/c-compiler.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch
rename to third_party/nixpkgs/pkgs/by-name/nr/nrg2iso/c-compiler.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix b/third_party/nixpkgs/pkgs/by-name/nr/nrg2iso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nr/nrg2iso/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nrsc5/default.nix b/third_party/nixpkgs/pkgs/by-name/nr/nrsc5/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nrsc5/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nr/nrsc5/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules b/third_party/nixpkgs/pkgs/by-name/ns/ns-usbloader/99-ns-usbloader.rules
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules
rename to third_party/nixpkgs/pkgs/by-name/ns/ns-usbloader/99-ns-usbloader.rules
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/make-deterministic.patch b/third_party/nixpkgs/pkgs/by-name/ns/ns-usbloader/make-deterministic.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/make-deterministic.patch
rename to third_party/nixpkgs/pkgs/by-name/ns/ns-usbloader/make-deterministic.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/no-launch4j.patch b/third_party/nixpkgs/pkgs/by-name/ns/ns-usbloader/no-launch4j.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/no-launch4j.patch
rename to third_party/nixpkgs/pkgs/by-name/ns/ns-usbloader/no-launch4j.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/ns-usbloader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/ns-usbloader/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/nsc/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nsc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/nsc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nsc/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/nsh/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/nsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/nsis/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nsis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/nsis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nsis/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/nsnake/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nsnake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/nsnake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nsnake/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nsncd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nsncd/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nsq/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nsq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nsq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nsq/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nss_ldap/crashes.patch b/third_party/nixpkgs/pkgs/by-name/ns/nss_ldap/crashes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/nss_ldap/crashes.patch
rename to third_party/nixpkgs/pkgs/by-name/ns/nss_ldap/crashes.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch b/third_party/nixpkgs/pkgs/by-name/ns/nss_ldap/nss_ldap-265-glibc-2.16.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch
rename to third_party/nixpkgs/pkgs/by-name/ns/nss_ldap/nss_ldap-265-glibc-2.16.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nss_ldap/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nss_ldap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/nss_ldap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nss_ldap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nss_pam_ldapd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nss_pam_ldapd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nss_wrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nss_wrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nssmdns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nssmdns/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nsync/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nsync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nsync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ns/nsync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ntbtls/default.nix b/third_party/nixpkgs/pkgs/by-name/nt/ntbtls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ntbtls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nt/ntbtls/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix b/third_party/nixpkgs/pkgs/by-name/nt/ntirpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nt/ntirpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix b/third_party/nixpkgs/pkgs/by-name/nt/ntk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nt/ntk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ntl/default.nix b/third_party/nixpkgs/pkgs/by-name/nt/ntl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ntl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nt/ntl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ntlmrecon/default.nix b/third_party/nixpkgs/pkgs/by-name/nt/ntlmrecon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ntlmrecon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nt/ntlmrecon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ntopng/default.nix b/third_party/nixpkgs/pkgs/by-name/nt/ntopng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ntopng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nt/ntopng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix b/third_party/nixpkgs/pkgs/by-name/nt/ntp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nt/ntp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nttcp/format-security.patch b/third_party/nixpkgs/pkgs/by-name/nt/nttcp/format-security.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nttcp/format-security.patch
rename to third_party/nixpkgs/pkgs/by-name/nt/nttcp/format-security.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nttcp/default.nix b/third_party/nixpkgs/pkgs/by-name/nt/nttcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nttcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nt/nttcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ntttcp/default.nix b/third_party/nixpkgs/pkgs/by-name/nt/ntttcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ntttcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nt/ntttcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/nuXmv/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nuXmv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/nuXmv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nuXmv/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nu_scripts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nu_scripts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nuclei/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nuclei/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/nudoku/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nudoku/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/nudoku/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nudoku/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/third_party/nixpkgs/pkgs/by-name/nu/nuget-to-nix/nuget-to-nix.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
rename to third_party/nixpkgs/pkgs/by-name/nu/nuget-to-nix/nuget-to-nix.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nuget-to-nix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nuget-to-nix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/nuked-md/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nuked-md/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/nuked-md/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nuked-md/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nullidentdmod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nullidentdmod/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/num-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/num-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/num-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/num-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numactl/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numactl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/numactl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numactl/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numad/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/numad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numad/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numatop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numatop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numberstation/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numberstation/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/numcpp/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numcpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/numcpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numcpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/numdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/numdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numix-cursor-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numix-cursor-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/numix/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numix-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/numix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numix-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numix-icon-theme-square/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numix-icon-theme-square/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/numix-solarized/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/numix-solarized/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/numix-sx/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numix-sx-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/numix-sx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numix-sx-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/numlockx/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numlockx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/numlockx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numlockx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/numworks-epsilon/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numworks-epsilon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/numworks-epsilon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numworks-epsilon/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules b/third_party/nixpkgs/pkgs/by-name/nu/numworks-udev-rules/50-numworks-calculator.rules
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules
rename to third_party/nixpkgs/pkgs/by-name/nu/numworks-udev-rules/50-numworks-calculator.rules
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/numworks-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/numworks-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/update.sh b/third_party/nixpkgs/pkgs/by-name/nu/numworks-udev-rules/update.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/update.sh
rename to third_party/nixpkgs/pkgs/by-name/nu/numworks-udev-rules/update.sh
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nuraft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nuraft/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nurl/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/nu/nurl/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nurl/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/nu/nurl/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nurl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nurl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/nusmv/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nusmv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/nusmv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nusmv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nut/hardcode-paths.patch b/third_party/nixpkgs/pkgs/by-name/nu/nut/hardcode-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nut/hardcode-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/nu/nut/hardcode-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nut/nutshutdown-conf-default.patch b/third_party/nixpkgs/pkgs/by-name/nu/nut/nutshutdown-conf-default.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nut/nutshutdown-conf-default.patch
rename to third_party/nixpkgs/pkgs/by-name/nu/nut/nutshutdown-conf-default.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nut/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nut/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nuttcp/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nuttcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nuttcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nuttcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nux/default.nix b/third_party/nixpkgs/pkgs/by-name/nu/nux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nu/nux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nvd/default.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/nvd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nv/nvd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/nvi/default.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/nvi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nv/nvi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvidia-optical-flow-sdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nv/nvidia-optical-flow-sdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvidia_cg_toolkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nv/nvidia_cg_toolkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvimpager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nv/nvimpager/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/nvitop/default.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvitop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/nvitop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nv/nvitop/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvme-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nv/nvme-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvmet-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvmet-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/nvmet-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nv/nvmet-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/nvpy/default.nix b/third_party/nixpkgs/pkgs/by-name/nv/nvpy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/nvpy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nv/nvpy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/nw/nwg-bar/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nwg-bar/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/nw/nwg-bar/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-bar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nw/nwg-bar/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-displays/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nw/nwg-displays/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-dock/default.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-dock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nwg-dock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nw/nwg-dock/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix
index c5ba0f1e39..e7ab93f870 100644
--- a/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix
@@ -12,16 +12,16 @@
let
pname = "nwg-drawer";
- version = "0.5.0";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-drawer";
rev = "v${version}";
- hash = "sha256-0ksvat0NDC2P+T0TyDAKh7YNLYhH+znxqLCqQ/5GDj8=";
+ hash = "sha256-A/Rg7iUk8qpJ5lxumv4JNNJG1vN8wJIabJupp2c+nsw=";
};
- vendorHash = "sha256-KULOXphc6GWIGP79C9sgfAIRMoqwcjaVp4jVyF6of/E=";
+ vendorHash = "sha256-r4DtY06z0ZcPoHba4pqpCWqxYo7RbwCKi2g4jdoN1kg=";
in
buildGoModule {
inherit pname version src vendorHash;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-launchers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nw/nwg-launchers/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-look/default.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-look/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nwg-look/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nw/nwg-look/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-menu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nw/nwg-menu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-wrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-wrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/nwg-wrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nw/nwg-wrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix b/third_party/nixpkgs/pkgs/by-name/nx/nx-libs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nx/nx-libs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix b/third_party/nixpkgs/pkgs/by-name/nx/nx2elf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nx/nx2elf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/third_party/nixpkgs/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nyancat/default.nix b/third_party/nixpkgs/pkgs/by-name/ny/nyancat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/nyancat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ny/nyancat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nylon/configure-use-solib.patch b/third_party/nixpkgs/pkgs/by-name/ny/nylon/configure-use-solib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nylon/configure-use-solib.patch
rename to third_party/nixpkgs/pkgs/by-name/ny/nylon/configure-use-solib.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nylon/default.nix b/third_party/nixpkgs/pkgs/by-name/ny/nylon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nylon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ny/nylon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/nyx/default.nix b/third_party/nixpkgs/pkgs/by-name/ny/nyx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/nyx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ny/nyx/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/nz/nzportable/assets.nix b/third_party/nixpkgs/pkgs/by-name/nz/nzportable/assets.nix
new file mode 100644
index 0000000000..c002f5c121
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/nz/nzportable/assets.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ stdenvNoCC,
+ fetchFromGitHub,
+}:
+stdenvNoCC.mkDerivation {
+ pname = "nzp-assets";
+ version = "0-unstable-2024-09-28-13-34-48";
+
+ src = fetchFromGitHub {
+ owner = "nzp-team";
+ repo = "assets";
+ rev = "4a7b1b787061c1c7c17ab3b59a8e0e0f44c9546f";
+ hash = "sha256-gCTC/76r0ITIDLIph9uivq0ZJGaPUmlBGizdCUxJrng=";
+ };
+
+ outputs = [
+ "out"
+ "pc"
+ ];
+
+ # TODO: add more outputs for other ports
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out
+ cp -r common/* $out
+
+ mkdir -p $pc
+ cp -r pc/* $pc
+ chmod -R +w $pc/nzp
+ cp -r $out/* $pc/nzp
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Game asset repository for Nazi Zombies: Portable";
+ homepage = "https://github.com/nzp-team/assets";
+ license = with lib.licenses; [ cc-by-sa-40 ];
+ platforms = lib.platforms.all;
+ maintainers = with lib.maintainers; [ pluiedev ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/nz/nzportable/fteqw.nix b/third_party/nixpkgs/pkgs/by-name/nz/nzportable/fteqw.nix
new file mode 100644
index 0000000000..459873c24b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/nz/nzportable/fteqw.nix
@@ -0,0 +1,176 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+
+ cmake,
+ ninja,
+ pkg-config,
+ makeWrapper,
+ zip,
+ gettext,
+
+ libpng,
+ zlib,
+ gnutls,
+ libGL,
+ xorg,
+ alsa-lib,
+ libjpeg,
+ libogg,
+ libvorbis,
+ libopus,
+ dbus,
+ fontconfig,
+ SDL2,
+ bullet,
+ openexr,
+ sqlite,
+ addDriverRunpath,
+
+ enableEGL ? true,
+ libglvnd,
+
+ enableVulkan ? true,
+ vulkan-headers,
+ vulkan-loader,
+
+ enableWayland ? true,
+ wayland,
+ libxkbcommon,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "nzp-fteqw";
+ version = "0-unstable-2024-09-11-20-07-31";
+
+ src = fetchFromGitHub {
+ owner = "nzp-team";
+ repo = "fteqw";
+ rev = "593345a7f03245fc45580ac252857e5db5105033";
+ hash = "sha256-ANDHh4PKh8fAvbBiiW47l1XeGOCes0Sg595+65NFG6w=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ makeWrapper
+ pkg-config
+ zip
+ gettext
+ ];
+
+ buildInputs =
+ [
+ libGL
+ xorg.libX11
+ xorg.libXrandr
+ xorg.libXcursor
+ xorg.libXScrnSaver
+ dbus
+ fontconfig
+ libjpeg
+ libpng
+ alsa-lib
+ libogg
+ libvorbis
+ libopus
+ SDL2
+ gnutls
+ zlib
+ bullet
+ ]
+ ++ lib.optional enableEGL libglvnd
+ ++ lib.optionals enableWayland [
+ wayland
+ libxkbcommon
+ ]
+ ++ lib.optional enableVulkan vulkan-headers;
+
+ cmakeFlags = [
+ (lib.cmakeFeature "FTE_BUILD_CONFIG" "${finalAttrs.src}/engine/common/config_nzportable.h")
+ # Disable optional tools - only keep FTEQCC
+ (lib.cmakeBool "FTE_TOOL_IQM" false)
+ (lib.cmakeBool "FTE_TOOL_IMAGE" false)
+ (lib.cmakeBool "FTE_TOOL_QTV" false)
+ (lib.cmakeBool "FTE_TOOL_MASTER" false)
+ ];
+
+ postInstall = ''
+ mv $out/games $out/bin
+ '';
+
+ postFixup =
+ let
+ # grep for `Sys_LoadLibrary` for more.
+ # Some of the deps listed in the source code are actually not active
+ # due to being either disabled by the nzportable profile (e.g. lua, bz2),
+ # available in /run/opengl-driver,
+ # or statically linked (e.g. libpng, libjpeg, zlib, freetype)
+ # Some of them are also just deprecated by better backend options
+ # (SDL audio is preferred over ALSA, OpenAL and PulseAudio, for example)
+
+ libs = [
+ addDriverRunpath.driverLink
+
+ # gl/gl_vidlinuxglx.c
+ xorg.libX11
+ xorg.libXrandr
+ xorg.libXxf86vm
+ xorg.libXxf86dga
+ xorg.libXi
+ xorg.libXcursor
+ libGL
+
+ libvorbis
+
+ sqlite # server/sv_sql.c
+
+ SDL2 # a lot of different files
+ gnutls # common/net_ssl_gnutls.c
+ openexr # client/image.c
+
+ (placeholder "out")
+ ] ++ lib.optional enableWayland wayland ++ lib.optional enableVulkan vulkan-loader;
+ in
+ ''
+ wrapProgram $out/bin/fteqw \
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}"
+ '';
+
+ meta = {
+ description = "Nazi Zombies: Portable's fork of Spike's FTEQW engine/client";
+ longDescription = ''
+ This package contains only the FTEQW engine, and none of the assets used in NZ:P.
+ Please use the `nzportable` package for an out-of-the-box NZ:P experience.
+
+ FTEQW supports several graphics options.
+ You can specify those graphics option by overriding the FTEQW package, like this:
+ ```nix
+ nzp-fteqw.override {
+ enableVulkan = true;
+ }
+ ```
+ And in the game, you need to run `setrenderer ` to change the current renderer.
+
+ Supported graphics options are as follows:
+ - `enableEGL`: Enable the OpenGL ES renderer (`egl`). Enabled by default.
+ - `enableVulkan`: Enable the Vulkan renderer (`xvk`). Enabled by default.
+ - `enableWayland`: Enable native Wayland support, instead of using X11.
+ Adds up to two renderers, based on whether EGL and Vulkan are installed: `wlgl` and `wlvk`.
+ Seems to be currently broken and currently not enabled by default.
+ '';
+ homepage = "https://github.com/nzp-team/fteqw";
+ license = lib.licenses.gpl2Plus;
+ # See README
+ platforms = [
+ "x86_64-linux"
+ "i686-linux"
+ "armv7l-linux"
+ "aarch64-linux"
+ "x86_64-windows"
+ "i686-windows"
+ ];
+ maintainers = with lib.maintainers; [ pluiedev ];
+ mainProgram = "fteqw";
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/by-name/nz/nzportable/package.nix b/third_party/nixpkgs/pkgs/by-name/nz/nzportable/package.nix
new file mode 100644
index 0000000000..cb6e4f9273
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/nz/nzportable/package.nix
@@ -0,0 +1,84 @@
+{
+ lib,
+ callPackage,
+ writeShellApplication,
+}:
+let
+ assets = callPackage ./assets.nix { };
+ quakec = callPackage ./quakec.nix { };
+ fteqw = callPackage ./fteqw.nix { };
+
+ # We use the youngest version of all of the dependencies as the version number.
+ # This is similar to what upstream uses, except ours is a bit more accurate
+ # since we don't rely on a CI to run at an arbitrary time.
+ dateString =
+ lib.pipe
+ [
+ assets
+ fteqw
+ quakec
+ ]
+ [
+ # Find the youngest (most recently updated) version
+ (lib.foldl' (acc: p: if lib.versionOlder acc p.version then p.version else acc) "")
+ (lib.splitString "-")
+ (lib.sublist 2 6) # drop the first two segments (0 and unstable) and only keep the date
+ lib.concatStrings
+ ];
+
+ version = "2.0.0-indev+${dateString}";
+in
+writeShellApplication {
+ name = "nzportable";
+
+ text = ''
+ runDir=''${XDG_DATA_HOME:-$HOME/.local/share}/nzportable
+ data=${assets.pc}
+
+ relinkGameFiles() {
+ mkdir -p "$runDir"/nzp
+
+ # Remove existing links
+ find "$runDir" -type l -exec rm {} +
+
+ # Link game files
+ ln -s $data/default.fmf "$runDir"
+ ln -st "$runDir"/nzp $data/nzp/* ${quakec.fte}/*
+
+ # Write current version
+ echo "${version}" > "$runDir"/nzp/version.txt
+ }
+
+ if [[ ! -d $runDir ]]; then
+ echo "Game directory $runDir not found. Assuming first launch"
+ echo "Linking game files"
+ relinkGameFiles
+ else
+ currentVersion=$(<"$runDir"/nzp/version.txt)
+ if [[ "${version}" != "$currentVersion" ]]; then
+ echo "Version mismatch! (saved version $currentVersion != current version ${version})"
+ echo "Relinking game files"
+ relinkGameFiles
+ fi
+ fi
+
+ exec ${lib.getExe fteqw} -basedir "$runDir" "$@"
+ '';
+
+ derivationArgs = {
+ inherit version;
+ passthru = {
+ updateScript = callPackage ./update.nix { };
+ inherit assets quakec fteqw;
+ };
+ };
+
+ meta = {
+ inherit (fteqw.meta) platforms;
+ description = "Call of Duty: Zombies demake, powered by various Quake sourceports (PC version)";
+ homepage = "https://docs.nzp.gay";
+ license = lib.licenses.gpl2Plus;
+ maintainers = with lib.maintainers; [ pluiedev ];
+ mainProgram = "nzportable";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/nz/nzportable/quakec.nix b/third_party/nixpkgs/pkgs/by-name/nz/nzportable/quakec.nix
new file mode 100644
index 0000000000..32fb863d75
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/nz/nzportable/quakec.nix
@@ -0,0 +1,64 @@
+{
+ lib,
+ stdenvNoCC,
+ fetchFromGitHub,
+ python3,
+ nzportable,
+}:
+stdenvNoCC.mkDerivation {
+ pname = "nzp-quakec";
+ version = "0-unstable-2024-10-12-12-03-59";
+
+ src = fetchFromGitHub {
+ owner = "nzp-team";
+ repo = "quakec";
+ rev = "01e95c4dab91ce0e8b7387d2726d9ee307792ae7";
+ hash = "sha256-h4llx3tzeoI1aHLokM7NqkZJWuo6rcrmWfb0pDQL+zM=";
+ };
+
+ outputs = [
+ "out"
+ "fte"
+ ];
+
+ nativeBuildInputs = [ python3 ];
+
+ buildInputs = with python3.pkgs; [
+ colorama
+ fastcrc
+ pandas
+ nzportable.fteqw
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ python3 bin/qc_hash_generator.py -i tools/asset_conversion_table.csv -o source/server/hash_table.qc
+
+ mkdir -p build/{fte,standard}
+
+ fteqcc -srcfile progs/csqc.src
+ fteqcc -O3 -DFTE -srcfile progs/ssqc.src
+ fteqcc -O3 -srcfile progs/ssqc.src
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out $fte
+ cp -r build/standard/* $out
+ cp -r build/fte/* $fte
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "QuakeC repository for Nazi Zombies: Portable";
+ homepage = "https://github.com/nzp-team/quakec";
+ license = lib.licenses.gpl2Plus;
+ platforms = with lib.platforms; linux ++ darwin;
+ maintainers = with lib.maintainers; [ pluiedev ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/nz/nzportable/update.nix b/third_party/nixpkgs/pkgs/by-name/nz/nzportable/update.nix
new file mode 100644
index 0000000000..03c4a1cd1e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/nz/nzportable/update.nix
@@ -0,0 +1,41 @@
+{
+ lib,
+ writeShellApplication,
+ jq,
+ curl,
+ nix-prefetch-git,
+ common-updater-scripts,
+}:
+
+lib.getExe (writeShellApplication {
+ name = "nzp-updater";
+ runtimeInputs = [
+ jq
+ curl
+ nix-prefetch-git
+ common-updater-scripts
+ ];
+ text = ''
+ youngest=0
+ update() {
+ repo=$1
+ tag=$2
+
+ prefetch=$(nix-prefetch-git "https://github.com/nzp-team/$repo" --rev "$tag")
+
+ timestamp=$(echo "$prefetch" | jq -r '.date | strptime("%Y-%m-%dT%H:%M:%S%z") | mktime | strftime("%Y-%m-%d-%H-%M-%S")')
+ rev=$(echo "$prefetch" | jq -r ".rev")
+ hash=$(echo "$prefetch" | jq -r ".hash")
+
+ if [[ $youngest -lt $timestamp ]]; then
+ youngest=$timestamp
+ fi
+
+ update-source-version "$UPDATE_NIX_ATTR_PATH.$repo" "0-unstable-$timestamp" "$hash" --rev="$rev"
+ }
+
+ update fteqw bleeding-edge
+ update assets newest
+ update quakec bleeding-edge
+ '';
+})
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/oak/default.nix b/third_party/nixpkgs/pkgs/by-name/oa/oak/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/oak/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oa/oak/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix b/third_party/nixpkgs/pkgs/by-name/oa/oapi-codegen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oa/oapi-codegen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix b/third_party/nixpkgs/pkgs/by-name/oa/oatpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oa/oatpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/oa/oauth2-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oa/oauth2-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/oauth2c/default.nix b/third_party/nixpkgs/pkgs/by-name/oa/oauth2c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/oauth2c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oa/oauth2c/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/oberon-risc-emu/default.nix b/third_party/nixpkgs/pkgs/by-name/ob/oberon-risc-emu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/oberon-risc-emu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ob/oberon-risc-emu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/third_party/nixpkgs/pkgs/by-name/ob/obex_data_server/obex-data-server-0.4.6-build-fixes-1.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
rename to third_party/nixpkgs/pkgs/by-name/ob/obex_data_server/obex-data-server-0.4.6-build-fixes-1.patch
diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ob/obex_data_server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ob/obex_data_server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix b/third_party/nixpkgs/pkgs/by-name/ob/obexd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ob/obexd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix b/third_party/nixpkgs/pkgs/by-name/ob/obexfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ob/obexfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix b/third_party/nixpkgs/pkgs/by-name/ob/obexftp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ob/obexftp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/obfs4/default.nix b/third_party/nixpkgs/pkgs/by-name/ob/obfs4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/obfs4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ob/obfs4/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/objconv/default.nix b/third_party/nixpkgs/pkgs/by-name/ob/objconv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/objconv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ob/objconv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/obs-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ob/obs-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/obs-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ob/obs-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ob/obsidian/package.nix b/third_party/nixpkgs/pkgs/by-name/ob/obsidian/package.nix
index 03413d8eb5..aebb166a46 100644
--- a/third_party/nixpkgs/pkgs/by-name/ob/obsidian/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ob/obsidian/package.nix
@@ -61,7 +61,7 @@ let
-t $out/share/applications/
for size in 16 24 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
- magick ${icon} -background none -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
+ magick -background none ${icon} -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
done
runHook postInstall
'';
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix b/third_party/nixpkgs/pkgs/by-name/ob/obuild/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ob/obuild/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocaml-top/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocaml-top/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocaml_make/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocaml_make/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/oc/ocaml_make/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/oc/ocaml_make/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocf-resource-agents/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ocf-resource-agents/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocf-resource-agents/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/oci-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/oci-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocl-icd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocl-icd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/oclgrind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/oclgrind/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ocproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ocproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ocr-a/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocr-a/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ocr-a/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocr-a/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ocrad/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocrad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/ocrad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocrad/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/fix-launch.diff b/third_party/nixpkgs/pkgs/by-name/oc/ocrfeeder/fix-launch.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/fix-launch.diff
rename to third_party/nixpkgs/pkgs/by-name/oc/ocrfeeder/fix-launch.diff
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocrfeeder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocrfeeder/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ocserv/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocserv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ocserv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocserv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocsigen-i18n/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/ocsigen-i18n/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/octomap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/octomap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/ffmpeg-path.patch b/third_party/nixpkgs/pkgs/by-name/oc/octoprint/ffmpeg-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/octoprint/ffmpeg-path.patch
rename to third_party/nixpkgs/pkgs/by-name/oc/octoprint/ffmpeg-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/octoprint/package.nix
similarity index 98%
rename from third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/octoprint/package.nix
index 5052f0aef0..a4b437ac6d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/oc/octoprint/package.nix
@@ -120,13 +120,13 @@ let
(self: super: {
octoprint = self.buildPythonPackage rec {
pname = "OctoPrint";
- version = "1.10.2";
+ version = "1.10.3";
src = fetchFromGitHub {
owner = "OctoPrint";
repo = "OctoPrint";
rev = version;
- hash = "sha256-vISMps2v18A7MkF24SyIcK5yOQsTxBQLnKybVd8R2FU=";
+ hash = "sha256-BToW1/AcQ01OK7RWZrkstX2M4+uKuL/wFB6HGkVUflk=";
};
propagatedBuildInputs =
diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/pip-path.patch b/third_party/nixpkgs/pkgs/by-name/oc/octoprint/pip-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/octoprint/pip-path.patch
rename to third_party/nixpkgs/pkgs/by-name/oc/octoprint/pip-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix b/third_party/nixpkgs/pkgs/by-name/oc/octoprint/plugins.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/octoprint/plugins.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/octopus-caller/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/octopus-caller/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/octopus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/octopus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/octosuite/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/octosuite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/octosuite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/octosuite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix b/third_party/nixpkgs/pkgs/by-name/oc/oculante/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oc/oculante/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/odamex/default.nix b/third_party/nixpkgs/pkgs/by-name/od/odamex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/doom-ports/odamex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/od/odamex/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/oddjob/default.nix b/third_party/nixpkgs/pkgs/by-name/od/oddjob/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/oddjob/default.nix
rename to third_party/nixpkgs/pkgs/by-name/od/oddjob/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ode/default.nix b/third_party/nixpkgs/pkgs/by-name/od/ode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/od/ode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/odin2/default.nix b/third_party/nixpkgs/pkgs/by-name/od/odin2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/odin2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/od/odin2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix b/third_party/nixpkgs/pkgs/by-name/od/odo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/od/odo/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix b/third_party/nixpkgs/pkgs/by-name/od/odp-dpdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/od/odp-dpdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix b/third_party/nixpkgs/pkgs/by-name/od/odpic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/od/odpic/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/third_party/nixpkgs/pkgs/by-name/od/odroid-xu3-bootloader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/od/odroid-xu3-bootloader/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/odt2txt/default.nix b/third_party/nixpkgs/pkgs/by-name/od/odt2txt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/odt2txt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/od/odt2txt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/odyssey/default.nix b/third_party/nixpkgs/pkgs/by-name/od/odyssey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/odyssey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/od/odyssey/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/oed/default.nix b/third_party/nixpkgs/pkgs/by-name/oe/oed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/oed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oe/oed/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/offensive-azure/default.nix b/third_party/nixpkgs/pkgs/by-name/of/offensive-azure/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/offensive-azure/default.nix
rename to third_party/nixpkgs/pkgs/by-name/of/offensive-azure/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/offlineimap/default.nix b/third_party/nixpkgs/pkgs/by-name/of/offlineimap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/offlineimap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/of/offlineimap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix b/third_party/nixpkgs/pkgs/by-name/of/offrss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/of/offrss/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/offzip/default.nix b/third_party/nixpkgs/pkgs/by-name/of/offzip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/offzip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/of/offzip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch b/third_party/nixpkgs/pkgs/by-name/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
rename to third_party/nixpkgs/pkgs/by-name/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix b/third_party/nixpkgs/pkgs/by-name/of/ofono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/of/ofono/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ogdf/default.nix b/third_party/nixpkgs/pkgs/by-name/og/ogdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ogdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/og/ogdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix b/third_party/nixpkgs/pkgs/by-name/og/oggvideotools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/og/oggvideotools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/ogmtools/default.nix b/third_party/nixpkgs/pkgs/by-name/og/ogmtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/ogmtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/og/ogmtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/ograc/default.nix b/third_party/nixpkgs/pkgs/by-name/og/ograc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/ograc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/og/ograc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix b/third_party/nixpkgs/pkgs/by-name/oh/oh-my-git/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/oh-my-git/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oh/oh-my-git/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/by-name/oh/oh-my-zsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oh/oh-my-zsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/oh/default.nix b/third_party/nixpkgs/pkgs/by-name/oh/oh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/oh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oh/oh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix b/third_party/nixpkgs/pkgs/by-name/oh/oha/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/oha/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oh/oha/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/identd/oidentd/default.nix b/third_party/nixpkgs/pkgs/by-name/oi/oidentd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/identd/oidentd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oi/oidentd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/oil-buku/default.nix b/third_party/nixpkgs/pkgs/by-name/oi/oil-buku/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/oil-buku/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oi/oil-buku/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/oksh/default.nix b/third_party/nixpkgs/pkgs/by-name/ok/oksh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/oksh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ok/oksh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/okta-aws-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ok/okta-aws-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/okta-aws-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ok/okta-aws-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ok/okteto/package.nix b/third_party/nixpkgs/pkgs/by-name/ok/okteto/package.nix
index 0970b4f0f0..7bc8d6c269 100644
--- a/third_party/nixpkgs/pkgs/by-name/ok/okteto/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ok/okteto/package.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "okteto";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
- hash = "sha256-TxZdHR6SNHrIAdrrg3X9TnWCR8bjos93d7k7eaKpvQ8=";
+ hash = "sha256-hs09DdTIcORd+Ys8QPsemEsC6PXzm3GkB3gtgE3ARPs=";
};
vendorHash = "sha256-GiA/fmLT9x3gGF066bHTBWDd1yhygeG9snwCpwhOlMM=";
diff --git a/third_party/nixpkgs/pkgs/servers/olaris/default.nix b/third_party/nixpkgs/pkgs/by-name/ol/olaris-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/olaris/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ol/olaris-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix b/third_party/nixpkgs/pkgs/by-name/ol/oldsindhi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ol/oldsindhi/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/oldstandard/default.nix b/third_party/nixpkgs/pkgs/by-name/ol/oldstandard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/oldstandard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ol/oldstandard/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix b/third_party/nixpkgs/pkgs/by-name/ol/olm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/olm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ol/olm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/olsrd/default.nix b/third_party/nixpkgs/pkgs/by-name/ol/olsrd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/olsrd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ol/olsrd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/om4/default.nix b/third_party/nixpkgs/pkgs/by-name/om/om4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/om4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/om/om4/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix b/third_party/nixpkgs/pkgs/by-name/om/omake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/om/omake/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/omni-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/om/omni-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/omni-gtk-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/om/omni-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/omniorb/default.nix b/third_party/nixpkgs/pkgs/by-name/om/omniorb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/omniorb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/om/omniorb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix b/third_party/nixpkgs/pkgs/by-name/om/omorfi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/om/omorfi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/omping/default.nix b/third_party/nixpkgs/pkgs/by-name/om/omping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/omping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/om/omping/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/omxplayer/default.nix b/third_party/nixpkgs/pkgs/by-name/om/omxplayer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/omxplayer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/om/omxplayer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/onboard/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/on/onboard/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/onboard/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/on/onboard/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch b/third_party/nixpkgs/pkgs/by-name/on/onboard/hunspell-use-xdg-datadirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch
rename to third_party/nixpkgs/pkgs/by-name/on/onboard/hunspell-use-xdg-datadirs.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix b/third_party/nixpkgs/pkgs/by-name/on/onboard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/onboard/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ondir/default.nix b/third_party/nixpkgs/pkgs/by-name/on/ondir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ondir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/ondir/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/oneko/default.nix b/third_party/nixpkgs/pkgs/by-name/on/oneko/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/oneko/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/oneko/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/third_party/nixpkgs/pkgs/by-name/on/oneshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/oneshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/onesixtyone/default.nix b/third_party/nixpkgs/pkgs/by-name/on/onesixtyone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/onesixtyone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/onesixtyone/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/onestepback/default.nix b/third_party/nixpkgs/pkgs/by-name/on/onestepback/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/onestepback/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/onestepback/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/oniguruma/default.nix b/third_party/nixpkgs/pkgs/by-name/on/oniguruma/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/oniguruma/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/oniguruma/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/onioncircuits/default.nix b/third_party/nixpkgs/pkgs/by-name/on/onioncircuits/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/onioncircuits/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/onioncircuits/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/on/onlykey-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/onlykey-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/on/onlykey-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/onlykey-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/onlykey-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix b/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-documentserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/onlyoffice-documentserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/onmetal-image/default.nix b/third_party/nixpkgs/pkgs/by-name/on/onmetal-image/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/onmetal-image/default.nix
rename to third_party/nixpkgs/pkgs/by-name/on/onmetal-image/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix b/third_party/nixpkgs/pkgs/by-name/oo/oobicpl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oo/oobicpl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix b/third_party/nixpkgs/pkgs/by-name/oo/ookla-speedtest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oo/ookla-speedtest/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/oonf-olsrd2/default.nix b/third_party/nixpkgs/pkgs/by-name/oo/oonf-olsrd2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/oonf-olsrd2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oo/oonf-olsrd2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/oo/ooniprobe-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oo/ooniprobe-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opae/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opae/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opae/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opae/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opaline/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opaline/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam-publish/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opam-publish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ocaml/opam-publish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opam-publish/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam2json/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opam2json/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ocaml/opam2json/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opam2json/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opcr-policy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opcr-policy/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/open-dyslexic/default.nix b/third_party/nixpkgs/pkgs/by-name/op/open-dyslexic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/open-dyslexic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/open-dyslexic/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/open-ecard/default.nix b/third_party/nixpkgs/pkgs/by-name/op/open-ecard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/open-ecard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/open-ecard/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/open-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/op/open-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/open-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/open-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/open-in-mpv/default.nix b/third_party/nixpkgs/pkgs/by-name/op/open-in-mpv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/open-in-mpv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/open-in-mpv/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix b/third_party/nixpkgs/pkgs/by-name/op/open-isns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/open-isns/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix b/third_party/nixpkgs/pkgs/by-name/op/open-pdf-sign/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/open-pdf-sign/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/op/open-policy-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/open-policy-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/op/open-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/open-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix b/third_party/nixpkgs/pkgs/by-name/op/open-stage-control/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/open-stage-control/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix b/third_party/nixpkgs/pkgs/by-name/op/open-wbo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/open-wbo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/open-wbo/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/openarena/Makefile.local b/third_party/nixpkgs/pkgs/by-name/op/openarena/Makefile.local
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/openarena/Makefile.local
rename to third_party/nixpkgs/pkgs/by-name/op/openarena/Makefile.local
diff --git a/third_party/nixpkgs/pkgs/games/openarena/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openarena/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/openarena/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openarena/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openbgpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/openbgpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openbgpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openboardview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openboardview/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/openbox/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/openbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch b/third_party/nixpkgs/pkgs/by-name/op/openbsm/bsm-add-audit_token_to_pid.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch
rename to third_party/nixpkgs/pkgs/by-name/op/openbsm/bsm-add-audit_token_to_pid.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openbsm/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openbsm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openbsm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openbsm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opencascade-occt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opencascade-occt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/opencbm/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opencbm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/opencbm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opencbm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/opencc/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opencc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/opencc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opencc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch b/third_party/nixpkgs/pkgs/by-name/op/opencl-clang/opencl-headers-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/op/opencl-clang/opencl-headers-dir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opencl-clang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opencl-clang/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opencl-clhpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opencl-clhpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opencl-headers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opencl-headers/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/openclonk/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openclonk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/openclonk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openclonk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencollada/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opencollada/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opencollada/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opencollada/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencollada/pcre.patch b/third_party/nixpkgs/pkgs/by-name/op/opencollada/pcre.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opencollada/pcre.patch
rename to third_party/nixpkgs/pkgs/by-name/op/opencollada/pcre.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opencore-amr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opencore-amr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/opencorsairlink/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opencorsairlink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/opencorsairlink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opencorsairlink/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/opencryptoki/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opencryptoki/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/opencryptoki/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opencryptoki/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openct/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openct/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openct/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openct/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendbx/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opendbx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opendbx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opendbx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendkim/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opendkim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opendkim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opendkim/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendmarc/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opendmarc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opendmarc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opendmarc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/opendune/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opendune/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/opendune/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opendune/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/opendungeons/cmakepaths.patch b/third_party/nixpkgs/pkgs/by-name/op/opendungeons/cmakepaths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/opendungeons/cmakepaths.patch
rename to third_party/nixpkgs/pkgs/by-name/op/opendungeons/cmakepaths.patch
diff --git a/third_party/nixpkgs/pkgs/games/opendungeons/fix_link_date_time.patch b/third_party/nixpkgs/pkgs/by-name/op/opendungeons/fix_link_date_time.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/opendungeons/fix_link_date_time.patch
rename to third_party/nixpkgs/pkgs/by-name/op/opendungeons/fix_link_date_time.patch
diff --git a/third_party/nixpkgs/pkgs/games/opendungeons/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opendungeons/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/opendungeons/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opendungeons/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/openexrid.patch b/third_party/nixpkgs/pkgs/by-name/op/openexrid-unstable/openexrid.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/openexrid.patch
rename to third_party/nixpkgs/pkgs/by-name/op/openexrid-unstable/openexrid.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openexrid-unstable/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openexrid-unstable/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openfec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openfec/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openfortivpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openfortivpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openfpgaloader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openfpgaloader/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openfx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openfx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opengrok/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opengrok/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openhmd/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openhmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openhmd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openhmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/cuda.patch b/third_party/nixpkgs/pkgs/by-name/op/openimagedenoise/cuda.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/cuda.patch
rename to third_party/nixpkgs/pkgs/by-name/op/openimagedenoise/cuda.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openimagedenoise/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openimagedenoise/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/openipmi/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openipmi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/openipmi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openipmi/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openiscsi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openiscsi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/openjade/msggen.patch b/third_party/nixpkgs/pkgs/by-name/op/openjade/msggen.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sgml/openjade/msggen.patch
rename to third_party/nixpkgs/pkgs/by-name/op/openjade/msggen.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openjade/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openjade/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/openjk/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openjk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/openjk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openjk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openjpeg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openjpeg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openldap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openldap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openlibm/package.nix
similarity index 86%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openlibm/package.nix
index 857b438d22..a7c5063e54 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/op/openlibm/package.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "openlibm";
- version = "0.8.3";
+ version = "0.8.4";
src = fetchFromGitHub {
owner = "JuliaLang";
repo = "openlibm";
rev = "v${version}";
- sha256 = "sha256-WSf4mcZXiEL3nKTLQh3Oi1MxeH9MOFRe7DU5zFT2aQE=";
+ sha256 = "sha256-JhyF93XU2Yd6Ia+JtYvF7Dr+d90r6xMZj/fWDwCNeWY=";
};
makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
diff --git a/third_party/nixpkgs/pkgs/games/openlierox/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openlierox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/openlierox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openlierox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openmm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openmm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/openblasPath.patch b/third_party/nixpkgs/pkgs/by-name/op/openmolcas/openblasPath.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/openblasPath.patch
rename to third_party/nixpkgs/pkgs/by-name/op/openmolcas/openblasPath.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openmolcas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openmolcas/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch b/third_party/nixpkgs/pkgs/by-name/op/openmolcas/qcmaquis.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch
rename to third_party/nixpkgs/pkgs/by-name/op/openmolcas/qcmaquis.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openmpi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openmpi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/openntpd/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openntpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/openntpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openntpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openobex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openobex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openocd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openocd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openpa/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openpa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openpa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openpa/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix
index 8bd0e1fb5c..08f64ba454 100644
--- a/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix
@@ -2,6 +2,7 @@
, stdenv
, rustPlatform
, fetchFromGitea
+, installShellFiles
, pkg-config
, pcsclite
, dbus
@@ -24,7 +25,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-G5+lVK41hbzy/Ltc0EKoUfqF0M1OYu679jyVjYKJmn0=";
- nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
+ nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ];
buildInputs = [ pcsclite dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.PCSC
@@ -37,6 +38,13 @@ rustPlatform.buildRustPackage rec {
};
};
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ OCT_COMPLETION_OUTPUT_DIR=$PWD/shell $out/bin/oct
+ installShellCompletion ./shell/oct.{bash,fish} ./shell/_oct
+ OCT_MANPAGE_OUTPUT_DIR=$PWD/man $out/bin/oct
+ installManPage ./man/*.1
+ '';
+
meta = with lib; {
description = "Tool for inspecting and configuring OpenPGP cards";
homepage = "https://codeberg.org/openpgp-card/openpgp-card-tools";
diff --git a/third_party/nixpkgs/pkgs/games/openrct2/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openrct2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/openrct2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openrct2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/openresolv/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openresolv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/openresolv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openresolv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/openring/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openring/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/openring/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openring/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/openrisk/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openrisk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/openrisk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openrisk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opensaml-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opensaml-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/opensbi/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opensbi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/opensbi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opensbi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/openscad-lsp/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openscad-lsp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/openscad-lsp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openscad-lsp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/openseachest/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openseachest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/openseachest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openseachest/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opensearch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opensearch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openshift/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openshift/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openslide/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openslide/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openslide/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openslide/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openslp/CVE-2016-4912.patch b/third_party/nixpkgs/pkgs/by-name/op/openslp/CVE-2016-4912.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openslp/CVE-2016-4912.patch
rename to third_party/nixpkgs/pkgs/by-name/op/openslp/CVE-2016-4912.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openslp/CVE-2019-5544.patch b/third_party/nixpkgs/pkgs/by-name/op/openslp/CVE-2019-5544.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openslp/CVE-2019-5544.patch
rename to third_party/nixpkgs/pkgs/by-name/op/openslp/CVE-2019-5544.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openslp/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openslp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openslp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openslp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/opensm/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opensm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/opensm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opensm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opensmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opensmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch b/third_party/nixpkgs/pkgs/by-name/op/opensmtpd-filter-dkimsign/no-chown-while-installing.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch
rename to third_party/nixpkgs/pkgs/by-name/op/opensmtpd-filter-dkimsign/no-chown-while-installing.patch
diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opensmtpd-filter-dkimsign/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opensmtpd-filter-dkimsign/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/opensoldat/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opensoldat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/opensoldat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opensoldat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/fix-register-storage-class.patch b/third_party/nixpkgs/pkgs/by-name/op/opensp/fix-register-storage-class.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sgml/opensp/fix-register-storage-class.patch
rename to third_party/nixpkgs/pkgs/by-name/op/opensp/fix-register-storage-class.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opensp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opensp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/op/opensp/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sgml/opensp/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/op/opensp/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openspecfun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openspecfun/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openspin/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openspin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/openspin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openspin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opensubdiv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opensubdiv/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/opensupaplex/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opensupaplex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/opensupaplex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opensupaplex/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opentofu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opentofu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch b/third_party/nixpkgs/pkgs/by-name/op/opentofu/provider-path-0_15.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch
rename to third_party/nixpkgs/pkgs/by-name/op/opentofu/provider-path-0_15.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opentracing-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opentracing-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opentracker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opentracker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opentsdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opentsdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/opentyrian/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opentyrian/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/opentyrian/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opentyrian/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openvino/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openvino/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openwsman/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openwsman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openwsman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openwsman/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openxr-loader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openxr-loader/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/openzone/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openzone-cursors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/openzone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openzone-cursors/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openzwave/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openzwave/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/openzwave/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/openzwave/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opera/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opera/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/by-name/op/operator-sdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/operator-sdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opkg-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opkg-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opkg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opkg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/op/oppai-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/oppai-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/ops/default.nix b/third_party/nixpkgs/pkgs/by-name/op/ops/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/ops/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/ops/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opsdroid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opsdroid/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/optar/default.nix b/third_party/nixpkgs/pkgs/by-name/op/optar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/optar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/optar/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/optipng/default.nix b/third_party/nixpkgs/pkgs/by-name/op/optipng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/optipng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/optipng/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/opus-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opusTools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/opus-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opusTools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/opusfile/disable-cert-store.patch b/third_party/nixpkgs/pkgs/by-name/op/opusfile/disable-cert-store.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/opusfile/disable-cert-store.patch
rename to third_party/nixpkgs/pkgs/by-name/op/opusfile/disable-cert-store.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/opusfile/include-multistream.patch b/third_party/nixpkgs/pkgs/by-name/op/opusfile/include-multistream.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/opusfile/include-multistream.patch
rename to third_party/nixpkgs/pkgs/by-name/op/opusfile/include-multistream.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/opusfile/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opusfile/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/opusfile/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opusfile/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix b/third_party/nixpkgs/pkgs/by-name/op/opustags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/op/opustags/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/oq/default.nix b/third_party/nixpkgs/pkgs/by-name/oq/oq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/oq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/oq/oq/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix b/third_party/nixpkgs/pkgs/by-name/or/oracle-instantclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/oracle-instantclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/or/oranchelo-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/oranchelo-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix b/third_party/nixpkgs/pkgs/by-name/or/oranda/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/oranda/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/oras/default.nix b/third_party/nixpkgs/pkgs/by-name/or/oras/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/oras/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/oras/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/orbitron/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orbitron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/orbitron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orbitron/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/orbuculum/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orbuculum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/orbuculum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orbuculum/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/orc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/orca-c/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orca-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/orca-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orca-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orcania/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orcania/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orchis-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orchis-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/org-stats/default.nix b/third_party/nixpkgs/pkgs/by-name/or/org-stats/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/org-stats/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/org-stats/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/org-stats/version.patch b/third_party/nixpkgs/pkgs/by-name/or/org-stats/version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/org-stats/version.patch
rename to third_party/nixpkgs/pkgs/by-name/or/org-stats/version.patch
diff --git a/third_party/nixpkgs/pkgs/data/themes/orion/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/orion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orion/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/orjail/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orjail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/orjail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orjail/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orocos-kdl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orocos-kdl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/orogene/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orogene/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/orogene/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orogene/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix b/third_party/nixpkgs/pkgs/by-name/or/ortp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/ortp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/orz/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/orz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/or/orz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/os-prober/default.nix b/third_party/nixpkgs/pkgs/by-name/os/os-prober/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/os-prober/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/os-prober/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/oscclip/default.nix b/third_party/nixpkgs/pkgs/by-name/os/oscclip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/oscclip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/oscclip/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/osdlyrics/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osdlyrics/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/osdlyrics/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osdlyrics/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/oshka/default.nix b/third_party/nixpkgs/pkgs/by-name/os/oshka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/oshka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/oshka/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osinfo-db-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osinfo-db-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osinfo-db/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osinfo-db/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osm-gps-map/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osm-gps-map/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osm2xmap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osm2xmap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/osmctools/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmctools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/osmctools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmctools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/osmid/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/osmid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmid/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmium-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmium-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bsc/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-bsc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-bsc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-bsc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bts/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-bts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-bts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-bts/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-ggsn/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-ggsn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-ggsn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-ggsn/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hlr/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-hlr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-hlr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-hlr/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-hnbgw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnbgw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-hnbgw/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-hnodeb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnodeb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-hnodeb/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-iuh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-iuh/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-mgw/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-mgw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-mgw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-mgw/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-msc/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-msc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-msc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-msc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-pcu/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-pcu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-pcu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-pcu/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sgsn/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-sgsn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-sgsn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-sgsn/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo-sip-connector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/osmocom/osmo-sip-connector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo-sip-connector/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/osmo/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/osmo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/osmtogeojson/package-lock.json b/third_party/nixpkgs/pkgs/by-name/os/osmtogeojson/package-lock.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/osmtogeojson/package-lock.json
rename to third_party/nixpkgs/pkgs/by-name/os/osmtogeojson/package-lock.json
diff --git a/third_party/nixpkgs/pkgs/applications/misc/osmtogeojson/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osmtogeojson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/osmtogeojson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osmtogeojson/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ospd-openvas/default.nix b/third_party/nixpkgs/pkgs/by-name/os/ospd-openvas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ospd-openvas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/ospd-openvas/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/osqp/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osqp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/osqp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osqp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osslsigncode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osslsigncode/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix b/third_party/nixpkgs/pkgs/by-name/os/ossutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/ossutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree-rs-ext/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/os/ostree-rs-ext/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ostree-rs-ext/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/os/ostree-rs-ext/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree-rs-ext/default.nix b/third_party/nixpkgs/pkgs/by-name/os/ostree-rs-ext/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ostree-rs-ext/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/ostree-rs-ext/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/by-name/os/ostree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/ostree/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ostrich-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/os/ostrich-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ostrich-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/ostrich-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/osv-detector/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osv-detector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/osv-detector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osv-detector/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/osv-scanner/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osv-scanner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/osv-scanner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osv-scanner/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/osxsnarf/default.nix b/third_party/nixpkgs/pkgs/by-name/os/osxsnarf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/osxsnarf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/os/osxsnarf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/otel-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ot/otel-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/otel-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ot/otel-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/otel-cli/patches/bin-echo-patch.patch b/third_party/nixpkgs/pkgs/by-name/ot/otel-cli/patches/bin-echo-patch.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/otel-cli/patches/bin-echo-patch.patch
rename to third_party/nixpkgs/pkgs/by-name/ot/otel-cli/patches/bin-echo-patch.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/otf2bdf/default.nix b/third_party/nixpkgs/pkgs/by-name/ot/otf2bdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/otf2bdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ot/otf2bdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/otfcc/fix-aarch64.patch b/third_party/nixpkgs/pkgs/by-name/ot/otfcc/fix-aarch64.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/otfcc/fix-aarch64.patch
rename to third_party/nixpkgs/pkgs/by-name/ot/otfcc/fix-aarch64.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/otfcc/move-makefiles.patch b/third_party/nixpkgs/pkgs/by-name/ot/otfcc/move-makefiles.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/otfcc/move-makefiles.patch
rename to third_party/nixpkgs/pkgs/by-name/ot/otfcc/move-makefiles.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/otfcc/default.nix b/third_party/nixpkgs/pkgs/by-name/ot/otfcc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/otfcc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ot/otfcc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix b/third_party/nixpkgs/pkgs/by-name/ot/otpauth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ot/otpauth/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix b/third_party/nixpkgs/pkgs/by-name/ot/otpclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ot/otpclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/otpw/default.nix b/third_party/nixpkgs/pkgs/by-name/ot/otpw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/otpw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ot/otpw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ots/default.nix b/third_party/nixpkgs/pkgs/by-name/ot/ots/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ots/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ot/ots/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/ott/default.nix b/third_party/nixpkgs/pkgs/by-name/ot/ott/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/ott/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ot/ott/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/otto-matic/default.nix b/third_party/nixpkgs/pkgs/by-name/ot/otto-matic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/otto-matic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ot/otto-matic/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/ouch/default.nix b/third_party/nixpkgs/pkgs/by-name/ou/ouch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/ouch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ou/ouch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/oui/default.nix b/third_party/nixpkgs/pkgs/by-name/ou/oui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/oui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ou/oui/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/out-of-tree/default.nix b/third_party/nixpkgs/pkgs/by-name/ou/out-of-tree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/out-of-tree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ou/out-of-tree/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/ov/default.nix b/third_party/nixpkgs/pkgs/by-name/ov/ov/package.nix
similarity index 91%
rename from third_party/nixpkgs/pkgs/tools/text/ov/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ov/ov/package.nix
index 3d900ea7d9..aa0b24a495 100644
--- a/third_party/nixpkgs/pkgs/tools/text/ov/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ov/ov/package.nix
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "ov";
- version = "0.36.0";
+ version = "0.37.0";
src = fetchFromGitHub {
owner = "noborus";
repo = "ov";
rev = "refs/tags/v${version}";
- hash = "sha256-0dnaZZmciKnN+rVKitqAf3Bt2vtWP+/fB1tuCuMRvio=";
+ hash = "sha256-PZYYr2763L/BOn05TSDr3tkjQQkg2Niic3rJrFSevu0=";
};
- vendorHash = "sha256-Ktusm7NldO5dTiLBIZ7fzsQ69kyTmKs9OJXZPP1oSws=";
+ vendorHash = "sha256-Xntel9WXwCY5iqC9JvrE/iSIXff504fCUP5kYc6pf7Y=";
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix b/third_party/nixpkgs/pkgs/by-name/ov/oven-media-engine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ov/oven-media-engine/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/support-ffmpeg-7.patch b/third_party/nixpkgs/pkgs/by-name/ov/oven-media-engine/support-ffmpeg-7.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/support-ffmpeg-7.patch
rename to third_party/nixpkgs/pkgs/by-name/ov/oven-media-engine/support-ffmpeg-7.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix b/third_party/nixpkgs/pkgs/by-name/ov/overmind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ov/overmind/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/overpass/default.nix b/third_party/nixpkgs/pkgs/by-name/ov/overpass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/overpass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ov/overpass/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix b/third_party/nixpkgs/pkgs/by-name/ov/oversteer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ov/oversteer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ovftool/installCheckPhase.ova b/third_party/nixpkgs/pkgs/by-name/ov/ovftool/installCheckPhase.ova
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/ovftool/installCheckPhase.ova
rename to third_party/nixpkgs/pkgs/by-name/ov/ovftool/installCheckPhase.ova
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ovftool/default.nix b/third_party/nixpkgs/pkgs/by-name/ov/ovftool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/ovftool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ov/ovftool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/owamp/default.nix b/third_party/nixpkgs/pkgs/by-name/ow/owamp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/owamp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ow/owamp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/owl/mac/MainMenu.nib b/third_party/nixpkgs/pkgs/by-name/ow/owl-compositor/mac/MainMenu.nib
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/owl/mac/MainMenu.nib
rename to third_party/nixpkgs/pkgs/by-name/ow/owl-compositor/mac/MainMenu.nib
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/owl/mac/OwlPreferences.nib b/third_party/nixpkgs/pkgs/by-name/ow/owl-compositor/mac/OwlPreferences.nib
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/owl/mac/OwlPreferences.nib
rename to third_party/nixpkgs/pkgs/by-name/ow/owl-compositor/mac/OwlPreferences.nib
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/owl/default.nix b/third_party/nixpkgs/pkgs/by-name/ow/owl-compositor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/owl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ow/owl-compositor/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix b/third_party/nixpkgs/pkgs/by-name/ow/owl-lisp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ow/owl-lisp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/owl/default.nix b/third_party/nixpkgs/pkgs/by-name/ow/owl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/owl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ow/owl/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/owncast/default.nix b/third_party/nixpkgs/pkgs/by-name/ow/owncast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/owncast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ow/owncast/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/owntracks-recorder/default.nix b/third_party/nixpkgs/pkgs/by-name/ow/owntracks-recorder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/owntracks-recorder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ow/owntracks-recorder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/ox/default.nix b/third_party/nixpkgs/pkgs/by-name/ox/ox/package.nix
similarity index 60%
rename from third_party/nixpkgs/pkgs/applications/editors/ox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ox/ox/package.nix
index ff4551ba0b..a9b15a7380 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/ox/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ox/ox/package.nix
@@ -1,19 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "ox";
- version = "0.6.7";
+ version = "0.6.10";
src = fetchFromGitHub {
owner = "curlpipe";
repo = pname;
rev = version;
- hash = "sha256-UFNOW/INV/65C6UysKi9lGw+PIj2NXF6ejG5UY702/I=";
+ hash = "sha256-7PaAcVatm/gqeZRuzCjoF6ZGDP6mIjDTuhmJQ5wt7x8=";
};
- cargoHash = "sha256-sy/RNMXJn5k9qw0ghCQA7PqZokpDw0xns4abwa938Gk=";
-
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
+ cargoHash = "sha256-2Jk8uDiTGUQqLOOQVlYm5R7qQXIqP0PkFvv5E5qTzT0=";
meta = with lib; {
description = "Independent Rust text editor that runs in your terminal";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/oxefmsynth/default.nix b/third_party/nixpkgs/pkgs/by-name/ox/oxefmsynth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/oxefmsynth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ox/oxefmsynth/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix b/third_party/nixpkgs/pkgs/by-name/ox/oxipng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ox/oxipng/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix b/third_party/nixpkgs/pkgs/by-name/ox/oxker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ox/oxker/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix b/third_party/nixpkgs/pkgs/by-name/ox/oxlint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ox/oxlint/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/oxtools/default.nix b/third_party/nixpkgs/pkgs/by-name/ox/oxtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/oxtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ox/oxtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/oxygenfonts/default.nix b/third_party/nixpkgs/pkgs/by-name/ox/oxygenfonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/oxygenfonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ox/oxygenfonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/p0f/default.nix b/third_party/nixpkgs/pkgs/by-name/p0/p0f/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/p0f/default.nix
rename to third_party/nixpkgs/pkgs/by-name/p0/p0f/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/third_party/nixpkgs/pkgs/by-name/p1/p11-kit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/p1/p11-kit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix b/third_party/nixpkgs/pkgs/by-name/p2/p2pool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/p2/p2pool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/p4d/default.nix b/third_party/nixpkgs/pkgs/by-name/p4/p4d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/p4d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/p4/p4d/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/p910nd/default.nix b/third_party/nixpkgs/pkgs/by-name/p9/p910nd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/p910nd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/p9/p910nd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/pa-applet/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pa_applet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/pa-applet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pa_applet/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/logging/pacemaker/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pacemaker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/logging/pacemaker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pacemaker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pachyderm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pachyderm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/package-project-cmake/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/package-project-cmake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/package-project-cmake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/package-project-cmake/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/packcc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/packcc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/packcc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/packet-sd/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/packet-sd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/packet-sd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/packet-sd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/packetdrill/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/packetdrill/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/packetdrill/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/packetdrill/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/packr/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/packr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/packr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/packr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/minecraft/packwiz/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/packwiz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/minecraft/packwiz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/packwiz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch b/third_party/nixpkgs/pkgs/by-name/pa/pacman/dont-create-empty-dirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch
rename to third_party/nixpkgs/pkgs/by-name/pa/pacman/dont-create-empty-dirs.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pacman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pacman/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/paco/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/paco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paco/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pacparser/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pacparser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pacparser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pacparser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pacup/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pacup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/pacup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pacup/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/pacvim/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pacvim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/pacvim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pacvim/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/padbuster/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/padbuster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/padbuster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/padbuster/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/page/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/page/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/page/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/page/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pagemon/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pagemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pagemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pagemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/paging-calculator/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paging-calculator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/paging-calculator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paging-calculator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pagmo2/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pagmo2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pagmo2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pagmo2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pagsuite/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pagsuite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/pagsuite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pagsuite/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/paho-mqtt-c/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paho-mqtt-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/paho-mqtt-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paho-mqtt-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pairdrop/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pairdrop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pairdrop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pairdrop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pal/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/paleta/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paleta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/paleta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paleta/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/palp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/palp/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/pam-reattach/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam-reattach/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/pam-reattach/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam-reattach/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_ccreds/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_ccreds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_ccreds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_ccreds/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_dp9ik/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_dp9ik/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_dp9ik/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_dp9ik/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_gnupg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_gnupg/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_krb5/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_krb5/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_ldap/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_ldap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_ldap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_ldap/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mktemp/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_mktemp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_mktemp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_mktemp/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch b/third_party/nixpkgs/pkgs/by-name/pa/pam_mount/insert_utillinux_path_hooks.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_mount/insert_utillinux_path_hooks.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_mount/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_mount/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mysql/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_mysql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_mysql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_mysql/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_p11/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_p11/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_pgsql/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_pgsql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_pgsql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_pgsql/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_rssh/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_rssh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_rssh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_rssh/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch b/third_party/nixpkgs/pkgs/by-name/pa/pam_ssh_agent_auth/edcsa-crash-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_ssh_agent_auth/edcsa-crash-fix.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/third_party/nixpkgs/pkgs/by-name/pa/pam_ssh_agent_auth/multiple-key-files.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_ssh_agent_auth/multiple-key-files.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_tmpdir/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_tmpdir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_tmpdir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_tmpdir/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_u2f/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_u2f/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_u2f/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_u2f/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_ussh/go.mod b/third_party/nixpkgs/pkgs/by-name/pa/pam_ussh/go.mod
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_ussh/go.mod
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_ussh/go.mod
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_ussh/go.sum b/third_party/nixpkgs/pkgs/by-name/pa/pam_ussh/go.sum
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_ussh/go.sum
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_ussh/go.sum
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_ussh/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pam_ussh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pam_ussh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pam_ussh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pamix/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pamix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pamix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pamix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pamixer/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pamixer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pamixer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pamixer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/paml/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/paml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paml/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pamtester/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pamtester/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pamtester/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pamtester/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/panamax/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/panamax/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pandoc-katex/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pandoc-katex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pandoc-katex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pandoc-katex/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pandoc-lua-filters/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pandoc-lua-filters/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pandoc-lua-filters/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pandoc-lua-filters/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pandoc/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pandoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pandoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pandoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/panicparse/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/panicparse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/panicparse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/panicparse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/panoply/package.nix
similarity index 91%
rename from third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/panoply/package.nix
index 4905c0cbb4..20b27dac96 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pa/panoply/package.nix
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "panoply";
- version = "5.5.4";
+ version = "5.5.5";
src = fetchurl {
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
- hash = "sha256-rC2vQcaanK2nNSDtiXNhyBiV0SN3QqtwU8WNBc7D/Nw=";
+ hash = "sha256-rvJ3pyAbHI2/g3v+eKQF0Q9mx6+lLozaB8CLAAzOXRs=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/panopticon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/panopticon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/panotools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/panotools/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/pantum-driver/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pantum-driver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/pantum-driver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pantum-driver/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/papeer/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/papeer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/papeer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/papeer/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/paper-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paper-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/paper-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paper-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paper-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paper-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paperless-ngx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paperless-ngx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paperlike-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paperlike-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/papertrail/Gemfile b/third_party/nixpkgs/pkgs/by-name/pa/papertrail/Gemfile
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/papertrail/Gemfile
rename to third_party/nixpkgs/pkgs/by-name/pa/papertrail/Gemfile
diff --git a/third_party/nixpkgs/pkgs/tools/text/papertrail/Gemfile.lock b/third_party/nixpkgs/pkgs/by-name/pa/papertrail/Gemfile.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/papertrail/Gemfile.lock
rename to third_party/nixpkgs/pkgs/by-name/pa/papertrail/Gemfile.lock
diff --git a/third_party/nixpkgs/pkgs/tools/text/papertrail/gemset.nix b/third_party/nixpkgs/pkgs/by-name/pa/papertrail/gemset.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/papertrail/gemset.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/papertrail/gemset.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/papertrail/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/papertrail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/papertrail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/papertrail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/paperview/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paperview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/paperview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paperview/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/papi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/papi/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/papirus-folders/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/papirus-folders/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-nord/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/papirus-nord/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/papirus-nord/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/papirus-nord/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/paprefs/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paprefs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/paprefs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paprefs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/paps/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/paps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paps/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/par/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/par/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/par/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/par/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/par2cmdline/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/par2cmdline/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/parastoo-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/parastoo-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/pari-galdata/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pari-galdata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/pari-galdata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pari-galdata/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pari-seadata-small/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pari-seadata-small/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/parinfer-rust/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/parinfer-rust/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/parlatype/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/parlatype/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/parlatype/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/parlatype/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/parquet-tools/moto5.patch b/third_party/nixpkgs/pkgs/by-name/pa/parquet-tools/moto5.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/parquet-tools/moto5.patch
rename to third_party/nixpkgs/pkgs/by-name/pa/parquet-tools/moto5.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/parquet-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/parquet-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/parquet-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/parquet-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/parse-cli-bin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/parse-cli-bin/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/parsero/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/parsero/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/parsero/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/parsero/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/parson/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/parson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/parson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/parson/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/partclone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/partclone/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/parted/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/parted/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/parted/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/parted/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/particl-core/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/particl-core/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/partimage/gentoos-zlib.patch b/third_party/nixpkgs/pkgs/by-name/pa/partimage/gentoos-zlib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/partimage/gentoos-zlib.patch
rename to third_party/nixpkgs/pkgs/by-name/pa/partimage/gentoos-zlib.patch
diff --git a/third_party/nixpkgs/pkgs/tools/backup/partimage/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/partimage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/partimage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/partimage/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/partio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/partio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/partio/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pass-secret-service/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pass-secret-service/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/passage/darwin-getopt-path.patch b/third_party/nixpkgs/pkgs/by-name/pa/passage/darwin-getopt-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/passage/darwin-getopt-path.patch
rename to third_party/nixpkgs/pkgs/by-name/pa/passage/darwin-getopt-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/passage/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/passage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/passage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/passage/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/passerine/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/passerine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/passerine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/passerine/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/passff-host/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/passff-host/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/passff-host/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/passff-host/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/passh/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/passh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/passh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/passh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/passky-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/passky-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/passky-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/passky-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/passphrase2pgp/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/passphrase2pgp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/passphrase2pgp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/passphrase2pgp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/past-time/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/past-time/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/past-time/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/past-time/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pastebinit/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pastebinit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pastebinit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pastebinit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pastebinit/use-drv-etc.patch b/third_party/nixpkgs/pkgs/by-name/pa/pastebinit/use-drv-etc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pastebinit/use-drv-etc.patch
rename to third_party/nixpkgs/pkgs/by-name/pa/pastebinit/use-drv-etc.patch
diff --git a/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pasystray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pasystray/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/patatt/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/patatt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/patatt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/patatt/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-ppd-files/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/patchPpdFilesHook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-ppd-files/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/patchPpdFilesHook/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh b/third_party/nixpkgs/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-lines.awk b/third_party/nixpkgs/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-lines.awk
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-lines.awk
rename to third_party/nixpkgs/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-lines.awk
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-ppd-files/test.nix b/third_party/nixpkgs/pkgs/by-name/pa/patchPpdFilesHook/test.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-ppd-files/test.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/patchPpdFilesHook/test.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-ppd-files/test.ppd b/third_party/nixpkgs/pkgs/by-name/pa/patchPpdFilesHook/test.ppd
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-ppd-files/test.ppd
rename to third_party/nixpkgs/pkgs/by-name/pa/patchPpdFilesHook/test.ppd
diff --git a/third_party/nixpkgs/pkgs/applications/audio/patchage/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/patchage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/patchage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/patchage/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/patcher9x/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/patcher9x/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/patcher9x/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/patcher9x/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pathvector/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pathvector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pathvector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pathvector/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/patray/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/patray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/patray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/patray/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/patsh/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/patsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/patsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/patsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/paulstretch/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paulstretch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/paulstretch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paulstretch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pavucontrol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pavucontrol/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pax-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pax-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pax-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pax-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pax-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pax-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paxctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paxctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/paxtest/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paxtest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/paxtest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/paxtest/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/payload-dumper-go/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/payload-dumper-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/payload-dumper-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/payload-dumper-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/payload_dumper/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/payload_dumper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/payload_dumper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/payload_dumper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pazi/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pazi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pazi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/pazi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pb_cli/default.nix b/third_party/nixpkgs/pkgs/by-name/pb/pb_cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pb_cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pb/pb_cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/pbgopy/default.nix b/third_party/nixpkgs/pkgs/by-name/pb/pbgopy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/pbgopy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pb/pbgopy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/pbm/default.nix b/third_party/nixpkgs/pkgs/by-name/pb/pbm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/pbm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pb/pbm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix b/third_party/nixpkgs/pkgs/by-name/pb/pbpctrl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pb/pbpctrl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch b/third_party/nixpkgs/pkgs/by-name/pb/pbrt/openexr-cmake-3.12.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch
rename to third_party/nixpkgs/pkgs/by-name/pb/pbrt/openexr-cmake-3.12.patch
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pbrt/default.nix b/third_party/nixpkgs/pkgs/by-name/pb/pbrt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/pbrt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pb/pbrt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pbzip2/default.nix b/third_party/nixpkgs/pkgs/by-name/pb/pbzip2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/pbzip2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pb/pbzip2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pbzx/default.nix b/third_party/nixpkgs/pkgs/by-name/pb/pbzx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/pbzx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pb/pbzx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pbzx/stdin.patch b/third_party/nixpkgs/pkgs/by-name/pb/pbzx/stdin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/pbzx/stdin.patch
rename to third_party/nixpkgs/pkgs/by-name/pb/pbzx/stdin.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pc/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pcalc/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcalc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/pcalc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcalc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pcapc/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcapc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pcapc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcapc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pcapfix/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcapfix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pcapfix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcapfix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcaudiolib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcaudiolib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcb2gcode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcb2gcode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/pcem/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/pcem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcem/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcg_c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcg_c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcg-c/prefix-variable.patch b/third_party/nixpkgs/pkgs/by-name/pc/pcg_c/prefix-variable.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pcg-c/prefix-variable.patch
rename to third_party/nixpkgs/pkgs/by-name/pc/pcg_c/prefix-variable.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pcimem/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcimem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pcimem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcimem/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcloud/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcloud/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcmanfm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcmanfm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcmanx-gtk2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcmanx-gtk2/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcmciaUtils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcmciaUtils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcmsolver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcmsolver/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pcp/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcsc-cyberjack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcsc-cyberjack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsc-safenet/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcsc-safenet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pcsc-safenet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcsc-safenet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/eid.patch b/third_party/nixpkgs/pkgs/by-name/pc/pcsc-scm-scl011/eid.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/eid.patch
rename to third_party/nixpkgs/pkgs/by-name/pc/pcsc-scm-scl011/eid.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcsc-scm-scl011/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcsc-scm-scl011/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix b/third_party/nixpkgs/pkgs/by-name/pc/pcstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pc/pcstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdal/tests.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdal/tests.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pdal/tests.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdal/tests.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdf-parser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdf-parser/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdf-quench/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdf-quench/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdf2djvu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdf2djvu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdf2svg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdf2svg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdfchain/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfchain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/pdfchain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdfchain/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfcpu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdfcpu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfcrack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdfcrack/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pdfdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdfdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfgrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdfgrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/pdfmm/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfmm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/pdfmm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdfmm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfsandwich/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdfsandwich/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfslicer/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfslicer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pdfslicer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdfslicer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pdftag/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdftag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pdftag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdftag/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdftk/deps.json b/third_party/nixpkgs/pkgs/by-name/pd/pdftk/deps.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/pdftk/deps.json
rename to third_party/nixpkgs/pkgs/by-name/pd/pdftk/deps.json
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdftk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdftk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pdftoipe/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdftoipe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pdftoipe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdftoipe/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdm/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdns/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns/version.patch b/third_party/nixpkgs/pkgs/by-name/pd/pdns/version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/dns/pdns/version.patch
rename to third_party/nixpkgs/pkgs/by-name/pd/pdns/version.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pdnsd/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdnsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pdnsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pd/pdnsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pe-parse/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/pe-parse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pe-parse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/pe-parse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/pebble/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/pebble/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/pecita/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/pecita/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/pecita/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/pecita/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/peco/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/peco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/peco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/peco/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/peek/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/peek/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/peek/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/peek/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/peep/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/peep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/peep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/peep/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/fix-pyixapi-0.2.3-compatibility.patch b/third_party/nixpkgs/pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
rename to third_party/nixpkgs/pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/peering-manager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/peering-manager/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/peg/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/peg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/peg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/peg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pell/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/pell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/pell/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/penna/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/penna/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/penna/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/penna/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pentestgpt/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/pentestgpt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pentestgpt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/pentestgpt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/perccli/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/perccli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/perccli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/perccli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/perceptualdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/perceptualdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/percollate/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/percollate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/percollate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/percollate/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/perf-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/perf-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/perfect-hash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/perfect-hash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/perfect-hash/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/perkeep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/perkeep/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/perlnavigator/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/perlnavigator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/perlnavigator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/perlnavigator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/peroxide/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/peroxide/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/peroxide/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/peroxide/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/perseus/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/perseus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/perseus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/perseus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/peru/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/peru/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/peru/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/peru/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pest-ide-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/pest-ide-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/pest-ide-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/pest-ide-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pet/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/pet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/pet/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/petidomo/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/petidomo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/petidomo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/petidomo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/pev/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/pev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/pev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/pev/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pew/default.nix b/third_party/nixpkgs/pkgs/by-name/pe/pew/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pew/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pe/pew/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix b/third_party/nixpkgs/pkgs/by-name/pf/pferd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pf/pferd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pfetch-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/pf/pfetch-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pfetch-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pf/pfetch-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pfetch/default.nix b/third_party/nixpkgs/pkgs/by-name/pf/pfetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pfetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pf/pfetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pffft/default.nix b/third_party/nixpkgs/pkgs/by-name/pf/pffft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pffft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pf/pffft/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pflask/default.nix b/third_party/nixpkgs/pkgs/by-name/pf/pflask/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pflask/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pf/pflask/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pfsshell/default.nix b/third_party/nixpkgs/pkgs/by-name/pf/pfsshell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pfsshell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pf/pfsshell/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/pg/pg-dump-anon/package.nix b/third_party/nixpkgs/pkgs/by-name/pg/pg-dump-anon/package.nix
index d5f5dddea4..a097eb8aa9 100644
--- a/third_party/nixpkgs/pkgs/by-name/pg/pg-dump-anon/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pg/pg-dump-anon/package.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitLab, buildGoModule, nixosTests, postgresql, makeWrapper }:
+{ lib, fetchFromGitLab, buildGoModule, nixosTests, postgresql_17, makeWrapper }:
buildGoModule rec {
pname = "pg-dump-anon";
@@ -14,12 +14,12 @@ buildGoModule rec {
vendorHash = "sha256-CwU1zoIayxvfnGL9kPdummPJiV+ECfSz4+q6gZGb8pw=";
- passthru.tests = { inherit (nixosTests) pg_anonymizer; };
+ passthru.tests = { inherit (nixosTests.postgresql) anonymizer; };
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/pg_dump_anon \
- --prefix PATH : ${lib.makeBinPath [ postgresql ]}
+ --prefix PATH : ${lib.makeBinPath [ postgresql_17 ]}
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pg_activity/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pg_activity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/pg_activity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pg_activity/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pg_checksums/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pg_checksums/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/pg_featureserv/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pg_featureserv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/geospatial/pg_featureserv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pg_featureserv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pg_flame/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pg_flame/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pg_flame/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pg_flame/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/pg_tileserv/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pg_tileserv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/geospatial/pg_tileserv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pg_tileserv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pg_top/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pg_top/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pg_top/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pg_top/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgbackrest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgbackrest/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgbouncer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgbouncer/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgcat/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/pgcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgcenter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgcenter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgf_graphics/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgf_graphics/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgformatter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgformatter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pgloader/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgloader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pgloader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgloader/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgmanage/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgmanage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pgmanage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgmanage/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgmetrics/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgmetrics/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pgo-client/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgo-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/pgo-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgo-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pgpdump/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgpdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pgpdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgpdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgpkeyserver-lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgpkeyserver-lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgpool/darwin-strlcpy.patch b/third_party/nixpkgs/pkgs/by-name/pg/pgpool/darwin-strlcpy.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/pgpool/darwin-strlcpy.patch
rename to third_party/nixpkgs/pkgs/by-name/pg/pgpool/darwin-strlcpy.patch
diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgpool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgpool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pgtop/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgtop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pgtop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgtop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgweb/default.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgweb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/pgweb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pg/pgweb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/phantomsocks/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phantomsocks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/phantomsocks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phantomsocks/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/phash/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/phash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phash/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phd2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phd2/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phinger-cursors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phinger-cursors/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/phlare/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phlare/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/phlare/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phlare/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/phockup/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phockup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/phockup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phockup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phodav/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phodav/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phoronix-test-suite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phoronix-test-suite/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/tests.nix b/third_party/nixpkgs/pkgs/by-name/ph/phoronix-test-suite/tests.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/tests.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phoronix-test-suite/tests.nix
diff --git a/third_party/nixpkgs/pkgs/servers/photofield/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/photofield/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/photofield/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/photofield/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/photon-rss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/photon-rss/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/photon/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/photon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/photon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/photon/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/photoprism/backend.nix b/third_party/nixpkgs/pkgs/by-name/ph/photoprism/backend.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/photoprism/backend.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/photoprism/backend.nix
diff --git a/third_party/nixpkgs/pkgs/servers/photoprism/frontend.nix b/third_party/nixpkgs/pkgs/by-name/ph/photoprism/frontend.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/photoprism/frontend.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/photoprism/frontend.nix
diff --git a/third_party/nixpkgs/pkgs/servers/photoprism/libtensorflow.nix b/third_party/nixpkgs/pkgs/by-name/ph/photoprism/libtensorflow.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/photoprism/libtensorflow.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/photoprism/libtensorflow.nix
diff --git a/third_party/nixpkgs/pkgs/servers/photoprism/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/photoprism/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/photoprism/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/photoprism/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phrase-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phrase-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/phrasendrescher/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phrasendrescher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/phrasendrescher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phrasendrescher/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/phylactery/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/phylactery/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/physlock/default.nix b/third_party/nixpkgs/pkgs/by-name/ph/physlock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/physlock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ph/physlock/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/pi/piano-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/piano-rs/package.nix
new file mode 100644
index 0000000000..70feb3ba5c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/pi/piano-rs/package.nix
@@ -0,0 +1,47 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ makeBinaryWrapper,
+ pkg-config,
+ alsa-lib,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "piano-rs";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "ritiek";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-qZeH9xXQPIOJ87mvLahnJB3DuEgLX0EAXPvECgxNlq0=";
+ };
+
+ cargoHash = "sha256-vDqfWXeQVEnMWMjhAG/A0afff7dWMoQejDZjcVlYBMQ=";
+
+ nativeBuildInputs = [
+ makeBinaryWrapper
+ pkg-config
+ ];
+
+ buildInputs = [
+ alsa-lib
+ ];
+
+ postInstall = ''
+ mkdir -p "$out"/share/piano-rs
+ cp -r assets "$out"/share/piano-rs
+ wrapProgram "$out"/bin/piano-rs \
+ --set ASSETS "$out"/share/piano-rs/assets
+ '';
+
+ meta = with lib; {
+ description = "A multiplayer piano using UDP sockets that can be played using computer keyboard, in the terminal";
+ homepage = "https://github.com/ritiek/piano-rs";
+ license = licenses.mit;
+ mainProgram = "piano-rs";
+ maintainers = with maintainers; [ ritiek ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pianobar/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pianobar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pianobar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pianobar/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picard-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picard-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/picard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picard/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/picat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pick/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pick/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pick/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pick/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pico-sdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pico-sdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/picoc/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/picoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picolisp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picolisp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picoloop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picoloop/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picoprobe-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picoprobe-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/picosat/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picosat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/picosat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picosat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/picoscope/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picoscope/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/picoscope/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picoscope/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/picoscope/sources.json b/third_party/nixpkgs/pkgs/by-name/pi/picoscope/sources.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/picoscope/sources.json
rename to third_party/nixpkgs/pkgs/by-name/pi/picoscope/sources.json
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/picoscope/update.py b/third_party/nixpkgs/pkgs/by-name/pi/picoscope/update.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/picoscope/update.py
rename to third_party/nixpkgs/pkgs/by-name/pi/picoscope/update.py
diff --git a/third_party/nixpkgs/pkgs/tools/networking/picosnitch/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picosnitch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/picosnitch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picosnitch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picotool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/picotool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picotool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/picotts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/picotts/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/0.3.nix b/third_party/nixpkgs/pkgs/by-name/pi/pict-rs/0.3.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/0.3.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pict-rs/0.3.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/Cargo-0.3.lock b/third_party/nixpkgs/pkgs/by-name/pi/pict-rs/Cargo-0.3.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/Cargo-0.3.lock
rename to third_party/nixpkgs/pkgs/by-name/pi/pict-rs/Cargo-0.3.lock
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pict-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pict-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/pies/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pies/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/pies/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pies/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pifpaf/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pifpaf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pifpaf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pifpaf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pig/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/pig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pig/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/piglit/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/piglit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/piglit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/piglit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pigz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pigz/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pijul/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pijul/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pik/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pik/package.nix
index c40651558d..9a0ab2efb1 100644
--- a/third_party/nixpkgs/pkgs/by-name/pi/pik/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pi/pik/package.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "pik";
- version = "0.9.0";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "jacek-kurlit";
repo = "pik";
rev = version;
- hash = "sha256-YAnMSVQu/E+OyhHX3vugfBocyi++aGwG9vF6zL8T2RU=";
+ hash = "sha256-q1nNQC9qGa7nUNIaDdqW3wIrfzH7JKS/yZAe9KNmX3k=";
};
- cargoHash = "sha256-a7mqtxZMJl8zR8oCfuGNAiT5MEAmNpbDLSgi8A6FfPA=";
+ cargoHash = "sha256-gqzt3cFOS4uzIstIvmPS0n18aFUt0YnoTRz7EVTV7sA=";
passthru.tests.version = testers.testVersion { package = pik; };
diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/borg-path.patch b/third_party/nixpkgs/pkgs/by-name/pi/pika-backup/borg-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/pika-backup/borg-path.patch
rename to third_party/nixpkgs/pkgs/by-name/pi/pika-backup/borg-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pika-backup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pika-backup/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pika/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pika/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/pika/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pika/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pikchr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pikchr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/piknik/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/piknik/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/piknik/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/piknik/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pikopixel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pikopixel/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/pim6sd/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pim6sd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/pim6sd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pim6sd/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/pinball/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinball/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/pinball/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pinball/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinentry-bemenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pinentry-bemenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinentry-rofi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pinentry-rofi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pinfo/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pinfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pinfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pingtcp/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pingtcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pingtcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pingtcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/pingus/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pingus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/pingus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pingus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinniped/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pinniped/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/pinpoint/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinpoint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/pinpoint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pinpoint/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pinsel/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinsel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pinsel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pinsel/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/pioneer/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pioneer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/pioneer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pioneer/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/pioneers/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pioneers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/pioneers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pioneers/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pip-audit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pip-audit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipe-rename/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pipe-rename/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pipectl/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipectl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pipectl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pipectl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipenv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pipenv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch b/third_party/nixpkgs/pkgs/by-name/pi/piper-phonemize/espeak-mbrola.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch
rename to third_party/nixpkgs/pkgs/by-name/pi/piper-phonemize/espeak-mbrola.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/piper-phonemize/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/piper-phonemize/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/piper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/piper/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipes-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pipes-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pipes/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pipework/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipework/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pipework/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pipework/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pipr/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pipr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pipr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pipreqs/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipreqs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pipreqs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pipreqs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pirate-get/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pirate-get/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pirate-get/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pirate-get/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pistol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pistol/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/piston-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/piston-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/piston-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/piston-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/pitch-black/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pitch-black/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/pitch-black/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pitch-black/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pitivi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pitivi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/pitivi/prevent-closure-contamination.patch b/third_party/nixpkgs/pkgs/by-name/pi/pitivi/prevent-closure-contamination.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/pitivi/prevent-closure-contamination.patch
rename to third_party/nixpkgs/pkgs/by-name/pi/pitivi/prevent-closure-contamination.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/pius/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pius/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pius/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pius/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pixd/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pixd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pixd/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pixelfed/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixelfed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/pixelfed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pixelfed/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixelnuke/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pixelnuke/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pixeluvo/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixeluvo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/pixeluvo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pixeluvo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pixiecore/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixiecore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pixiecore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pixiecore/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pixiewps/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixiewps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pixiewps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pixiewps/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pixman/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pixman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pixman/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pixz/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pizarra/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pizarra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/pizarra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pizarra/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix b/third_party/nixpkgs/pkgs/by-name/pk/pk2cmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pk/pk2cmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix b/third_party/nixpkgs/pkgs/by-name/pk/pkcs11helper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pk/pkcs11helper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch b/third_party/nixpkgs/pkgs/by-name/pk/pkg-config-unwrapped/2.36.3-not-win32.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch
rename to third_party/nixpkgs/pkgs/by-name/pk/pkg-config-unwrapped/2.36.3-not-win32.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix b/third_party/nixpkgs/pkgs/by-name/pk/pkg-config-unwrapped/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pk/pkg-config-unwrapped/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/requires-private.patch b/third_party/nixpkgs/pkgs/by-name/pk/pkg-config-unwrapped/requires-private.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/requires-private.patch
rename to third_party/nixpkgs/pkgs/by-name/pk/pkg-config-unwrapped/requires-private.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix b/third_party/nixpkgs/pkgs/by-name/pk/pkg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pk/pkg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/pk/pkgdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pk/pkgdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pkger/default.nix b/third_party/nixpkgs/pkgs/by-name/pk/pkger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pkger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pk/pkger/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pkgtop/default.nix b/third_party/nixpkgs/pkgs/by-name/pk/pkgtop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pkgtop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pk/pkgtop/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix b/third_party/nixpkgs/pkgs/by-name/pk/pktgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pk/pktgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/planarity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/planarity/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/planetaryannihilation/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/planetary_annihilation/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/planetaryannihilation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/planetary_annihilation/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/planify/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/planify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/planify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/planify/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/plank/hide-in-pantheon.patch b/third_party/nixpkgs/pkgs/by-name/pl/plank/hide-in-pantheon.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/plank/hide-in-pantheon.patch
rename to third_party/nixpkgs/pkgs/by-name/pl/plank/hide-in-pantheon.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/plank/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plank/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/plank/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plank/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/planner/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/planner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/planner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/planner/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/plano/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plano-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/plano/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plano-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/planus/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/planus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/planus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/planus/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/plasma-hud/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plasma-hud/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/plasma-hud/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plasma-hud/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/plasma-overdose-kde-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plasma-overdose-kde-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/plasma-overdose-kde-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plasma-overdose-kde-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/platform-folders/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/platform-folders/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/platform-folders/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/platform-folders/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/platinum-searcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/platinum-searcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/platypus/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/platypus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/platypus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/platypus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/play-with-mpv/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/play-with-mpv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/play-with-mpv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/play-with-mpv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/playerctl/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/playerctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/playerctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/playerctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/please-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/please-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/please-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/please-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/please/nixos-specific.patch b/third_party/nixpkgs/pkgs/by-name/pl/please/nixos-specific.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/please/nixos-specific.patch
rename to third_party/nixpkgs/pkgs/by-name/pl/please/nixos-specific.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/please/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/please/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/please/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/please/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/plecost/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plecost/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/plecost/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plecost/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/plib/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/plib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plink-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plink-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/plistwatch/go-modules.patch b/third_party/nixpkgs/pkgs/by-name/pl/plistwatch/go-modules.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/plistwatch/go-modules.patch
rename to third_party/nixpkgs/pkgs/by-name/pl/plistwatch/go-modules.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/plistwatch/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plistwatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/plistwatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plistwatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/programming/plm/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/programming/plm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/plocate/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plocate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/plocate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plocate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/plog/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/plog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ploticus/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/ploticus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/ploticus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/ploticus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ploticus/ploticus-install.patch b/third_party/nixpkgs/pkgs/by-name/pl/ploticus/ploticus-install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/ploticus/ploticus-install.patch
rename to third_party/nixpkgs/pkgs/by-name/pl/ploticus/ploticus-install.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ploticus/set-prefabs-dir.patch b/third_party/nixpkgs/pkgs/by-name/pl/ploticus/set-prefabs-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/ploticus/set-prefabs-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/pl/ploticus/set-prefabs-dir.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ploticus/use-gd-package.patch b/third_party/nixpkgs/pkgs/by-name/pl/ploticus/use-gd-package.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/ploticus/use-gd-package.patch
rename to third_party/nixpkgs/pkgs/by-name/pl/ploticus/use-gd-package.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/plotinus/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plotinus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/plotinus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plotinus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/plots/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plots/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/plots/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plots/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch b/third_party/nixpkgs/pkgs/by-name/pl/plotutils/c++17-register-usage-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/pl/plotutils/c++17-register-usage-fix.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/plotutils/debian-patches.nix b/third_party/nixpkgs/pkgs/by-name/pl/plotutils/debian-patches.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/plotutils/debian-patches.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plotutils/debian-patches.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/plotutils/debian-patches.txt b/third_party/nixpkgs/pkgs/by-name/pl/plotutils/debian-patches.txt
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/plotutils/debian-patches.txt
rename to third_party/nixpkgs/pkgs/by-name/pl/plotutils/debian-patches.txt
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/plotutils/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plotutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/plotutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plotutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/plowshare/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plowshare/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/plowshare/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plowshare/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/plugdata/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plugdata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/plugdata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plugdata/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plugin-torture/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plugin-torture/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/plujain-ramp/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plujain-ramp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/plujain-ramp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plujain-ramp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/plumed/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plumed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/plumed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plumed/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/pluto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/pluto/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/plymouth/add-runtime-plugin-path.patch b/third_party/nixpkgs/pkgs/by-name/pl/plymouth/add-runtime-plugin-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/plymouth/add-runtime-plugin-path.patch
rename to third_party/nixpkgs/pkgs/by-name/pl/plymouth/add-runtime-plugin-path.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/plymouth/dont-create-broken-symlink.patch b/third_party/nixpkgs/pkgs/by-name/pl/plymouth/dont-create-broken-symlink.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/plymouth/dont-create-broken-symlink.patch
rename to third_party/nixpkgs/pkgs/by-name/pl/plymouth/dont-create-broken-symlink.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/plymouth/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/pl/plymouth/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/plymouth/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/pl/plymouth/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix b/third_party/nixpkgs/pkgs/by-name/pl/plymouth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pl/plymouth/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pmacct/default.nix b/third_party/nixpkgs/pkgs/by-name/pm/pmacct/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pmacct/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pm/pmacct/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch b/third_party/nixpkgs/pkgs/by-name/pm/pmccabe/getopt_on_darwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch
rename to third_party/nixpkgs/pkgs/by-name/pm/pmccabe/getopt_on_darwin.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix b/third_party/nixpkgs/pkgs/by-name/pm/pmccabe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pm/pmccabe/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/pmenu/default.nix b/third_party/nixpkgs/pkgs/by-name/pm/pmenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/pmenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pm/pmenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pmidi/default.nix b/third_party/nixpkgs/pkgs/by-name/pm/pmidi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pmidi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pm/pmidi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix b/third_party/nixpkgs/pkgs/by-name/pm/pmix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pm/pmix/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pmount/default.nix b/third_party/nixpkgs/pkgs/by-name/pm/pmount/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pmount/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pm/pmount/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pms/default.nix b/third_party/nixpkgs/pkgs/by-name/pm/pms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pm/pms/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pm-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/pm/pmutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pm-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pm/pmutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/pn/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/pn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pngcheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pngcheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pngcrush/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pngcrush/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngloss/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pngloss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pngloss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pngloss/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngnq/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pngnq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pngnq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pngnq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngoptimizer/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pngoptimizer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pngoptimizer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pngoptimizer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngout/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pngout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pngout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pngout/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/png++/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pngpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/png++/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pngpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngquant/add-Cargo.lock.patch b/third_party/nixpkgs/pkgs/by-name/pn/pngquant/add-Cargo.lock.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pngquant/add-Cargo.lock.patch
rename to third_party/nixpkgs/pkgs/by-name/pn/pngquant/add-Cargo.lock.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngquant/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pngquant/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pngquant/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pngquant/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pngtoico/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pngtoico/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngtools/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pngtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pngtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pngtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/pnmixer/default.nix b/third_party/nixpkgs/pkgs/by-name/pn/pnmixer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/pnmixer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pn/pnmixer/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pocketbase/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/pocketbase/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pocketbase/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix b/third_party/nixpkgs/pkgs/by-name/po/poco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/poco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poco/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pod2mdoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pod2mdoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/misc/podgrab/default.nix b/third_party/nixpkgs/pkgs/by-name/po/podgrab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/podgrab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/podgrab/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/podiff/default.nix b/third_party/nixpkgs/pkgs/by-name/po/podiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/podiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/podiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/hardcode-paths.patch b/third_party/nixpkgs/pkgs/by-name/po/podman/hardcode-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/podman/hardcode-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/po/podman/hardcode-paths.patch
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/by-name/po/podman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/podman/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/third_party/nixpkgs/pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch
rename to third_party/nixpkgs/pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/pods/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/po/pods/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/pods/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/po/pods/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pods/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pods/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix b/third_party/nixpkgs/pkgs/by-name/po/poetry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/poetry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poetry/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix b/third_party/nixpkgs/pkgs/by-name/po/poetry/plugins/poetry-audit-plugin.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poetry/plugins/poetry-audit-plugin.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix b/third_party/nixpkgs/pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-poeblix.nix b/third_party/nixpkgs/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-poeblix.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix b/third_party/nixpkgs/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix b/third_party/nixpkgs/pkgs/by-name/po/poetry/unwrapped.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poetry/unwrapped.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry2conda/default.nix b/third_party/nixpkgs/pkgs/by-name/po/poetry2conda/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/poetry2conda/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poetry2conda/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix b/third_party/nixpkgs/pkgs/by-name/po/poezio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poezio/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pokeget-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pokeget-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pokeget-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pokeget-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pokemon-colorscripts-mac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pokemon-colorscripts-mac/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pokemonsay/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pokemonsay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pokemonsay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pokemonsay/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/pokete/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pokete/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/pokete/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pokete/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix b/third_party/nixpkgs/pkgs/by-name/po/polar-bookshelf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/polar-bookshelf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf1/default.nix b/third_party/nixpkgs/pkgs/by-name/po/polar-bookshelf1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/polar-bookshelf1/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix b/third_party/nixpkgs/pkgs/by-name/po/policycoreutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/policycoreutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/polipo/default.nix b/third_party/nixpkgs/pkgs/by-name/po/polipo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/polipo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/polipo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch b/third_party/nixpkgs/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
rename to third_party/nixpkgs/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/elogind.patch b/third_party/nixpkgs/pkgs/by-name/po/polkit/elogind.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/polkit/elogind.patch
rename to third_party/nixpkgs/pkgs/by-name/po/polkit/elogind.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix b/third_party/nixpkgs/pkgs/by-name/po/polkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/polkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/system_bus.conf b/third_party/nixpkgs/pkgs/by-name/po/polkit/system_bus.conf
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/polkit/system_bus.conf
rename to third_party/nixpkgs/pkgs/by-name/po/polkit/system_bus.conf
diff --git a/third_party/nixpkgs/pkgs/data/fonts/poly/default.nix b/third_party/nixpkgs/pkgs/by-name/po/poly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/poly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poly/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix b/third_party/nixpkgs/pkgs/by-name/po/poly2tri-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poly2tri-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/polygon-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/po/polygon-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/polygon-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/polygon-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/polygraph/default.nix b/third_party/nixpkgs/pkgs/by-name/po/polygraph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/polygraph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/polygraph/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/polylith/default.nix b/third_party/nixpkgs/pkgs/by-name/po/polylith/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/polylith/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/polylith/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix b/third_party/nixpkgs/pkgs/by-name/po/polymake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/polymake/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix b/third_party/nixpkgs/pkgs/by-name/po/polypane/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/polypane/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/polytopes_db/default.nix b/third_party/nixpkgs/pkgs/by-name/po/polytopes_db/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/polytopes_db/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/polytopes_db/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pomerium-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pomerium-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pomerium-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pomerium-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pommed-light/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pommed_light/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pommed-light/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pommed_light/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/pomsky/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/po/pomsky/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/pomsky/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/po/pomsky/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/text/pomsky/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pomsky/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/pomsky/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pomsky/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/pong3d/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pong3d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/pong3d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pong3d/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ponymix/default.nix b/third_party/nixpkgs/pkgs/by-name/po/ponymix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ponymix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/ponymix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ponysay/default.nix b/third_party/nixpkgs/pkgs/by-name/po/ponysay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ponysay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/ponysay/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/poop/default.nix b/third_party/nixpkgs/pkgs/by-name/po/poop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/poop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poop/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/pop-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pop-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/pop-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pop-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pop-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pop-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pop/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pop/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/popa3d/enable-standalone-mode.patch b/third_party/nixpkgs/pkgs/by-name/po/popa3d/enable-standalone-mode.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/popa3d/enable-standalone-mode.patch
rename to third_party/nixpkgs/pkgs/by-name/po/popa3d/enable-standalone-mode.patch
diff --git a/third_party/nixpkgs/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch b/third_party/nixpkgs/pkgs/by-name/po/popa3d/fix-mail-spool-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch
rename to third_party/nixpkgs/pkgs/by-name/po/popa3d/fix-mail-spool-path.patch
diff --git a/third_party/nixpkgs/pkgs/servers/mail/popa3d/default.nix b/third_party/nixpkgs/pkgs/by-name/po/popa3d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/popa3d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/popa3d/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/popa3d/use-glibc-crypt.patch b/third_party/nixpkgs/pkgs/by-name/po/popa3d/use-glibc-crypt.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/popa3d/use-glibc-crypt.patch
rename to third_party/nixpkgs/pkgs/by-name/po/popa3d/use-glibc-crypt.patch
diff --git a/third_party/nixpkgs/pkgs/servers/mail/popa3d/use-openssl.patch b/third_party/nixpkgs/pkgs/by-name/po/popa3d/use-openssl.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/popa3d/use-openssl.patch
rename to third_party/nixpkgs/pkgs/by-name/po/popa3d/use-openssl.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix b/third_party/nixpkgs/pkgs/by-name/po/popeye/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/popeye/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/popfile/default.nix b/third_party/nixpkgs/pkgs/by-name/po/popfile/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/popfile/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/popfile/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/popl/default.nix b/third_party/nixpkgs/pkgs/by-name/po/popl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/popl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/popl/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/poppler-data/default.nix b/third_party/nixpkgs/pkgs/by-name/po/poppler_data/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/poppler-data/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poppler_data/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/popsicle/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/po/popsicle/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/popsicle/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/po/popsicle/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/misc/popsicle/default.nix b/third_party/nixpkgs/pkgs/by-name/po/popsicle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/popsicle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/popsicle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/popt/1.16-cygwin.patch b/third_party/nixpkgs/pkgs/by-name/po/popt/1.16-cygwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/popt/1.16-cygwin.patch
rename to third_party/nixpkgs/pkgs/by-name/po/popt/1.16-cygwin.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/popt/1.16-vpath.patch b/third_party/nixpkgs/pkgs/by-name/po/popt/1.16-vpath.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/popt/1.16-vpath.patch
rename to third_party/nixpkgs/pkgs/by-name/po/popt/1.16-vpath.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/popt/default.nix b/third_party/nixpkgs/pkgs/by-name/po/popt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/popt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/popt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/popura/default.nix b/third_party/nixpkgs/pkgs/by-name/po/popura/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/popura/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/popura/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/porsmo/default.nix b/third_party/nixpkgs/pkgs/by-name/po/porsmo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/porsmo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/porsmo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/portal/default.nix b/third_party/nixpkgs/pkgs/by-name/po/portal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/portal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/portal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/third_party/nixpkgs/pkgs/by-name/po/portfolio-filemanager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/portfolio-filemanager/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/portmod/default.nix b/third_party/nixpkgs/pkgs/by-name/po/portmod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/portmod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/portmod/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/portunus/default.nix b/third_party/nixpkgs/pkgs/by-name/po/portunus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/portunus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/portunus/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/po/positron-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/po/positron-bin/package.nix
index c399ba32f7..c26e54e5b3 100644
--- a/third_party/nixpkgs/pkgs/by-name/po/positron-bin/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/po/positron-bin/package.nix
@@ -72,11 +72,7 @@ stdenv.mkDerivation {
(lib.getLib systemd)
];
- unpackPhase = ''
- runHook preUnpack
- ${lib.optionalString stdenv.hostPlatform.isLinux ''dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-owner''}
- runHook postUnpack
- '';
+ postUnpack = lib.optionalString stdenv.hostPlatform.isLinux ''dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-owner'';
installPhase =
if stdenv.hostPlatform.isDarwin then
diff --git a/third_party/nixpkgs/pkgs/tools/security/posteid-seed-extractor/default.nix b/third_party/nixpkgs/pkgs/by-name/po/posteid-seed-extractor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/posteid-seed-extractor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/posteid-seed-extractor/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/postfixadmin/default.nix b/third_party/nixpkgs/pkgs/by-name/po/postfixadmin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/postfixadmin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postfixadmin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix b/third_party/nixpkgs/pkgs/by-name/po/postgres-lsp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postgres-lsp/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix b/third_party/nixpkgs/pkgs/by-name/po/postgresqlTestHook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postgresqlTestHook/package.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/third_party/nixpkgs/pkgs/by-name/po/postgresqlTestHook/postgresql-test-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/po/postgresqlTestHook/postgresql-test-hook.sh
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix b/third_party/nixpkgs/pkgs/by-name/po/postgresqlTestHook/test.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postgresqlTestHook/test.nix
diff --git a/third_party/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix b/third_party/nixpkgs/pkgs/by-name/po/postgresql_jdbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postgresql_jdbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/postgrey/default.nix b/third_party/nixpkgs/pkgs/by-name/po/postgrey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/postgrey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postgrey/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix b/third_party/nixpkgs/pkgs/by-name/po/postiats-utilities/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postiats-utilities/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/postman/darwin.nix b/third_party/nixpkgs/pkgs/by-name/po/postman/darwin.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/postman/darwin.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postman/darwin.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/postman/linux.nix b/third_party/nixpkgs/pkgs/by-name/po/postman/linux.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/postman/linux.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postman/linux.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/by-name/po/postman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/postman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postman/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix b/third_party/nixpkgs/pkgs/by-name/po/postscript-lexmark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postscript-lexmark/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/postsrsd/default.nix b/third_party/nixpkgs/pkgs/by-name/po/postsrsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/postsrsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/postsrsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/potrace/default.nix b/third_party/nixpkgs/pkgs/by-name/po/potrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/potrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/potrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/potreeconverter/default.nix b/third_party/nixpkgs/pkgs/by-name/po/potreeconverter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/potreeconverter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/potreeconverter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pouf/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pouf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pouf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pouf/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/pounce/default.nix b/third_party/nixpkgs/pkgs/by-name/po/pounce/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/pounce/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/pounce/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/power-calibrate/default.nix b/third_party/nixpkgs/pkgs/by-name/po/power-calibrate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/power-calibrate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/power-calibrate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/poweralertd/default.nix b/third_party/nixpkgs/pkgs/by-name/po/poweralertd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/poweralertd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/poweralertd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/powercap/default.nix b/third_party/nixpkgs/pkgs/by-name/po/powercap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/powercap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/powercap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0001-Fix-flask-2.3-issue.patch b/third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0001-Fix-flask-2.3-issue.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0001-Fix-flask-2.3-issue.patch
rename to third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0001-Fix-flask-2.3-issue.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0002-Remove-cssrewrite-filter.patch b/third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0002-Remove-cssrewrite-filter.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0002-Remove-cssrewrite-filter.patch
rename to third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0002-Remove-cssrewrite-filter.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch b/third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch
rename to third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch b/third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
rename to third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0005-Use-app-context-to-create-routes.patch b/third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0005-Use-app-context-to-create-routes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0005-Use-app-context-to-create-routes.patch
rename to third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0005-Use-app-context-to-create-routes.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0006-Register-modules-before-starting.patch b/third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0006-Register-modules-before-starting.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/0006-Register-modules-before-starting.patch
rename to third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/0006-Register-modules-before-starting.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix b/third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/powerdns-admin/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/po/powerline-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/powerline-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/powerline-go/default.nix b/third_party/nixpkgs/pkgs/by-name/po/powerline-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/powerline-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/powerline-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/powerline-symbols/default.nix b/third_party/nixpkgs/pkgs/by-name/po/powerline-symbols/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/powerline-symbols/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/powerline-symbols/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/powermanga/default.nix b/third_party/nixpkgs/pkgs/by-name/po/powermanga/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/powermanga/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/powermanga/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/powershell/default.nix b/third_party/nixpkgs/pkgs/by-name/po/powershell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/powershell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/powershell/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix b/third_party/nixpkgs/pkgs/by-name/po/powerstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/po/powerstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix b/third_party/nixpkgs/pkgs/by-name/pp/ppl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pp/ppl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/pplatex/default.nix b/third_party/nixpkgs/pkgs/by-name/pp/pplatex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/tex/pplatex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pp/pplatex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pplite/default.nix b/third_party/nixpkgs/pkgs/by-name/pp/pplite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pplite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pp/pplite/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix b/third_party/nixpkgs/pkgs/by-name/pp/ppp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pp/ppp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix b/third_party/nixpkgs/pkgs/by-name/pp/pprof/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pp/pprof/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pps-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/pp/pps-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pps-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pp/pps-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pptp/default.nix b/third_party/nixpkgs/pkgs/by-name/pp/pptp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pptp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pp/pptp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pptpd/default.nix b/third_party/nixpkgs/pkgs/by-name/pp/pptpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pptpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pp/pptpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pptpd/ppp-2.5.0-compat.patch b/third_party/nixpkgs/pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pptpd/ppp-2.5.0-compat.patch
rename to third_party/nixpkgs/pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/pqrs/default.nix b/third_party/nixpkgs/pkgs/by-name/pq/pqrs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pqrs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pq/pqrs/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/pr-tracker/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/pr-tracker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/pr-tracker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/pr-tracker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/praat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/praat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/praat/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/prboom-plus/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prboom-plus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/doom-ports/prboom-plus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prboom-plus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit-hook-ensure-sops/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pre-commit-hook-ensure-sops/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/hook-tmpl.patch b/third_party/nixpkgs/pkgs/by-name/pr/pre-commit/hook-tmpl.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pre-commit/hook-tmpl.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/pre-commit/hook-tmpl.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/third_party/nixpkgs/pkgs/by-name/pr/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/pre-commit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/pre-commit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/pygrep-pythonpath.patch b/third_party/nixpkgs/pkgs/by-name/pr/pre-commit/pygrep-pythonpath.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pre-commit/pygrep-pythonpath.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/pre-commit/pygrep-pythonpath.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/precice-config-visualizer/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/precice-config-visualizer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/precice-config-visualizer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/precice-config-visualizer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/precice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/precice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/precice/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/prelink/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prelink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/prelink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prelink/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/premid/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/premid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/premid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/premid/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/presage/fixed-cppunit-detection.patch b/third_party/nixpkgs/pkgs/by-name/pr/presage/fixed-cppunit-detection.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/presage/fixed-cppunit-detection.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/presage/fixed-cppunit-detection.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/presage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/presage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/presage/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/present-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/present-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/present-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/present-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/present/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/present/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/present/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/present/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pretender/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretender/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pretender/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/pretender/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pretty-simple/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretty-simple/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pretty-simple/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/pretty-simple/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/prettyping/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prettyping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/prettyping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prettyping/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prettypst/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/pr/prettypst/Cargo.lock
deleted file mode 100644
index 85297670f8..0000000000
--- a/third_party/nixpkgs/pkgs/by-name/pr/prettypst/Cargo.lock
+++ /dev/null
@@ -1,467 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "anstream"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748"
-dependencies = [
- "windows-sys",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-dependencies = [
- "anstyle",
- "windows-sys",
-]
-
-[[package]]
-name = "clap"
-version = "4.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "comemo"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4"
-dependencies = [
- "comemo-macros",
- "siphasher",
-]
-
-[[package]]
-name = "comemo-macros"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ecow"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "indexmap"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
-
-[[package]]
-name = "memchr"
-version = "2.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-
-[[package]]
-name = "once_cell"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
-
-[[package]]
-name = "prettypst"
-version = "1.1.0"
-dependencies = [
- "clap",
- "serde",
- "thiserror",
- "toml",
- "typst-syntax",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.193"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.193"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "siphasher"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "typst-syntax"
-version = "0.10.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.10.0#70ca0d257bb4ba927f63260e20443f244e0bb58c"
-dependencies = [
- "comemo",
- "ecow",
- "once_cell",
- "serde",
- "tracing",
- "unicode-ident",
- "unicode-math-class",
- "unicode-script",
- "unicode-segmentation",
- "unscanny",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-math-class"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65"
-
-[[package]]
-name = "unicode-script"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-
-[[package]]
-name = "unscanny"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
-
-[[package]]
-name = "winnow"
-version = "0.5.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94"
-dependencies = [
- "memchr",
-]
diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prettypst/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prettypst/package.nix
index 7cccdb5a2d..51bc7fd39b 100644
--- a/third_party/nixpkgs/pkgs/by-name/pr/prettypst/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pr/prettypst/package.nix
@@ -5,21 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "prettypst";
- version = "unstable-2023-12-06";
+ version = "unstable-2024-10-20";
src = fetchFromGitHub {
owner = "antonWetzel";
repo = "prettypst";
- rev = "bf46317ecac4331f101b2752de5328de5981eeba";
- hash = "sha256-wPayP/693BKIrHrRkx4uY0UuZRoCGPNW8LB3Z0oSBi4=";
+ rev = "a724b56de0527faf0f1f1eecb17d0b847872411c";
+ hash = "sha256-CVvcrytEG2q6kPiGBMfy/oQCD63Gm2AenvLUhCUx6fw=";
};
- cargoLock = {
- lockFile = ./Cargo.lock;
- outputHashes = {
- "typst-syntax-0.10.0" = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s=";
- };
- };
+ cargoHash = "sha256-zUeCthQ2fQ1P0gxN5XXg6a+Op8JFMrzU02Mh0mpwv30=";
meta = {
changelog = "https://github.com/antonWetzel/prettypst/blob/${src.rev}/changelog.md";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pridecat/fix_install.patch b/third_party/nixpkgs/pkgs/by-name/pr/pridecat/fix_install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pridecat/fix_install.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/pridecat/fix_install.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pridecat/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/pridecat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pridecat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/pridecat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pridefetch/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/pridefetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pridefetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/pridefetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/prime-server/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prime-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/prime-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prime-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/principia/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/principia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/principia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/principia/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/printrun/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/printrun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/printrun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/printrun/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/prism/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prism/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/prism/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prism/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pritunl-ssh/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/pritunl-ssh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pritunl-ssh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/pritunl-ssh/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/procdump/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/procdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/procdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/procdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/process-compose/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/process-compose/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/process-viewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/process-viewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/prociono/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prociono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/prociono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prociono/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/procmail/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/procmail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/procmail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/procmail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/procyon/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/procyon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/procyon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/procyon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/prodigal/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prodigal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/prodigal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prodigal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/professor/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/professor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/professor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/professor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/profetch/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/profetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/profetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/profetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/profile-cleaner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/profile-cleaner/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/profile-sync-daemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/profile-sync-daemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proggyfonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/proggyfonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proggyfonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/programmer-calculator/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/programmer-calculator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/programmer-calculator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/programmer-calculator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/progress/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/progress/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/progress/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proj-datumgrid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proj-datumgrid/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/projectable/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/projectable/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/projectable/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/projectable/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prometheus-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in
rename to third_party/nixpkgs/pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter/add-go-mod.patch b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-surfboard-exporter/add-go-mod.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter/add-go-mod.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/prometheus-surfboard-exporter/add-go-mod.patch
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/promscale/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/promscale/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/proot/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/proot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/properties-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/properties-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/prosody-filer/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prosody-filer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/xmpp/prosody-filer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prosody-filer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/protege-distribution/disable-console-log.patch b/third_party/nixpkgs/pkgs/by-name/pr/protege-distribution/disable-console-log.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/protege-distribution/disable-console-log.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/protege-distribution/disable-console-log.patch
diff --git a/third_party/nixpkgs/pkgs/development/web/protege-distribution/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protege-distribution/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/protege-distribution/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protege-distribution/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/protege-distribution/static-path.patch b/third_party/nixpkgs/pkgs/by-name/pr/protege-distribution/static-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/protege-distribution/static-path.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/protege-distribution/static-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/proteus/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proteus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/proteus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proteus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/proto-contrib/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proto-contrib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/proto-contrib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proto-contrib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobufc/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protobufc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/protobufc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protobufc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-doc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-doc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-grpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-vtproto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-twirp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-twirp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-twirp_swagger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-twirp_swagger/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-twirp_typescript/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-twirp_typescript/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-validate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-validate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/protocol/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protocol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/protocol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protocol/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protolint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/protolint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protolint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protolock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protolock/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/proton-caller/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proton-caller/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/proton-caller/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proton-caller/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix
index e144efcc83..46132abca0 100644
--- a/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
- version = "GE-Proton9-18";
+ version = "GE-Proton9-20";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
- hash = "sha256-NoRNM61Y9q8ksOXPeDV/NaIqHblWjXtK3tXcX5UEwkI=";
+ hash = "sha256-1twCv81KO1fcRcIb4H7VtAjtcKrX+DymsYdf885eOWo=";
};
outputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
index e3b310d744..665d032b1a 100644
--- a/third_party/nixpkgs/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage rec {
pname = "proton-vpn-local-agent";
- version = "0-unstable-2024-10-10";
- cargoHash = "sha256-yAeqx9zo4xz4g/klo10vMEcecc8npIUY8tkV/nq11WA=";
+ version = "1.0.0";
+ cargoHash = "sha256-TE2iqxTC6UH7pCM1wKEwaujMenNIp4LE+oy545tGmL0=";
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "python-proton-vpn-local-agent";
- rev = "01332194d217d91a514ecaebcdfbfa3d21ccd1ed";
+ rev = version;
hash = "sha256-I+tbVQzD4xJUsoRF8TU/2EMldVqtfxY3E7PQN3ks0mA=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protonmail-bridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protonmail-bridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/prototool/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prototool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/prototool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prototool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/prototypejs/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prototypejs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/prototypejs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prototypejs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/protox/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/protox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/protozero/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protozero/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/protozero/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/protozero/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/prover9/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prover9/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/prover9/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prover9/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proverif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proverif/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proxify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proxify/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/proximity-sort/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proximity-sort/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/proximity-sort/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proximity-sort/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/proxmove/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proxmove/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/proxmove/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proxmove/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch b/third_party/nixpkgs/pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
diff --git a/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proxmox-backup-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proxmox-backup-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proxychains-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proxychains-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch b/third_party/nixpkgs/pkgs/by-name/pr/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxychains/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proxychains/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/proxychains/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proxychains/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxychains/swap-priority-4-and-5-in-get_config_path.patch b/third_party/nixpkgs/pkgs/by-name/pr/proxychains/swap-priority-4-and-5-in-get_config_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/proxychains/swap-priority-4-and-5-in-get_config_path.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/proxychains/swap-priority-4-and-5-in-get_config_path.patch
diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/dont-phone-home.patch b/third_party/nixpkgs/pkgs/by-name/pr/proxysql/dont-phone-home.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/proxysql/dont-phone-home.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/proxysql/dont-phone-home.patch
diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/makefiles.patch b/third_party/nixpkgs/pkgs/by-name/pr/proxysql/makefiles.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/proxysql/makefiles.patch
rename to third_party/nixpkgs/pkgs/by-name/pr/proxysql/makefiles.patch
diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proxysql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proxysql/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/proycon-wayout/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/proycon-wayout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/proycon-wayout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/proycon-wayout/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prqlc/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prqlc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/prqlc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prqlc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/prs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pr/prs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ps2client/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/ps2client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/ps2client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/ps2client/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/ps2eps/hardcode-deps.patch b/third_party/nixpkgs/pkgs/by-name/ps/ps2eps/hardcode-deps.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/ps2eps/hardcode-deps.patch
rename to third_party/nixpkgs/pkgs/by-name/ps/ps2eps/hardcode-deps.patch
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/ps2eps/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/ps2eps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/ps2eps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/ps2eps/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/ps3-disc-dumper/deps.nix b/third_party/nixpkgs/pkgs/by-name/ps/ps3-disc-dumper/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/ps3-disc-dumper/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/ps3-disc-dumper/deps.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/ps3-disc-dumper/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/ps3-disc-dumper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/ps3-disc-dumper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/ps3-disc-dumper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/ps3iso-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/ps3iso-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/ps3iso-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/ps3iso-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ps3netsrv/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/ps3netsrv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ps3netsrv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/ps3netsrv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psc-package/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psc-package/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/pscale/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pscale/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/pscale/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pscircle/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/pscircle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/pscircle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/pscircle/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psftools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psftools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/psi-notify/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psi-notify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/psi-notify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psi-notify/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/system/psitop/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psitop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/system/psitop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psitop/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/psitransfer/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psitransfer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/psitransfer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psitransfer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/pslib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/pslib/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psmisc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psmisc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/psol/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/psol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psol/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/pspg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/pspg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pspp/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/pspp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/pspp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/pspp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/psql2csv/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psql2csv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/psql2csv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psql2csv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psqlodbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psqlodbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pssh/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/pssh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pssh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/pssh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/psstop/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psstop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/psstop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psstop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/pstoedit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/pstoedit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pstreams/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/pstreams/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pstreams/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/pstreams/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pstree/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/pstree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pstree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/pstree/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/psudohash/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psudohash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/psudohash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psudohash/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/psutils/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/psutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/psw/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/psw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/psw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ps/psw/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/by-name/pt/pt2-clone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pt/pt2-clone/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ptags/default.nix b/third_party/nixpkgs/pkgs/by-name/pt/ptags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/ptags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pt/ptags/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ptask/json_c_is_error.patch b/third_party/nixpkgs/pkgs/by-name/pt/ptask/json_c_is_error.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ptask/json_c_is_error.patch
rename to third_party/nixpkgs/pkgs/by-name/pt/ptask/json_c_is_error.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ptask/default.nix b/third_party/nixpkgs/pkgs/by-name/pt/ptask/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ptask/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pt/ptask/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ptask/tw-version.patch b/third_party/nixpkgs/pkgs/by-name/pt/ptask/tw-version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ptask/tw-version.patch
rename to third_party/nixpkgs/pkgs/by-name/pt/ptask/tw-version.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ptex/default.nix b/third_party/nixpkgs/pkgs/by-name/pt/ptex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ptex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pt/ptex/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/ptouch-print/default.nix b/third_party/nixpkgs/pkgs/by-name/pt/ptouch-print/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/ptouch-print/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pt/ptouch-print/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/public-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/public-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/public-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/public-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/publicsuffix-list/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/publicsuffix-list/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/publii/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/publii/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/publii/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/publii/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pubs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pubs/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/pufferpanel/deps.patch b/third_party/nixpkgs/pkgs/by-name/pu/pufferpanel/deps.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/pufferpanel/deps.patch
rename to third_party/nixpkgs/pkgs/by-name/pu/pufferpanel/deps.patch
diff --git a/third_party/nixpkgs/pkgs/servers/pufferpanel/disable-group-checks.patch b/third_party/nixpkgs/pkgs/by-name/pu/pufferpanel/disable-group-checks.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/pufferpanel/disable-group-checks.patch
rename to third_party/nixpkgs/pkgs/by-name/pu/pufferpanel/disable-group-checks.patch
diff --git a/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pufferpanel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pufferpanel/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/pufferpanel/skip-network-tests.patch b/third_party/nixpkgs/pkgs/by-name/pu/pufferpanel/skip-network-tests.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/pufferpanel/skip-network-tests.patch
rename to third_party/nixpkgs/pkgs/by-name/pu/pufferpanel/skip-network-tests.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pugixml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pugixml/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pulldown-cmark/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulldown-cmark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/pulldown-cmark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pulldown-cmark/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulsarctl/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulsarctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/pulsarctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pulsarctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulseaudio-ctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pulseaudio-ctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch b/third_party/nixpkgs/pkgs/by-name/pu/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch
rename to third_party/nixpkgs/pkgs/by-name/pu/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulseaudio-dlna/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pulseaudio-dlna/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulseeffects-legacy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pulseeffects-legacy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/pulsemixer/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulsemixer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/pulsemixer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pulsemixer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulumi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pulumi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulumictl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pulumictl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pup/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/puppeteer-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/puppeteer-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/puppeteer-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/puppeteer-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pur/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pur/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pur/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pur/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pure-ftpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pure-ftpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pure-prompt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pure-prompt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/puremapping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/puremapping/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pureref/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/pureref/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/pureref/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/pureref/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/purpur/default.nix b/third_party/nixpkgs/pkgs/by-name/pu/purpur/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/purpur/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pu/purpur/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pw-viz/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/pw/pw-viz/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pw-viz/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/pw/pw-viz/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pw-viz/default.nix b/third_party/nixpkgs/pkgs/by-name/pw/pw-viz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pw-viz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pw/pw-viz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/pw-volume/default.nix b/third_party/nixpkgs/pkgs/by-name/pw/pw-volume/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/pw-volume/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pw/pw-volume/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pwdsafety/default.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwdsafety/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pwdsafety/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pw/pwdsafety/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pwgen-secure/default.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwgen-secure/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pwgen-secure/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pw/pwgen-secure/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/pwgen/default.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwgen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/pwgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pw/pwgen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pwnat/default.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwnat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pwnat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pw/pwnat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwsafe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pw/pwsafe/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pwvucontrol/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/pw/pwvucontrol/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pwvucontrol/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/pw/pwvucontrol/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pwvucontrol/default.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwvucontrol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/pwvucontrol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pw/pwvucontrol/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/pxattr/default.nix b/third_party/nixpkgs/pkgs/by-name/px/pxattr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/pxattr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/px/pxattr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pxlib/default.nix b/third_party/nixpkgs/pkgs/by-name/px/pxlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pxlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/px/pxlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pxview/default.nix b/third_party/nixpkgs/pkgs/by-name/px/pxview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pxview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/px/pxview/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pxz/flush-stdout-help-version.patch b/third_party/nixpkgs/pkgs/by-name/px/pxz/flush-stdout-help-version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/pxz/flush-stdout-help-version.patch
rename to third_party/nixpkgs/pkgs/by-name/px/pxz/flush-stdout-help-version.patch
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pxz/default.nix b/third_party/nixpkgs/pkgs/by-name/px/pxz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/pxz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/px/pxz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/py3c/default.nix b/third_party/nixpkgs/pkgs/by-name/py/py3c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/py3c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/py3c/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/pyca/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pyCA/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/pyca/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pyCA/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyamlboot/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyamlboot/package.nix
index 6606fee6d1..82fe116dc1 100644
--- a/third_party/nixpkgs/pkgs/by-name/py/pyamlboot/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/py/pyamlboot/package.nix
@@ -3,6 +3,7 @@
fetchFromGitHub,
python3Packages,
testers,
+ pyamlboot,
}:
python3Packages.buildPythonApplication rec {
@@ -27,9 +28,9 @@ python3Packages.buildPythonApplication rec {
];
passthru.tests.version = testers.testVersion {
- package = "pyamlboot";
+ package = pyamlboot;
command = "boot.py -v";
- version = "boot.py ${version}";
+ version = "boot.py ${lib.versions.majorMinor version}";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pydf/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pydf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pydf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pydf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pyenv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pyenv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/pykms/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pykms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/pykms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pykms/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pylint-exit/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pylint-exit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pylint-exit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pylint-exit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/declarative-default-user.patch b/third_party/nixpkgs/pkgs/by-name/py/pyload-ng/declarative-default-user.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/pyload-ng/declarative-default-user.patch
rename to third_party/nixpkgs/pkgs/by-name/py/pyload-ng/declarative-default-user.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/declarative-env-config.patch b/third_party/nixpkgs/pkgs/by-name/py/pyload-ng/declarative-env-config.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/pyload-ng/declarative-env-config.patch
rename to third_party/nixpkgs/pkgs/by-name/py/pyload-ng/declarative-env-config.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pyload-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pyload-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/pylode/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pylode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/pylode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pylode/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock
index 353c5f0f38..bc834e8899 100644
--- a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/Cargo.lock
@@ -31,9 +31,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.92"
+version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
[[package]]
name = "autocfg"
@@ -93,9 +93,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "cc"
-version = "1.1.34"
+version = "1.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
+checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf"
dependencies = [
"shlex",
]
@@ -131,6 +131,17 @@ dependencies = [
"syn 2.0.87",
]
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
[[package]]
name = "either"
version = "1.13.0"
@@ -139,9 +150,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "els"
-version = "0.1.60-nightly.0"
+version = "0.1.60-nightly.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91526cd54184ae2ddea4124e87a00dca78fff3780de423dcc0b089d8ed0f31e1"
+checksum = "89c30c054c5e833e623d0673f81696e19e58269c66a7a134785e00c0534979b6"
dependencies = [
"erg_common",
"erg_compiler",
@@ -155,9 +166,9 @@ dependencies = [
[[package]]
name = "erg_common"
-version = "0.6.48-nightly.0"
+version = "0.6.48-nightly.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5e16917f93caa5866a8f628d8d4c82c72c7bde70bb1cae1969f1f5d0521f9a"
+checksum = "b194a638b1a921dfe528d62aa8a027f822142a3898f28d65c965bdacf50a2de1"
dependencies = [
"backtrace-on-stack-overflow",
"erg_proc_macros",
@@ -168,9 +179,9 @@ dependencies = [
[[package]]
name = "erg_compiler"
-version = "0.6.48-nightly.0"
+version = "0.6.48-nightly.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446393772e60305fbbce5d331aad109037e4ee7c098f8431c6431c2fab200548"
+checksum = "9d437395714e82c213db0366bab94b314f8f0fac5eaeb8297580df1e0b004fa1"
dependencies = [
"erg_common",
"erg_parser",
@@ -178,9 +189,9 @@ dependencies = [
[[package]]
name = "erg_parser"
-version = "0.6.48-nightly.0"
+version = "0.6.48-nightly.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e00edb38b9576bace8b914c65d5c4511055feb2de41527449bae6471bd05017"
+checksum = "d27a6c9659043cf12bcfc8066f34193438e19633ecc1161bfe5e36df12d2aa4a"
dependencies = [
"erg_common",
"erg_proc_macros",
@@ -189,9 +200,9 @@ dependencies = [
[[package]]
name = "erg_proc_macros"
-version = "0.6.48-nightly.0"
+version = "0.6.48-nightly.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f51df19e941a11864b34dc9cbf7c94b36a8641def3bdb041de873dad566b9f7"
+checksum = "52070b88941a145aecc724ff8dd57742f6e36cbb422311db5858dccf7c84efed"
dependencies = [
"quote",
"syn 1.0.109",
@@ -248,13 +259,142 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
]
[[package]]
@@ -292,9 +432,9 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
[[package]]
name = "libc"
-version = "0.2.161"
+version = "0.2.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
[[package]]
name = "libm"
@@ -302,6 +442,12 @@ version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
[[package]]
name = "lock_api"
version = "0.4.12"
@@ -563,7 +709,7 @@ dependencies = [
[[package]]
name = "py2erg"
-version = "0.0.69"
+version = "0.0.70"
dependencies = [
"erg_common",
"erg_compiler",
@@ -573,7 +719,7 @@ dependencies = [
[[package]]
name = "pylyzer"
-version = "0.0.69"
+version = "0.0.70"
dependencies = [
"els",
"erg_common",
@@ -583,7 +729,7 @@ dependencies = [
[[package]]
name = "pylyzer_core"
-version = "0.0.69"
+version = "0.0.70"
dependencies = [
"erg_common",
"erg_compiler",
@@ -594,7 +740,7 @@ dependencies = [
[[package]]
name = "pylyzer_wasm"
-version = "0.0.69"
+version = "0.0.70"
dependencies = [
"erg_common",
"erg_compiler",
@@ -803,6 +949,12 @@ version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
[[package]]
name = "static_assertions"
version = "1.1.0"
@@ -831,6 +983,17 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
[[package]]
name = "thread_local"
version = "1.1.8"
@@ -851,20 +1014,15 @@ dependencies = [
]
[[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
]
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
[[package]]
name = "unic-char-property"
version = "0.9.0"
@@ -917,27 +1075,12 @@ dependencies = [
"unic-common",
]
-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
[[package]]
name = "unicode-ident"
version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
[[package]]
name = "unicode-width"
version = "0.1.14"
@@ -974,9 +1117,9 @@ dependencies = [
[[package]]
name = "url"
-version = "2.5.2"
+version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
dependencies = [
"form_urlencoded",
"idna",
@@ -984,6 +1127,18 @@ dependencies = [
"serde",
]
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
[[package]]
name = "version_check"
version = "0.9.5"
@@ -1188,6 +1343,42 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
[[package]]
name = "zerocopy"
version = "0.7.35"
@@ -1208,3 +1399,46 @@ dependencies = [
"quote",
"syn 2.0.87",
]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
diff --git a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix
index 0c4d6a456a..a73a9de8f7 100644
--- a/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/py/pylyzer/package.nix
@@ -7,7 +7,6 @@
python3,
makeWrapper,
writeScriptBin,
- darwin,
which,
nix-update-script,
versionCheckHook,
@@ -15,13 +14,13 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
- version = "0.0.69";
+ version = "0.0.70";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "refs/tags/v${version}";
- hash = "sha256-3Ufige1OQWriJ6qQXjpfzL1tlA/9Sa8BEmhMDdpYlAQ=";
+ hash = "sha256-jj9r5npClLY9mhDHFI92825RYvwn6m9KlngfFL0bqCw=";
};
cargoLock = {
@@ -39,10 +38,10 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
python3
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+ ];
preBuild = ''
- export HOME=$TMPDIR
+ export HOME=$(mktemp -d)
'';
postInstall = ''
@@ -52,11 +51,17 @@ rustPlatform.buildRustPackage rec {
nativeCheckInputs = [ which ];
- checkFlags = [
- # this test causes stack overflow
- # > thread 'exec_import' has overflowed its stack
- "--skip=exec_import"
- ];
+ checkFlags =
+ [
+ # this test causes stack overflow
+ # > thread 'exec_import' has overflowed its stack
+ "--skip=exec_import"
+ ]
+ ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+ # Dict({Str..Obj: Int}) does not implement Iterable(Str..Obj..Obj) and Indexable({"a"}..Obj, Int)
+ # https://github.com/mtshiba/pylyzer/issues/114
+ "--skip=exec_casting"
+ ];
postFixup = ''
wrapProgram $out/bin/pylyzer --set ERG_PATH $out/lib/erg
diff --git a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pympress/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/pympress/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pympress/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pynac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pynac/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/pypi-mirror/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pypi-mirror/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pypi-mirror/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pypi-mirror/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pyrosimple/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pyrosimple/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pyrseas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pyrseas/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pysentation/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pysentation/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pysentation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pysentation/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pystring/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pystring/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pystring/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pystring/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python-cosmopolitan/default.nix b/third_party/nixpkgs/pkgs/by-name/py/python-cosmopolitan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/python-cosmopolitan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/python-cosmopolitan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/python-launcher/default.nix b/third_party/nixpkgs/pkgs/by-name/py/python-launcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/python-launcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/python-launcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pytrainer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/py/pytrainer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix b/third_party/nixpkgs/pkgs/by-name/q-/q-text-as-data/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix
rename to third_party/nixpkgs/pkgs/by-name/q-/q-text-as-data/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/qa/qalculate-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qa/qalculate-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch b/third_party/nixpkgs/pkgs/by-name/qb/qbe/001-dont-hardcode-tmp.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch
rename to third_party/nixpkgs/pkgs/by-name/qb/qbe/001-dont-hardcode-tmp.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix b/third_party/nixpkgs/pkgs/by-name/qb/qbe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qb/qbe/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/qbe/test-can-run-hello-world.nix b/third_party/nixpkgs/pkgs/by-name/qb/qbe/test-can-run-hello-world.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/qbe/test-can-run-hello-world.nix
rename to third_party/nixpkgs/pkgs/by-name/qb/qbe/test-can-run-hello-world.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/third_party/nixpkgs/pkgs/by-name/qb/qbec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qb/qbec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/qc/default.nix b/third_party/nixpkgs/pkgs/by-name/qc/qc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/qc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qc/qc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/qcard/default.nix b/third_party/nixpkgs/pkgs/by-name/qc/qcard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/qcard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qc/qcard/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix b/third_party/nixpkgs/pkgs/by-name/qc/qcdnum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qc/qcdnum/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/qdl/default.nix b/third_party/nixpkgs/pkgs/by-name/qd/qdl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/qdl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qd/qdl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/qemacs/default.nix b/third_party/nixpkgs/pkgs/by-name/qe/qemacs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/qemacs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qe/qemacs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qhull/default.nix b/third_party/nixpkgs/pkgs/by-name/qh/qhull/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/qhull/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qh/qhull/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix b/third_party/nixpkgs/pkgs/by-name/qm/qm-dsp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qm/qm-dsp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/qmidiarp/default.nix b/third_party/nixpkgs/pkgs/by-name/qm/qmidiarp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/qmidiarp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qm/qmidiarp/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/qm/qmk-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qm/qmk-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix b/third_party/nixpkgs/pkgs/by-name/qm/qmk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qm/qmk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/qmk_hid/default.nix b/third_party/nixpkgs/pkgs/by-name/qm/qmk_hid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/qmk_hid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qm/qmk_hid/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/qo/qogir-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qo/qogir-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix b/third_party/nixpkgs/pkgs/by-name/qo/qogir-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/qogir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qo/qogir-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qoi/default.nix b/third_party/nixpkgs/pkgs/by-name/qo/qoi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/qoi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qo/qoi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/qo/qovery-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qo/qovery-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/third_party/nixpkgs/pkgs/by-name/qp/qpdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qp/qpdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/qperf/default.nix b/third_party/nixpkgs/pkgs/by-name/qp/qperf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/qperf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qp/qperf/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/qp/qpid-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qp/qpid-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/qprint/default.nix b/third_party/nixpkgs/pkgs/by-name/qp/qprint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/qprint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qp/qprint/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/qqwing/default.nix b/third_party/nixpkgs/pkgs/by-name/qq/qqwing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/qqwing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qq/qqwing/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/qrscan/default.nix b/third_party/nixpkgs/pkgs/by-name/qr/qrscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/qrscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qr/qrscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch b/third_party/nixpkgs/pkgs/by-name/qr/qrupdate/disable-zch1dn-test.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch
rename to third_party/nixpkgs/pkgs/by-name/qr/qrupdate/disable-zch1dn-test.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix b/third_party/nixpkgs/pkgs/by-name/qr/qrupdate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qr/qrupdate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/QuadProgpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/QuadProgpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/quadrafuzz/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quadrafuzz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/quadrafuzz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quadrafuzz/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/quake3/quake3e/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quake3e/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/quake3/quake3e/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quake3e/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/quantlib/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quantlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/quantlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quantlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/quantomatic/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quantomatic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/quantomatic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quantomatic/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/quantumminigolf/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quantumminigolf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/quantumminigolf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quantumminigolf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/quark-engine/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quark-engine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/quark-engine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quark-engine/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/quark/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/quark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quark/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quartus-prime-lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quartus-prime-lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/quartus.nix b/third_party/nixpkgs/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/quartus-prime/quartus.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/quast/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/quast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quast/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quattrocento-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quattrocento-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/quattrocento/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quattrocento/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/quattrocento/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quattrocento/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/quesoglc/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quesoglc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/quesoglc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quesoglc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/questdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/questdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/quich/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quich/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/quich/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quich/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quick-lint-js/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quick-lint-js/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/quickfix/disableUnitTests.patch b/third_party/nixpkgs/pkgs/by-name/qu/quickfix/disableUnitTests.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/quickfix/disableUnitTests.patch
rename to third_party/nixpkgs/pkgs/by-name/qu/quickfix/disableUnitTests.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/quickfix/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickfix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/quickfix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quickfix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/quickgui/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickgui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/quickgui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quickgui/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/quickgui/pubspec.lock.json b/third_party/nixpkgs/pkgs/by-name/qu/quickgui/pubspec.lock.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/quickgui/pubspec.lock.json
rename to third_party/nixpkgs/pkgs/by-name/qu/quickgui/pubspec.lock.json
diff --git a/third_party/nixpkgs/pkgs/development/libraries/quickmem/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickmem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/quickmem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quickmem/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/quickserve/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickserve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/quickserve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quickserve/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/quicksynergy/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quicksynergy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/quicksynergy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quicksynergy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/quicktemplate/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quicktemplate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/quicktemplate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quicktemplate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/quicktun/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quicktun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/quicktun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quicktun/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/quicktun/tar-1.30.diff b/third_party/nixpkgs/pkgs/by-name/qu/quicktun/tar-1.30.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/quicktun/tar-1.30.diff
rename to third_party/nixpkgs/pkgs/by-name/qu/quicktun/tar-1.30.diff
diff --git a/third_party/nixpkgs/pkgs/tools/security/quill-qr/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quill-qr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/quill-qr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quill-qr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/quilt/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quilt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/quilt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quilt/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/quintom-cursor-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quintom-cursor-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/quintom-cursor-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quintom-cursor-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/quirc/0001-Don-t-build-demos.patch b/third_party/nixpkgs/pkgs/by-name/qu/quirc/0001-Don-t-build-demos.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/quirc/0001-Don-t-build-demos.patch
rename to third_party/nixpkgs/pkgs/by-name/qu/quirc/0001-Don-t-build-demos.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/quirc/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quirc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/quirc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quirc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quisk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quisk/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/quivira/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quivira/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/quivira/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quivira/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/quorum/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quorum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/quorum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/qu/quorum/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/r128gain/ffmpeg-location.patch b/third_party/nixpkgs/pkgs/by-name/r1/r128gain/ffmpeg-location.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/r128gain/ffmpeg-location.patch
rename to third_party/nixpkgs/pkgs/by-name/r1/r128gain/ffmpeg-location.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix b/third_party/nixpkgs/pkgs/by-name/r1/r128gain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/r1/r128gain/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix b/third_party/nixpkgs/pkgs/by-name/r2/r2mod_cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/r2/r2mod_cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/r2modman/default.nix b/third_party/nixpkgs/pkgs/by-name/r2/r2modman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/r2modman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/r2/r2modman/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/r2modman/steam-launch-fix.patch b/third_party/nixpkgs/pkgs/by-name/r2/r2modman/steam-launch-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/r2modman/steam-launch-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/r2/r2modman/steam-launch-fix.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix b/third_party/nixpkgs/pkgs/by-name/r5/r53-ddns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/r5/r53-ddns/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/ra-multiplex/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ra-multiplex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/ra-multiplex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ra-multiplex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rabbitmq-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rabbitmq-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rabtap/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rabtap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/rabtap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rabtap/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/racer/mkdir.patch b/third_party/nixpkgs/pkgs/by-name/ra/racer/mkdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/racer/mkdir.patch
rename to third_party/nixpkgs/pkgs/by-name/ra/racer/mkdir.patch
diff --git a/third_party/nixpkgs/pkgs/games/racer/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/racer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/racer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/racer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/radamsa/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/radamsa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/radamsa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/radamsa/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/radeontools/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/radeontools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/radeontools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/radeontools/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/radeontop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/radeontop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/radioboat/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/radioboat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/radioboat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/radioboat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/radsecproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/radsecproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/radvd/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/radvd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/radvd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/radvd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch b/third_party/nixpkgs/pkgs/by-name/ra/raft-canonical/disable-missing-dir-test.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch
rename to third_party/nixpkgs/pkgs/by-name/ra/raft-canonical/disable-missing-dir-test.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/disable-net-tests.patch b/third_party/nixpkgs/pkgs/by-name/ra/raft-canonical/disable-net-tests.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/raft-canonical/disable-net-tests.patch
rename to third_party/nixpkgs/pkgs/by-name/ra/raft-canonical/disable-net-tests.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/raft-canonical/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/raft-canonical/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/ragnarwm/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ragnarwm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/ragnarwm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ragnarwm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rain/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rain/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/raiseorlaunch/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/raiseorlaunch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/raiseorlaunch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/raiseorlaunch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rakkess/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rakkess/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rakkess/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rakkess/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/raleway/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/raleway/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/raleway/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/raleway/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rambox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rambox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ramfetch/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ramfetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ramfetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ramfetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/ran/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ran/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/ran/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ran/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rancher/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rancher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/rancher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rancher/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/randoop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/randoop/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/randtype/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/randtype/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/randtype/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/randtype/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rang/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rang/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/range-v3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/range-v3/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ranger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ranger/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rankwidth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rankwidth/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rapidcheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rapidcheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rapidfuzz-cpp/package.nix
similarity index 93%
rename from third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rapidfuzz-cpp/package.nix
index ad5a525456..72978aa7c6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ra/rapidfuzz-cpp/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rapidfuzz-cpp";
- version = "3.0.5";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "rapidfuzz";
repo = "rapidfuzz-cpp";
rev = "v${finalAttrs.version}";
- hash = "sha256-8s2Jd1fI8iNmFyMbCEaGZdpqvYFB1tVNZ41ICLN4AeI=";
+ hash = "sha256-0ZMK9WVMflgGD4uEKp7/SvWXCByYQtPU9gSJsNEqTbM=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/fix-build.patch b/third_party/nixpkgs/pkgs/by-name/ra/rapidsvn/fix-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/fix-build.patch
rename to third_party/nixpkgs/pkgs/by-name/ra/rapidsvn/fix-build.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rapidsvn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rapidsvn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidxml/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rapidxml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rapidxml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rapidxml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rapidyaml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rapidyaml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/misc/rappel/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rappel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/misc/rappel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rappel/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rar2fs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rar2fs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/rarcrack/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rarcrack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/rarcrack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rarcrack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/rare-regex/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rare-regex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/rare-regex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rare-regex/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rargs/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rargs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rargs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rargs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rars/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rars/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rars/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rars/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rascal/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rascal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/rascal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rascal/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rasdaemon/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rasdaemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/rasdaemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rasdaemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ratman/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ratman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ratman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ratman/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/ratmen/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ratmen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/ratmen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ratmen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ratools/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ratools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ratools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ratools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ratox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ratox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ratpoints/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ratpoints/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ratt/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ratt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ratt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ratt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/rauc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/rauc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/raul/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/raul/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/raul/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/raul/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/ravedude/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/ravedude/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/ravedude/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/ravedude/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/raven-reader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/newsreaders/raven-reader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/raven-reader/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/raxml/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/raxml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/raxml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/raxml/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/raylib-games/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/raylib-games/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/raylib-games/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/raylib-games/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix b/third_party/nixpkgs/pkgs/by-name/ra/raylib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ra/raylib/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix b/third_party/nixpkgs/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/rbenv/default.nix b/third_party/nixpkgs/pkgs/by-name/rb/rbenv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/ruby-modules/rbenv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rb/rbenv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/by-name/rb/rbw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/rbw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rb/rbw/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/rc-9front/default.nix b/third_party/nixpkgs/pkgs/by-name/rc/rc-9front/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/rc-9front/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rc/rc-9front/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/rc-9front/path.patch b/third_party/nixpkgs/pkgs/by-name/rc/rc-9front/path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/rc-9front/path.patch
rename to third_party/nixpkgs/pkgs/by-name/rc/rc-9front/path.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/rcodesign/disable-sign-for-notarization-test.patch b/third_party/nixpkgs/pkgs/by-name/rc/rcodesign/disable-sign-for-notarization-test.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rcodesign/disable-sign-for-notarization-test.patch
rename to third_party/nixpkgs/pkgs/by-name/rc/rcodesign/disable-sign-for-notarization-test.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/rcodesign/fix-verbosity-level.patch b/third_party/nixpkgs/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rcodesign/fix-verbosity-level.patch
rename to third_party/nixpkgs/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/rcodesign/default.nix b/third_party/nixpkgs/pkgs/by-name/rc/rcodesign/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rcodesign/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rc/rcodesign/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rcodesign/update-time-rs-in-cargo-lock.patch b/third_party/nixpkgs/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rcodesign/update-time-rs-in-cargo-lock.patch
rename to third_party/nixpkgs/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rcon/default.nix b/third_party/nixpkgs/pkgs/by-name/rc/rcon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/rcon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rc/rcon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rconc/default.nix b/third_party/nixpkgs/pkgs/by-name/rc/rconc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/rconc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rc/rconc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rcs/default.nix b/third_party/nixpkgs/pkgs/by-name/rc/rcs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/rcs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rc/rcs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rcshist/default.nix b/third_party/nixpkgs/pkgs/by-name/rc/rcshist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/rcshist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rc/rcshist/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rdap/default.nix b/third_party/nixpkgs/pkgs/by-name/rd/rdap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/rdap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rd/rdap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix b/third_party/nixpkgs/pkgs/by-name/rd/rdesktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rd/rdesktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix b/third_party/nixpkgs/pkgs/by-name/rd/rdfind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rd/rdfind/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix b/third_party/nixpkgs/pkgs/by-name/rd/rdiff-backup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rd/rdiff-backup/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/third_party/nixpkgs/pkgs/by-name/rd/rdkafka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rd/rdkafka/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/third_party/nixpkgs/pkgs/by-name/rd/rdma-core/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rd/rdma-core/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rdocker/default.nix b/third_party/nixpkgs/pkgs/by-name/rd/rdocker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rdocker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rd/rdocker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rdrview/default.nix b/third_party/nixpkgs/pkgs/by-name/rd/rdrview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/rdrview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rd/rdrview/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/rdup/default.nix b/third_party/nixpkgs/pkgs/by-name/rd/rdup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/rdup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rd/rdup/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix b/third_party/nixpkgs/pkgs/by-name/re/re-flex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/re-flex/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/search/re-isearch/default.nix b/third_party/nixpkgs/pkgs/by-name/re/re-isearch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/search/re-isearch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/re-isearch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix b/third_party/nixpkgs/pkgs/by-name/re/re2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/re2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/re2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix b/third_party/nixpkgs/pkgs/by-name/re/re2c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/re2c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/third_party/nixpkgs/pkgs/by-name/re/react-native-debugger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/react-native-debugger/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/react-static/package.json b/third_party/nixpkgs/pkgs/by-name/re/react-static/package.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/react-static/package.json
rename to third_party/nixpkgs/pkgs/by-name/re/react-static/package.json
diff --git a/third_party/nixpkgs/pkgs/development/tools/react-static/default.nix b/third_party/nixpkgs/pkgs/by-name/re/react-static/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/react-static/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/react-static/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/read-edid/fno-common.patch b/third_party/nixpkgs/pkgs/by-name/re/read-edid/fno-common.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/read-edid/fno-common.patch
rename to third_party/nixpkgs/pkgs/by-name/re/read-edid/fno-common.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/read-edid/default.nix b/third_party/nixpkgs/pkgs/by-name/re/read-edid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/read-edid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/read-edid/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/readability-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/re/readability-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/readability-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/readability-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/readosm/default.nix b/third_party/nixpkgs/pkgs/by-name/re/readosm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/readosm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/readosm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/readstat/default.nix b/third_party/nixpkgs/pkgs/by-name/re/readstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/readstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/readstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/third_party/nixpkgs/pkgs/by-name/re/real_time_config_quick_scan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/real_time_config_quick_scan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch b/third_party/nixpkgs/pkgs/by-name/re/realesrgan-ncnn-vulkan/cmakelists.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch
rename to third_party/nixpkgs/pkgs/by-name/re/realesrgan-ncnn-vulkan/cmakelists.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch b/third_party/nixpkgs/pkgs/by-name/re/realesrgan-ncnn-vulkan/models_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch
rename to third_party/nixpkgs/pkgs/by-name/re/realesrgan-ncnn-vulkan/models_path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/third_party/nixpkgs/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/reap/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/reap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/reason-shell/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reason-shell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/misc/reason-shell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reason-shell/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reaverwps-t6x/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reaverwps-t6x/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reaverwps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reaverwps/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/reaver-wps/parallel-build.patch b/third_party/nixpkgs/pkgs/by-name/re/reaverwps/parallel-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/reaver-wps/parallel-build.patch
rename to third_party/nixpkgs/pkgs/by-name/re/reaverwps/parallel-build.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/recapp/default.nix b/third_party/nixpkgs/pkgs/by-name/re/recapp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/recapp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/recapp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/recastnavigation/default.nix b/third_party/nixpkgs/pkgs/by-name/re/recastnavigation/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/recastnavigation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/recastnavigation/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/recode/default.nix b/third_party/nixpkgs/pkgs/by-name/re/recode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/recode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/recode/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix b/third_party/nixpkgs/pkgs/by-name/re/recoverjpeg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/recoverjpeg/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix b/third_party/nixpkgs/pkgs/by-name/re/recursive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/recursive/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/red/default.nix b/third_party/nixpkgs/pkgs/by-name/re/red/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/red/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/red/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/redeclipse/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redeclipse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/redeclipse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redeclipse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/redfang/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redfang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/redfang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redfang/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redhat-official-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redhat-official-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/redir/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/redir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redir/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch b/third_party/nixpkgs/pkgs/by-name/re/redis-plus-plus/0001-Fix-pkg-config-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/re/redis-plus-plus/0001-Fix-pkg-config-paths.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redis-plus-plus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redis-plus-plus/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/redisinsight/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redisinsight/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/redisinsight/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redisinsight/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/redli/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/redli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redo-apenwarr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redo-apenwarr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-c/Makefile b/third_party/nixpkgs/pkgs/by-name/re/redo-c/Makefile
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/redo-c/Makefile
rename to third_party/nixpkgs/pkgs/by-name/re/redo-c/Makefile
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redo-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redo-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redo-sh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redo-sh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/redoc-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redoc-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/redoc-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redoc-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/redoflacs/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redoflacs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/redoflacs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redoflacs/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redpanda-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/redpanda/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redpanda-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/redprl/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redprl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/redprl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redprl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/java-modules/redshift_jdbc/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redshift_jdbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/java-modules/redshift_jdbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redshift_jdbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/redsocks/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redsocks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/redsocks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redsocks/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/redstore/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redstore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/redstore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redstore/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/redux/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/redux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/redwax-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/re/redwax-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/redwax-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/redwax-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/reflex/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reflex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/reflex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reflex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/refmt/default.nix b/third_party/nixpkgs/pkgs/by-name/re/refmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/refmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/refmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/reftools/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reftools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/reftools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reftools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix b/third_party/nixpkgs/pkgs/by-name/re/refurb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/refurb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/refurb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/reg/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/reg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/regclient/default.nix b/third_party/nixpkgs/pkgs/by-name/re/regclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/regclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/regclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/regenkfs/default.nix b/third_party/nixpkgs/pkgs/by-name/re/regenkfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/regenkfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/regenkfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/regex-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/re/regex-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/regex-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/regex-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/regexploit/default.nix b/third_party/nixpkgs/pkgs/by-name/re/regexploit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/regexploit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/regexploit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix b/third_party/nixpkgs/pkgs/by-name/re/regextester/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/regextester/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/regionset/default.nix b/third_party/nixpkgs/pkgs/by-name/re/regionset/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/regionset/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/regionset/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/regpg/default.nix b/third_party/nixpkgs/pkgs/by-name/re/regpg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/regpg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/regpg/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/re/regripper/package.nix b/third_party/nixpkgs/pkgs/by-name/re/regripper/package.nix
index a26a00a41d..ac5405d72f 100644
--- a/third_party/nixpkgs/pkgs/by-name/re/regripper/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/re/regripper/package.nix
@@ -1,29 +1,27 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, perl
-, perlPackages
-, runtimeShell
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ perl,
+ perlPackages,
+ runtimeShell,
}:
stdenv.mkDerivation rec {
pname = "regripper";
- version = "unstable-2023-07-23";
+ version = "0-unstable-2024-11-02";
src = fetchFromGitHub {
owner = "keydet89";
repo = "RegRipper3.0";
- rev = "cee174fb6f137b14c426e97d17945ddee0d31051";
- hash = "sha256-vejIRlcVjxQJpxJabJJcljODYr+lLJjYINVtAPObvkQ=";
+ rev = "89f3cac57e10bce1a79627e6038353e8e8a0c378";
+ hash = "sha256-dW3Gr4HQH484i47Bg+CEnBYoGQQRMBJr88+YeuU+iV4=";
};
- propagatedBuildInputs = [ perl perlPackages.ParseWin32Registry ];
-
- postPatch = ''
- substituteInPlace rip.pl rr.pl \
- --replace \"plugins/\" \"$out/share/regripper/plugins/\" \
- --replace \"plugins\" \"$out/share/regripper/plugins\"
- '';
+ propagatedBuildInputs = [
+ perl
+ perlPackages.ParseWin32Registry
+ ];
installPhase = ''
runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix b/third_party/nixpkgs/pkgs/by-name/re/rehex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/rehex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reindeer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reindeer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reiser4progs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reiser4progs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reiserfsprogs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reiserfsprogs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/relic/default.nix b/third_party/nixpkgs/pkgs/by-name/re/relic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/relic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/relic/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch b/third_party/nixpkgs/pkgs/by-name/re/remake/glibc-2.27-glob.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch
rename to third_party/nixpkgs/pkgs/by-name/re/remake/glibc-2.27-glob.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix b/third_party/nixpkgs/pkgs/by-name/re/remake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/remake/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/third_party/nixpkgs/pkgs/by-name/re/remarkable-toolchain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/remarkable-toolchain/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/third_party/nixpkgs/pkgs/by-name/re/remarkable2-toolchain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/remarkable2-toolchain/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/remkrom/default.nix b/third_party/nixpkgs/pkgs/by-name/re/remkrom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/knightos/remkrom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/remkrom/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/remontoire/default.nix b/third_party/nixpkgs/pkgs/by-name/re/remontoire/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/remontoire/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/remontoire/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix b/third_party/nixpkgs/pkgs/by-name/re/remote-touchpad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/remote-touchpad/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix b/third_party/nixpkgs/pkgs/by-name/re/remotebox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/remotebox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rename/default.nix b/third_party/nixpkgs/pkgs/by-name/re/rename/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rename/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/rename/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/renameutils/install-exec.patch b/third_party/nixpkgs/pkgs/by-name/re/renameutils/install-exec.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/renameutils/install-exec.patch
rename to third_party/nixpkgs/pkgs/by-name/re/renameutils/install-exec.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/renameutils/default.nix b/third_party/nixpkgs/pkgs/by-name/re/renameutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/renameutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/renameutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix b/third_party/nixpkgs/pkgs/by-name/re/renderizer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/renderizer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix b/third_party/nixpkgs/pkgs/by-name/re/renoise/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/renoise/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rep/default.nix b/third_party/nixpkgs/pkgs/by-name/re/rep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/rep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/repgrep/default.nix b/third_party/nixpkgs/pkgs/by-name/re/repgrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/repgrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/repgrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/replace/malloc.patch b/third_party/nixpkgs/pkgs/by-name/re/replace/malloc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/replace/malloc.patch
rename to third_party/nixpkgs/pkgs/by-name/re/replace/malloc.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/replace/default.nix b/third_party/nixpkgs/pkgs/by-name/re/replace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/replace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/replace/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/replacement/default.nix b/third_party/nixpkgs/pkgs/by-name/re/replacement/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/replacement/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/replacement/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/fix-makefile.patch b/third_party/nixpkgs/pkgs/by-name/re/reposurgeon/fix-makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/fix-makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/re/reposurgeon/fix-makefile.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reposurgeon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reposurgeon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/repro-get/default.nix b/third_party/nixpkgs/pkgs/by-name/re/repro-get/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/repro-get/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/repro-get/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/reproc/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reproc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/reproc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reproc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/repseek/default.nix b/third_party/nixpkgs/pkgs/by-name/re/repseek/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/repseek/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/repseek/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reptyr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reptyr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/requestly/default.nix b/third_party/nixpkgs/pkgs/by-name/re/requestly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/requestly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/requestly/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/reredirect/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reredirect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/reredirect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reredirect/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/resgate/default.nix b/third_party/nixpkgs/pkgs/by-name/re/resgate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/resgate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/resgate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/reshape/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reshape/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/reshape/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reshape/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix b/third_party/nixpkgs/pkgs/by-name/re/resilio-sync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/resilio-sync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/re/resolv_wrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/resolv_wrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/resolve-march-native/default.nix b/third_party/nixpkgs/pkgs/by-name/re/resolve-march-native/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/resolve-march-native/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/resolve-march-native/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/responder/default.nix b/third_party/nixpkgs/pkgs/by-name/re/responder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/responder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/responder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/backup/restic-integrity/default.nix b/third_party/nixpkgs/pkgs/by-name/re/restic-integrity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/restic-integrity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/restic-integrity/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/restish/default.nix b/third_party/nixpkgs/pkgs/by-name/re/restish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/restish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/restish/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix b/third_party/nixpkgs/pkgs/by-name/re/restool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/restool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/restream/default.nix b/third_party/nixpkgs/pkgs/by-name/re/restream/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/remarkable/restream/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/restream/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/resumed/default.nix b/third_party/nixpkgs/pkgs/by-name/re/resumed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/resumed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/resumed/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix b/third_party/nixpkgs/pkgs/by-name/re/resvg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/resvg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix b/third_party/nixpkgs/pkgs/by-name/re/retdec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/retdec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/retro-gtk/gio-unix.patch b/third_party/nixpkgs/pkgs/by-name/re/retro-gtk/gio-unix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/retro-gtk/gio-unix.patch
rename to third_party/nixpkgs/pkgs/by-name/re/retro-gtk/gio-unix.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/re/retro-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/retro-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retrofe/default.nix b/third_party/nixpkgs/pkgs/by-name/re/retrofe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/retrofe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/retrofe/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/retry/default.nix b/third_party/nixpkgs/pkgs/by-name/re/retry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/retry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/retry/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/revanced-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/re/revanced-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/revanced-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/revanced-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/reveal-md/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reveal-md/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/reveal-md/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reveal-md/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reversal-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reversal-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/third_party/nixpkgs/pkgs/by-name/re/reviewdog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/reviewdog/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/revive/default.nix b/third_party/nixpkgs/pkgs/by-name/re/revive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/revive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/revive/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix b/third_party/nixpkgs/pkgs/by-name/re/rewritefs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/rewritefs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rewrk/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/re/rewrk/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/rewrk/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/re/rewrk/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rewrk/default.nix b/third_party/nixpkgs/pkgs/by-name/re/rewrk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/rewrk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/rewrk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/rex/default.nix b/third_party/nixpkgs/pkgs/by-name/re/rex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/rex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/rex/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/rfc-bibtex/default.nix b/third_party/nixpkgs/pkgs/by-name/rf/rfc-bibtex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/rfc-bibtex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rf/rfc-bibtex/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rfc/default.nix b/third_party/nixpkgs/pkgs/by-name/rf/rfc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rfc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rf/rfc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/rftg/default.nix b/third_party/nixpkgs/pkgs/by-name/rf/rftg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/rftg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rf/rftg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix b/third_party/nixpkgs/pkgs/by-name/rg/rgbds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rg/rgbds/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/rgxg/default.nix b/third_party/nixpkgs/pkgs/by-name/rg/rgxg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/rgxg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rg/rgxg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rhack/default.nix b/third_party/nixpkgs/pkgs/by-name/rh/rhack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/rhack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rh/rhack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rhai-doc/default.nix b/third_party/nixpkgs/pkgs/by-name/rh/rhai-doc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/rhai-doc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rh/rhai-doc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/rhash/do-link-so.patch b/third_party/nixpkgs/pkgs/by-name/rh/rhash/do-link-so.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/rhash/do-link-so.patch
rename to third_party/nixpkgs/pkgs/by-name/rh/rhash/do-link-so.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/rhash/dont-fail-ln.patch b/third_party/nixpkgs/pkgs/by-name/rh/rhash/dont-fail-ln.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/rhash/dont-fail-ln.patch
rename to third_party/nixpkgs/pkgs/by-name/rh/rhash/dont-fail-ln.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/rhash/default.nix b/third_party/nixpkgs/pkgs/by-name/rh/rhash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/rhash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rh/rhash/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/rhoas/default.nix b/third_party/nixpkgs/pkgs/by-name/rh/rhoas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/rhoas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rh/rhoas/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix b/third_party/nixpkgs/pkgs/by-name/rh/rhodium-libre/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rh/rhodium-libre/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/third_party/nixpkgs/pkgs/by-name/rh/rhvoice/honor_nix_environment.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
rename to third_party/nixpkgs/pkgs/by-name/rh/rhvoice/honor_nix_environment.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhvoice/default.nix b/third_party/nixpkgs/pkgs/by-name/rh/rhvoice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/rhvoice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rh/rhvoice/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix b/third_party/nixpkgs/pkgs/by-name/rh/rhythmbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rh/rhythmbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/rich-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rich-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/rich-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rich-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/richgo/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/richgo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/richgo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/richgo/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ricty/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/ricty/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ricty/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/ricty/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rictydiminished-with-firacode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rictydiminished-with-firacode/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/riemann/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/riemann/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/riemann_c_client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/riemann_c_client/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ries/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/ries/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/ries/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/ries/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/riff/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/riff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/riff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/riff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rig/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rig/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rig/rig_1.11-1.diff b/third_party/nixpkgs/pkgs/by-name/ri/rig/rig_1.11-1.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rig/rig_1.11-1.diff
rename to third_party/nixpkgs/pkgs/by-name/ri/rig/rig_1.11-1.diff
diff --git a/third_party/nixpkgs/pkgs/games/rigsofrods-bin/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rigsofrods-bin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/rigsofrods-bin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rigsofrods-bin/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/riko4/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/riko4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/riko4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/riko4/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/rili/moderinze_cpp.patch b/third_party/nixpkgs/pkgs/by-name/ri/rili/moderinze_cpp.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/rili/moderinze_cpp.patch
rename to third_party/nixpkgs/pkgs/by-name/ri/rili/moderinze_cpp.patch
diff --git a/third_party/nixpkgs/pkgs/games/rili/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rili/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/rili/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rili/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/rime-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rime-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/rime-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rime-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/rime-data/fetchSchema.nix b/third_party/nixpkgs/pkgs/by-name/ri/rime-data/fetchSchema.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/rime-data/fetchSchema.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rime-data/fetchSchema.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/rime-data/generateFetchSchema.sh b/third_party/nixpkgs/pkgs/by-name/ri/rime-data/generateFetchSchema.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/rime-data/generateFetchSchema.sh
rename to third_party/nixpkgs/pkgs/by-name/ri/rime-data/generateFetchSchema.sh
diff --git a/third_party/nixpkgs/pkgs/data/misc/rime-data/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rime-data/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/rime-data/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rime-data/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ri/rime-zhwiki/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/rime-zhwiki/package.nix
new file mode 100644
index 0000000000..95fba1f228
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ri/rime-zhwiki/package.nix
@@ -0,0 +1,33 @@
+{
+ fetchurl,
+ stdenvNoCC,
+ lib,
+}:
+stdenvNoCC.mkDerivation {
+ pname = "rime-zhwiki";
+ version = "20240909";
+ src = fetchurl {
+ url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/0.2.5/zhwiki-20240909.dict.yaml";
+ hash = "sha256-ZQ8orW7jEbPtOEvYYxdnTJGTwdXVZBEWjUMYR93vOCE=";
+ };
+
+ dontUnpack = true;
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/rime-data
+ cp $src $out/share/rime-data/zhwiki.dict.yaml
+
+ runHook postInstall
+ '';
+
+ meta = {
+ maintainers = with lib.maintainers; [ xddxdd ];
+ description = "RIME dictionary file for entries from zh.wikipedia.org";
+ homepage = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki";
+ license = [
+ lib.licenses.fdl13Plus
+ lib.licenses.cc-by-sa-40
+ ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/rinetd/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rinetd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/rinetd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rinetd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rinutils/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rinutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rinutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rinutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rio/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/riot-redis/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/riot-redis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/riot-redis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/riot-redis/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/ripdrag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/ripdrag/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ripe-atlas-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/ripe-atlas-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ripe-atlas-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/ripe-atlas-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/ripgrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/ripgrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ripmime/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/ripmime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ripmime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/ripmime/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ripser/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/ripser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/ripser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/ripser/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/riscv-pk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/riscv-pk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/risor/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/risor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/risor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/risor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ristate/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/ristate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ristate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/ristate/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/rivalcfg/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rivalcfg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/rivalcfg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rivalcfg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/river-luatile/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/river-luatile/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/river-luatile/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/river-luatile/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/river-tag-overlay/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/river-tag-overlay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/river-tag-overlay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/river-tag-overlay/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rivercarro/deps.nix b/third_party/nixpkgs/pkgs/by-name/ri/rivercarro/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rivercarro/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rivercarro/deps.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rivercarro/default.nix b/third_party/nixpkgs/pkgs/by-name/ri/rivercarro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rivercarro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ri/rivercarro/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/rkdeveloptool-pine64/default.nix b/third_party/nixpkgs/pkgs/by-name/rk/rkdeveloptool-pine64/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/rkdeveloptool-pine64/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rk/rkdeveloptool-pine64/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/rkdeveloptool/default.nix b/third_party/nixpkgs/pkgs/by-name/rk/rkdeveloptool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/rkdeveloptool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rk/rkdeveloptool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix b/third_party/nixpkgs/pkgs/by-name/rk/rke/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rk/rke/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix b/third_party/nixpkgs/pkgs/by-name/rk/rkflashtool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rk/rkflashtool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rkrlv2/default.nix b/third_party/nixpkgs/pkgs/by-name/rk/rkrlv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/rkrlv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rk/rkrlv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rkvm/default.nix b/third_party/nixpkgs/pkgs/by-name/rk/rkvm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rkvm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rk/rkvm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rlaunch/default.nix b/third_party/nixpkgs/pkgs/by-name/rl/rlaunch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rlaunch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rl/rlaunch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rlci/default.nix b/third_party/nixpkgs/pkgs/by-name/rl/rlci/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/rlci/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rl/rlci/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rlog/default.nix b/third_party/nixpkgs/pkgs/by-name/rl/rlog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rlog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rl/rlog/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rlottie/default.nix b/third_party/nixpkgs/pkgs/by-name/rl/rlottie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rlottie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rl/rlottie/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix b/third_party/nixpkgs/pkgs/by-name/rl/rlwrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rl/rlwrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rm-improved/Cargo.lock.patch b/third_party/nixpkgs/pkgs/by-name/rm/rm-improved/Cargo.lock.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rm-improved/Cargo.lock.patch
rename to third_party/nixpkgs/pkgs/by-name/rm/rm-improved/Cargo.lock.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rm-improved/default.nix b/third_party/nixpkgs/pkgs/by-name/rm/rm-improved/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rm-improved/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rm/rm-improved/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rman/default.nix b/third_party/nixpkgs/pkgs/by-name/rm/rman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/rman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rm/rman/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmapi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rm/rmapi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rmate-sh/default.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmate-sh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rmate-sh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rm/rmate-sh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmfuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rm/rmfuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rmount/default.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmount/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/rmount/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rm/rmount/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rmtrash/default.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmtrash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rmtrash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rm/rmtrash/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rmw/default.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rmw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rm/rmw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/rn/rng-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rn/rng-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/rnix-hashes/default.nix b/third_party/nixpkgs/pkgs/by-name/rn/rnix-hashes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/rnix-hashes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rn/rnix-hashes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rnm/default.nix b/third_party/nixpkgs/pkgs/by-name/rn/rnm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/rnm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rn/rnm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rnnoise/model-version.json b/third_party/nixpkgs/pkgs/by-name/rn/rnnoise/model-version.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rnnoise/model-version.json
rename to third_party/nixpkgs/pkgs/by-name/rn/rnnoise/model-version.json
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix b/third_party/nixpkgs/pkgs/by-name/rn/rnnoise/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rn/rnnoise/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix b/third_party/nixpkgs/pkgs/by-name/rn/rnp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/rnp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rn/rnp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/rnr/default.nix b/third_party/nixpkgs/pkgs/by-name/rn/rnr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/rnr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rn/rnr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/rnv/default.nix b/third_party/nixpkgs/pkgs/by-name/rn/rnv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xml/rnv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rn/rnv/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/roadrunner/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roadrunner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/roadrunner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roadrunner/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/roam-research/common.nix b/third_party/nixpkgs/pkgs/by-name/ro/roam-research/common.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/roam-research/common.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roam-research/common.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/roam-research/darwin.nix b/third_party/nixpkgs/pkgs/by-name/ro/roam-research/darwin.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/roam-research/darwin.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roam-research/darwin.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/roam-research/linux.nix b/third_party/nixpkgs/pkgs/by-name/ro/roam-research/linux.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/roam-research/linux.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roam-research/linux.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/roam-research/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roam-research/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/roam-research/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roam-research/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
index 50eaa4e137..df952d7023 100644
--- a/third_party/nixpkgs/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
@@ -6,18 +6,18 @@
roave-backward-compatibility-check,
}:
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
pname = "roave-backward-compatibility-check";
- version = "8.9.0";
+ version = "8.10.0";
src = fetchFromGitHub {
owner = "Roave";
repo = "BackwardCompatibilityCheck";
rev = finalAttrs.version;
- hash = "sha256-Bvqo2SmtRWvatXxtHbctBrY0xe0KA+knNmEg+KC8hgY=";
+ hash = "sha256-wOqF7FkwOnTxYe7OnAl8R7NyGkdJ37H0OIr5e/1Q03I=";
};
- vendorHash = "sha256-cMVOcLRvfwFbxd2mXJhDx1iaUTHPEsI4vh9/JCoOj3M=";
+ vendorHash = "sha256-Xd+SxqLbm5QCROwq4jDm4cWLxF2nraqA+xdrZxW3ILY=";
passthru = {
tests.version = testers.testVersion {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/robin-map/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/robin-map/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/robin-map/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/robin-map/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ro/robo/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/robo/package.nix
index adde9d7c2d..e1713b90b5 100644
--- a/third_party/nixpkgs/pkgs/by-name/ro/robo/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ro/robo/package.nix
@@ -2,31 +2,20 @@
lib,
php82,
fetchFromGitHub,
- fetchpatch,
}:
-php82.buildComposerProject (finalAttrs: {
+php82.buildComposerProject2 (finalAttrs: {
pname = "robo";
- version = "5.0.0";
+ version = "5.1.0";
src = fetchFromGitHub {
owner = "consolidation";
repo = "robo";
rev = finalAttrs.version;
- hash = "sha256-tibG2sR5CsRnUjZEvOewX/fyMuAS1kgKjYbrkk+f0BI=";
+ hash = "sha256-bAT4jHvqWeYcACeyGtBwVBA2Rz+AvkZcUGLDwSf+fLg=";
};
- patches = [
- # Fix the version number
- # Most likely to remove at the next bump update
- # See https://github.com/drupol/robo/pull/1
- (fetchpatch {
- url = "https://github.com/drupol/robo/commit/c3cd001525c1adb5980a3a18a5561a0a5bbe1f50.patch";
- hash = "sha256-iMdZx+Bldmf1IS6Ypoet7GSsE6J9ZnE0HTskznkyEKM=";
- })
- ];
-
- vendorHash = "sha256-RRnHv6sOYm8fYhY3Q6m5sFDflFXd9b9LPcAqk/D1jdE=";
+ vendorHash = "sha256-PYtZy6c/Z1GTcYyfU77uJjXCzQSfBaNkon8kqGyVq+o=";
meta = {
changelog = "https://github.com/consolidation/robo/blob/${finalAttrs.version}/CHANGELOG.md";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/robo3t/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/robo3t/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/robo3t/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/robo3t/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ro/roboto-flex/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/roboto-flex/package.nix
new file mode 100644
index 0000000000..22d0d854ad
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ro/roboto-flex/package.nix
@@ -0,0 +1,32 @@
+{
+ lib,
+ stdenvNoCC,
+ fetchzip,
+}:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "roboto-flex";
+ version = "3.200";
+
+ src = fetchzip {
+ url = "https://github.com/googlefonts/roboto-flex/releases/download/${version}/roboto-flex-fonts.zip";
+ stripRoot = false;
+ hash = "sha256-p8BvE4f6zQLygl49hzYTXXVQFZEJjrlfUvjNW+miar4=";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm644 roboto-flex-fonts/fonts/variable/*.ttf -t $out/share/fonts/truetype
+
+ runHook postInstall
+ '';
+
+ meta = {
+ homepage = "https://github.com/googlefonts/roboto-flex";
+ description = "Google Roboto Flex family of fonts";
+ license = lib.licenses.ofl;
+ platforms = lib.platforms.all;
+ maintainers = [ lib.maintainers.romildo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roboto-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roboto-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/roboto-serif/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roboto-serif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/roboto-serif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roboto-serif/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roboto-slab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roboto-slab/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/roboto/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roboto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/roboto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roboto/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/irc/robustirc-bridge/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/robustirc-bridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/irc/robustirc-bridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/robustirc-bridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roc-toolkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roc-toolkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roccat-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roccat-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rocketchat-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rocketchat-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/fix-findliburing.patch b/third_party/nixpkgs/pkgs/by-name/ro/rocksdb/fix-findliburing.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rocksdb/fix-findliburing.patch
rename to third_party/nixpkgs/pkgs/by-name/ro/rocksdb/fix-findliburing.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rocksdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rocksdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/rocksndiamonds/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rocksndiamonds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/rocksndiamonds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rocksndiamonds/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-bluetooth/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-bluetooth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rofi-bluetooth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-bluetooth/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch b/third_party/nixpkgs/pkgs/by-name/ro/rofi-calc/0001-Patch-plugindir-to-output.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-calc/0001-Patch-plugindir-to-output.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-calc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-calc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-file-browser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-file-browser/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-menugen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-menugen/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rofi-mpd/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-mpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/rofi-mpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-mpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-power-menu/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-power-menu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rofi-power-menu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-power-menu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rofi-pulse-select/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-pulse-select/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/rofi-pulse-select/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-pulse-select/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-screenshot/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-screenshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rofi-screenshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-screenshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-systemd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-systemd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch b/third_party/nixpkgs/pkgs/by-name/ro/rofi-top/0001-Patch-plugindir-to-output.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-top/0001-Patch-plugindir-to-output.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch b/third_party/nixpkgs/pkgs/by-name/ro/rofi-top/0002-Patch-add-cairo.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-top/0002-Patch-add-cairo.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-top/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-top/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rofi-top/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-top/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/rofi-vpn/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-vpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/rofi-vpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rofi-vpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rojo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rojo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rojo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rolespec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rolespec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/roogle/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roogle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/roogle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roogle/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roomeqwizard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roomeqwizard/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/roon-bridge/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roon-bridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/roon-bridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roon-bridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roon-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/roon-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roon-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rootlesskit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rootlesskit/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/rose-pine-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/rose-pine-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/rose-pine/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rose-pine-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/rose-pine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rose-pine-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/rosie/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rosie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/rosie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rosie/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/roslyn/deps.nix b/third_party/nixpkgs/pkgs/by-name/ro/roslyn/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/roslyn/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roslyn/deps.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/roslyn/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roslyn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/roslyn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roslyn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/roswell/0001-get-image-from-environment.patch b/third_party/nixpkgs/pkgs/by-name/ro/roswell/0001-get-image-from-environment.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/roswell/0001-get-image-from-environment.patch
rename to third_party/nixpkgs/pkgs/by-name/ro/roswell/0001-get-image-from-environment.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roswell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/roswell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roswell/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rot8/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rot8/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rot8/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rot8/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rotate-backups/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rotate-backups/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rote/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rote/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rote/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rote/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch b/third_party/nixpkgs/pkgs/by-name/ro/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch
rename to third_party/nixpkgs/pkgs/by-name/ro/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch
diff --git a/third_party/nixpkgs/pkgs/games/rotp/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rotp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/rotp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rotp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/round/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/round/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/round/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/round/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rounded-mgenplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rounded-mgenplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/roundup/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/roundup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/roundup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/roundup/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/route159/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/route159/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/route159/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/route159/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/routedns/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/routedns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/routedns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/routedns/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/router/librusty_v8.nix b/third_party/nixpkgs/pkgs/by-name/ro/router/librusty_v8.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/router/librusty_v8.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/router/librusty_v8.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/router/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/router/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/router/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/router/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/routersploit/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/routersploit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/routersploit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/routersploit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/routino/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/routino/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/routino/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/routino/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/rowhammer-test/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/rowhammer-test/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpPPPoE/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rp/rpPPPoE/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/rpcbind/default.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpcbind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/rpcbind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rp/rpcbind/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/rpcbind/sunrpc.patch b/third_party/nixpkgs/pkgs/by-name/rp/rpcbind/sunrpc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/rpcbind/sunrpc.patch
rename to third_party/nixpkgs/pkgs/by-name/rp/rpcbind/sunrpc.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpcsvc-proto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rp/rpcsvc-proto/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpg-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/rpg-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rp/rpg-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpiplay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/rpiplay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rp/rpiplay/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/rpl/default.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/rpl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rp/rpl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpm-ostree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rp/rpm-ostree/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/rpm2targz/default.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpm2targz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/rpm2targz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rp/rpm2targz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpmextract/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rp/rpmextract/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/rpmextract/rpmextract.sh b/third_party/nixpkgs/pkgs/by-name/rp/rpmextract/rpmextract.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/rpmextract/rpmextract.sh
rename to third_party/nixpkgs/pkgs/by-name/rp/rpmextract/rpmextract.sh
diff --git a/third_party/nixpkgs/pkgs/development/tools/rq/default.nix b/third_party/nixpkgs/pkgs/by-name/rq/rq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rq/rq/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix b/third_party/nixpkgs/pkgs/by-name/rq/rqlite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rq/rqlite/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/rrootage/default.nix b/third_party/nixpkgs/pkgs/by-name/rr/rrootage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/rrootage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rr/rrootage/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rsass/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/rsass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rsass/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/rsbep/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsbep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/rsbep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rsbep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/rsbkb/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsbkb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/rsbkb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rsbkb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/rsbkb/time.patch b/third_party/nixpkgs/pkgs/by-name/rs/rsbkb/time.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/rsbkb/time.patch
rename to third_party/nixpkgs/pkgs/by-name/rs/rsbkb/time.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rsclock/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsclock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rsclock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rsclock/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/rscw/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rscw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/rscw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rscw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/rset/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rset/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/rset/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rset/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/rset/paths.patch b/third_party/nixpkgs/pkgs/by-name/rs/rset/paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/rset/paths.patch
rename to third_party/nixpkgs/pkgs/by-name/rs/rset/paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rshijack/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rshijack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/rshijack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rshijack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rshim-user-space/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rshim-user-space/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/rsign2/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsign2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/rsign2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rsign2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rslint/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rslint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rslint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rslint/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsnapshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rsnapshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsonpath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rsonpath/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rspamd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rspamd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rss-bridge-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rss-bridge-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rss-bridge-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rss-bridge-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rss-bridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rss-bridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/rss-glx/cstddef.patch b/third_party/nixpkgs/pkgs/by-name/rs/rss-glx/cstddef.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/rss-glx/cstddef.patch
rename to third_party/nixpkgs/pkgs/by-name/rs/rss-glx/cstddef.patch
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rss-glx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rss-glx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsstail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rsstail/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rstfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rstfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rstfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rs/rstfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rt-tests/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rt-tests/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/rt/dont-check-users_groups.patch b/third_party/nixpkgs/pkgs/by-name/rt/rt/dont-check-users_groups.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/rt/dont-check-users_groups.patch
rename to third_party/nixpkgs/pkgs/by-name/rt/rt/dont-check-users_groups.patch
diff --git a/third_party/nixpkgs/pkgs/servers/rt/override-generated.patch b/third_party/nixpkgs/pkgs/by-name/rt/rt/override-generated.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/rt/override-generated.patch
rename to third_party/nixpkgs/pkgs/by-name/rt/rt/override-generated.patch
diff --git a/third_party/nixpkgs/pkgs/servers/rt/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/rt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rt/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rt5677/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rt5677-firmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/rt5677/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rt5677-firmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/enable-write-permissions.patch b/third_party/nixpkgs/pkgs/by-name/rt/rtfm/enable-write-permissions.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rtfm/enable-write-permissions.patch
rename to third_party/nixpkgs/pkgs/by-name/rt/rtfm/enable-write-permissions.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/make.patch b/third_party/nixpkgs/pkgs/by-name/rt/rtfm/make.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rtfm/make.patch
rename to third_party/nixpkgs/pkgs/by-name/rt/rtfm/make.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtfm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtfm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/shards.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtfm/shards.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rtfm/shards.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtfm/shards.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtkit/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/rtkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/rtl-ais/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtl-ais/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/rtl-ais/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtl-ais/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtl8192su-firmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtl8192su-firmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtl8761b-firmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtl8761b-firmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/rtl_433/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtl_433/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/rtl_433/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtl_433/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rtlcss/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtlcss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rtlcss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtlcss/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtmpdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtmpdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rtptools/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtptools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/rtptools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtptools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rtrlib/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtrlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rtrlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtrlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rtss/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/rtss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtss/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rttr/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rttr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rttr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rttr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rtz/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/rt/rtz/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rtz/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/rt/rtz/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rtz/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rtz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rt/rtz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/rubber/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rubber/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/rubber/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rubber/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rubberband/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rubberband/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rubberband/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rubberband/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/rubik/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rubik/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/rubik/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rubik/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rubiks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rubiks/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rubyripper/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rubyripper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/rubyripper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rubyripper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rucksack/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rucksack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rucksack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rucksack/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock
index 32edeb8ae7..c2078ab16a 100644
--- a/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock
@@ -123,9 +123,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.91"
+version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
+checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
[[package]]
name = "append-only-vec"
@@ -407,7 +407,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -687,7 +687,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim 0.10.0",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -698,7 +698,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -1162,12 +1162,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
"serde",
]
@@ -1193,9 +1193,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
[[package]]
name = "inotify"
-version = "0.9.6"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
dependencies = [
"bitflags 1.3.2",
"inotify-sys",
@@ -1213,9 +1213,9 @@ dependencies = [
[[package]]
name = "insta"
-version = "1.41.0"
+version = "1.41.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f72d3e19488cf7d8ea52d2fc0f8754fc933398b337cd3cbdb28aaeb35159ef"
+checksum = "7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8"
dependencies = [
"console",
"globset",
@@ -1267,7 +1267,7 @@ dependencies = [
"Inflector",
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -1393,7 +1393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b"
dependencies = [
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -1532,14 +1532,15 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.11"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
+ "hermit-abi",
"libc",
"log",
"wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -1593,12 +1594,11 @@ dependencies = [
[[package]]
name = "notify"
-version = "6.1.1"
+version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009"
dependencies = [
"bitflags 2.6.0",
- "crossbeam-channel",
"filetime",
"fsevent-sys",
"inotify",
@@ -1606,8 +1606,18 @@ dependencies = [
"libc",
"log",
"mio",
+ "notify-types",
"walkdir",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "notify-types"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7393c226621f817964ffb3dc5704f9509e107a8b024b489cc2c1b217378785df"
+dependencies = [
+ "instant",
]
[[package]]
@@ -1786,9 +1796,9 @@ dependencies = [
[[package]]
name = "pep440_rs"
-version = "0.7.1"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c8ee724d21f351f9d47276614ac9710975db827ba9fe2ca5a517ba648193307"
+checksum = "0922a442c78611fa8c5ed6065d2d898a820cf12fa90604217fdb2d01675efec7"
dependencies = [
"serde",
"unicode-width 0.2.0",
@@ -1848,7 +1858,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -2102,6 +2112,7 @@ dependencies = [
"countme",
"dir-test",
"hashbrown 0.15.0",
+ "indexmap",
"insta",
"itertools 0.13.0",
"memchr",
@@ -2306,7 +2317,7 @@ dependencies = [
[[package]]
name = "ruff"
-version = "0.7.2"
+version = "0.7.3"
dependencies = [
"anyhow",
"argfile",
@@ -2523,7 +2534,7 @@ dependencies = [
[[package]]
name = "ruff_linter"
-version = "0.7.2"
+version = "0.7.3"
dependencies = [
"aho-corasick",
"annotate-snippets 0.9.2",
@@ -2546,7 +2557,7 @@ dependencies = [
"natord",
"path-absolutize",
"pathdiff",
- "pep440_rs 0.7.1",
+ "pep440_rs 0.7.2",
"pyproject-toml",
"quick-junit",
"regex",
@@ -2590,7 +2601,7 @@ dependencies = [
"proc-macro2",
"quote",
"ruff_python_trivia",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -2627,6 +2638,7 @@ dependencies = [
"ruff_source_file",
"ruff_text_size",
"rustc-hash 2.0.0",
+ "salsa",
"schemars",
"serde",
]
@@ -2837,7 +2849,7 @@ dependencies = [
[[package]]
name = "ruff_wasm"
-version = "0.7.2"
+version = "0.7.3"
dependencies = [
"console_error_panic_hook",
"console_log",
@@ -2876,7 +2888,7 @@ dependencies = [
"matchit",
"path-absolutize",
"path-slash",
- "pep440_rs 0.7.1",
+ "pep440_rs 0.7.2",
"regex",
"ruff_cache",
"ruff_formatter",
@@ -3008,7 +3020,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
"synstructure",
]
@@ -3042,7 +3054,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3065,9 +3077,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
[[package]]
name = "serde"
-version = "1.0.213"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
@@ -3085,13 +3097,13 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.213"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3102,7 +3114,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3125,7 +3137,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3166,7 +3178,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3268,7 +3280,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3290,9 +3302,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.85"
+version = "2.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [
"proc-macro2",
"quote",
@@ -3307,7 +3319,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3370,7 +3382,7 @@ dependencies = [
"cfg-if",
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3381,28 +3393,28 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
"test-case-core",
]
[[package]]
name = "thiserror"
-version = "1.0.65"
+version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.65"
+version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3514,7 +3526,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3772,7 +3784,7 @@ checksum = "6b91f57fe13a38d0ce9e28a03463d8d3c2468ed03d75375110ec71d93b449a08"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -3858,7 +3870,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
"wasm-bindgen-shared",
]
@@ -3892,7 +3904,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -3926,7 +3938,7 @@ checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
@@ -4214,7 +4226,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.85",
+ "syn 2.0.87",
]
[[package]]
diff --git a/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix
index a647e00c91..914b9b2971 100644
--- a/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix
@@ -15,7 +15,7 @@
python3Packages.buildPythonPackage rec {
pname = "ruff";
- version = "0.7.2";
+ version = "0.7.3";
pyproject = true;
outputs = [
@@ -27,7 +27,7 @@ python3Packages.buildPythonPackage rec {
owner = "astral-sh";
repo = "ruff";
rev = "refs/tags/${version}";
- hash = "sha256-9zbLlQfDeqdUp1AKP/NRMZl9KeTyyTJz7JZVW/GGRM0=";
+ hash = "sha256-TQ7nBd2S77VYShYxpxZ3CfCMiOGyl9EtIv9nXZjmijc=";
};
# Do not rely on path lookup at runtime to find the ruff binary
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ruffle/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/ruffle/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/ruffle/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ru/ruffle/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/ruffle/package.nix
similarity index 99%
rename from third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/ruffle/package.nix
index 55b2ce67fc..86586f05e5 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ru/ruffle/package.nix
@@ -57,7 +57,6 @@ rustPlatform.buildRustPackage {
wayland
xorg.libX11
xorg.libXcursor
- xorg.libXrandr
xorg.libXi
xorg.libxcb
xorg.libXrender
diff --git a/third_party/nixpkgs/pkgs/tools/security/ruler/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/ruler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ruler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/ruler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/run-scaled/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/run-scaled/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/run-scaled/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/run-scaled/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/run/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/run/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/run/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/run/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/runc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/runc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rund/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rund/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rund/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rund/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/rune-languageserver/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rune-languageserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/rune-languageserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rune-languageserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rune/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rune/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/rune/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rune/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/runelite/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/runelite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/runelite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/runelite/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/runescape/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/runescape/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/runiq/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/runiq/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/runiq/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ru/runiq/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/text/runiq/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/runiq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/runiq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/runiq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/runit/fix-ar-ranlib.patch b/third_party/nixpkgs/pkgs/by-name/ru/runit/fix-ar-ranlib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/runit/fix-ar-ranlib.patch
rename to third_party/nixpkgs/pkgs/by-name/ru/runit/fix-ar-ranlib.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/runit/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/runit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/runit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/runit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/runitor/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/runitor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/runitor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/runitor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/runningx/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/runningx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/runningx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/runningx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/runzip/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/runzip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/runzip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/runzip/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/rush/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rush/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/rush/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rush/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-audit-info/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rust-audit-info/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/rust-audit-info/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rust-audit-info/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust-code-analysis/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rust-code-analysis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust-code-analysis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rust-code-analysis/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/rust-petname/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rust-petname/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/rust-petname/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rust-petname/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rust-script/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rust-script/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rust-traverse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rust-traverse/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rustc-demangle/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/rustc-demangle/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rustc-demangle/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ru/rustc-demangle/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rustc-demangle/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustc-demangle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rustc-demangle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rustc-demangle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustfilt/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustfilt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/rustfilt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rustfilt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rusty-man/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rusty-man/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/rusty-man/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rusty-man/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rusty-psn/fix-cargo-lock.patch b/third_party/nixpkgs/pkgs/by-name/ru/rusty-psn/fix-cargo-lock.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rusty-psn/fix-cargo-lock.patch
rename to third_party/nixpkgs/pkgs/by-name/ru/rusty-psn/fix-cargo-lock.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rusty-psn/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rusty-psn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/rusty-psn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rusty-psn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustycli/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustycli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/rustycli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rustycli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rustypaste-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustypaste-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rustypaste-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rustypaste-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustypaste/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/rustypaste/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rustypaste/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustywind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rustywind/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rutabaga_gfx/darwin-install.patch b/third_party/nixpkgs/pkgs/by-name/ru/rutabaga_gfx/darwin-install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rutabaga_gfx/darwin-install.patch
rename to third_party/nixpkgs/pkgs/by-name/ru/rutabaga_gfx/darwin-install.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/rutabaga_gfx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/rutabaga_gfx/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ruwudu/default.nix b/third_party/nixpkgs/pkgs/by-name/ru/ruwudu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ruwudu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ru/ruwudu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix b/third_party/nixpkgs/pkgs/by-name/rv/rvvm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rv/rvvm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rw/default.nix b/third_party/nixpkgs/pkgs/by-name/rw/rw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/rw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rw/rw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/rwc/default.nix b/third_party/nixpkgs/pkgs/by-name/rw/rwc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/rwc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rw/rwc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/rwedid/default.nix b/third_party/nixpkgs/pkgs/by-name/rw/rwedid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/rwedid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rw/rwedid/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix b/third_party/nixpkgs/pkgs/by-name/rx/rx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rx/rx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/rxp/default.nix b/third_party/nixpkgs/pkgs/by-name/rx/rxp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xml/rxp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rx/rxp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rymcast/default.nix b/third_party/nixpkgs/pkgs/by-name/ry/rymcast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/rymcast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ry/rymcast/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix b/third_party/nixpkgs/pkgs/by-name/ry/ryzenadj/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ry/ryzenadj/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/rzip/default.nix b/third_party/nixpkgs/pkgs/by-name/rz/rzip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/rzip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rz/rzip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/s-tar/default.nix b/third_party/nixpkgs/pkgs/by-name/s-/s-tar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/s-tar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s-/s-tar/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/s-tui/default.nix b/third_party/nixpkgs/pkgs/by-name/s-/s-tui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/s-tui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s-/s-tui/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2geometry/default.nix b/third_party/nixpkgs/pkgs/by-name/s2/s2geometry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/s2geometry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s2/s2geometry/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/by-name/s2/s2n-tls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s2/s2n-tls/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/s2png/default.nix b/third_party/nixpkgs/pkgs/by-name/s2/s2png/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/s2png/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s2/s2png/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch b/third_party/nixpkgs/pkgs/by-name/s3/s3backer/fix-darwin-builds.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch
rename to third_party/nixpkgs/pkgs/by-name/s3/s3backer/fix-darwin-builds.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix b/third_party/nixpkgs/pkgs/by-name/s3/s3backer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s3/s3backer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/s3bro/default.nix b/third_party/nixpkgs/pkgs/by-name/s3/s3bro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/s3bro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s3/s3bro/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix b/third_party/nixpkgs/pkgs/by-name/s3/s3ql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s3/s3ql/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/s4cmd/default.nix b/third_party/nixpkgs/pkgs/by-name/s4/s4cmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/s4cmd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s4/s4cmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/s5/default.nix b/third_party/nixpkgs/pkgs/by-name/s5/s5/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/s5/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s5/s5/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/s5cmd/default.nix b/third_party/nixpkgs/pkgs/by-name/s5/s5cmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/s5cmd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s5/s5cmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/s9fes/default.nix b/third_party/nixpkgs/pkgs/by-name/s9/s9fes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/s9fes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/s9/s9fes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sacad/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sacad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sacad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sacad/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sacc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sacc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sacd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sacd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/sacrifice/compat.patch b/third_party/nixpkgs/pkgs/by-name/sa/sacrifice/compat.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/sacrifice/compat.patch
rename to third_party/nixpkgs/pkgs/by-name/sa/sacrifice/compat.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sacrifice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sacrifice/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/sacrifice/pythia83xx.patch b/third_party/nixpkgs/pkgs/by-name/sa/sacrifice/pythia83xx.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/sacrifice/pythia83xx.patch
rename to third_party/nixpkgs/pkgs/by-name/sa/sacrifice/pythia83xx.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/sad/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sad/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/safe-rm/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/safe-rm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/safe-rm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/safe-rm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/safe/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/safe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/safe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/safe/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/safecloset/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/safecloset/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/safecopy/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/safecopy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/safecopy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/safecopy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/safeeyes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/safeeyes/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/safefile/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/safefile/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/README.md b/third_party/nixpkgs/pkgs/by-name/sa/sage/README.md
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/README.md
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/README.md
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/dist-tests.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/dist-tests.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/dist-tests.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/dist-tests.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/env-locations.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/env-locations.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch b/third_party/nixpkgs/pkgs/by-name/sa/sage/patches/disable-singular-doctest.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/patches/disable-singular-doctest.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/gap-element-crash.patch b/third_party/nixpkgs/pkgs/by-name/sa/sage/patches/gap-element-crash.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/patches/gap-element-crash.patch
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/patches/gap-element-crash.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/silence-linker.patch b/third_party/nixpkgs/pkgs/by-name/sa/sage/patches/silence-linker.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/patches/silence-linker.patch
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/patches/silence-linker.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/third_party/nixpkgs/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sympow-cache.patch b/third_party/nixpkgs/pkgs/by-name/sa/sage/patches/sympow-cache.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sympow-cache.patch
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/patches/sympow-cache.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/python-modules/sage-docbuild.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/python-modules/sage-docbuild.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/python-modules/sage-setup.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-setup.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/python-modules/sage-setup.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/sage-env.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/sage-env.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/sage-src.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/sage-src.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/sage-tests.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/sage-tests.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/sage-with-env.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/sage-with-env.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/sage.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/sage.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/sagedoc.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/sagedoc.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/sagelib.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/sagelib.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/threejs-sage.nix b/third_party/nixpkgs/pkgs/by-name/sa/sage/threejs-sage.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/sage/threejs-sage.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sage/threejs-sage.nix
diff --git a/third_party/nixpkgs/pkgs/misc/sagetex/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sagetex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/sagetex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sagetex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sagittarius-scheme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sagittarius-scheme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sagoin/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sagoin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sagoin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sagoin/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sahel-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sahel-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/sailsd/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sailsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/sailsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sailsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/saldl/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/saldl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/saldl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/saldl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/saleae-logic-2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/saleae-logic-2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/saleae-logic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/saleae-logic/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/preload.c b/third_party/nixpkgs/pkgs/by-name/sa/saleae-logic/preload.c
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/preload.c
rename to third_party/nixpkgs/pkgs/by-name/sa/saleae-logic/preload.c
diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/third_party/nixpkgs/pkgs/by-name/sa/salt/fix-libcrypto-loading.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
rename to third_party/nixpkgs/pkgs/by-name/sa/salt/fix-libcrypto-loading.patch
diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/salt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/salt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/salt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sam-ba/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sam-ba/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sam-ba/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sam-ba/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sambamba/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sambamba/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/samblaster/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/samblaster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/samblaster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/samblaster/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/sameboy/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sameboy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/sameboy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sameboy/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/samim-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/samim-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sammler/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sammler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sammler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sammler/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sampler/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sampler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sampler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sampler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/samplicator/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/samplicator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/samplicator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/samplicator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/samply/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/samply/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/samply/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/samply/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/sampradaya/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sampradaya/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/sampradaya/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sampradaya/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/third_party/nixpkgs/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/module.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/module.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sanctity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sanctity/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sane-airscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sane-airscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/sanoid/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sanoid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/sanoid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sanoid/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/sarabun/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sarabun-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/sarabun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sarabun-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sassc/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sassc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sassc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sassc/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sasutils/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sasutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sasutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sasutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/savepagenow/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/savepagenow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/savepagenow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/savepagenow/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/saw-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/saw-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/java/sawjap/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sawjap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/java/sawjap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sa/sawjap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sbagen/default.nix b/third_party/nixpkgs/pkgs/by-name/sb/sbagen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sbagen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sb/sbagen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sbc/default.nix b/third_party/nixpkgs/pkgs/by-name/sb/sbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sb/sbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix b/third_party/nixpkgs/pkgs/by-name/sb/sblim-sfcc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sb/sblim-sfcc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/sbs/default.nix b/third_party/nixpkgs/pkgs/by-name/sb/sbs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/sbs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sb/sbs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sbsigntool/autoconf.patch b/third_party/nixpkgs/pkgs/by-name/sb/sbsigntool/autoconf.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sbsigntool/autoconf.patch
rename to third_party/nixpkgs/pkgs/by-name/sb/sbsigntool/autoconf.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/sbsigntool/default.nix b/third_party/nixpkgs/pkgs/by-name/sb/sbsigntool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sbsigntool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sb/sbsigntool/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/by-name/sb/sbt-extras/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sb/sbt-extras/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/sc-im/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/sc-im/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sc68/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/sc68/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sc68/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/sc68/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sca2d/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/sca2d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sca2d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/sca2d/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scalafmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scalafmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scalapack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scalapack/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scaleft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scaleft/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/scalp/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scalp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/scalp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scalp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scalr-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scalr-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/scanbd/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scanbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/scanbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scanbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/scanmem/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scanmem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/scanmem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scanmem/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/scaphandre/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scaphandre/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/scaphandre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scaphandre/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/sccache/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/sccache/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scdl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scdl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch b/third_party/nixpkgs/pkgs/by-name/sc/scenebuilder/fix-default-maven-plugin-versions.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch
rename to third_party/nixpkgs/pkgs/by-name/sc/scenebuilder/fix-default-maven-plugin-versions.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scenebuilder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scenebuilder/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch b/third_party/nixpkgs/pkgs/by-name/sc/scenebuilder/pom-remove-javafx.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch
rename to third_party/nixpkgs/pkgs/by-name/sc/scenebuilder/pom-remove-javafx.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/scenic-view/deps.json b/third_party/nixpkgs/pkgs/by-name/sc/scenic-view/deps.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/scenic-view/deps.json
rename to third_party/nixpkgs/pkgs/by-name/sc/scenic-view/deps.json
diff --git a/third_party/nixpkgs/pkgs/development/tools/scenic-view/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scenic-view/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/scenic-view/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scenic-view/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/schedtool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/schedtool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/schema2ldif/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/schema2ldif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/schema2ldif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/schema2ldif/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/schemacrawler/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/schemacrawler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/schemacrawler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/schemacrawler/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scheme-bytestructures/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scheme-bytestructures/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scheme-manpages/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scheme-manpages/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/scheme48/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scheme48/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/scheme48/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scheme48/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/schemes/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/schemes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/schemes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/schemes/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/scid-vs-pc/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scid-vs-pc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/scid-vs-pc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scid-vs-pc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/scid/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/scid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scid/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/scientifica/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scientifica/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/scientifica/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scientifica/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scilab-bin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scilab-bin/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/scilla/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scilla/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/scilla/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scilla/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/scip/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/scip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scip/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/scli/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/scli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/scmccid/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scmccid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/scmccid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scmccid/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/scmpuff/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scmpuff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/scmpuff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scmpuff/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/scope-lite/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scope-lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/scope-lite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scope-lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scopehal-apps/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scopehal-apps/package.nix
index 9b13dcf52b..aae1cbb53f 100644
--- a/third_party/nixpkgs/pkgs/by-name/sc/scopehal-apps/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sc/scopehal-apps/package.nix
@@ -21,9 +21,13 @@
glslang,
spirv-tools,
ffts,
+ moltenvk,
+ apple-sdk_11,
+ darwinMinVersionHook,
+ llvmPackages,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "scopehal-apps";
version = "0-unstable-2024-09-16";
@@ -37,30 +41,42 @@ stdenv.mkDerivation rec {
strictDeps = true;
- nativeBuildInputs = [
- cmake
- pkg-config
- shaderc
- spirv-tools
- wrapGAppsHook4
- ];
+ nativeBuildInputs =
+ [
+ cmake
+ pkg-config
+ shaderc
+ spirv-tools
+ ]
+ ++ lib.optionals stdenv.isLinux [
+ wrapGAppsHook4
+ ];
- buildInputs = [
- cairomm
- ffts
- glew
- glfw
- glslang
- gtkmm3
- liblxi
- libsigcxx
- libtirpc
- vulkan-headers
- vulkan-loader
- vulkan-tools
- yaml-cpp
- zstd
- ];
+ buildInputs =
+ [
+ cairomm
+ glew
+ glfw
+ glslang
+ liblxi
+ libsigcxx
+ vulkan-headers
+ vulkan-loader
+ vulkan-tools
+ yaml-cpp
+ zstd
+ ]
+ ++ lib.optionals stdenv.isLinux [
+ ffts
+ gtkmm3
+ libtirpc
+ ]
+ ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
+ ++ lib.optionals stdenv.isDarwin [
+ apple-sdk_11
+ (darwinMinVersionHook "10.15")
+ moltenvk
+ ];
# Targets InitializeSearchPaths
postPatch = ''
@@ -68,12 +84,19 @@ stdenv.mkDerivation rec {
--replace-fail '"/share/' '"/../share/'
'';
+ cmakeFlags = lib.optionals stdenv.isDarwin [
+ "-DCMAKE_INSTALL_RPATH=${lib.strings.makeLibraryPath [ vulkan-loader ]}"
+ ];
+
meta = {
description = "Advanced test & measurement remote control and analysis suite";
homepage = "https://www.ngscopeclient.org/";
license = lib.licenses.bsd3;
mainProgram = "ngscopeclient";
- maintainers = with lib.maintainers; [ bgamari ];
- platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [
+ bgamari
+ carlossless
+ ];
+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/games/scorched3d/file-existence.patch b/third_party/nixpkgs/pkgs/by-name/sc/scorched3d/file-existence.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/scorched3d/file-existence.patch
rename to third_party/nixpkgs/pkgs/by-name/sc/scorched3d/file-existence.patch
diff --git a/third_party/nixpkgs/pkgs/games/scorched3d/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scorched3d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/scorched3d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scorched3d/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scorecard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scorecard/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/scowl/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scowl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/scowl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scowl/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/scponly/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scponly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/scponly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scponly/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/scponly/scponly-fix-make.patch b/third_party/nixpkgs/pkgs/by-name/sc/scponly/scponly-fix-make.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/scponly/scponly-fix-make.patch
rename to third_party/nixpkgs/pkgs/by-name/sc/scponly/scponly-fix-make.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/scraper/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scraper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/scraper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scraper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scream/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/scream/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scream/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/screen-message/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/screen-message/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/screen-message/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/screen-message/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/screenfetch/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/screenfetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/screenfetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/screenfetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/screenkey/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/screenkey/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/screenkey/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/screenkey/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/script-directory/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/script-directory/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/script-directory/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/script-directory/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scriptaculous/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scriptaculous/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/scriptisto/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scriptisto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/scriptisto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scriptisto/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/scrolls/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scrolls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/scrolls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scrolls/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scrot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scrot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/scrub/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scrub/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/scrub/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scrub/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sc/scryer-prolog/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/sc/scryer-prolog/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scryer-prolog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scryer-prolog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/scrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/scrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/scsh/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/scsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/sct/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/sct/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/sct/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/sct/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scudcloud/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scudcloud/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix b/third_party/nixpkgs/pkgs/by-name/sd/sd-local/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sd/sd-local/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sd-switch/default.nix b/third_party/nixpkgs/pkgs/by-name/sd/sd-switch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sd-switch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sd/sd-switch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sdat2img/default.nix b/third_party/nixpkgs/pkgs/by-name/sd/sdat2img/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/sdat2img/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sd/sdat2img/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sdate/default.nix b/third_party/nixpkgs/pkgs/by-name/sd/sdate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sdate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sd/sdate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sdcv/default.nix b/third_party/nixpkgs/pkgs/by-name/sd/sdcv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sdcv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sd/sdcv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix b/third_party/nixpkgs/pkgs/by-name/sd/sdl-jstest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sd/sdl-jstest/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sdlookup/default.nix b/third_party/nixpkgs/pkgs/by-name/sd/sdlookup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sdlookup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sd/sdlookup/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/sdlpop/default.nix b/third_party/nixpkgs/pkgs/by-name/sd/sdlpop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/sdlpop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sd/sdlpop/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/sdlpop/prince.sh b/third_party/nixpkgs/pkgs/by-name/sd/sdlpop/prince.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/sdlpop/prince.sh
rename to third_party/nixpkgs/pkgs/by-name/sd/sdlpop/prince.sh
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix b/third_party/nixpkgs/pkgs/by-name/sd/sdparm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sd/sdparm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrplay/default.nix b/third_party/nixpkgs/pkgs/by-name/sd/sdrplay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/sdrplay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sd/sdrplay/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sea-orm-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sea-orm-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sea-orm-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sea-orm-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seafile-shared/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seafile-shared/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sealcurses/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sealcurses/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sealcurses/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sealcurses/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/seashells/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seashells/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/seashells/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seashells/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/seasocks/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seasocks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/seasocks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seasocks/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/seatd/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seatd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/seatd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seatd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/seaview/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seaview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/seaview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seaview/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seaweedfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seaweedfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/sec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sec/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/seccure/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seccure/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/seccure/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seccure/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix b/third_party/nixpkgs/pkgs/by-name/se/secp256k1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/secp256k1/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/secrets-extractor/default.nix b/third_party/nixpkgs/pkgs/by-name/se/secrets-extractor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/secrets-extractor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/secrets-extractor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/secretscanner/default.nix b/third_party/nixpkgs/pkgs/by-name/se/secretscanner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/secretscanner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/secretscanner/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sedutil/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sedutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sedutil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sedutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/see/default.nix b/third_party/nixpkgs/pkgs/by-name/se/see/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/see/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/see/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/seehecht/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seehecht/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/seehecht/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seehecht/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/segger-ozone/default.nix b/third_party/nixpkgs/pkgs/by-name/se/segger-ozone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/segger-ozone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/segger-ozone/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/third_party/nixpkgs/pkgs/by-name/se/selendroid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/selendroid/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix b/third_party/nixpkgs/pkgs/by-name/se/selene/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/selene/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/selene/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/third_party/nixpkgs/pkgs/by-name/se/selenium-server-standalone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/selenium-server-standalone/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix b/third_party/nixpkgs/pkgs/by-name/se/selfoss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/selfoss/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix b/third_party/nixpkgs/pkgs/by-name/se/selinux-python/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/selinux-python/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix b/third_party/nixpkgs/pkgs/by-name/se/selinux-sandbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/selinux-sandbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sem/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sem/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/semantic-release/default.nix b/third_party/nixpkgs/pkgs/by-name/se/semantic-release/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/semantic-release/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/semantic-release/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/semiphemeral/default.nix b/third_party/nixpkgs/pkgs/by-name/se/semiphemeral/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/semiphemeral/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/semiphemeral/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/se/semodule-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/semodule-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/se/semver-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/semver-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/semver/default.nix b/third_party/nixpkgs/pkgs/by-name/se/semver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/semver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/semver/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/bump-go-version.patch b/third_party/nixpkgs/pkgs/by-name/se/senpai/bump-go-version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/senpai/bump-go-version.patch
rename to third_party/nixpkgs/pkgs/by-name/se/senpai/bump-go-version.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix b/third_party/nixpkgs/pkgs/by-name/se/senpai/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/senpai/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/sensible-side-buttons/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sensible-side-buttons/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/sensible-side-buttons/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sensible-side-buttons/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sensible-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sensible-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sent/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sent/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sentencepiece/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sentencepiece/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sentry-native/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sentry-native/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix b/third_party/nixpkgs/pkgs/by-name/se/senv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/senv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/senv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/seq24/mutex_no_nameclash.patch b/third_party/nixpkgs/pkgs/by-name/se/seq24/mutex_no_nameclash.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/seq24/mutex_no_nameclash.patch
rename to third_party/nixpkgs/pkgs/by-name/se/seq24/mutex_no_nameclash.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/seq24/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seq24/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/seq24/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seq24/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/seqkit/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seqkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/seqkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seqkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/seqtk/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seqtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/seqtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seqtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sequeler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sequeler/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sequelpro/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sequelpro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sequelpro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sequelpro/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia-sqop/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sequoia-sqop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sequoia-sqop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sequoia-sqop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia-sqv/Cargo.lock.patch b/third_party/nixpkgs/pkgs/by-name/se/sequoia-sqv/Cargo.lock.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sequoia-sqv/Cargo.lock.patch
rename to third_party/nixpkgs/pkgs/by-name/se/sequoia-sqv/Cargo.lock.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia-sqv/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sequoia-sqv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sequoia-sqv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sequoia-sqv/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix b/third_party/nixpkgs/pkgs/by-name/se/ser2net/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ser2net/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/ser2net/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix b/third_party/nixpkgs/pkgs/by-name/se/serd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/serd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/serd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/seren/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seren/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/seren/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seren/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix b/third_party/nixpkgs/pkgs/by-name/se/serf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/serf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/serf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/serf/scons.patch b/third_party/nixpkgs/pkgs/by-name/se/serf/scons.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/serf/scons.patch
rename to third_party/nixpkgs/pkgs/by-name/se/serf/scons.patch
diff --git a/third_party/nixpkgs/pkgs/servers/serf/default.nix b/third_party/nixpkgs/pkgs/by-name/se/serfdom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/serf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/serfdom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/serialdv/default.nix b/third_party/nixpkgs/pkgs/by-name/se/serialdv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/serialdv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/serialdv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/serpent/default.nix b/third_party/nixpkgs/pkgs/by-name/se/serpent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/serpent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/serpent/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/service-wrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/se/service-wrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/service-wrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/service-wrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/third_party/nixpkgs/pkgs/by-name/se/service-wrapper/service-wrapper.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
rename to third_party/nixpkgs/pkgs/by-name/se/service-wrapper/service-wrapper.sh
diff --git a/third_party/nixpkgs/pkgs/servers/serviio/default.nix b/third_party/nixpkgs/pkgs/by-name/se/serviio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/serviio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/serviio/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/seshat/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seshat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/seshat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seshat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/se/session-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/session-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix b/third_party/nixpkgs/pkgs/by-name/se/setbfree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/setbfree/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix b/third_party/nixpkgs/pkgs/by-name/se/setools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/setools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/setroot/default.nix b/third_party/nixpkgs/pkgs/by-name/se/setroot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/setroot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/setroot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/setserial/default.nix b/third_party/nixpkgs/pkgs/by-name/se/setserial/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/setserial/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/setserial/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/seturgent/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seturgent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/seturgent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seturgent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/sewer/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/sewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sexpp/default.nix b/third_party/nixpkgs/pkgs/by-name/se/sexpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sexpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/sexpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/seyren/default.nix b/third_party/nixpkgs/pkgs/by-name/se/seyren/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/seyren/default.nix
rename to third_party/nixpkgs/pkgs/by-name/se/seyren/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix b/third_party/nixpkgs/pkgs/by-name/sf/sfeed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sf/sfeed/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sfizz/gcc13.patch b/third_party/nixpkgs/pkgs/by-name/sf/sfizz/gcc13.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sfizz/gcc13.patch
rename to third_party/nixpkgs/pkgs/by-name/sf/sfizz/gcc13.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix b/third_party/nixpkgs/pkgs/by-name/sf/sfizz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sf/sfizz/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/sfm/default.nix b/third_party/nixpkgs/pkgs/by-name/sf/sfm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/sfm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sf/sfm/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/sfrotz/default.nix b/third_party/nixpkgs/pkgs/by-name/sf/sfrotz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/sfrotz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sf/sfrotz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sfsexp/default.nix b/third_party/nixpkgs/pkgs/by-name/sf/sfsexp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sfsexp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sf/sfsexp/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix b/third_party/nixpkgs/pkgs/by-name/sf/sftpgo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sftpgo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sf/sftpgo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix b/third_party/nixpkgs/pkgs/by-name/sf/sftpman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sf/sftpman/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sfxr/default.nix b/third_party/nixpkgs/pkgs/by-name/sf/sfxr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sfxr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sf/sfxr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sfz/default.nix b/third_party/nixpkgs/pkgs/by-name/sf/sfz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sfz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sf/sfz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/sg3_utils/default.nix b/third_party/nixpkgs/pkgs/by-name/sg/sg3_utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/sg3_utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sg/sg3_utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sgp4/default.nix b/third_party/nixpkgs/pkgs/by-name/sg/sgp4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sgp4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sg/sgp4/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/sgrep/default.nix b/third_party/nixpkgs/pkgs/by-name/sg/sgrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sgrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sg/sgrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix b/third_party/nixpkgs/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix b/third_party/nixpkgs/pkgs/by-name/sg/sgx-azure-dcap-client/test-suite.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix
rename to third_party/nixpkgs/pkgs/by-name/sg/sgx-azure-dcap-client/test-suite.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/azure-dcap-client/tests-missing-includes.patch b/third_party/nixpkgs/pkgs/by-name/sg/sgx-azure-dcap-client/tests-missing-includes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sgx/azure-dcap-client/tests-missing-includes.patch
rename to third_party/nixpkgs/pkgs/by-name/sg/sgx-azure-dcap-client/tests-missing-includes.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/default.nix b/third_party/nixpkgs/pkgs/by-name/sg/sgx-ssl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sg/sgx-ssl/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/tests.nix b/third_party/nixpkgs/pkgs/by-name/sg/sgx-ssl/tests.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/tests.nix
rename to third_party/nixpkgs/pkgs/by-name/sg/sgx-ssl/tests.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sha1collisiondetection/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/sha1collisiondetection/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sha1collisiondetection/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/sha1collisiondetection/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shaarli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shaarli/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shabnam-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shabnam-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/shadered/install_path_fix.patch b/third_party/nixpkgs/pkgs/by-name/sh/shadered/install_path_fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/shadered/install_path_fix.patch
rename to third_party/nixpkgs/pkgs/by-name/sh/shadered/install_path_fix.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/shadered/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shadered/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/shadered/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shadered/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shades-of-gray-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shades-of-gray-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch b/third_party/nixpkgs/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch
rename to third_party/nixpkgs/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/keep-path.patch b/third_party/nixpkgs/pkgs/by-name/sh/shadow/keep-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/shadow/keep-path.patch
rename to third_party/nixpkgs/pkgs/by-name/sh/shadow/keep-path.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shadow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shadow/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch b/third_party/nixpkgs/pkgs/by-name/sh/shadow/respect-xml-catalog-files-var.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch
rename to third_party/nixpkgs/pkgs/by-name/sh/shadow/respect-xml-catalog-files-var.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/runtime-shell.patch b/third_party/nixpkgs/pkgs/by-name/sh/shadow/runtime-shell.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/shadow/runtime-shell.patch
rename to third_party/nixpkgs/pkgs/by-name/sh/shadow/runtime-shell.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shadowfox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shadowfox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shadowsocks-libev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shadowsocks-libev/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/shairport-sync/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shairport-sync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/shairport-sync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shairport-sync/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/shallot/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shallot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/shallot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shallot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/shaq/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shaq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/shaq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shaq/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shared-mime-info/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shared-mime-info/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shared_desktop_ontologies/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shared_desktop_ontologies/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sharing/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/sharing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sharing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/sharing/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sharness/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/sharness/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sharness/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/sharness/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/sharpsat-td/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/sharpsat-td/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/sharpsat-td/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/sharpsat-td/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/sharutils/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/sharutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/sharutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/sharutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/shavee/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shavee/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/shavee/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shavee/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/shc/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/shc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/shell-genie/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shell-genie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/shell-genie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shell-genie/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/shell-hist/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shell-hist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/shell-hist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shell-hist/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/misc/shell2http/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shell2http/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/shell2http/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shell2http/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/shellclear/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shellclear/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/shellclear/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shellclear/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/shelldap/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shelldap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/shelldap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shelldap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/shellharden/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shellharden/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/shellharden/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shellharden/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shellhub-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shellhub-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/shellnoob/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shellnoob/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/shellnoob/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shellnoob/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/shellspec/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shellspec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/shellspec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shellspec/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/shellz/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shellz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/shellz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shellz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shen-sbcl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shen-sbcl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shen-sources/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shen-sources/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/sherpa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/sherpa/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/shhmsg/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shhmsg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/shhmsg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shhmsg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/shhopt/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shhopt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/shhopt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shhopt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shibboleth-sp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shibboleth-sp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/shikane/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shikane/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/shikane/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shikane/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/shim/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shim-unsigned/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/shim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shim-unsigned/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/shine/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/shine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shine/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shiori/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shiori/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shipments/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shipments/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/shipwright/darwin-fixes.patch b/third_party/nixpkgs/pkgs/by-name/sh/shipwright/darwin-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/shipwright/darwin-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/sh/shipwright/darwin-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/games/shipwright/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shipwright/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/shipwright/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shipwright/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/shisho/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shisho/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/shisho/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shisho/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/shmig/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shmig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/shmig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shmig/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/shncpd/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shncpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/shncpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shncpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/shntool/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shntool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/shntool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shntool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/shocco/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shocco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/shocco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shocco/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/shod/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/shod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shod/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/shopify-themekit/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shopify-themekit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/shopify-themekit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shopify-themekit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/shorewall/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shorewall/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/shorewall/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shorewall/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/shortcat/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shortcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/shortcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shortcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/shot-scraper/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shot-scraper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/shot-scraper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shot-scraper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/shotgun/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shotgun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/shotgun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shotgun/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/shotman/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shotman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/shotman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shotman/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shotwell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shotwell/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/shrikhand/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shrikhand/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/shrikhand/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shrikhand/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/shticker-book-unwritten/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shticker-book-unwritten/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/shticker-book-unwritten/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shticker-book-unwritten/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/shticker-book-unwritten/unwrapped.nix b/third_party/nixpkgs/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/shticker-book-unwritten/unwrapped.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/shtns/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shtns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/shtns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shtns/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/shunit2/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shunit2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/shunit2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shunit2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shutter/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shutter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/shutter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shutter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sic-image-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sic-image-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/sic/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/sic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sic/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sidequest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sidequest/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sidplayfp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sidplayfp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix b/third_party/nixpkgs/pkgs/by-name/si/siege/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/siege/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/siege/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/sienna/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sienna/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/sienna/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sienna/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/sierra/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sierra-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/sierra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sierra-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sieve-connect/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sieve-connect/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/sift/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sift/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sift/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sift/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sigal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sigal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix b/third_party/nixpkgs/pkgs/by-name/si/siglo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/siglo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/siglo/siglo-no-user-install.patch b/third_party/nixpkgs/pkgs/by-name/si/siglo/siglo-no-user-install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/siglo/siglo-no-user-install.patch
rename to third_party/nixpkgs/pkgs/by-name/si/siglo/siglo-no-user-install.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/sigma-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sigma-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sigma-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sigma-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/si/signal-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/signal-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/deps.json b/third_party/nixpkgs/pkgs/by-name/si/signald/deps.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/deps.json
rename to third_party/nixpkgs/pkgs/by-name/si/signald/deps.json
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix b/third_party/nixpkgs/pkgs/by-name/si/signald/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/signald/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signaldctl/default.nix b/third_party/nixpkgs/pkgs/by-name/si/signaldctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signaldctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/signaldctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/signify/default.nix b/third_party/nixpkgs/pkgs/by-name/si/signify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/signify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/signify/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/signing-party/gpgwrap_makefile.patch b/third_party/nixpkgs/pkgs/by-name/si/signing-party/gpgwrap_makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/signing-party/gpgwrap_makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/si/signing-party/gpgwrap_makefile.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/signing-party/default.nix b/third_party/nixpkgs/pkgs/by-name/si/signing-party/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/signing-party/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/signing-party/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/signwriting/default.nix b/third_party/nixpkgs/pkgs/by-name/si/signwriting/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/signwriting/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/signwriting/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sigrok-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sigrok-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sigrok-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sigrok-firmware-fx2lafw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sigrok-firmware-fx2lafw/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sigslot/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sigslot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sigslot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sigslot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/sigtop/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sigtop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/sigtop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sigtop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/sigutils/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sigutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/sigutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sigutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/siji/default.nix b/third_party/nixpkgs/pkgs/by-name/si/siji/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/siji/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/siji/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/sil-abyssinica/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sil-abyssinica/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/sil-abyssinica/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sil-abyssinica/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/sil-padauk/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sil-padauk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/sil-padauk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sil-padauk/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/sil-q/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sil-q/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/sil-q/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sil-q/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/sil/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/sil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sil/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/third_party/nixpkgs/pkgs/by-name/si/silc_client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/silc_client/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/silc-server/default.nix b/third_party/nixpkgs/pkgs/by-name/si/silc_server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/silc-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/silc_server/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/si/sile/package.nix b/third_party/nixpkgs/pkgs/by-name/si/sile/package.nix
index 54a2317adf..db31c2e383 100644
--- a/third_party/nixpkgs/pkgs/by-name/si/sile/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/si/sile/package.nix
@@ -1,9 +1,10 @@
{
lib,
stdenv,
- fetchzip,
+ fetchurl,
# nativeBuildInputs
+ zstd,
pkg-config,
jq,
cargo,
@@ -32,18 +33,20 @@ stdenv.mkDerivation (finalAttrs: {
pname = "sile";
version = "0.15.5";
- src = fetchzip {
- url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.zip";
- sha256 = "sha256-zP+MGCXGEg19U6tMrHIdgAAfKQT21vFtmoEROXgxUB0=";
+ src = fetchurl {
+ url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst";
+ sha256 = "sha256-0gE3sC0WMC0odnD9KFrSisO406+RZGCqa8jL/5Mhufk=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src;
+ nativeBuildInputs = [ zstd ];
dontConfigure = true;
hash = "sha256-hmgDG29C5JfQX2acMr8c3lmswa1u5XHauRWFd4QGmOo=";
};
nativeBuildInputs = [
+ zstd
pkg-config
jq
cargo
diff --git a/third_party/nixpkgs/pkgs/tools/security/silenthound/default.nix b/third_party/nixpkgs/pkgs/by-name/si/silenthound/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/silenthound/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/silenthound/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/silice/default.nix b/third_party/nixpkgs/pkgs/by-name/si/silice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/silice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/silice/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/silver-searcher/bash-completion.patch b/third_party/nixpkgs/pkgs/by-name/si/silver-searcher/bash-completion.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/silver-searcher/bash-completion.patch
rename to third_party/nixpkgs/pkgs/by-name/si/silver-searcher/bash-completion.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/silver-searcher/default.nix b/third_party/nixpkgs/pkgs/by-name/si/silver-searcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/silver-searcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/silver-searcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simdjson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simdjson/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simg2img/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simg2img/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simgear/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simgear/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simgrid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simgrid/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/simp1e-cursors/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simp1e-cursors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/simp1e-cursors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simp1e-cursors/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/simp_le/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simp_le/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/simp_le/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simp_le/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/simple-dlna-browser/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simple-dlna-browser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/simple-dlna-browser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simple-dlna-browser/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simple-http-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simple-http-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/simple-mtpfs/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simple-mtpfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/simple-mtpfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simple-mtpfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simpleTpmPk11/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simpleTpmPk11/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/simplehttp2server/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simplehttp2server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/simplehttp2server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simplehttp2server/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/simplenes/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simplenes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/simplenes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simplenes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simpleproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simpleproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/simutrans/default.nix b/third_party/nixpkgs/pkgs/by-name/si/simutrans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/simutrans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/simutrans/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sing-box/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sing-box/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/sing-geoip/main.go b/third_party/nixpkgs/pkgs/by-name/si/sing-geoip/main.go
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/sing-geoip/main.go
rename to third_party/nixpkgs/pkgs/by-name/si/sing-geoip/main.go
diff --git a/third_party/nixpkgs/pkgs/data/misc/sing-geoip/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sing-geoip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/sing-geoip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sing-geoip/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/sing-geosite/main.go b/third_party/nixpkgs/pkgs/by-name/si/sing-geosite/main.go
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/sing-geosite/main.go
rename to third_party/nixpkgs/pkgs/by-name/si/sing-geosite/main.go
diff --git a/third_party/nixpkgs/pkgs/data/misc/sing-geosite/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sing-geosite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/sing-geosite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sing-geosite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix b/third_party/nixpkgs/pkgs/by-name/si/singular/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/singular/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sipcalc/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sipcalc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sipcalc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sipcalc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sipexer/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sipexer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sipexer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sipexer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sipp/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sipp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/sipp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sipp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/siproxd/cheaders.patch b/third_party/nixpkgs/pkgs/by-name/si/siproxd/cheaders.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/siproxd/cheaders.patch
rename to third_party/nixpkgs/pkgs/by-name/si/siproxd/cheaders.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/siproxd/default.nix b/third_party/nixpkgs/pkgs/by-name/si/siproxd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/siproxd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/siproxd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sipsak/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sipsak/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sipsak/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sipsak/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sipvicious/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sipvicious/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sipvicious/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sipvicious/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sip/sipwitch/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sipwitch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sip/sipwitch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sipwitch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix b/third_party/nixpkgs/pkgs/by-name/si/siril/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/siril/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/sirula/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/si/sirula/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/sirula/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/si/sirula/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/sirula/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sirula/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/sirula/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sirula/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sish/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/sitelen-seli-kiwen/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sitelen-seli-kiwen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/sitelen-seli-kiwen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sitelen-seli-kiwen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sitespeed-io/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sitespeed-io/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sitespeed-io/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sitespeed-io/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sixpair/hcitool.patch b/third_party/nixpkgs/pkgs/by-name/si/sixpair/hcitool.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sixpair/hcitool.patch
rename to third_party/nixpkgs/pkgs/by-name/si/sixpair/hcitool.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sixpair/default.nix b/third_party/nixpkgs/pkgs/by-name/si/sixpair/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sixpair/default.nix
rename to third_party/nixpkgs/pkgs/by-name/si/sixpair/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/sjasmplus/default.nix b/third_party/nixpkgs/pkgs/by-name/sj/sjasmplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/sjasmplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sj/sjasmplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skaffold/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sk/skaffold/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/skate/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/skate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sk/skate/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix
index c069430866..b82123b366 100644
--- a/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sketchybar-app-font";
- version = "2.0.25";
+ version = "2.0.27";
src = fetchFromGitHub {
owner = "kvndrsslr";
repo = "sketchybar-app-font";
- rev = "v2.0.25";
- hash = "sha256-R3vf9IyMiPBC0cFjvRcaIDqd/q76dA2RbOjZKCwdk/Y=";
+ rev = "v2.0.27";
+ hash = "sha256-IgyDJvx+CxjSm2Aoh6TEPUcGdPJi48YnNyAhGUYVYjQ=";
};
pnpmDeps = pnpm.fetchDeps {
diff --git a/third_party/nixpkgs/pkgs/data/themes/skeu/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skeu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/skeu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sk/skeu/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/sk/skia/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/skia/package.nix
index 2790b77101..6622b305e5 100644
--- a/third_party/nixpkgs/pkgs/by-name/sk/skia/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sk/skia/package.nix
@@ -17,6 +17,9 @@
, vulkan-headers
, vulkan-memory-allocator
, xcbuild
+, cctools
+, zlib
+, apple-sdk_11
, enableVulkan ? !stdenv.hostPlatform.isDarwin
}:
@@ -46,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
gn
ninja
python3
- ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild cctools.libtool zlib ];
buildInputs = [
expat
@@ -61,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals enableVulkan [
vulkan-headers
vulkan-memory-allocator
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK
];
gnFlags = let
@@ -92,13 +97,15 @@ stdenv.mkDerivation (finalAttrs: {
"skia_use_vulkan=true"
];
+ env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lz";
+
# Somewhat arbitrary, but similar to what other distros are doing
installPhase = ''
runHook preInstall
# Libraries
mkdir -p $out/lib
- cp *.so *.a $out/lib
+ cp *.so *.a *.dylib $out/lib
# Includes
pushd ../../include
@@ -144,7 +151,5 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ fgaz ];
platforms = with lib.platforms; arm ++ aarch64 ++ x86 ++ x86_64;
pkgConfigModules = [ "skia" ];
- # https://github.com/NixOS/nixpkgs/pull/325871#issuecomment-2220610016
- broken = stdenv.hostPlatform.isDarwin;
};
})
diff --git a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/skim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sk/skim/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skippy-xd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sk/skippy-xd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/skjold/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skjold/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/skjold/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sk/skjold/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skktools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sk/skktools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skopeo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sk/skopeo/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/skydns/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skydns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/skydns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sk/skydns/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skytemple/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sk/skytemple/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sl/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/sl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/sl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/slack-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slack-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/slack-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slack-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slack-term/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slack-term/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sleek/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sl/sleek/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/sleek/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/sl/sleek/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sleek/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/sleek/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/sleek/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/sleek/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/sleep-on-lan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/sleep-on-lan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/sleuthkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/sleuthkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/slic3r/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slic3r/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/slic3r/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slic3r/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slides/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/slides/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slides/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/slimerjs/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slimerjs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/slimerjs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slimerjs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/slingshot/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slingshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/slingshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slingshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/sl/slint-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/sl/slint-lsp/package.nix
index 969457481d..a65350cac5 100644
--- a/third_party/nixpkgs/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sl/slint-lsp/package.nix
@@ -20,7 +20,7 @@
}:
let
- rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ]
+ rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXi ]
++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ];
in
rustPlatform.buildRustPackage rec {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/slippy/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slippy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/slippy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slippy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slirp4netns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slirp4netns/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/sloccount/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/sloccount/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/slop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sloth/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/sloth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sloth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/sloth/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/slowhttptest/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slowhttptest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/slowhttptest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slowhttptest/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/slrn/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slrn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/newsreaders/slrn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slrn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/slsa-verifier/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slsa-verifier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/slsa-verifier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slsa-verifier/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/slsnif/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slsnif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/slsnif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slsnif/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch b/third_party/nixpkgs/pkgs/by-name/sl/slurm-spank-stunnel/hostlist.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch
rename to third_party/nixpkgs/pkgs/by-name/sl/slurm-spank-stunnel/hostlist.patch
diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm-spank-x11/hostlist.patch b/third_party/nixpkgs/pkgs/by-name/sl/slurm-spank-x11/hostlist.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/computing/slurm-spank-x11/hostlist.patch
rename to third_party/nixpkgs/pkgs/by-name/sl/slurm-spank-x11/hostlist.patch
diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slurm-spank-x11/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slurm-spank-x11/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/common-env-echo.patch b/third_party/nixpkgs/pkgs/by-name/sl/slurm/common-env-echo.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/computing/slurm/common-env-echo.patch
rename to third_party/nixpkgs/pkgs/by-name/sl/slurm/common-env-echo.patch
diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slurm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sl/slurm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/smack/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/java/smack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/smart-wallpaper/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smart-wallpaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/smart-wallpaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smart-wallpaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix b/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix
index e68ce11857..c340d0a6ce 100644
--- a/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix
@@ -3,7 +3,6 @@
, rustPlatform
, darwin
-, libX11
, openssl
, pkg-config
, stdenv
@@ -11,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "smartcat";
- version = "1.7.1";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "efugier";
repo = "smartcat";
rev = "refs/tags/${version}";
- hash = "sha256-62yvXrhk9JO7JBfD7tNFjba2nHxdqAVyMIW3q+2Aomc=";
+ hash = "sha256-QoMBQ/Xjh/xbsE9HthUKwm5v2tiN1tC2u6I/aOeO6ws=";
};
- cargoHash = "sha256-y0EA6pDxAO4mxZE+k15LUrjxsDD4A/KxvJltZL9Lqgc=";
+ cargoHash = "sha256-SAv2tgo5jBSsVhLM2FR5S9Sg0yZBghSKKSV9hhUCvCk=";
nativeBuildInputs = [
pkg-config
@@ -28,7 +27,6 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
openssl
- libX11
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/smartcrop/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smartcrop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/smartcrop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smartcrop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smartdns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smartdns/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smarty3-i18n/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smarty3-i18n/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smarty3/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smarty3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/smarty3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smarty3/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/smbmap/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smbmap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/smbmap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smbmap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smbnetfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smbnetfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/smbscan/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smbscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/smbscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smbscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/smc-chilanka/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smc-chilanka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/smc-chilanka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smc-chilanka/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/smc/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/smc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smc/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/smcroute/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smcroute/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/smcroute/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smcroute/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/smem/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/smem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smem/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smemstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smemstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/smiley-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smiley-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/smiley-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smiley-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smimesign/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smimesign/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/smlfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smlfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/smlfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smlfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/smlpkg/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smlpkg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/smlpkg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smlpkg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/smokeping/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smokeping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/smokeping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smokeping/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smooth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smooth/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg/format.patch b/third_party/nixpkgs/pkgs/by-name/sm/smpeg/format.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/smpeg/format.patch
rename to third_party/nixpkgs/pkgs/by-name/sm/smpeg/format.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg/gcc6.patch b/third_party/nixpkgs/pkgs/by-name/sm/smpeg/gcc6.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/smpeg/gcc6.patch
rename to third_party/nixpkgs/pkgs/by-name/sm/smpeg/gcc6.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg/gtk.patch b/third_party/nixpkgs/pkgs/by-name/sm/smpeg/gtk.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/smpeg/gtk.patch
rename to third_party/nixpkgs/pkgs/by-name/sm/smpeg/gtk.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg/libx11.patch b/third_party/nixpkgs/pkgs/by-name/sm/smpeg/libx11.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/smpeg/libx11.patch
rename to third_party/nixpkgs/pkgs/by-name/sm/smpeg/libx11.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smpeg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smpeg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg2/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smpeg2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smpeg2/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/smtprelay/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smtprelay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/smtprelay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smtprelay/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/smu/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/smu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/smug/default.nix b/third_party/nixpkgs/pkgs/by-name/sm/smug/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/smug/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sm/smug/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snabb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snabb/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/snake4/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snake4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/snake4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snake4/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snallygaster/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snallygaster/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/snap7/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snap7/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/snap7/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snap7/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snapdragon-profiler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snapdragon-profiler/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snapmaker-luban/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snapmaker-luban/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snapper-gui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snapper-gui/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/snappy/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snappy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/snappy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snappy/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snappymail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/snappymail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snappymail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snapraid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snapraid/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/snapshot/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snapshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/snapshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snapshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/snazy/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snazy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/snazy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snazy/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/sndio/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/sndio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/sndio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/sndio/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sndpeek/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/sndpeek/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sndpeek/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/sndpeek/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sndpeek/pthread.patch b/third_party/nixpkgs/pkgs/by-name/sn/sndpeek/pthread.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sndpeek/pthread.patch
rename to third_party/nixpkgs/pkgs/by-name/sn/sndpeek/pthread.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/snet/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/snet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/sngrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/sngrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/sniffnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/sniffnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/sniglet/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/sniglet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/sniglet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/sniglet/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/snipes/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snipes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/snipes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snipes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snippetpixie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snippetpixie/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/sniproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sniproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/sniproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/snis/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/snis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snis/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/snixembed/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snixembed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/snixembed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snixembed/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/snmpcheck/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snmpcheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/snmpcheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snmpcheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/snobol4/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/sn/snobol4/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/snobol4/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/sn/snobol4/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/snobol4/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snobol4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/snobol4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snobol4/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/snooze/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snooze/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/snooze/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snooze/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/snore/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/snore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snore/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snort/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snort/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/snow/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/snow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snow/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/snowblind/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snowblind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/snowblind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snowblind/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/snowcat/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snowcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/snowcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snowcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/snowcrash/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snowcrash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/snowcrash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snowcrash/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/snowflake/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snowflake/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/snowflake/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snowflake/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/snowsql/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snowsql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/snowsql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snowsql/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snpeff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snpeff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/snzip/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snzip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/snzip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sn/snzip/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyremote/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soapyremote/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/soapyremote/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soapyremote/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapysdrplay/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soapysdrplay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/soapysdrplay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soapysdrplay/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/socat/default.nix b/third_party/nixpkgs/pkgs/by-name/so/socat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/socat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/socat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/social-engineer-toolkit/default.nix b/third_party/nixpkgs/pkgs/by-name/so/social-engineer-toolkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/social-engineer-toolkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/social-engineer-toolkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sockdump/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sockdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sockdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sockdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/so/socket_wrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/socket_wrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/socklog/default.nix b/third_party/nixpkgs/pkgs/by-name/so/socklog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/socklog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/socklog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sockperf/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sockperf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sockperf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sockperf/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sof-firmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sof-firmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soft-serve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/soft-serve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soft-serve/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/softnet/default.nix b/third_party/nixpkgs/pkgs/by-name/so/softnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/softnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/softnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/enable-activesync.patch b/third_party/nixpkgs/pkgs/by-name/so/sogo/enable-activesync.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/sogo/enable-activesync.patch
rename to third_party/nixpkgs/pkgs/by-name/so/sogo/enable-activesync.patch
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sogo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sogo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sokol/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sokol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sokol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sokol/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sol2/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sol2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sol2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sol2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix b/third_party/nixpkgs/pkgs/by-name/so/solaar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/solaar/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/solarc/default.nix b/third_party/nixpkgs/pkgs/by-name/so/solarc-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/solarc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/solarc-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix b/third_party/nixpkgs/pkgs/by-name/so/solc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/solc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/solc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/solicurses/default.nix b/third_party/nixpkgs/pkgs/by-name/so/solicurses/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/solicurses/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/solicurses/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/sollya/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sollya/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/sollya/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sollya/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix b/third_party/nixpkgs/pkgs/by-name/so/solvespace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/solvespace/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/so/somafm-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/somafm-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/somatic-sniper/default.nix b/third_party/nixpkgs/pkgs/by-name/so/somatic-sniper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/somatic-sniper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/somatic-sniper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch b/third_party/nixpkgs/pkgs/by-name/so/somatic-sniper/somatic-sniper.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch
rename to third_party/nixpkgs/pkgs/by-name/so/somatic-sniper/somatic-sniper.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix b/third_party/nixpkgs/pkgs/by-name/so/somebar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/somebar/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sonata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sonata/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/songrec/default.nix b/third_party/nixpkgs/pkgs/by-name/so/songrec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/songrec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/songrec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sonic/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sonic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sonic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sonic/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sonivox/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sonivox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sonivox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sonivox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sonixd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sonixd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sonobus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sonobus/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sonota/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sonota/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sonota/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sonota/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sonota/set_resource_path.patch b/third_party/nixpkgs/pkgs/by-name/so/sonota/set_resource_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sonota/set_resource_path.patch
rename to third_party/nixpkgs/pkgs/by-name/so/sonota/set_resource_path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sony-headphones-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sony-headphones-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sooperlooper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sooperlooper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sope/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sope/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sope/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sops/bash_autocomplete b/third_party/nixpkgs/pkgs/by-name/so/sops/bash_autocomplete
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sops/bash_autocomplete
rename to third_party/nixpkgs/pkgs/by-name/so/sops/bash_autocomplete
diff --git a/third_party/nixpkgs/pkgs/tools/security/sops/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sops/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sops/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sops/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sops/zsh_autocomplete b/third_party/nixpkgs/pkgs/by-name/so/sops/zsh_autocomplete
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sops/zsh_autocomplete
rename to third_party/nixpkgs/pkgs/by-name/so/sops/zsh_autocomplete
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sorcer/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sorcer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sorcer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sorcer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sord/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sord/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sord/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sord/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/sorted-grep/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sorted-grep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/sorted-grep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sorted-grep/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sortmerna/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sortmerna/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/sorts-mill-goudy/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sorts-mill-goudy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/sorts-mill-goudy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sorts-mill-goudy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/souffle/includes.patch b/third_party/nixpkgs/pkgs/by-name/so/souffle/includes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/souffle/includes.patch
rename to third_party/nixpkgs/pkgs/by-name/so/souffle/includes.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix b/third_party/nixpkgs/pkgs/by-name/so/souffle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/souffle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/souffle/tests.nix b/third_party/nixpkgs/pkgs/by-name/so/souffle/tests.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/souffle/tests.nix
rename to third_party/nixpkgs/pkgs/by-name/so/souffle/tests.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/souffle/threads.patch b/third_party/nixpkgs/pkgs/by-name/so/souffle/threads.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/souffle/threads.patch
rename to third_party/nixpkgs/pkgs/by-name/so/souffle/threads.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sound-juicer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sound-juicer/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sound-theme-freedesktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sound-theme-freedesktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soundconverter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soundconverter/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/soundfonts/fluid/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soundfont-fluid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/soundfonts/fluid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soundfont-fluid/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soundfont-generaluser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soundfont-generaluser/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soundfont-ydp-grand/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soundfont-ydp-grand/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/soundmodem/matFix.patch b/third_party/nixpkgs/pkgs/by-name/so/soundmodem/matFix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/soundmodem/matFix.patch
rename to third_party/nixpkgs/pkgs/by-name/so/soundmodem/matFix.patch
diff --git a/third_party/nixpkgs/pkgs/applications/radio/soundmodem/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soundmodem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/soundmodem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soundmodem/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soundsource/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soundsource/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/soundtouch/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soundtouch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/soundtouch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soundtouch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundtracker/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soundtracker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/soundtracker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soundtracker/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-code-pro/default.nix b/third_party/nixpkgs/pkgs/by-name/so/source-code-pro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/source-code-pro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/source-code-pro/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix b/third_party/nixpkgs/pkgs/by-name/so/source-han-code-jp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/source-han-code-jp/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-sans-pro/default.nix b/third_party/nixpkgs/pkgs/by-name/so/source-sans-pro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/source-sans-pro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/source-sans-pro/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/so/source-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/source-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/source-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix b/third_party/nixpkgs/pkgs/by-name/so/source-serif-pro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/source-serif-pro/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-serif/default.nix b/third_party/nixpkgs/pkgs/by-name/so/source-serif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/source-serif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/source-serif/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sourceHighlight/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sourceHighlight/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/arm64-check.patch b/third_party/nixpkgs/pkgs/by-name/so/soxr/arm64-check.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/audio/soxr/arm64-check.patch
rename to third_party/nixpkgs/pkgs/by-name/so/soxr/arm64-check.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soxr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soxr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/soxt/default.nix b/third_party/nixpkgs/pkgs/by-name/so/soxt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/soxt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/soxt/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sozu/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sozu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sozu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/so/sozu/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/space-orbit/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/space-orbit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/space-orbit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/space-orbit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/spacefm/glibc-fix.patch b/third_party/nixpkgs/pkgs/by-name/sp/spaceFM/glibc-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/spacefm/glibc-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spaceFM/glibc-fix.patch
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/spacefm/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spaceFM/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/spacefm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spaceFM/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/spacefm/x11-only.patch b/third_party/nixpkgs/pkgs/by-name/sp/spaceFM/x11-only.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/spacefm/x11-only.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spaceFM/x11-only.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spacenav-cube-example/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spacenav-cube-example/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/spacer/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spacer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/spacer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spacer/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spaceship-prompt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spaceship-prompt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/spacevim/helptags.patch b/third_party/nixpkgs/pkgs/by-name/sp/spacevim/helptags.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/spacevim/helptags.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spacevim/helptags.patch
diff --git a/third_party/nixpkgs/pkgs/applications/editors/spacevim/init.nix b/third_party/nixpkgs/pkgs/by-name/sp/spacevim/init.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/spacevim/init.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spacevim/init.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/spacevim/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spacevim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/spacevim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spacevim/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spamassassin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spamassassin/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/sa_compile-use-perl5lib.patch b/third_party/nixpkgs/pkgs/by-name/sp/spamassassin/sa_compile-use-perl5lib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/spamassassin/sa_compile-use-perl5lib.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spamassassin/sa_compile-use-perl5lib.patch
diff --git a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/satest-no-clean-path.patch b/third_party/nixpkgs/pkgs/by-name/sp/spamassassin/satest-no-clean-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/spamassassin/satest-no-clean-path.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spamassassin/satest-no-clean-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/span-lite/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/span-lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/span-lite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/span-lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/sparkleshare/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/sparkleshare/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sparrow3d/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/sparrow3d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sparrow3d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/sparrow3d/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sparrow3d/sparrow3d.pc.in b/third_party/nixpkgs/pkgs/by-name/sp/sparrow3d/sparrow3d.pc.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sparrow3d/sparrow3d.pc.in
rename to third_party/nixpkgs/pkgs/by-name/sp/sparrow3d/sparrow3d.pc.in
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sparsehash/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/sparsehash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sparsehash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/sparsehash/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spasm-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spasm-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/gis/spatialite-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spatialite_tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/gis/spatialite-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spatialite_tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/spawn-fcgi/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spawn_fcgi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/spawn-fcgi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spawn_fcgi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdk/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/spdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spdlog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spdlog/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spdx-license-list-data/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spdx-license-list-data/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/specr-transpile/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/specr-transpile/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spectmorph/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spectmorph/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/spectmorph/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spectmorph/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/spectra/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spectra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/spectra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spectra/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/spectre-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spectre-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/spectre-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spectre-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spectrojack/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spectrojack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/spectrojack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spectrojack/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spectrwm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spectrwm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/speech-denoiser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/speech-denoiser/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/speechd/fix-mbrola-paths.patch b/third_party/nixpkgs/pkgs/by-name/sp/speechd/fix-mbrola-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/speechd/fix-mbrola-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/speechd/fix-mbrola-paths.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/speechd/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/sp/speechd/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/speechd/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/speechd/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/speechd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/speechd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/speedread/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/speedread/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/speedread/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/speedread/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/speedtest-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/speedtest-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/speedtest-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/speedtest-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/speedtest-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/speedtest-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/sphinxsearch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/sphinxsearch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spice-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spice-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spice-protocol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spice-protocol/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/spice-up/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spice-up/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/spice-up/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spice-up/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spice-vdagent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spice-vdagent/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/spice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spice/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice/remove-rt-on-darwin.patch b/third_party/nixpkgs/pkgs/by-name/sp/spice/remove-rt-on-darwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/spice/remove-rt-on-darwin.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spice/remove-rt-on-darwin.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spicy-parser-generator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spicy-parser-generator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/spicy/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spicy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/spicy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spicy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/spideroak/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spideroak/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/spideroak/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spideroak/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spike/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spike/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spin/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/spiped/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spiped/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/spiped/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spiped/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spire/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/spire/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spire/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spirv-cross/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spirv-cross/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spirv-headers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spirv-headers/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spirv-llvm-translator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spirv-llvm-translator/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/spirv-tools/no-shared-libs.patch b/third_party/nixpkgs/pkgs/by-name/sp/spirv-tools/no-shared-libs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/spirv-tools/no-shared-libs.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spirv-tools/no-shared-libs.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/spirv-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spirv-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/spirv-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spirv-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/splat/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/splat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/splat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/splat/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spleen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spleen/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/splix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/splix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/configure-cfgfile-path.patch b/third_party/nixpkgs/pkgs/by-name/sp/spnavcfg/configure-cfgfile-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/spnavcfg/configure-cfgfile-path.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spnavcfg/configure-cfgfile-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/configure-pidfile-path.patch b/third_party/nixpkgs/pkgs/by-name/sp/spnavcfg/configure-pidfile-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/spnavcfg/configure-pidfile-path.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spnavcfg/configure-pidfile-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spnavcfg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spnavcfg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/allocate.patch b/third_party/nixpkgs/pkgs/by-name/sp/spooles/allocate.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/allocate.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spooles/allocate.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spooles/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spooles/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch b/third_party/nixpkgs/pkgs/by-name/sp/spooles/spooles.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spooles/spooles.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/transform.patch b/third_party/nixpkgs/pkgs/by-name/sp/spooles/transform.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/transform.patch
rename to third_party/nixpkgs/pkgs/by-name/sp/spooles/transform.patch
diff --git a/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotdl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spotdl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-cli-linux/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotify-cli-linux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/spotify-cli-linux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spotify-cli-linux/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotify-player/package.nix
similarity index 92%
rename from third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spotify-player/package.nix
index 3f297c3e9b..7adc58d48e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sp/spotify-player/package.nix
@@ -28,22 +28,25 @@
, stdenv
, darwin
, makeBinaryWrapper
+
+# passthru
+, nix-update-script
}:
assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaudio" "rodio" "portaudio" "jackaudio" "rodiojack" "sdl" "gstreamer" ];
rustPlatform.buildRustPackage rec {
pname = "spotify-player";
- version = "0.20.0";
+ version = "0.20.1";
src = fetchFromGitHub {
owner = "aome510";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-heycCm2Nwyo+DegMKeXZ+dF+ZqiFT/6P08/28buJc6I=";
+ hash = "sha256-SKlESIw8eAyAqR1HVW004yyL2nNVEnb4/xmf0ch3ZMo=";
};
- cargoHash = "sha256-U3a/6uF7vOV3QnxqPnooBdvjyyIPLnQXiXtTwKeHAxA=";
+ cargoHash = "sha256-VlJ8Bz4EY2rERyOn6ifC7JAL5Mvjt0ZOzlPBOwiH6WA=";
nativeBuildInputs = [
pkg-config
@@ -93,12 +96,16 @@ rustPlatform.buildRustPackage rec {
--prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}"
'';
+ passthru = {
+ updateScript = nix-update-script { };
+ };
+
meta = {
description = "Terminal spotify player that has feature parity with the official client";
homepage = "https://github.com/aome510/spotify-player";
changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}";
mainProgram = "spotify_player";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ dit7ya xyven1 _71zenith ];
+ maintainers = with lib.maintainers; [ dit7ya xyven1 _71zenith caperren ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/spotify-tray/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotify-tray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/spotify-tray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spotify-tray/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotify/darwin.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spotify/darwin.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotify/linux.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spotify/linux.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spotify/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/update.sh b/third_party/nixpkgs/pkgs/by-name/sp/spotify/update.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/spotify/update.sh
rename to third_party/nixpkgs/pkgs/by-name/sp/spotify/update.sh
diff --git a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spring-boot-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spring-boot-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/spruce/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spruce/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/spruce/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spruce/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sptk/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/sptk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sptk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/sptk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sptlrx/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/sptlrx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/sptlrx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/sptlrx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/spyre/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spyre/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/spyre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sp/spyre/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sq/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sq/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlboiler-crdb/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlboiler-crdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/sqlboiler-crdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlboiler-crdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sqlboiler/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlboiler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sqlboiler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlboiler/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlcheck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlcheck/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlcipher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlcipher/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlcl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlcl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlcmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlcmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/sqld/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sq/sqld/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/sqld/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/sq/sqld/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/servers/sql/sqld/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqld/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/sqld/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqld/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqldef/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqldef/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlfluff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlfluff/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlite-jdbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlite-jdbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlite-web/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlite-web/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/sqlite-web/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlite-web/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlitecpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlitecpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlpage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sqlpage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqlpage/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sqls/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sqls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqls/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sqsh/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sqsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/sqsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs/4k-align.patch b/third_party/nixpkgs/pkgs/by-name/sq/squashfsTools/4k-align.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/squashfs/4k-align.patch
rename to third_party/nixpkgs/pkgs/by-name/sq/squashfsTools/4k-align.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/squashfsTools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/squashfsTools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/squashfuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/squashfuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/squawk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/squawk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/squawk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/squeekboard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/squeekboard/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/by-name/sq/squid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/squid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sq/squid/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/srain/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/srain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srain/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/srandrd/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srandrd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/srandrd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srandrd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/sratom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/sratom/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/src-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/src-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/srecord/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srecord/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/srecord/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srecord/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sregex/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/sregex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sregex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/sregex/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/srelay/arm.patch b/third_party/nixpkgs/pkgs/by-name/sr/srelay/arm.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/srelay/arm.patch
rename to third_party/nixpkgs/pkgs/by-name/sr/srelay/arm.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/srelay/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srelay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/srelay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srelay/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/srisum/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srisum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/srisum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srisum/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/srm/fix-output-in-verbose-mode.patch b/third_party/nixpkgs/pkgs/by-name/sr/srm/fix-output-in-verbose-mode.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/srm/fix-output-in-verbose-mode.patch
rename to third_party/nixpkgs/pkgs/by-name/sr/srm/fix-output-in-verbose-mode.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/srm/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/srm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/srsran/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srsran/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/srsran/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srsran/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/srt-live-server/add-ctime-include.patch b/third_party/nixpkgs/pkgs/by-name/sr/srt-live-server/add-ctime-include.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/srt-live-server/add-ctime-include.patch
rename to third_party/nixpkgs/pkgs/by-name/sr/srt-live-server/add-ctime-include.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch b/third_party/nixpkgs/pkgs/by-name/sr/srt-live-server/fix-insecure-printfs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch
rename to third_party/nixpkgs/pkgs/by-name/sr/srt-live-server/fix-insecure-printfs.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/srt-live-server/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srt-live-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/srt-live-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srt-live-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch b/third_party/nixpkgs/pkgs/by-name/sr/srt-to-vtt-cl/fix-validation.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch
rename to third_party/nixpkgs/pkgs/by-name/sr/srt-to-vtt-cl/fix-validation.patch
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srt-to-vtt-cl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srt-to-vtt-cl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch b/third_party/nixpkgs/pkgs/by-name/sr/srt-to-vtt-cl/simplify-macOS-builds.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch
rename to third_party/nixpkgs/pkgs/by-name/sr/srt-to-vtt-cl/simplify-macOS-builds.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/srt/no-msvc-compat-headers.patch b/third_party/nixpkgs/pkgs/by-name/sr/srt/no-msvc-compat-headers.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/srt/no-msvc-compat-headers.patch
rename to third_party/nixpkgs/pkgs/by-name/sr/srt/no-msvc-compat-headers.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/srt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/srtp/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srtp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/srtp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srtp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/srtrelay/default.nix b/third_party/nixpkgs/pkgs/by-name/sr/srtrelay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/srtrelay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sr/srtrelay/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssb-patchwork/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssb-patchwork/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ssdeep/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssdeep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ssdeep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssdeep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/sselp/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sselp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/sselp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sselp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-agents/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssh-agents/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-audit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssh-audit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-chat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssh-chat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-ident/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssh-ident/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ssh-key-confirmer/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-key-confirmer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ssh-key-confirmer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssh-key-confirmer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-mitm/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-mitm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ssh-mitm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssh-mitm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-to-age/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssh-to-age/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-to-pgp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssh-to-pgp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ssh-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-tools/package.nix
similarity index 83%
rename from third_party/nixpkgs/pkgs/applications/misc/ssh-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssh-tools/package.nix
index 3e0b7e50d9..8d1f69ca53 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ssh-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ss/ssh-tools/package.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "ssh-tools";
- version = "1.8-unstable-2024-03-18";
+ version = "1.9";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "vaporup";
repo = "ssh-tools";
- rev = "69c73844b2498c46f1293b129808bfdce8822c28";
- hash = "sha256-cG75Jn331G0HZZyrE+JWC05f6DgYBz6sx8MTCxsG/vw=";
+ rev = "v${version}";
+ hash = "sha256-ZMjpc2zjvuLJES5ixEHvo7oAx1JGzy60LzN09Ykn/54=";
};
vendorHash = "sha256-GSFhz3cIRl4XUA18HUeUkrw+AJyOkU3ZrZKYTGsWbug=";
diff --git a/third_party/nixpkgs/pkgs/tools/security/sshchecker/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshchecker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sshchecker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshchecker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sshed/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sshed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshed/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/common.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshfs-fuse/common.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/common.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshfs-fuse/common.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/fix-fuse-darwin-h.patch b/third_party/nixpkgs/pkgs/by-name/ss/sshfs-fuse/fix-fuse-darwin-h.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/fix-fuse-darwin-h.patch
rename to third_party/nixpkgs/pkgs/by-name/ss/sshfs-fuse/fix-fuse-darwin-h.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshfs-fuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshfs-fuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sshguard/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshguard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sshguard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshguard/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshlatex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshlatex/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sshocker/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshocker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sshocker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshocker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sshoogr/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshoogr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sshoogr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshoogr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sshpass/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshpass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sshpass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshpass/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sshping/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshping/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sshping/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshping/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sshportal/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshportal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sshportal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshportal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sshs/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sshs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshuttle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sshuttle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sshuttle/sudo.patch b/third_party/nixpkgs/pkgs/by-name/ss/sshuttle/sudo.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sshuttle/sudo.patch
rename to third_party/nixpkgs/pkgs/by-name/ss/sshuttle/sudo.patch
diff --git a/third_party/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssl-cert-check/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssl-cert-check/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ssl-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssl-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ssl-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssl-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssldump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssldump/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/sslh/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sslh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/sslh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sslh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sslmate-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sslmate-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sslmate-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sslmate-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sslmate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sslmate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sslsplit/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sslsplit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sslsplit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sslsplit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/ssmsh/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssmsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/ssmsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssmsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ssocr/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssocr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ssocr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssocr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ssrc/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssrc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ssrc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssrc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sss-cli/fix-cargo-lock.patch b/third_party/nixpkgs/pkgs/by-name/ss/sss-cli/fix-cargo-lock.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sss-cli/fix-cargo-lock.patch
rename to third_party/nixpkgs/pkgs/by-name/ss/sss-cli/fix-cargo-lock.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/sss-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sss-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sss-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sss-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/ssss/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/ssss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssss/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/sstp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/sstp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ss/ssw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sta/default.nix b/third_party/nixpkgs/pkgs/by-name/st/sta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/sta/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/stabber/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stabber/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/stabber/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stabber/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stacks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stacks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/stacs/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stacs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/stacs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stacs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/stagit/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stagit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/stagit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stagit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/stalin/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stalin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/stalin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stalin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stalonetray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stalonetray/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix b/third_party/nixpkgs/pkgs/by-name/st/star-history/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/star-history/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix b/third_party/nixpkgs/pkgs/by-name/st/star/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/star/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/third_party/nixpkgs/pkgs/by-name/st/starboard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/starboard/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/misc/starcharts/default.nix b/third_party/nixpkgs/pkgs/by-name/st/starcharts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/starcharts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/starcharts/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-atmosphere/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-atmosphere/Cargo.lock
new file mode 100644
index 0000000000..4df443535d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-atmosphere/Cargo.lock
@@ -0,0 +1,2376 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-broadcast"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cc"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "chumsky"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
+dependencies = [
+ "hashbrown",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "confy"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45b1f4c00870f07dc34adcac82bb6a72cc5aabca8536ba1797e01df51d2ce9a0"
+dependencies = [
+ "directories",
+ "serde",
+ "thiserror",
+ "toml",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "copy_dir"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "543d1dd138ef086e2ff05e3a48cf9da045da2033d16f8538fd76b86cd49b2ca3"
+dependencies = [
+ "walkdir",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "directories"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
+[[package]]
+name = "enumflags2"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "flatbuffers"
+version = "24.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+dependencies = [
+ "mint",
+ "serde",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
+[[package]]
+name = "kdl"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "114071e31456ec827056ca691d141f8e96327d9d9a29140da2e6fba9a5f17b83"
+dependencies = [
+ "nom",
+ "phf",
+ "thiserror",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "knuffel"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04bee6ddc6071011314b1ce4f7705fef6c009401dba4fd22cb0009db6a177413"
+dependencies = [
+ "base64",
+ "chumsky",
+ "knuffel-derive",
+ "miette",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "knuffel-derive"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91977f56c49cfb961e3d840e2e7c6e4a56bde7283898cf606861f1421348283d"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.2",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "phf"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
+dependencies = [
+ "phf_shared",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "polling"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi 0.4.0",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+ "rand_pcg",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
+[[package]]
+name = "serde"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "serde_kdl"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3466b825d24b720fbdc89a64e0c548b5484d622f47974f5d10248eb5c04d389"
+dependencies = [
+ "kdl 3.0.0",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shiva-color-rs"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7bea807e4f40f1a3df2717cc134562397b6a8f869f22568388fd5eb14bb1b69"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "cluFlock",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix 0.27.1",
+ "parking_lot 0.12.3",
+ "rustc-hash 2.0.0",
+ "serde",
+ "shiva-color-rs",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-atmosphere"
+version = "0.4.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "confy",
+ "copy_dir",
+ "dirs",
+ "glam 0.28.0",
+ "kdl 4.6.0",
+ "knuffel",
+ "mint",
+ "rustc-hash 2.0.0",
+ "serde",
+ "serde_kdl",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "toml",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "color-eyre",
+ "glam 0.24.2",
+ "global_counter",
+ "parking_lot 0.12.3",
+ "rustc-hash 1.1.0",
+ "serde",
+ "serde_repr",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/molecules.git?branch=dev#a7732c8ec7fd30adf947209211f1079fa065657d"
+dependencies = [
+ "glam 0.27.0",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "rustc-hash 1.1.0",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "fnv",
+ "kdl 4.6.0",
+ "manifest-dir-macros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+ "zbus",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.3",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.14",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.13",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "uds_windows"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "winapi",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "xdg-home"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "zbus"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.29.0",
+ "ordered-stream",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "zvariant"
+version = "4.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-atmosphere/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-atmosphere/package.nix
new file mode 100644
index 0000000000..ca6df5a18c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-atmosphere/package.nix
@@ -0,0 +1,51 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ testers,
+ stardust-xr-atmosphere,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "stardust-xr-atmosphere";
+ version = "0-unstable-2024-08-22";
+
+ src = fetchFromGitHub {
+ owner = "stardustxr";
+ repo = "atmosphere";
+ rev = "0c8bfb91e8ca32a4895f858067334ed265517309";
+ hash = "sha256-pk1+kkPV6fx+7Xz9hKFFVw402iztcvNC31zVCc3hfTY=";
+ };
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "stardust-xr-0.45.0" = "sha256-WF/uNtFYB+ZQqsyXJe7qUCd8SHUgaNOLMxGuNIN1iKM=";
+ "stardust-xr-molecules-0.45.0" = "sha256-UldPQQ0Psx/lFUdCKJJDeG8W6lK6qDU3JSwffawK3xg=";
+ };
+ };
+
+ passthru = {
+ tests.versionTest = testers.testVersion {
+ package = stardust-xr-atmosphere;
+ command = "atmosphere --version";
+ version = "stardust-xr-atmosphere 0.4.0";
+ };
+ updateScript = nix-update-script {
+ extraArgs = [ "--version=branch" ];
+ };
+ };
+
+ meta = {
+ description = "Environment, homespace, and setup client for Stardust XR";
+ homepage = "https://stardustxr.org";
+ license = lib.licenses.mit;
+ mainProgram = "atmosphere";
+ maintainers = with lib.maintainers; [
+ pandapip1
+ technobaboo
+ ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-flatland/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-flatland/Cargo.lock
new file mode 100644
index 0000000000..2623ce6ebc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-flatland/Cargo.lock
@@ -0,0 +1,1342 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3415c18b81f66b23614db9fcccbf19d2af434e04d9a6c7ac10e49930f39d89f8"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorgrad"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6"
+dependencies = [
+ "csscolorparser",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "csscolorparser"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
+dependencies = [
+ "phf",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "23.5.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flatland"
+version = "0.8.0"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "colorgrad",
+ "glam 0.24.2",
+ "input-event-codes",
+ "lazy_static",
+ "manifest-dir-macros",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "input-event-codes"
+version = "5.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b6b0f8557f596a2db592f172015c40d0c149e16a956c7848e733d663f2c6636"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "lock_api"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.8",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.3.5",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.3.9",
+ "regex-syntax 0.7.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.7.5",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
+
+[[package]]
+name = "serde"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "smallvec"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.44.0"
+source = "git+https://github.com/StardustXR/core.git#66f759f44e34caa12d1b76a8f058352b8cdeabe4"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.44.0"
+source = "git+https://github.com/StardustXR/core.git#66f759f44e34caa12d1b76a8f058352b8cdeabe4"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "mint",
+ "nanoid",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "serde_repr",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git#66f759f44e34caa12d1b76a8f058352b8cdeabe4"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.44.0"
+source = "git+https://github.com/StardustXR/molecules.git#dffa22c302e730776876940f4dac39a526d601bc"
+dependencies = [
+ "color-rs",
+ "glam 0.25.0",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git#66f759f44e34caa12d1b76a8f058352b8cdeabe4"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "glam 0.25.0",
+ "kdl",
+ "manifest-dir-macros",
+ "mint",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tokio"
+version = "1.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "winnow"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+dependencies = [
+ "memchr",
+]
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-flatland/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-flatland/package.nix
new file mode 100644
index 0000000000..214c5636df
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-flatland/package.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "stardust-xr-flatland";
+ version = "0-unstable-2024-04-13";
+
+ src = fetchFromGitHub {
+ owner = "stardustxr";
+ repo = "flatland";
+ rev = "b3b0f29c4ea1b82c96cf9de507837bf15a5e4c0e";
+ hash = "sha256-m7c6XpmpTM1URuqMG2KqtaWbL2Vt8vJFJtmvq123BmY=";
+ };
+
+ env.STARDUST_RES_PREFIXES = "${src}/res";
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "stardust-xr-0.44.0" = "sha256-Gu/P78nFFVSpgwCcbMwyoqdEZO8zIcvP1ovU7Y0sXqg=";
+ "stardust-xr-molecules-0.44.0" = "sha256-TpgsmQnaAbtcp+veclGaht7f9hwEWEzMOpEIvdICTbc=";
+ };
+ };
+
+ passthru.updateScript = nix-update-script {
+ extraArgs = [ "--version=branch" ];
+ };
+
+ meta = {
+ description = "A flat window for Stardust XR";
+ homepage = "https://stardustxr.org";
+ license = lib.licenses.mit;
+ mainProgram = "flatland";
+ maintainers = with lib.maintainers; [
+ pandapip1
+ technobaboo
+ ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-gravity/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-gravity/Cargo.lock
new file mode 100644
index 0000000000..76c81456e1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-gravity/Cargo.lock
@@ -0,0 +1,1332 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cc"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "clap"
+version = "4.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "git+https://github.com/arturoc/color-rs.git#d50d5e37aaf91ccd39d0832f43a417e3405d2ece"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "24.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.5.0",
+ "libc",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.2",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.85"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags 2.5.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
+[[package]]
+name = "serde"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#a21dc0e610f6e7c905d42f80009700ff4474e583"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix 0.27.1",
+ "parking_lot 0.12.3",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#a21dc0e610f6e7c905d42f80009700ff4474e583"
+dependencies = [
+ "color-eyre",
+ "glam 0.24.2",
+ "global_counter",
+ "parking_lot 0.12.3",
+ "rustc-hash",
+ "serde",
+ "serde_repr",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#a21dc0e610f6e7c905d42f80009700ff4474e583"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-gravity"
+version = "0.4.1"
+dependencies = [
+ "clap",
+ "glam 0.28.0",
+ "nix 0.29.0",
+ "stardust-xr-fusion",
+ "tokio",
+ "ustr",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#a21dc0e610f6e7c905d42f80009700ff4474e583"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "fnv",
+ "kdl",
+ "manifest-dir-macros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot 0.12.3",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "ustr"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e904a2279a4a36d2356425bb20be271029cc650c335bc82af8bfae30085a3d0"
+dependencies = [
+ "ahash",
+ "byteorder",
+ "lazy_static",
+ "parking_lot 0.12.3",
+]
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-gravity/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-gravity/package.nix
new file mode 100644
index 0000000000..326b709e2b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-gravity/package.nix
@@ -0,0 +1,42 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "stardust-xr-gravity";
+ version = "0-unstable-2024-08-20";
+
+ src = fetchFromGitHub {
+ owner = "stardustxr";
+ repo = "gravity";
+ rev = "96787ed3139717ea6061f6e259e9fed3e483274a";
+ hash = "sha256-R87u7CX2n7iOOEEB3cHae2doqCn/skChHgeU+RNsHVk=";
+ };
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "stardust-xr-0.45.0" = "sha256-1Bor53L+Fe18SU6MKwPLQXDGZq6E9++gtwDy4zkzZXw=";
+ "color-rs-0.8.0" = "sha256-/p4wYiLryY0+h0HBJUo4OV2jdZpcVn2kqv+8XewM4gM=";
+ };
+ };
+
+ passthru.updateScript = nix-update-script {
+ extraArgs = [ "--version=branch" ];
+ };
+
+ meta = {
+ description = "Utility to launch apps and stardust clients at an offet";
+ homepage = "https://stardustxr.org";
+ license = lib.licenses.mit;
+ mainProgram = "gravity";
+ maintainers = with lib.maintainers; [
+ pandapip1
+ technobaboo
+ ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-kiara/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-kiara/Cargo.lock
new file mode 100644
index 0000000000..3b35f08aeb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-kiara/Cargo.lock
@@ -0,0 +1,1964 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3415c18b81f66b23614db9fcccbf19d2af434e04d9a6c7ac10e49930f39d89f8"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "colorgrad"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6"
+dependencies = [
+ "csscolorparser",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "csscolorparser"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
+dependencies = [
+ "phf",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.10.0",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "enum_dispatch"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "flagset"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "23.5.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "getrandom"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+ "serde",
+]
+
+[[package]]
+name = "input-event-codes"
+version = "5.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b6b0f8557f596a2db592f172015c40d0c149e16a956c7848e733d663f2c6636"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "kiara"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "color-rs",
+ "colorgrad",
+ "glam 0.25.0",
+ "input-event-codes",
+ "lazy_static",
+ "manifest-dir-macros",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.2",
+ "libc",
+ "redox_syscall 0.4.1",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ouroboros"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33"
+dependencies = [
+ "heck",
+ "itertools",
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.4.1",
+ "smallvec",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "version_check",
+ "yansi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.5",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+
+[[package]]
+name = "serde"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.113"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981"
+dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.2.2",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "smallvec"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.14.1"
+source = "git+https://github.com/StardustXR/core.git#ddb2953f6acac01ee9c4ccfae2d4b7eb959a07a2"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.43.2"
+source = "git+https://github.com/StardustXR/core.git#ddb2953f6acac01ee9c4ccfae2d4b7eb959a07a2"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "enum_dispatch",
+ "flagset",
+ "mint",
+ "nanoid",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "serde_repr",
+ "serde_with",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git#ddb2953f6acac01ee9c4ccfae2d4b7eb959a07a2"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.29.0"
+source = "git+https://github.com/StardustXR/molecules.git#8681d8f60bf49bcb73e5fb32c89c4f441b94533b"
+dependencies = [
+ "color-rs",
+ "glam 0.24.2",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git#ddb2953f6acac01ee9c4ccfae2d4b7eb959a07a2"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "glam 0.24.2",
+ "kdl",
+ "manifest-dir-macros",
+ "mint",
+ "ouroboros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tokio"
+version = "1.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.2.2",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
+[[package]]
+name = "winnow"
+version = "0.5.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "yansi"
+version = "1.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377"
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-kiara/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-kiara/package.nix
new file mode 100644
index 0000000000..1cc87ecca8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-kiara/package.nix
@@ -0,0 +1,64 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ makeBinaryWrapper,
+ niri,
+ stardust-xr-kiara,
+ testers,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "stardust-xr-kiara";
+ version = "0-unstable-2024-07-13";
+
+ src = fetchFromGitHub {
+ owner = "stardustxr";
+ repo = "kiara";
+ rev = "186b00a460c9dd8179f9af42fb9a420506ac3aff";
+ hash = "sha256-e89/x66S+MpJFtqat1hYEyRVUYFjef62LDN2hQPjNVw=";
+ };
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "stardust-xr-0.14.1" = "sha256-fmRb46s0Ec8wnoerBh4JCv1WKz2of1YW+YGwy0Gr/yQ=";
+ "stardust-xr-molecules-0.29.0" = "sha256-sXwzrh052DCo7Jj1waebqKVmX8J9VRj5DpeUcGq3W2k=";
+ };
+ };
+ nativeBuildInputs = [ makeBinaryWrapper ];
+
+ passthru = {
+ updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+ tests.helpTest = testers.runCommand {
+ name = "stardust-xr-kiara";
+ script = ''
+ kiara --help
+ touch $out
+ '';
+ nativeBuildInputs = [ stardust-xr-kiara ];
+ };
+ };
+
+ postInstall = ''
+ wrapProgram $out/bin/kiara --prefix PATH : ${niri}/bin
+ '';
+
+ env = {
+ NIRI_CONFIG = "${src}/src/niri_config.kdl";
+ STARDUST_RES_PREFIXES = "${src}/res";
+ };
+
+ meta = {
+ description = "A 360-degree app shell / DE for Stardust XR using Niri";
+ homepage = "https://stardustxr.org/";
+ license = lib.licenses.mit;
+ mainProgram = "kiara";
+ maintainers = with lib.maintainers; [
+ pandapip1
+ technobaboo
+ ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-magnetar/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-magnetar/Cargo.lock
new file mode 100644
index 0000000000..1d32fd4828
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-magnetar/Cargo.lock
@@ -0,0 +1,1874 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "async-broadcast"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cc"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
+[[package]]
+name = "enumflags2"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "flatbuffers"
+version = "24.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "magnetar"
+version = "0.1.0"
+dependencies = [
+ "color-eyre",
+ "glam 0.28.0",
+ "map-range",
+ "mint",
+ "rustc-hash 2.0.0",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tween",
+]
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nix"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.2",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "polling"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
+[[package]]
+name = "serde"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shiva-color-rs"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7bea807e4f40f1a3df2717cc134562397b6a8f869f22568388fd5eb14bb1b69"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "cluFlock",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix 0.27.1",
+ "parking_lot 0.12.3",
+ "rustc-hash 2.0.0",
+ "serde",
+ "shiva-color-rs",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "color-eyre",
+ "glam 0.24.2",
+ "global_counter",
+ "parking_lot 0.12.3",
+ "rustc-hash 1.1.0",
+ "serde",
+ "serde_repr",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/molecules.git?branch=dev#0f50742e8a9466a80677ae6d2f5aeede6b869180"
+dependencies = [
+ "glam 0.27.0",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "rustc-hash 1.1.0",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "fnv",
+ "kdl",
+ "manifest-dir-macros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+ "zbus",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot 0.12.3",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "tween"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "782d1e33eba0670d92d03e4da87f7304490493fc983d229dff383934c23f2d16"
+dependencies = [
+ "glam 0.27.0",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "uds_windows"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "winapi",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "xdg-home"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "zbus"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.28.0",
+ "ordered-stream",
+ "rand",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
+
+[[package]]
+name = "zvariant"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-magnetar/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-magnetar/package.nix
new file mode 100644
index 0000000000..5494dd52d4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-magnetar/package.nix
@@ -0,0 +1,42 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "stardust-xr-magnetar";
+ version = "0-unstable-2024-08-31";
+
+ src = fetchFromGitHub {
+ owner = "stardustxr";
+ repo = "magnetar";
+ rev = "48064b84b71d27ceea00b5d2f19dcbf21d75f554";
+ hash = "sha256-x1yHf5ceCws4C8NuoB/+kHwZK09vnn4IOFgduhjl4O8=";
+ };
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "stardust-xr-0.45.0" = "sha256-WF/uNtFYB+ZQqsyXJe7qUCd8SHUgaNOLMxGuNIN1iKM=";
+ "stardust-xr-molecules-0.45.0" = "sha256-NncLa5ApFtlxy/BF08vy4mw2zor02VsGPaVI4arMaqM=";
+ };
+ };
+
+ passthru.updateScript = nix-update-script {
+ extraArgs = [ "--version=branch" ];
+ };
+
+ meta = {
+ description = "Workspaces client for Stardust";
+ homepage = "https://stardustxr.org";
+ license = lib.licenses.mit;
+ mainProgram = "magnetar";
+ maintainers = with lib.maintainers; [
+ pandapip1
+ technobaboo
+ ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-phobetor/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-phobetor/Cargo.lock
new file mode 100644
index 0000000000..110171355f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-phobetor/Cargo.lock
@@ -0,0 +1,1579 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets",
+]
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3415c18b81f66b23614db9fcccbf19d2af434e04d9a6c7ac10e49930f39d89f8"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "enum_dispatch"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "flagset"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "23.5.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.2",
+ "serde",
+]
+
+[[package]]
+name = "input-event-codes"
+version = "5.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b6b0f8557f596a2db592f172015c40d0c149e16a956c7848e733d663f2c6636"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "memchr"
+version = "2.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ouroboros"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33"
+dependencies = [
+ "heck",
+ "itertools",
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.4.1",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "phobetor"
+version = "0.1.0"
+dependencies = [
+ "color-eyre",
+ "glam 0.25.0",
+ "input-event-codes",
+ "manifest-dir-macros",
+ "mint",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "version_check",
+ "yansi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+
+[[package]]
+name = "serde"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.196"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.0.2",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.14.1"
+source = "git+https://github.com/StardustXR/core.git#ca1762fc72a254d23395c88dd872e41cce60f7fc"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.43.2"
+source = "git+https://github.com/StardustXR/core.git#ca1762fc72a254d23395c88dd872e41cce60f7fc"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "enum_dispatch",
+ "flagset",
+ "mint",
+ "nanoid",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "serde_repr",
+ "serde_with",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git#ca1762fc72a254d23395c88dd872e41cce60f7fc"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.29.0"
+source = "git+https://github.com/StardustXR/molecules.git#675acfd0a9e2610e5269edbf4baab35395849e3e"
+dependencies = [
+ "color-rs",
+ "glam 0.24.2",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git#ca1762fc72a254d23395c88dd872e41cce60f7fc"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "glam 0.25.0",
+ "kdl",
+ "manifest-dir-macros",
+ "mint",
+ "ouroboros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+dependencies = [
+ "deranged",
+ "itoa",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tokio"
+version = "1.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.0.2",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "winnow"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "yansi"
+version = "1.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377"
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-phobetor/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-phobetor/package.nix
new file mode 100644
index 0000000000..819ddcfce3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-phobetor/package.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "stardust-xr-phobetor";
+ version = "0-unstable-2024-02-10";
+
+ src = fetchFromGitHub {
+ owner = "stardustxr";
+ repo = "phobetor";
+ rev = "f47d10c9ab8b37941bc9ca94677d6c80332376f3";
+ hash = "sha256-7CWOoirQ/8zKCO7lBA9snyShlwsKYONiYkl39lQrpTY=";
+ };
+
+ env.STARDUST_RES_PREFIXES = "${src}/res";
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "stardust-xr-0.14.1" = "sha256-HEv1KzemGHEEcfFrzgKJmHUhGsW95J+6bcK7Bb8T9KE=";
+ "stardust-xr-molecules-0.29.0" = "sha256-yAdoJiTEulZiwRzhgoQ2cDUBxCe6NcTm88TfvDJ9Co4=";
+ };
+ };
+
+ passthru.updateScript = nix-update-script {
+ extraArgs = [ "--version=branch" ];
+ };
+
+ meta = {
+ description = "Handheld panel shell for Stardust XR";
+ homepage = "https://stardustxr.org";
+ license = lib.licenses.mit;
+ mainProgram = "phobetor";
+ maintainers = with lib.maintainers; [
+ pandapip1
+ technobaboo
+ ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-protostar/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-protostar/Cargo.lock
new file mode 100644
index 0000000000..7703e25b5b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-protostar/Cargo.lock
@@ -0,0 +1,3432 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289"
+
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "app_grid"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "glam 0.24.2",
+ "manifest-dir-macros",
+ "protostar",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing-subscriber",
+ "tween",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "async-broadcast"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bit_field"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "bytemuck"
+version = "1.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cc"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-maps"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120b737cc99b0d73bf0a9bfa6086e84c0bde3b955851f37f812865bc08b35feb"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "color_quant"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "data-url"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "directories"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
+dependencies = [
+ "dirs-sys 0.4.1",
+]
+
+[[package]]
+name = "dirs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+dependencies = [
+ "dirs-sys 0.3.7",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys 0.4.1",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "dlv-list"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b"
+dependencies = [
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "dlv-list"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
+[[package]]
+name = "enumflags2"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "exr"
+version = "1.72.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
+dependencies = [
+ "bit_field",
+ "flume",
+ "half 2.4.1",
+ "lebe",
+ "miniz_oxide",
+ "rayon-core",
+ "smallvec",
+ "zune-inflate",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "ez-pixmap"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db6eea12c2400666a40349e9be4020a7a81a02a0adfa52d7b72695e720e8b44d"
+dependencies = [
+ "color-maps",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "24.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f"
+dependencies = [
+ "bitflags 1.3.2",
+ "rustc_version",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+
+[[package]]
+name = "flume"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+dependencies = [
+ "spin",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "fontconfig-parser"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d"
+dependencies = [
+ "roxmltree 0.19.0",
+]
+
+[[package]]
+name = "fontdb"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff20bef7942a72af07104346154a70a70b089c572e454b41bef6eb6cb10e9c06"
+dependencies = [
+ "fontconfig-parser",
+ "log",
+ "memmap2",
+ "ttf-parser",
+]
+
+[[package]]
+name = "freedesktop-icons-greedy"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e31b487427ff5df1386fa4721fcf41923140eb72fc20d776ac95ccbc21fa7bbb"
+dependencies = [
+ "dirs 4.0.0",
+ "itertools 0.11.0",
+ "once_cell",
+ "rust-ini 0.18.0",
+ "thiserror",
+ "walkdir",
+ "xdg",
+]
+
+[[package]]
+name = "freedesktop_entry_parser"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db9c27b72f19a99a895f8ca89e2d26e4ef31013376e56fdafef697627306c3e4"
+dependencies = [
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gif"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
+[[package]]
+name = "gif"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "glam"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+dependencies = [
+ "ahash 0.4.8",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.8",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hexagon_launcher"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "glam 0.25.0",
+ "manifest-dir-macros",
+ "protostar",
+ "serde",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing-subscriber",
+ "tween",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "image"
+version = "0.24.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "exr",
+ "gif 0.13.1",
+ "jpeg-decoder",
+ "num-traits",
+ "png",
+ "qoi",
+ "tiff",
+]
+
+[[package]]
+name = "imagesize"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.5",
+ "serde",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+dependencies = [
+ "rayon",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kdl"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062c875482ccb676fd40c804a40e3824d4464c18c364547456d1c8e8e951ae47"
+dependencies = [
+ "miette",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "kurbo"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "kurbo"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lebe"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "linicon-theme"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f8240c33bb08c5d8b8cdea87b683b05e61037aa76ff26bef40672cc6ecbb80"
+dependencies = [
+ "freedesktop_entry_parser",
+ "rust-ini 0.17.0",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nix"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-multimap"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485"
+dependencies = [
+ "dlv-list 0.2.3",
+ "hashbrown 0.9.1",
+]
+
+[[package]]
+name = "ordered-multimap"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
+dependencies = [
+ "dlv-list 0.3.0",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.2",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "png"
+version = "0.17.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "polling"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "protostar"
+version = "0.4.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "directories",
+ "dirs 5.0.1",
+ "ez-pixmap",
+ "freedesktop-icons-greedy",
+ "glam 0.24.2",
+ "image",
+ "itertools 0.12.1",
+ "lazy_static",
+ "linicon-theme",
+ "manifest-dir-macros",
+ "mint",
+ "nix 0.27.1",
+ "regex",
+ "resvg",
+ "rustc-hash 1.1.0",
+ "serde",
+ "serde_with",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tempdir",
+ "tokio",
+ "toml",
+ "tracing-subscriber",
+ "tween",
+ "ustr",
+ "walkdir",
+]
+
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
+dependencies = [
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.3.1",
+ "rdrand",
+ "winapi",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+dependencies = [
+ "rand_core 0.4.2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "rctree"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.4",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "remove_dir_all"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "resvg"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76888219c0881e22b0ceab06fddcfe83163cd81642bd60c7842387f9c968a72e"
+dependencies = [
+ "gif 0.12.0",
+ "jpeg-decoder",
+ "log",
+ "pico-args",
+ "png",
+ "rgb",
+ "svgfilters",
+ "svgtypes 0.10.0",
+ "tiny-skia",
+ "usvg",
+ "usvg-text-layout",
+]
+
+[[package]]
+name = "rgb"
+version = "0.8.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "rosvgtree"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150"
+dependencies = [
+ "log",
+ "roxmltree 0.18.1",
+ "simplecss",
+ "siphasher",
+ "svgtypes 0.9.0",
+]
+
+[[package]]
+name = "roxmltree"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302"
+dependencies = [
+ "xmlparser",
+]
+
+[[package]]
+name = "roxmltree"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
+
+[[package]]
+name = "rust-ini"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap 0.3.1",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap 0.4.3",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustybuzz"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a"
+dependencies = [
+ "bitflags 1.3.2",
+ "bytemuck",
+ "smallvec",
+ "ttf-parser",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-general-category",
+ "unicode-script",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
+[[package]]
+name = "serde"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.2.6",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shiva-color-rs"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7bea807e4f40f1a3df2717cc134562397b6a8f869f22568388fd5eb14bb1b69"
+dependencies = [
+ "angle",
+ "half 1.8.3",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simplecss"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "single"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "glam 0.24.2",
+ "manifest-dir-macros",
+ "protostar",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing-subscriber",
+ "tween",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "sirius"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "color-eyre",
+ "glam 0.24.2",
+ "manifest-dir-macros",
+ "protostar",
+ "serde",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing-subscriber",
+ "tween",
+ "walkdir",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "split-iter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
+
+[[package]]
+name = "stardust-xr"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "cluFlock",
+ "dirs 5.0.1",
+ "global_counter",
+ "mint",
+ "nix 0.27.1",
+ "parking_lot 0.12.3",
+ "rustc-hash 2.0.0",
+ "serde",
+ "shiva-color-rs",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "color-eyre",
+ "glam 0.24.2",
+ "global_counter",
+ "parking_lot 0.12.3",
+ "rustc-hash 1.1.0",
+ "serde",
+ "serde_repr",
+ "stardust-xr",
+ "stardust-xr-fusion-codegen",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion-codegen"
+version = "0.1.0"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "convert_case",
+ "mint",
+ "proc-macro2",
+ "quote",
+ "split-iter",
+ "stardust-xr-schemas",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.45.0"
+source = "git+https://github.com/StardustXR/molecules.git?branch=dev#0f50742e8a9466a80677ae6d2f5aeede6b869180"
+dependencies = [
+ "glam 0.27.0",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "rustc-hash 1.1.0",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git?branch=dev#4aef2a192195397d360ce33c99a0e9e8dd90253b"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "fnv",
+ "kdl",
+ "manifest-dir-macros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+ "zbus",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strict-num"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
+dependencies = [
+ "float-cmp",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "svgfilters"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "639abcebc15fdc2df179f37d6f5463d660c1c79cd552c12343a4600827a04bce"
+dependencies = [
+ "float-cmp",
+ "rgb",
+]
+
+[[package]]
+name = "svgtypes"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9ee29c1407a5b18ccfe5f6ac82ac11bab3b14407e09c209a6c1a32098b19734"
+dependencies = [
+ "kurbo 0.8.3",
+ "siphasher",
+]
+
+[[package]]
+name = "svgtypes"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98ffacedcdcf1da6579c907279b4f3c5492fbce99fbbf227f5ed270a589c2765"
+dependencies = [
+ "kurbo 0.9.5",
+ "siphasher",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempdir"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
+dependencies = [
+ "rand 0.4.6",
+ "remove_dir_all",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tiff"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
+dependencies = [
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tiny-skia"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "bytemuck",
+ "cfg-if",
+ "png",
+ "tiny-skia-path",
+]
+
+[[package]]
+name = "tiny-skia-path"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot 0.12.3",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.14",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.2.6",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap 2.2.6",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+dependencies = [
+ "indexmap 2.2.6",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.13",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "ttf-parser"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
+
+[[package]]
+name = "tween"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "782d1e33eba0670d92d03e4da87f7304490493fc983d229dff383934c23f2d16"
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "uds_windows"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "winapi",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-bidi-mirroring"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694"
+
+[[package]]
+name = "unicode-ccc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1"
+
+[[package]]
+name = "unicode-general-category"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-script"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-vo"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "ustr"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b050b13c1933490b043b8238a75bc7676cb49292f49768c9350eabb284eaeb87"
+dependencies = [
+ "ahash 0.8.11",
+ "byteorder",
+ "lazy_static",
+ "parking_lot 0.12.3",
+]
+
+[[package]]
+name = "usvg"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e"
+dependencies = [
+ "base64 0.21.7",
+ "data-url",
+ "flate2",
+ "imagesize",
+ "kurbo 0.9.5",
+ "log",
+ "rctree",
+ "rosvgtree",
+ "strict-num",
+]
+
+[[package]]
+name = "usvg-text-layout"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "195386e01bc35f860db024de275a76e7a31afdf975d18beb6d0e44764118b4db"
+dependencies = [
+ "fontdb",
+ "kurbo 0.9.5",
+ "log",
+ "rustybuzz",
+ "unicode-bidi",
+ "unicode-script",
+ "unicode-vo",
+ "usvg",
+]
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
+[[package]]
+name = "weezl"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "xdg"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
+
+[[package]]
+name = "xdg-home"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "xmlparser"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
+
+[[package]]
+name = "zbus"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.28.0",
+ "ordered-stream",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "zune-inflate"
+version = "0.2.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "zvariant"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-protostar/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-protostar/package.nix
new file mode 100644
index 0000000000..237b5c204e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-protostar/package.nix
@@ -0,0 +1,62 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "stardust-xr-protostar";
+ version = "0-unstable-2024-07-19";
+
+ src = fetchFromGitHub {
+ owner = "stardustxr";
+ repo = "protostar";
+ rev = "39499a061af74c3a2d5e1e46e4ad21aca5727219";
+ hash = "sha256-TPpkjTOZVtyVZdK65C951DpEzfI9aaRMXclZ31dAk9s=";
+ };
+
+ env.STARDUST_RES_PREFIXES = "${src}/res";
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "stardust-xr-0.45.0" = "sha256-WF/uNtFYB+ZQqsyXJe7qUCd8SHUgaNOLMxGuNIN1iKM=";
+ "stardust-xr-molecules-0.45.0" = "sha256-NncLa5ApFtlxy/BF08vy4mw2zor02VsGPaVI4arMaqM=";
+ };
+ };
+
+ checkFlags = [
+ # ---- xdg::test_get_desktop_files stdout ----
+ # thread 'xdg::test_get_desktop_files' panicked at protostar/src/xdg.rs:98:5:
+ # assertion failed: desktop_files.iter().any(|file|
+ # file.ends_with("com.belmoussaoui.ashpd.demo.desktop"))
+ "--skip=xdg::test_get_desktop_files"
+
+ # ---- xdg::test_get_icon_path stdout ----
+ # thread 'xdg::test_get_icon_path' panicked at protostar/src/xdg.rs:355:38:
+ # Could not create image cache directory: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }
+ # note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+ "--skip=xdg::test_get_icon_path"
+
+ # ---- xdg::test_render_svg_to_png stdout ----
+ # thread 'xdg::test_render_svg_to_png' panicked at protostar/src/xdg.rs:355:38:
+ # Could not create image cache directory: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }
+ "--skip=xdg::test_render_svg_to_png"
+ ];
+
+ passthru.updateScript = nix-update-script {
+ extraArgs = [ "--version=branch" ];
+ };
+
+ meta = {
+ description = "Prototype application launchers for Stardust XR";
+ homepage = "https://stardustxr.org";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ pandapip1
+ technobaboo
+ ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-sphereland/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-sphereland/Cargo.lock
new file mode 100644
index 0000000000..c3e55b6e62
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-sphereland/Cargo.lock
@@ -0,0 +1,1687 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "angle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf965b6b142c8c68150e815ef527d17f0fe74e622b2c5287fd8626cb7c4a5fa"
+dependencies = [
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets",
+]
+
+[[package]]
+name = "cluFlock"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c0fabbd86438044c17b633a514a4e5512f356ee114d7378665d24212462f88"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3415c18b81f66b23614db9fcccbf19d2af434e04d9a6c7ac10e49930f39d89f8"
+dependencies = [
+ "angle",
+ "half",
+ "num-traits",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorgrad"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6"
+dependencies = [
+ "csscolorparser",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "csscolorparser"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
+dependencies = [
+ "phf",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "enum_dispatch"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "flagset"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "flatbuffers"
+version = "23.5.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640"
+dependencies = [
+ "bitflags",
+ "rustc_version",
+]
+
+[[package]]
+name = "flexbuffers"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8"
+dependencies = [
+ "bitflags",
+ "byteorder",
+ "num_enum",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "mint",
+]
+
+[[package]]
+name = "global_counter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a77c0a6d353621e0ba32c0eb64a5ed3832d900135712779e38bd2ea31d6509f"
+dependencies = [
+ "once_cell",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.2",
+ "serde",
+]
+
+[[package]]
+name = "input-event-codes"
+version = "5.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b6b0f8557f596a2db592f172015c40d0c149e16a956c7848e733d663f2c6636"
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lerp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc56a024593ecbcacb6bb4f8f4ace719eb08ae9b701535640ef3efb0e706260"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "manifest-dir-macros"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "map-range"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffa558d7f51b549670be5ff6db164cd9be428c035cbf4e3f782db3da66845a5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ouroboros"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c86de06555b970aec45229b27291b53154f21a5743a163419f4e4c0b065dcde"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cad0c4b129e9696e37cb712b243777b90ef489a0bfaa0ac34e7d9b860e4f134"
+dependencies = [
+ "heck",
+ "itertools",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.4.1",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+
+[[package]]
+name = "serde"
+version = "1.0.190"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.190"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.0.2",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "smallvec"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "sphereland"
+version = "0.8.0"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "colorgrad",
+ "glam",
+ "input-event-codes",
+ "lazy_static",
+ "manifest-dir-macros",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "stardust-xr-fusion",
+ "stardust-xr-molecules",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "stardust-xr"
+version = "0.14.1"
+source = "git+https://github.com/StardustXR/core.git#975331f9739a9f6cb90ec75813b7720c86225848"
+dependencies = [
+ "cluFlock",
+ "color-rs",
+ "dirs",
+ "global_counter",
+ "mint",
+ "nix",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-schemas",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-fusion"
+version = "0.43.2"
+source = "git+https://github.com/StardustXR/core.git#975331f9739a9f6cb90ec75813b7720c86225848"
+dependencies = [
+ "color-eyre",
+ "color-rs",
+ "enum_dispatch",
+ "flagset",
+ "mint",
+ "nanoid",
+ "parking_lot 0.12.1",
+ "rustc-hash",
+ "serde",
+ "serde_repr",
+ "serde_with",
+ "stardust-xr",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "stardust-xr-molecules"
+version = "0.29.0"
+source = "git+https://github.com/StardustXR/molecules.git#55c108d9a717df5265ac02306264b1bf64e758fc"
+dependencies = [
+ "color-rs",
+ "glam",
+ "lazy_static",
+ "lerp",
+ "map-range",
+ "mint",
+ "rustc-hash",
+ "serde",
+ "stardust-xr-fusion",
+ "tokio",
+ "tracing",
+ "xkbcommon",
+]
+
+[[package]]
+name = "stardust-xr-schemas"
+version = "1.5.3"
+source = "git+https://github.com/StardustXR/core.git#975331f9739a9f6cb90ec75813b7720c86225848"
+dependencies = [
+ "flatbuffers",
+ "flexbuffers",
+ "glam",
+ "manifest-dir-macros",
+ "mint",
+ "ouroboros",
+ "serde",
+ "serde_repr",
+ "thiserror",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+dependencies = [
+ "deranged",
+ "itoa",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tokio"
+version = "1.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.0.2",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "winnow"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "xkbcommon"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c286371c44b3572d19b09196c129a8fff47d7704d6494daefb44fec10f0278ab"
+dependencies = [
+ "libc",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-sphereland/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-sphereland/package.nix
new file mode 100644
index 0000000000..77ebbac9b4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/st/stardust-xr-sphereland/package.nix
@@ -0,0 +1,48 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ libxkbcommon,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "stardust-xr-sphereland";
+ version = "0-unstable-2023-11-06";
+
+ src = fetchFromGitHub {
+ owner = "stardustxr";
+ repo = "sphereland";
+ rev = "39552d918c99a84eaf5f2d5e8734a472bf196f65";
+ hash = "sha256-LKdqTl14cdgD14IwAP34mWdDgREhy1CHOT86HywOxqM=";
+ };
+
+ env.STARDUST_RES_PREFIXES = "${src}/res";
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "stardust-xr-0.14.1" = "sha256-aJYovCKcR6zoqsVenCBnL5a/ccvXxNku+mAKRf0pp1Q=";
+ "stardust-xr-molecules-0.29.0" = "sha256-rzbLqx+X8KEjut6Cq4x/qiSN9OfbMemrDUP0F+hXy4U=";
+ };
+ };
+ buildInputs = [
+ libxkbcommon
+ ];
+
+ passthru.updateScript = nix-update-script {
+ extraArgs = [ "--version=branch" ];
+ };
+
+ meta = {
+ description = "Pointer/keyboard operated window manager for Stardust XR";
+ homepage = "https://stardustxr.org";
+ license = lib.licenses.mit;
+ mainProgram = "sphereland";
+ maintainers = with lib.maintainers; [
+ pandapip1
+ technobaboo
+ ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/games/stardust/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stardust/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/stardust/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stardust/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/starfetch/default.nix b/third_party/nixpkgs/pkgs/by-name/st/starfetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/starfetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/starfetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/stargate-libcds/Makefile.patch b/third_party/nixpkgs/pkgs/by-name/st/stargate-libcds/Makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/stargate-libcds/Makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/st/stargate-libcds/Makefile.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/stargate-libcds/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stargate-libcds/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/stargate-libcds/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stargate-libcds/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/starlark-rust/default.nix b/third_party/nixpkgs/pkgs/by-name/st/starlark-rust/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/starlark-rust/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/starlark-rust/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/starry/default.nix b/third_party/nixpkgs/pkgs/by-name/st/starry/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/starry/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/starry/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix b/third_party/nixpkgs/pkgs/by-name/st/static-web-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/static-web-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/static-web-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/statifier/default.nix b/third_party/nixpkgs/pkgs/by-name/st/statifier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/statifier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/statifier/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/statik/default.nix b/third_party/nixpkgs/pkgs/by-name/st/statik/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/statik/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/statik/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/station/default.nix b/third_party/nixpkgs/pkgs/by-name/st/station/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/station/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/station/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix b/third_party/nixpkgs/pkgs/by-name/st/statix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/statix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/statix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/statserial/default.nix b/third_party/nixpkgs/pkgs/by-name/st/statserial/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/statserial/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/statserial/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/stb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/stderred/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stderred/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/stderred/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stderred/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/documentation/stdman/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stdman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/stdman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stdman/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/documentation/std-man-pages/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stdmanpages/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/documentation/std-man-pages/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stdmanpages/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/steam-acf/default.nix b/third_party/nixpkgs/pkgs/by-name/st/steam-acf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/steam-acf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/steam-acf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/steam-rom-manager/default.nix b/third_party/nixpkgs/pkgs/by-name/st/steam-rom-manager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/steam-rom-manager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/steam-rom-manager/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/steam-tui/default.nix b/third_party/nixpkgs/pkgs/by-name/st/steam-tui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/steam-tui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/steam-tui/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix b/third_party/nixpkgs/pkgs/by-name/st/steamcontroller/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/steamcontroller/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/steamos-devkit/default.nix b/third_party/nixpkgs/pkgs/by-name/st/steamos-devkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/steamos-devkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/steamos-devkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/steamtinkerlaunch/default.nix b/third_party/nixpkgs/pkgs/by-name/st/steamtinkerlaunch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/steamtinkerlaunch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/steamtinkerlaunch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/stegseek/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stegseek/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/stegseek/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stegseek/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/stegsolve/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stegsolve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/stegsolve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stegsolve/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stellar-core/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stellar-core/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/stenc/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stenc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/stenc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stenc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix b/third_party/nixpkgs/pkgs/by-name/st/step-kms-plugin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/step-kms-plugin/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/stepmania/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stepmania/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/stepmania/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stepmania/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/stepreduce/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stepreduce/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/stepreduce/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stepreduce/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stfl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stfl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stgit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stgit/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/st/sticky-notes/yarn.lock b/third_party/nixpkgs/pkgs/by-name/st/sticky-notes/yarn.lock
deleted file mode 100644
index 487cf869c8..0000000000
--- a/third_party/nixpkgs/pkgs/by-name/st/sticky-notes/yarn.lock
+++ /dev/null
@@ -1,1093 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@adobe/css-tools@^4.0.1":
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.2.0.tgz#e1a84fca468f4b337816fcb7f0964beb620ba855"
- integrity sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==
-
-"@esbuild/android-arm64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz#ad2ee47dd021035abdfb0c38848ff77a1e1918c4"
- integrity sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g==
-
-"@esbuild/android-arm@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.10.tgz#bb5a68af8adeb94b30eadee7307404dc5237d076"
- integrity sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw==
-
-"@esbuild/android-x64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.10.tgz#751d5d8ae9ece1efa9627b689c888eb85b102360"
- integrity sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA==
-
-"@esbuild/darwin-arm64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz#85601ee7efb2129cd3218d5bcbe8da1173bc1e8b"
- integrity sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg==
-
-"@esbuild/darwin-x64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz#362c7e988c61fe72d5edef4f717e4b4fc728da98"
- integrity sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ==
-
-"@esbuild/freebsd-arm64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz#e8a85a46ede7c3a048a12f16b9d551d25adc8bb1"
- integrity sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ==
-
-"@esbuild/freebsd-x64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz#cd0a1b68bffbcb5b65e65b3fd542e8c7c3edd86b"
- integrity sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg==
-
-"@esbuild/linux-arm64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz#13b183f432512ed9d9281cc89476caeebe9e9123"
- integrity sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA==
-
-"@esbuild/linux-arm@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz#dd11e0a5faa3ea94dc80278a601c3be7b4fdf1da"
- integrity sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA==
-
-"@esbuild/linux-ia32@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz#4d836f87b92807d9292379963c4888270d282405"
- integrity sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw==
-
-"@esbuild/linux-loong64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz#92eb2ee200c17ef12c7fb3b648231948699e7a4c"
- integrity sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA==
-
-"@esbuild/linux-mips64el@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz#14f7d50c40fe7f7ee545a9bd07c6f6e4cba5570e"
- integrity sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg==
-
-"@esbuild/linux-ppc64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz#1ab5802e93ae511ce9783e1cb95f37df0f84c4af"
- integrity sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ==
-
-"@esbuild/linux-riscv64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz#4fae25201ef7ad868731d16c8b50b0e386c4774a"
- integrity sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ==
-
-"@esbuild/linux-s390x@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz#126254d8335bb3586918b1ca60beb4abb46e6d54"
- integrity sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg==
-
-"@esbuild/linux-x64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz#7fa4667b2df81ea0538e1b75e607cf04e526ce91"
- integrity sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg==
-
-"@esbuild/netbsd-x64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz#2d24727ddc2305619685bf237a46d6087a02ee9a"
- integrity sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA==
-
-"@esbuild/openbsd-x64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz#bf3fc38ee6ecf028c1f0cfe11f61d53cc75fef12"
- integrity sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig==
-
-"@esbuild/sunos-x64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz#8deabd6dfec6256f80bb101bc59d29dbae99c69b"
- integrity sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg==
-
-"@esbuild/win32-arm64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz#1ec1ee04c788c4c57a83370b6abf79587b3e4965"
- integrity sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg==
-
-"@esbuild/win32-ia32@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz#a362528d7f3ad5d44fa8710a96764677ef92ebe9"
- integrity sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ==
-
-"@esbuild/win32-x64@0.17.10":
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz#ac779220f2da96afd480fb3f3148a292f66e7fc3"
- integrity sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw==
-
-"@eslint/eslintrc@^1.4.1":
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
- integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
- dependencies:
- ajv "^6.12.4"
- debug "^4.3.2"
- espree "^9.4.0"
- globals "^13.19.0"
- ignore "^5.2.0"
- import-fresh "^3.2.1"
- js-yaml "^4.1.0"
- minimatch "^3.1.2"
- strip-json-comments "^3.1.1"
-
-"@humanwhocodes/config-array@^0.11.8":
- version "0.11.8"
- resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
- integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
- dependencies:
- "@humanwhocodes/object-schema" "^1.2.1"
- debug "^4.1.1"
- minimatch "^3.0.5"
-
-"@humanwhocodes/module-importer@^1.0.1":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
- integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-
-"@humanwhocodes/object-schema@^1.2.1":
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
- integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-
-"@nodelib/fs.scandir@2.1.5":
- version "2.1.5"
- resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
- integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
- dependencies:
- "@nodelib/fs.stat" "2.0.5"
- run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
- integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-
-"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
- version "1.2.8"
- resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
- integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
- dependencies:
- "@nodelib/fs.scandir" "2.1.5"
- fastq "^1.6.0"
-
-"@types/json-schema@^7.0.9":
- version "7.0.11"
- resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
- integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-
-"@types/minimist@^1.2.2":
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
- integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
-
-"@types/node@*":
- version "18.14.1"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.1.tgz#90dad8476f1e42797c49d6f8b69aaf9f876fc69f"
- integrity sha512-QH+37Qds3E0eDlReeboBxfHbX9omAcBCXEzswCu6jySP642jiM3cYSIkU/REqwhCUqXdonHFuBfJDiAJxMNhaQ==
-
-"@types/semver@^7.3.12":
- version "7.3.13"
- resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
- integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
-
-"@types/stylus@^0.48.38":
- version "0.48.38"
- resolved "https://registry.yarnpkg.com/@types/stylus/-/stylus-0.48.38.tgz#6e62a59f9350f53a253aa42b038b6aa44a642c5b"
- integrity sha512-B5otJekvD6XM8iTrnO6e2twoTY2tKL9VkL/57/2Lo4tv3EatbCaufdi68VVtn/h4yjO+HVvYEyrNQd0Lzj6riw==
- dependencies:
- "@types/node" "*"
-
-"@typescript-eslint/eslint-plugin@^5.33.0":
- version "5.51.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.51.0.tgz#da3f2819633061ced84bb82c53bba45a6fe9963a"
- integrity sha512-wcAwhEWm1RgNd7dxD/o+nnLW8oH+6RK1OGnmbmkj/GGoDPV1WWMVP0FXYQBivKHdwM1pwii3bt//RC62EriIUQ==
- dependencies:
- "@typescript-eslint/scope-manager" "5.51.0"
- "@typescript-eslint/type-utils" "5.51.0"
- "@typescript-eslint/utils" "5.51.0"
- debug "^4.3.4"
- grapheme-splitter "^1.0.4"
- ignore "^5.2.0"
- natural-compare-lite "^1.4.0"
- regexpp "^3.2.0"
- semver "^7.3.7"
- tsutils "^3.21.0"
-
-"@typescript-eslint/parser@^5.33.0":
- version "5.51.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.51.0.tgz#2d74626652096d966ef107f44b9479f02f51f271"
- integrity sha512-fEV0R9gGmfpDeRzJXn+fGQKcl0inIeYobmmUWijZh9zA7bxJ8clPhV9up2ZQzATxAiFAECqPQyMDB4o4B81AaA==
- dependencies:
- "@typescript-eslint/scope-manager" "5.51.0"
- "@typescript-eslint/types" "5.51.0"
- "@typescript-eslint/typescript-estree" "5.51.0"
- debug "^4.3.4"
-
-"@typescript-eslint/scope-manager@5.51.0":
- version "5.51.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz#ad3e3c2ecf762d9a4196c0fbfe19b142ac498990"
- integrity sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==
- dependencies:
- "@typescript-eslint/types" "5.51.0"
- "@typescript-eslint/visitor-keys" "5.51.0"
-
-"@typescript-eslint/type-utils@5.51.0":
- version "5.51.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.51.0.tgz#7af48005531700b62a20963501d47dfb27095988"
- integrity sha512-QHC5KKyfV8sNSyHqfNa0UbTbJ6caB8uhcx2hYcWVvJAZYJRBo5HyyZfzMdRx8nvS+GyMg56fugMzzWnojREuQQ==
- dependencies:
- "@typescript-eslint/typescript-estree" "5.51.0"
- "@typescript-eslint/utils" "5.51.0"
- debug "^4.3.4"
- tsutils "^3.21.0"
-
-"@typescript-eslint/types@5.51.0":
- version "5.51.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.51.0.tgz#e7c1622f46c7eea7e12bbf1edfb496d4dec37c90"
- integrity sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==
-
-"@typescript-eslint/typescript-estree@5.51.0":
- version "5.51.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz#0ec8170d7247a892c2b21845b06c11eb0718f8de"
- integrity sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==
- dependencies:
- "@typescript-eslint/types" "5.51.0"
- "@typescript-eslint/visitor-keys" "5.51.0"
- debug "^4.3.4"
- globby "^11.1.0"
- is-glob "^4.0.3"
- semver "^7.3.7"
- tsutils "^3.21.0"
-
-"@typescript-eslint/utils@5.51.0":
- version "5.51.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.51.0.tgz#074f4fabd5b12afe9c8aa6fdee881c050f8b4d47"
- integrity sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==
- dependencies:
- "@types/json-schema" "^7.0.9"
- "@types/semver" "^7.3.12"
- "@typescript-eslint/scope-manager" "5.51.0"
- "@typescript-eslint/types" "5.51.0"
- "@typescript-eslint/typescript-estree" "5.51.0"
- eslint-scope "^5.1.1"
- eslint-utils "^3.0.0"
- semver "^7.3.7"
-
-"@typescript-eslint/visitor-keys@5.51.0":
- version "5.51.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz#c0147dd9a36c0de758aaebd5b48cae1ec59eba87"
- integrity sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==
- dependencies:
- "@typescript-eslint/types" "5.51.0"
- eslint-visitor-keys "^3.3.0"
-
-acorn-jsx@^5.3.2:
- version "5.3.2"
- resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
- integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn@^8.8.0:
- version "8.8.2"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
- integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
-ajv@^6.10.0, ajv@^6.12.4:
- version "6.12.6"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
- integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
- dependencies:
- fast-deep-equal "^3.1.1"
- fast-json-stable-stringify "^2.0.0"
- json-schema-traverse "^0.4.1"
- uri-js "^4.2.2"
-
-ansi-regex@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
- integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^4.1.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
- integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
- dependencies:
- color-convert "^2.0.1"
-
-argparse@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
- integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-array-union@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
- integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-balanced-match@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
- integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-brace-expansion@^1.1.7:
- version "1.1.11"
- resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
- integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
- dependencies:
- balanced-match "^1.0.0"
- concat-map "0.0.1"
-
-braces@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
- integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
- dependencies:
- fill-range "^7.0.1"
-
-callsites@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
- integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-chalk@^4.0.0:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
- integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
- dependencies:
- ansi-styles "^4.1.0"
- supports-color "^7.1.0"
-
-color-convert@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
- integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
- dependencies:
- color-name "~1.1.4"
-
-color-name@~1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
- integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-concat-map@0.0.1:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
- integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-cross-spawn@^7.0.2:
- version "7.0.3"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
- integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
- dependencies:
- path-key "^3.1.0"
- shebang-command "^2.0.0"
- which "^2.0.1"
-
-debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
- version "4.3.4"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
- integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
- dependencies:
- ms "2.1.2"
-
-deep-is@^0.1.3:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
- integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-dir-glob@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
- integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
- dependencies:
- path-type "^4.0.0"
-
-doctrine@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
- integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
- dependencies:
- esutils "^2.0.2"
-
-esbuild@^0.17.10:
- version "0.17.10"
- resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.10.tgz#3be050561b34c5dc05b46978f4e1f326d5cc9437"
- integrity sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A==
- optionalDependencies:
- "@esbuild/android-arm" "0.17.10"
- "@esbuild/android-arm64" "0.17.10"
- "@esbuild/android-x64" "0.17.10"
- "@esbuild/darwin-arm64" "0.17.10"
- "@esbuild/darwin-x64" "0.17.10"
- "@esbuild/freebsd-arm64" "0.17.10"
- "@esbuild/freebsd-x64" "0.17.10"
- "@esbuild/linux-arm" "0.17.10"
- "@esbuild/linux-arm64" "0.17.10"
- "@esbuild/linux-ia32" "0.17.10"
- "@esbuild/linux-loong64" "0.17.10"
- "@esbuild/linux-mips64el" "0.17.10"
- "@esbuild/linux-ppc64" "0.17.10"
- "@esbuild/linux-riscv64" "0.17.10"
- "@esbuild/linux-s390x" "0.17.10"
- "@esbuild/linux-x64" "0.17.10"
- "@esbuild/netbsd-x64" "0.17.10"
- "@esbuild/openbsd-x64" "0.17.10"
- "@esbuild/sunos-x64" "0.17.10"
- "@esbuild/win32-arm64" "0.17.10"
- "@esbuild/win32-ia32" "0.17.10"
- "@esbuild/win32-x64" "0.17.10"
-
-escape-string-regexp@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
- integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-eslint-scope@^5.1.1:
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
- integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
- dependencies:
- esrecurse "^4.3.0"
- estraverse "^4.1.1"
-
-eslint-scope@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
- integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
- dependencies:
- esrecurse "^4.3.0"
- estraverse "^5.2.0"
-
-eslint-utils@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
- integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
- dependencies:
- eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
- integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
-eslint-visitor-keys@^3.3.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
- integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
-
-eslint@^8.21.0:
- version "8.33.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.33.0.tgz#02f110f32998cb598c6461f24f4d306e41ca33d7"
- integrity sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==
- dependencies:
- "@eslint/eslintrc" "^1.4.1"
- "@humanwhocodes/config-array" "^0.11.8"
- "@humanwhocodes/module-importer" "^1.0.1"
- "@nodelib/fs.walk" "^1.2.8"
- ajv "^6.10.0"
- chalk "^4.0.0"
- cross-spawn "^7.0.2"
- debug "^4.3.2"
- doctrine "^3.0.0"
- escape-string-regexp "^4.0.0"
- eslint-scope "^7.1.1"
- eslint-utils "^3.0.0"
- eslint-visitor-keys "^3.3.0"
- espree "^9.4.0"
- esquery "^1.4.0"
- esutils "^2.0.2"
- fast-deep-equal "^3.1.3"
- file-entry-cache "^6.0.1"
- find-up "^5.0.0"
- glob-parent "^6.0.2"
- globals "^13.19.0"
- grapheme-splitter "^1.0.4"
- ignore "^5.2.0"
- import-fresh "^3.0.0"
- imurmurhash "^0.1.4"
- is-glob "^4.0.0"
- is-path-inside "^3.0.3"
- js-sdsl "^4.1.4"
- js-yaml "^4.1.0"
- json-stable-stringify-without-jsonify "^1.0.1"
- levn "^0.4.1"
- lodash.merge "^4.6.2"
- minimatch "^3.1.2"
- natural-compare "^1.4.0"
- optionator "^0.9.1"
- regexpp "^3.2.0"
- strip-ansi "^6.0.1"
- strip-json-comments "^3.1.0"
- text-table "^0.2.0"
-
-espree@^9.4.0:
- version "9.4.1"
- resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"
- integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==
- dependencies:
- acorn "^8.8.0"
- acorn-jsx "^5.3.2"
- eslint-visitor-keys "^3.3.0"
-
-esquery@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
- integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
- dependencies:
- estraverse "^5.1.0"
-
-esrecurse@^4.3.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
- integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
- dependencies:
- estraverse "^5.2.0"
-
-estraverse@^4.1.1:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
- integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.1.0, estraverse@^5.2.0:
- version "5.3.0"
- resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
- integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-esutils@^2.0.2:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
- integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
- integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-glob@^3.2.9:
- version "3.2.12"
- resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
- integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
- dependencies:
- "@nodelib/fs.stat" "^2.0.2"
- "@nodelib/fs.walk" "^1.2.3"
- glob-parent "^5.1.2"
- merge2 "^1.3.0"
- micromatch "^4.0.4"
-
-fast-json-stable-stringify@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
- integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@^2.0.6:
- version "2.0.6"
- resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
- integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
-
-fastq@^1.6.0:
- version "1.15.0"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
- integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
- dependencies:
- reusify "^1.0.4"
-
-file-entry-cache@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
- integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
- dependencies:
- flat-cache "^3.0.4"
-
-fill-range@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
- integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
- dependencies:
- to-regex-range "^5.0.1"
-
-find-up@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
- integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
- dependencies:
- locate-path "^6.0.0"
- path-exists "^4.0.0"
-
-flat-cache@^3.0.4:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
- integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
- dependencies:
- flatted "^3.1.0"
- rimraf "^3.0.2"
-
-flatted@^3.1.0:
- version "3.2.7"
- resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
- integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
-
-fs.realpath@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
- integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-glob-parent@^5.1.2:
- version "5.1.2"
- resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
- integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
- dependencies:
- is-glob "^4.0.1"
-
-glob-parent@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
- integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
- dependencies:
- is-glob "^4.0.3"
-
-glob@^7.1.3, glob@^7.1.6:
- version "7.2.3"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
- integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^3.1.1"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
-globals@^13.19.0:
- version "13.20.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
- integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
- dependencies:
- type-fest "^0.20.2"
-
-globby@^11.1.0:
- version "11.1.0"
- resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
- integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
- dependencies:
- array-union "^2.1.0"
- dir-glob "^3.0.1"
- fast-glob "^3.2.9"
- ignore "^5.2.0"
- merge2 "^1.4.1"
- slash "^3.0.0"
-
-grapheme-splitter@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
- integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
-
-has-flag@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
- integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-ignore@^5.2.0:
- version "5.2.4"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
- integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
-
-import-fresh@^3.0.0, import-fresh@^3.2.1:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
- integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
- dependencies:
- parent-module "^1.0.0"
- resolve-from "^4.0.0"
-
-imurmurhash@^0.1.4:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
- integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-inflight@^1.0.4:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
- integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
- dependencies:
- once "^1.3.0"
- wrappy "1"
-
-inherits@2:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
- integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-extglob@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
- integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
- integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
- dependencies:
- is-extglob "^2.1.1"
-
-is-number@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
- integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-path-inside@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
- integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
-isexe@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
- integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-js-sdsl@^4.1.4:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711"
- integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==
-
-js-yaml@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
- integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
- dependencies:
- argparse "^2.0.1"
-
-json-schema-traverse@^0.4.1:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
- integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-stable-stringify-without-jsonify@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
- integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
-
-levn@^0.4.1:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
- integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
- dependencies:
- prelude-ls "^1.2.1"
- type-check "~0.4.0"
-
-linkifyjs@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.1.1.tgz#73d427e3bbaaf4ca8e71c589ad4ffda11a9a5fde"
- integrity sha512-zFN/CTVmbcVef+WaDXT63dNzzkfRBKT1j464NJQkV7iSgJU0sLBus9W0HBwnXK13/hf168pbrx/V/bjEHOXNHA==
-
-locate-path@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
- integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
- dependencies:
- p-locate "^5.0.0"
-
-lodash.merge@^4.6.2:
- version "4.6.2"
- resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
- integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
-lru-cache@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
- integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
- dependencies:
- yallist "^4.0.0"
-
-merge2@^1.3.0, merge2@^1.4.1:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
- integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-micromatch@^4.0.4:
- version "4.0.5"
- resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
- integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
- dependencies:
- braces "^3.0.2"
- picomatch "^2.3.1"
-
-minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
- integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
- dependencies:
- brace-expansion "^1.1.7"
-
-minimist@^1.2.8:
- version "1.2.8"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
- integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-mkdirp@^2.1.3:
- version "2.1.3"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.3.tgz#b083ff37be046fd3d6552468c1f0ff44c1545d1f"
- integrity sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==
-
-ms@2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
- integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-natural-compare-lite@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
- integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
-
-natural-compare@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
- integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
-
-once@^1.3.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
- integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
- dependencies:
- wrappy "1"
-
-optionator@^0.9.1:
- version "0.9.1"
- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
- integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
- dependencies:
- deep-is "^0.1.3"
- fast-levenshtein "^2.0.6"
- levn "^0.4.1"
- prelude-ls "^1.2.1"
- type-check "^0.4.0"
- word-wrap "^1.2.3"
-
-p-limit@^3.0.2:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
- integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
- dependencies:
- yocto-queue "^0.1.0"
-
-p-locate@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
- integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
- dependencies:
- p-limit "^3.0.2"
-
-parent-module@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
- integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
- dependencies:
- callsites "^3.0.0"
-
-path-exists@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
- integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
- integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-key@^3.1.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
- integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-type@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
- integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-picomatch@^2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
- integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-prelude-ls@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
- integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-
-punycode@^2.1.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
- integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
-
-queue-microtask@^1.2.2:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
- integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-regexpp@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
- integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-resolve-from@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
- integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-reusify@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
- integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-rimraf@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
- integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
- dependencies:
- glob "^7.1.3"
-
-run-parallel@^1.1.9:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
- integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
- dependencies:
- queue-microtask "^1.2.2"
-
-sax@~1.2.4:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
- integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-semver@^7.3.7:
- version "7.3.8"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
- integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
- dependencies:
- lru-cache "^6.0.0"
-
-shebang-command@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
- integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
- dependencies:
- shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
- integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-slash@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
- integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-source-map@^0.7.3:
- version "0.7.4"
- resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
- integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
-
-strip-ansi@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
- integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
- dependencies:
- ansi-regex "^5.0.1"
-
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
- integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-stylus@^0.59.0:
- version "0.59.0"
- resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.59.0.tgz#a344d5932787142a141946536d6e24e6a6be7aa6"
- integrity sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg==
- dependencies:
- "@adobe/css-tools" "^4.0.1"
- debug "^4.3.2"
- glob "^7.1.6"
- sax "~1.2.4"
- source-map "^0.7.3"
-
-supports-color@^7.1.0:
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
- integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
- dependencies:
- has-flag "^4.0.0"
-
-text-table@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
- integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
-to-regex-range@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
- integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
- dependencies:
- is-number "^7.0.0"
-
-tslib@^1.8.1:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
- integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tsutils@^3.21.0:
- version "3.21.0"
- resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
- integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
- dependencies:
- tslib "^1.8.1"
-
-type-check@^0.4.0, type-check@~0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
- integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
- dependencies:
- prelude-ls "^1.2.1"
-
-type-fest@^0.20.2:
- version "0.20.2"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
- integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-typescript@^4.7.4:
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
- integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
-
-uri-js@^4.2.2:
- version "4.4.1"
- resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
- integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
- dependencies:
- punycode "^2.1.0"
-
-which@^2.0.1:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
- integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
- dependencies:
- isexe "^2.0.0"
-
-word-wrap@^1.2.3:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
- integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-wrappy@1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
- integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-yallist@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
- integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yocto-queue@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
- integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix b/third_party/nixpkgs/pkgs/by-name/st/sticky/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/sticky/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stig/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/stilo/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stilo-themes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/stilo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stilo-themes/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/stix-otf/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stix-otf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/stix-otf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stix-otf/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stix-two/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stix-two/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stm32cubemx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stm32cubemx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32flash/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stm32flash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/stm32/stm32flash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stm32flash/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/stm8/stm8flash/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stm8flash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/stm8/stm8flash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stm8flash/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stochas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stochas/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/stockfish/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stockfish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/stockfish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stockfish/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/stone-kingdoms/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stone-kingdoms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/stone-kingdoms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stone-kingdoms/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stone-phaser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stone-phaser/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/stone/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/stone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stone/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/store-backup/CVE-2020-7040.patch b/third_party/nixpkgs/pkgs/by-name/st/storeBackup/CVE-2020-7040.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/store-backup/CVE-2020-7040.patch
rename to third_party/nixpkgs/pkgs/by-name/st/storeBackup/CVE-2020-7040.patch
diff --git a/third_party/nixpkgs/pkgs/tools/backup/store-backup/default.nix b/third_party/nixpkgs/pkgs/by-name/st/storeBackup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/store-backup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/storeBackup/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix b/third_party/nixpkgs/pkgs/by-name/st/storj-uplink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/storj-uplink/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix b/third_party/nixpkgs/pkgs/by-name/st/storm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/computing/storm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/storm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/storrent/default.nix b/third_party/nixpkgs/pkgs/by-name/st/storrent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/storrent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/storrent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/stow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stow/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/stp/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/stp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/stp/stdint.patch b/third_party/nixpkgs/pkgs/by-name/st/stp/stdint.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/stp/stdint.patch
rename to third_party/nixpkgs/pkgs/by-name/st/stp/stdint.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix b/third_party/nixpkgs/pkgs/by-name/st/strace-analyzer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/strace-analyzer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/third_party/nixpkgs/pkgs/by-name/st/strace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/strace/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stratis-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stratis-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stratisd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stratisd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stratovirt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stratovirt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink/ffmpeg-path.patch b/third_party/nixpkgs/pkgs/by-name/st/streamlink/ffmpeg-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/streamlink/ffmpeg-path.patch
rename to third_party/nixpkgs/pkgs/by-name/st/streamlink/ffmpeg-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix b/third_party/nixpkgs/pkgs/by-name/st/streamlink/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/streamlink/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/streamripper/default.nix b/third_party/nixpkgs/pkgs/by-name/st/streamripper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/streamripper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/streamripper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/strelka/default.nix b/third_party/nixpkgs/pkgs/by-name/st/strelka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/strelka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/strelka/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stress-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stress-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/stress/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stress/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/stress/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stress/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/stressapptest/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stressapptest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/stressapptest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stressapptest/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/stretchly/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stretchly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/stretchly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stretchly/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/stricat/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stricat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/stricat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stricat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/string-machine/default.nix b/third_party/nixpkgs/pkgs/by-name/st/string-machine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/string-machine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/string-machine/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stripe-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stripe-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/strongswan/ext_auth-path.patch b/third_party/nixpkgs/pkgs/by-name/st/strongswan/ext_auth-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/strongswan/ext_auth-path.patch
rename to third_party/nixpkgs/pkgs/by-name/st/strongswan/ext_auth-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/strongswan/firewall_defaults.patch b/third_party/nixpkgs/pkgs/by-name/st/strongswan/firewall_defaults.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/strongswan/firewall_defaults.patch
rename to third_party/nixpkgs/pkgs/by-name/st/strongswan/firewall_defaults.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix b/third_party/nixpkgs/pkgs/by-name/st/strongswan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/strongswan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/strongswan/updown-path.patch b/third_party/nixpkgs/pkgs/by-name/st/strongswan/updown-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/strongswan/updown-path.patch
rename to third_party/nixpkgs/pkgs/by-name/st/strongswan/updown-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/audio/stt/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/stt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stuffbin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stuffbin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stumpish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stumpish/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/stumpish/paths.patch b/third_party/nixpkgs/pkgs/by-name/st/stumpish/paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/stumpish/paths.patch
rename to third_party/nixpkgs/pkgs/by-name/st/stumpish/paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/stun/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/stun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stun/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stunnel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stunnel/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/stuntman/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stuntman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/stuntman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stuntman/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/stw/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/stw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stw/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/stxxl/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stxxl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/stxxl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stxxl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/stylish/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stylish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/stylish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stylish/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stylua/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/stylua/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/stylua/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/styx/default.nix b/third_party/nixpkgs/pkgs/by-name/st/styx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/styx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/st/styx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sub-batch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sub-batch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/subberthehut/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subberthehut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/subberthehut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subberthehut/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/subdl/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subdl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/subdl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subdl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/subedit/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subedit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/subedit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subedit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subfinder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subfinder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/subgit/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subgit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/subgit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subgit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/subjs/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subjs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/subjs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subjs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/sublime/2/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sublime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/sublime/2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sublime/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subnetcalc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subnetcalc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subread/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subread/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/misc/subsonic/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subsonic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/subsonic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subsonic/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subtitleeditor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subtitleeditor/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/subtitlr/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subtitlr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/subtitlr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subtitlr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/subunit/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subunit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/subunit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subunit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix b/third_party/nixpkgs/pkgs/by-name/su/subxt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/subxt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/subxt/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sudo-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sudo-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sudo-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sudo-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sudo-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sudo-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sudo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sudo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sudo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/suid-chroot/default.nix b/third_party/nixpkgs/pkgs/by-name/su/suidChroot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/suid-chroot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/suidChroot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/third_party/nixpkgs/pkgs/by-name/su/suitesparse-graphblas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/suitesparse-graphblas/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/summon/default.nix b/third_party/nixpkgs/pkgs/by-name/su/summon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/summon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/summon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sumo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sumo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sumokoin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sumokoin/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/sundtek/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sundtek/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/sundtek/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sundtek/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sunwait/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sunwait/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sunxi-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sunxi-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/su/supabase-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/supabase-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix b/third_party/nixpkgs/pkgs/by-name/su/super-productivity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/super-productivity/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/super-tiny-icons/default.nix b/third_party/nixpkgs/pkgs/by-name/su/super-tiny-icons/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/super-tiny-icons/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/super-tiny-icons/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/supertux/default.nix b/third_party/nixpkgs/pkgs/by-name/su/superTux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/supertux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/superTux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/supercronic/default.nix b/third_party/nixpkgs/pkgs/by-name/su/supercronic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/supercronic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/supercronic/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/superd/default.nix b/third_party/nixpkgs/pkgs/by-name/su/superd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/superd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/superd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/system/supergfxctl/default.nix b/third_party/nixpkgs/pkgs/by-name/su/supergfxctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/system/supergfxctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/supergfxctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch b/third_party/nixpkgs/pkgs/by-name/su/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
rename to third_party/nixpkgs/pkgs/by-name/su/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix b/third_party/nixpkgs/pkgs/by-name/su/superlu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/superlu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch b/third_party/nixpkgs/pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch
rename to third_party/nixpkgs/pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix b/third_party/nixpkgs/pkgs/by-name/su/supertag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/supertag/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/supervise/default.nix b/third_party/nixpkgs/pkgs/by-name/su/supervise/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/supervise/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/supervise/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix b/third_party/nixpkgs/pkgs/by-name/su/surelog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/surelog/package.nix
diff --git a/third_party/nixpkgs/pkgs/desktops/surf-display/default.nix b/third_party/nixpkgs/pkgs/by-name/su/surf-display/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/desktops/surf-display/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/surf-display/package.nix
diff --git a/third_party/nixpkgs/pkgs/desktops/surf-display/pdf-makefile.patch b/third_party/nixpkgs/pkgs/by-name/su/surf-display/pdf-makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/desktops/surf-display/pdf-makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/su/surf-display/pdf-makefile.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/surface-control/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/su/surface-control/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/surface-control/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/su/surface-control/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix b/third_party/nixpkgs/pkgs/by-name/su/surface-control/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/surface-control/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/surfraw/default.nix b/third_party/nixpkgs/pkgs/by-name/su/surfraw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/surfraw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/surfraw/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/surge-XT/default.nix b/third_party/nixpkgs/pkgs/by-name/su/surge-XT/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/surge-XT/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/surge-XT/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/surge-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/su/surge-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/surge-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/surge-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/su/surreal-engine/package.nix b/third_party/nixpkgs/pkgs/by-name/su/surreal-engine/package.nix
new file mode 100644
index 0000000000..71376ed3d3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/su/surreal-engine/package.nix
@@ -0,0 +1,75 @@
+{
+ alsa-lib,
+ cmake,
+ dbus,
+ fetchFromGitHub,
+ lib,
+ libffi,
+ makeWrapper,
+ openal,
+ pkg-config,
+ SDL2,
+ stdenv,
+ vulkan-loader,
+ wayland,
+ waylandpp,
+ libxkbcommon,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "surreal-engine";
+ version = "0-unstable-2024-11-08";
+
+ src = fetchFromGitHub {
+ owner = "dpjudas";
+ repo = "SurrealEngine";
+ rev = "087fa2af7fd0ce51702dd4024b4ae15a88222678";
+ hash = "sha256-AEIBhTkkRq4+L4ycx82GE29dM7zNgE0oHOkwEH9ezUg=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ makeWrapper
+ pkg-config
+ ];
+
+ buildInputs = [
+ alsa-lib
+ dbus
+ libffi
+ openal
+ SDL2
+ vulkan-loader
+ wayland
+ waylandpp
+ libxkbcommon
+ ];
+
+ postPatch = ''
+ substituteInPlace SurrealEngine/UI/WidgetResourceData.cpp --replace-fail /usr/share $out/share
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dt $out/bin Surreal{Debugger,Editor,Engine}
+ install -Dt $out/share/surrealengine SurrealEngine.pk3
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ for bin in $out/bin/Surreal{Debugger,Editor,Engine}; do
+ wrapProgram $bin --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
+ done
+ '';
+
+ meta = with lib; {
+ description = "Reimplementation of the original Unreal Engine";
+ mainProgram = "SurrealEngine";
+ homepage = "https://github.com/dpjudas/SurrealEngine";
+ license = licenses.zlib;
+ maintainers = with maintainers; [ hughobrien ];
+ platforms = platforms.linux;
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/radio/suscan/default.nix b/third_party/nixpkgs/pkgs/by-name/su/suscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/suscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/suscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sutils/default.nix b/third_party/nixpkgs/pkgs/by-name/su/sutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/sutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/sv-lang/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/sv-lang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/sv-lang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/sv-lang/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/svaba/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svaba/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/svaba/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svaba/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svd2rust/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svd2rust/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svg2pdf/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svg2pdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/svg2pdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svg2pdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svgbob/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svgbob/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svgcleaner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svgcleaner/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/svkbd/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svkbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/accessibility/svkbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svkbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svlint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svlint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/svls/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/svls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svls/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svnfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svnfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/svox/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/svox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/svrcore/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svrcore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/svrcore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svrcore/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svt-av1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svt-av1/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svtplay-dl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svtplay-dl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/svu/default.nix b/third_party/nixpkgs/pkgs/by-name/sv/svu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/svu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sv/svu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swagger-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/swagger-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swagger-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swagger-codegen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swagger-codegen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swagger-codegen3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swagger-codegen3/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/swaggerhole/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swaggerhole/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/swaggerhole/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swaggerhole/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swaglyrics/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swaglyrics/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/swaks/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swaks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/swaks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swaks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/swapspace/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swapspace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/swapspace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swapspace/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/swapview/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swapview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/swapview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swapview/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swarm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swarm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/sway-launcher-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/sway-launcher-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/swaynag-battery/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swaynag-battery/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/swaynag-battery/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swaynag-battery/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swaynotificationcenter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swaynotificationcenter/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swayr/icon-paths.patch b/third_party/nixpkgs/pkgs/by-name/sw/swayr/icon-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/swayr/icon-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/sw/swayr/icon-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swayr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swayr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swayrbar/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swayrbar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/swayrbar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swayrbar/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/swaysettings/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swaysettings/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/swaysettings/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swaysettings/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swaysome/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swaysome/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/swaysome/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swaysome/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/swc/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/swc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swc/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/sweet-nova/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/sweet-nova/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/sweet-nova/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/sweet-nova/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/swego/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swego/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/swego/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swego/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/swfmill/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swfmill/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/swfmill/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swfmill/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/swh-lv2/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swh_lv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/swh-lv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swh_lv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/swiftbar/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swiftbar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/swiftbar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swiftbar/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/swiftdefaultapps/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swiftdefaultapps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/swiftdefaultapps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swiftdefaultapps/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/swiften/build-fix.patch b/third_party/nixpkgs/pkgs/by-name/sw/swiften/build-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/swiften/build-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/sw/swiften/build-fix.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/swiften/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swiften/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/swiften/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swiften/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/swiften/scons.patch b/third_party/nixpkgs/pkgs/by-name/sw/swiften/scons.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/swiften/scons.patch
rename to third_party/nixpkgs/pkgs/by-name/sw/swiften/scons.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/swiftformat/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swiftformat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/swiftformat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swiftformat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/swiftshader/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swiftshader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/swiftshader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swiftshader/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swingsane/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swingsane/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/switcheroo-control/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/switcheroo-control/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/switcheroo-control/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/switcheroo-control/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix b/third_party/nixpkgs/pkgs/by-name/sw/swtpm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sw/swtpm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/sx-go/default.nix b/third_party/nixpkgs/pkgs/by-name/sx/sx-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/sx-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sx/sx-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sycl-info/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/sycl-info/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/sycl-info/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/sycl-info/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sydbox/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/sydbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sydbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/sydbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/symbolic-preview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/symbolic-preview/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/symengine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/symengine/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/symfpu/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/symfpu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/symfpu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/symfpu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/symlinks/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/symlinks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/symlinks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/symlinks/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/symmetrica/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/symmetrica/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/mail/sympa/make-docs.patch b/third_party/nixpkgs/pkgs/by-name/sy/sympa/make-docs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/sympa/make-docs.patch
rename to third_party/nixpkgs/pkgs/by-name/sy/sympa/make-docs.patch
diff --git a/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/sympa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/sympa/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/third_party/nixpkgs/pkgs/by-name/sy/sympow/clean-extra-logfile-output-from-pari.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch
rename to third_party/nixpkgs/pkgs/by-name/sy/sympow/clean-extra-logfile-output-from-pari.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/sympow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/sympow/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/synaesthesia/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/synaesthesia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/synaesthesia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/synaesthesia/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/synapse-admin/package.json b/third_party/nixpkgs/pkgs/by-name/sy/synapse-admin/package.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/synapse-admin/package.json
rename to third_party/nixpkgs/pkgs/by-name/sy/synapse-admin/package.json
diff --git a/third_party/nixpkgs/pkgs/tools/admin/synapse-admin/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/synapse-admin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/synapse-admin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/synapse-admin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/synapse/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/synapse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/synapse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/synapse/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch b/third_party/nixpkgs/pkgs/by-name/sy/syncterm/0001-use-sched-yield-53264f2b.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch
rename to third_party/nixpkgs/pkgs/by-name/sy/syncterm/0001-use-sched-yield-53264f2b.patch
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/syncterm/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/syncterm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/syncterm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/syncterm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/synfigstudio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/synfigstudio/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/synology-cloud-sync-decryption-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/synology-cloud-sync-decryption-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/synology-drive-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/synology-drive-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/syntex/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/syntex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/syntex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/syntex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/sysbench/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/sysbench/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/syscall_limiter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/syscall_limiter/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/sysfsutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/sysfsutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch b/third_party/nixpkgs/pkgs/by-name/sy/sysklogd/fix-includes-for-musl.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch
rename to third_party/nixpkgs/pkgs/by-name/sy/sysklogd/fix-includes-for-musl.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/sysklogd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/sysklogd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/systemd.patch b/third_party/nixpkgs/pkgs/by-name/sy/sysklogd/systemd.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/systemd.patch
rename to third_party/nixpkgs/pkgs/by-name/sy/sysklogd/systemd.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/union-wait.patch b/third_party/nixpkgs/pkgs/by-name/sy/sysklogd/union-wait.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sysklogd/union-wait.patch
rename to third_party/nixpkgs/pkgs/by-name/sy/sysklogd/union-wait.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/define-wchar_t.patch b/third_party/nixpkgs/pkgs/by-name/sy/syslinux/define-wchar_t.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/syslinux/define-wchar_t.patch
rename to third_party/nixpkgs/pkgs/by-name/sy/syslinux/define-wchar_t.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/gcc10.patch b/third_party/nixpkgs/pkgs/by-name/sy/syslinux/gcc10.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/syslinux/gcc10.patch
rename to third_party/nixpkgs/pkgs/by-name/sy/syslinux/gcc10.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/import-efisetjmp.patch b/third_party/nixpkgs/pkgs/by-name/sy/syslinux/import-efisetjmp.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/syslinux/import-efisetjmp.patch
rename to third_party/nixpkgs/pkgs/by-name/sy/syslinux/import-efisetjmp.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/syslinux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/syslinux/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/install.patch b/third_party/nixpkgs/pkgs/by-name/sy/sysstat/install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sysstat/install.patch
rename to third_party/nixpkgs/pkgs/by-name/sy/sysstat/install.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/sysstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/sysstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/system-syzygy/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sy/system-syzygy/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/system-syzygy/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/sy/system-syzygy/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/games/system-syzygy/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/system-syzygy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/system-syzygy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/system-syzygy/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sy/system76-firmware/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/sy/system76-firmware/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/system76-firmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/system76-firmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/systembus-notify/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/systembus-notify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/systembus-notify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/systembus-notify/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/systemc/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/systemc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/systemc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/systemc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/systemd-journal2gelf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/systemd-journal2gelf/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd-wait/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/systemd-wait/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd-wait/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/systemd-wait/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/systemfd/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/systemfd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/systemfd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/systemfd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/systeroid/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/systeroid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/systeroid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/systeroid/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/systrayhelper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/systrayhelper/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/sysvinit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/sysvinit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sysz/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/sysz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/sysz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sy/sysz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/szip/default.nix b/third_party/nixpkgs/pkgs/by-name/sz/szip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/szip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sz/szip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/szyszka/default.nix b/third_party/nixpkgs/pkgs/by-name/sz/szyszka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/szyszka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sz/szyszka/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/t1lib/default.nix b/third_party/nixpkgs/pkgs/by-name/t1/t1lib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/t1lib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/t1/t1lib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/t1utils/default.nix b/third_party/nixpkgs/pkgs/by-name/t1/t1utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/t1utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/t1/t1utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/t4kcommon/default.nix b/third_party/nixpkgs/pkgs/by-name/t4/t4kcommon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/t4kcommon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/t4/t4kcommon/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ta-lib/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/ta-lib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ta-lib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/ta-lib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/tab/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/tab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tab/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tableplus/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tableplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tableplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tableplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tabula-java/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tabula-java/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tabula-java/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tabula-java/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tacacsplus/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tacacsplus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tacacsplus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tacacsplus/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/taco/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/taco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taco/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/taco/taco.patch b/third_party/nixpkgs/pkgs/by-name/ta/taco/taco.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/taco/taco.patch
rename to third_party/nixpkgs/pkgs/by-name/ta/taco/taco.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tagger/deps.nix b/third_party/nixpkgs/pkgs/by-name/ta/tagger/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tagger/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tagger/deps.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tagger/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tagger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tagger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tagger/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taglib-sharp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taglib-sharp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taglib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taglib/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taglib_extras/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taglib_extras/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tagparser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tagparser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tagref/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tagref/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tagref/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tagref/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tagtime/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tagtime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tagtime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tagtime/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tagutil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tagutil/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tahoe-lafs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tahoe-lafs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tailer/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tailer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tailer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tailer/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tailor-gui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tailor-gui/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tailscale-systray/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tailscale-systray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tailscale-systray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tailscale-systray/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taizen/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taizen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/taizen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taizen/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/takao/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/takao/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/takao/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/takao/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/taktuk/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taktuk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/taktuk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taktuk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/talentedhack/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/talentedhack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/talentedhack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/talentedhack/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/talkfilters/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/talkfilters/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/talkfilters/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/talkfilters/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/talloc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/talloc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/talosctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/talosctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tamatool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tamatool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tambura/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tambura/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tambura/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tambura/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/tamsyn/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tamsyn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/tamsyn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tamsyn/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/tamzen/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tamzen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/tamzen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tamzen/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tango/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tango/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tango/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tango/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tangram/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tangram/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tangram/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tangram/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/tanidvr/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tanidvr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/tanidvr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tanidvr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tanka/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tanka/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/taoup/cachefile.patch b/third_party/nixpkgs/pkgs/by-name/ta/taoup/cachefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/taoup/cachefile.patch
rename to third_party/nixpkgs/pkgs/by-name/ta/taoup/cachefile.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/taoup/help.patch b/third_party/nixpkgs/pkgs/by-name/ta/taoup/help.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/taoup/help.patch
rename to third_party/nixpkgs/pkgs/by-name/ta/taoup/help.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/taoup/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taoup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/taoup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taoup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/taoup/tput.patch b/third_party/nixpkgs/pkgs/by-name/ta/taoup/tput.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/taoup/tput.patch
rename to third_party/nixpkgs/pkgs/by-name/ta/taoup/tput.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/taplo/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taplo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/taplo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taplo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/taproot-assets/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taproot-assets/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/taproot-assets/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taproot-assets/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/tapview/dont_check_echo.patch b/third_party/nixpkgs/pkgs/by-name/ta/tapview/dont_check_echo.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/tapview/dont_check_echo.patch
rename to third_party/nixpkgs/pkgs/by-name/ta/tapview/dont_check_echo.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/tapview/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tapview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/tapview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tapview/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tar2ext4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tar2ext4/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tarantool/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tarantool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tarantool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tarantool/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/target-isns/install_prefix_path.patch b/third_party/nixpkgs/pkgs/by-name/ta/target-isns/install_prefix_path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/target-isns/install_prefix_path.patch
rename to third_party/nixpkgs/pkgs/by-name/ta/target-isns/install_prefix_path.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/target-isns/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/target-isns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/target-isns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/target-isns/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/targetcli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/targetcli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/tarsnap/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tarsnap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/tarsnap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tarsnap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tarsnapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tarsnapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tarssh/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tarssh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tarssh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tarssh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/tart/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tart/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/tart/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tart/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tasknc/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tasknc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tasknc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tasknc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskopen/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taskopen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/taskopen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taskopen/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/misc/taskserver/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taskserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/taskserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taskserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tasksh/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tasksh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tasksh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tasksh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/taskspooler/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taskspooler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/taskspooler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taskspooler/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tasktimer/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tasktimer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tasktimer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tasktimer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/taskwarrior-tui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/taskwarrior-tui/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tau-hydrogen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tau-hydrogen/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tauon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tauon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tayga/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tayga/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tayga/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ta/tayga/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix b/third_party/nixpkgs/pkgs/by-name/tb/tbls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tb/tbls/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/tboot/default.nix b/third_party/nixpkgs/pkgs/by-name/tb/tboot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tboot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tb/tboot/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbox/libtbox.pc.in b/third_party/nixpkgs/pkgs/by-name/tb/tbox/libtbox.pc.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tbox/libtbox.pc.in
rename to third_party/nixpkgs/pkgs/by-name/tb/tbox/libtbox.pc.in
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbox/default.nix b/third_party/nixpkgs/pkgs/by-name/tb/tbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tb/tbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tcat/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/tcb/fix-makefiles.patch b/third_party/nixpkgs/pkgs/by-name/tc/tcb/fix-makefiles.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tcb/fix-makefiles.patch
rename to third_party/nixpkgs/pkgs/by-name/tc/tcb/fix-makefiles.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/tcb/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tcb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcb/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tcl2048/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcl2048/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tcl2048/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcl2048/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcp-cutter/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcp-cutter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tcp-cutter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcp-cutter/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch b/third_party/nixpkgs/pkgs/by-name/tc/tcp_wrappers/cdecls.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
rename to third_party/nixpkgs/pkgs/by-name/tc/tcp_wrappers/cdecls.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcp_wrappers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcp_wrappers/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcpcrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcpcrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcpdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcpdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcpflow/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcpflow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tcpflow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcpflow/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/tcping-go/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcping-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/tcping-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcping-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/tcpkali/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcpkali/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/tcpkali/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcpkali/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcptraceroute/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcptraceroute/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix b/third_party/nixpkgs/pkgs/by-name/tc/tcptrack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tc/tcptrack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix b/third_party/nixpkgs/pkgs/by-name/td/tdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/td/tdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tdfgo/default.nix b/third_party/nixpkgs/pkgs/by-name/td/tdfgo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tdfgo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/td/tdfgo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/third_party/nixpkgs/pkgs/by-name/td/tdlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/td/tdlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/td/tdns-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/td/tdns-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tdrop/default.nix b/third_party/nixpkgs/pkgs/by-name/td/tdrop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tdrop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/td/tdrop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tea/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tea/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tea/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tea/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teams/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teams/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/te/teamspeak3/package.nix b/third_party/nixpkgs/pkgs/by-name/te/teamspeak3/package.nix
new file mode 100644
index 0000000000..01e5739b16
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/te/teamspeak3/package.nix
@@ -0,0 +1,143 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ fetchzip,
+ makeDesktopItem,
+ glib,
+ qt5,
+ libsForQt5,
+ perl,
+ libcxx,
+ autoPatchelfHook,
+ copyDesktopItems,
+}:
+
+let
+ pluginsdk = fetchzip {
+ url = "https://files.teamspeak-services.com/releases/sdk/3.3.1/ts_sdk_3.3.1.zip";
+ hash = "sha256-wx4pBZHpFPoNvEe4xYE80KnXGVda9XcX35ho4R8QxrQ=";
+ };
+in
+
+stdenv.mkDerivation rec {
+ pname = "teamspeak3";
+
+ version = "3.6.2";
+
+ src = fetchurl {
+ url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_amd64-${version}.run";
+ hash = "sha256-WfEQQ4lxoj+QSnAOfdCoEc+Z1Oa5dbo6pFli1DsAZCI=";
+ };
+
+ nativeBuildInputs = [
+ perl # Installer script needs `shasum`
+ qt5.wrapQtAppsHook
+ autoPatchelfHook
+ copyDesktopItems
+ ];
+
+ buildInputs =
+ [
+ libsForQt5.quazip
+ glib
+ libcxx
+ ]
+ ++ (with qt5; [
+ qtbase
+ qtwebengine
+ qtwebchannel
+ qtwebsockets
+ qtsvg
+ ]);
+
+ # This runs the installer script. If it gets stuck, run it with -x.
+ # If it then gets stuck at something like:
+ #
+ # ++ exec
+ # + PAGER_PATH=
+ #
+ # it's looking for a dependency and didn't find it. Check the script and make
+ # sure the dep is in nativeBuildInputs.
+ unpackPhase = ''
+ runHook preUnpack
+
+ # Run the installer script non-interactively
+ echo -e '\ny' | PAGER=cat sh -e $src
+
+ cd TeamSpeak3-Client-linux_amd64
+
+ runHook postUnpack
+ '';
+
+ patchPhase = ''
+ runHook prePatch
+
+ # Delete unecessary libraries - these are provided by nixos.
+ find . -\( -name '*.so' -or -name '*.so.*' -\) -print0 | xargs -0 rm # I hate find.
+
+ rm QtWebEngineProcess
+ rm qt.conf
+
+ mv ts3client_linux_amd64 ts3client
+
+ # Our libquazip's so name has this suffix and there is no symlink
+ patchelf --replace-needed libquazip.so libquazip1-qt5.so ts3client error_report
+
+ runHook postPatch
+ '';
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "teamspeak";
+ exec = "ts3client";
+ icon = "teamspeak";
+ comment = "The TeamSpeak voice communication tool";
+ desktopName = "TeamSpeak";
+ genericName = "TeamSpeak";
+ categories = [ "Network" ];
+ })
+ ];
+
+ qtWrapperArgs = [
+ # wayland is currently broken, remove when TS3 fixes that
+ "--set QT_QPA_PLATFORM xcb"
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/opt/teamspeak
+ mv * $out/opt/teamspeak/
+
+ # Grab the desktop icon from the plugin sdk
+ install ${pluginsdk}/doc/_static/logo.png -D $out/share/icons/hicolor/64x64/apps/teamspeak.png
+
+ mkdir -p $out/bin/
+ ln -s $out/opt/teamspeak/ts3client $out/bin/ts3client
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "TeamSpeak voice communication tool";
+ homepage = "https://teamspeak.com/";
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ license = {
+ # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak.
+ fullName = "Teamspeak client license";
+ url = "https://www.teamspeak.com/en/privacy-and-terms/";
+ free = false;
+ };
+ maintainers = with lib.maintainers; [
+ lhvwb
+ lukegb
+ atemu
+ ];
+ mainProgram = "ts3client";
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/teavpn2/nix.patch b/third_party/nixpkgs/pkgs/by-name/te/teavpn2/nix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/teavpn2/nix.patch
rename to third_party/nixpkgs/pkgs/by-name/te/teavpn2/nix.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/teavpn2/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teavpn2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/teavpn2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teavpn2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tebreak/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tebreak/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tecnoballz/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tecnoballz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tecnoballz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tecnoballz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/ted/default.nix b/third_party/nixpkgs/pkgs/by-name/te/ted/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/ted/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/ted/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/teehee/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teehee/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/teehee/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teehee/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/teensy-cmake-macros/hook.nix b/third_party/nixpkgs/pkgs/by-name/te/teensy-cmake-macros/hook.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/teensy-cmake-macros/hook.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teensy-cmake-macros/hook.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/teensy-cmake-macros/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teensy-cmake-macros/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/teensy-cmake-macros/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teensy-cmake-macros/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/teensy-cmake-macros/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/te/teensy-cmake-macros/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/teensy-cmake-macros/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/te/teensy-cmake-macros/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/development/embedded/teensy-loader-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teensy-loader-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/teensy-loader-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teensy-loader-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/teensy-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teensy-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/teensy-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teensy-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/teensy-udev-rules/teensy.rules b/third_party/nixpkgs/pkgs/by-name/te/teensy-udev-rules/teensy.rules
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/teensy-udev-rules/teensy.rules
rename to third_party/nixpkgs/pkgs/by-name/te/teensy-udev-rules/teensy.rules
diff --git a/third_party/nixpkgs/pkgs/games/teetertorture/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teetertorture/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/teetertorture/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teetertorture/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tegaki-zinnia-japanese/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tegaki-zinnia-japanese/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/teip/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/teip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teip/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tektoncd-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tektoncd-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tela-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tela-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/telepathy/farstream/default.nix b/third_party/nixpkgs/pkgs/by-name/te/telepathy-farstream/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/telepathy/farstream/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/telepathy-farstream/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/third_party/nixpkgs/pkgs/by-name/te/telepathy-gabble/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/telepathy-gabble/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix b/third_party/nixpkgs/pkgs/by-name/te/telepathy-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/telepathy-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/third_party/nixpkgs/pkgs/by-name/te/telepathy-haze/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/telepathy-haze/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/third_party/nixpkgs/pkgs/by-name/te/telepathy-idle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/telepathy-idle/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/third_party/nixpkgs/pkgs/by-name/te/telepathy-logger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/telepathy-logger/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/third_party/nixpkgs/pkgs/by-name/te/telepathy-mission-control/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/telepathy-mission-control/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/third_party/nixpkgs/pkgs/by-name/te/telepresence2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/telepresence2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/teler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/tell-me-your-secrets/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tell-me-your-secrets/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tell-me-your-secrets/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tell-me-your-secrets/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/teller/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teller/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/teller/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teller/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/template-glib/default.nix b/third_party/nixpkgs/pkgs/by-name/te/template-glib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/template-glib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/template-glib/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tempo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tempo/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tempora_lgc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tempora_lgc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch b/third_party/nixpkgs/pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/te/temporal-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/temporal-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/third_party/nixpkgs/pkgs/by-name/te/temporal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/temporal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporalite/default.nix b/third_party/nixpkgs/pkgs/by-name/te/temporalite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/temporalite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/temporalite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tenacity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tenacity/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tendermint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tendermint/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/tenderness/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tenderness/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/tenderness/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tenderness/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tennix/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tennix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tennix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tennix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tensorflow-lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tensorflow-lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tensorman/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tensorman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tensorman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tensorman/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tere/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tere/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tere/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tere/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/termbook/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/te/termbook/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/termbook/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/te/termbook/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/text/termbook/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termbook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/termbook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termbook/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/termbox/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/termbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/termcolor/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termcolor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/termcolor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termcolor/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/termdbms/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termdbms/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/termdbms/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termdbms/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/termdbms/viewer.patch b/third_party/nixpkgs/pkgs/by-name/te/termdbms/viewer.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/termdbms/viewer.patch
rename to third_party/nixpkgs/pkgs/by-name/te/termdbms/viewer.patch
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/termimage/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termimage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/termimage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termimage/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-colors/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terminal-colors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/terminal-colors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terminal-colors/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terminal-notifier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terminal-notifier/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terminal-parrot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terminal-parrot/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-stocks/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terminal-stocks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/terminal-stocks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terminal-stocks/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terminator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terminator/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/terminus-font/SOURCE_DATE_EPOCH-for-otb.patch b/third_party/nixpkgs/pkgs/by-name/te/terminus_font/SOURCE_DATE_EPOCH-for-otb.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/terminus-font/SOURCE_DATE_EPOCH-for-otb.patch
rename to third_party/nixpkgs/pkgs/by-name/te/terminus_font/SOURCE_DATE_EPOCH-for-otb.patch
diff --git a/third_party/nixpkgs/pkgs/data/fonts/terminus-font/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terminus_font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/terminus-font/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terminus_font/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terminus_font_ttf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terminus_font_ttf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termius/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/termius/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termius/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/termonad/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termonad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/termonad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termonad/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/termplay/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termplay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/termplay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termplay/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termshark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termshark/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/termsyn/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termsyn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/termsyn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termsyn/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/termtekst/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termtekst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/termtekst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termtekst/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/termtosvg/default.nix b/third_party/nixpkgs/pkgs/by-name/te/termtosvg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/termtosvg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/termtosvg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/terra-station/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terra-station/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/terra-station/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terra-station/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terracognita/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terracognita/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terraform-backend-git/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terraform-backend-git/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terraform-inventory/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terraform-inventory/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terraform-ls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terraform-ls/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terraform-lsp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terraform-lsp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terraformer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terraformer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terramate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terramate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terranix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terranix/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/terraria-server/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terraria-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/terraria-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terraria-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terrascan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terrascan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terser/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tes3cmd/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tes3cmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tes3cmd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tes3cmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/teseq/default.nix b/third_party/nixpkgs/pkgs/by-name/te/teseq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/teseq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/teseq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/tesh/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tesh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/tesh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tesh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/tessen/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tessen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tessen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tessen/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/tessera/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tessera/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/tessera/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tessera/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/test-drive/default.nix b/third_party/nixpkgs/pkgs/by-name/te/test-drive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/test-drive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/test-drive/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix b/third_party/nixpkgs/pkgs/by-name/te/testssl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/testssl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tet/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/tet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tetraproc/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tetraproc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tetraproc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tetraproc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/tetrd/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tetrd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/tetrd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tetrd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tev/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tevent/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tevent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tevent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tevent/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/tewi/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tewi-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/tewi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tewi-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tewisay/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tewisay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tewisay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tewisay/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix b/third_party/nixpkgs/pkgs/by-name/te/texi2html/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/texi2html/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/texi2html/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix b/third_party/nixpkgs/pkgs/by-name/te/texi2mdoc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/texi2mdoc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/text-engine/default.nix b/third_party/nixpkgs/pkgs/by-name/te/text-engine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/text-engine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/text-engine/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/textplots/default.nix b/third_party/nixpkgs/pkgs/by-name/te/textplots/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/textplots/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/textplots/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/textql/default.nix b/third_party/nixpkgs/pkgs/by-name/te/textql/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/textql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/textql/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/textual-paint/default.nix b/third_party/nixpkgs/pkgs/by-name/te/textual-paint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/textual-paint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/textual-paint/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/texture-synthesis/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/te/texture-synthesis/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/texture-synthesis/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/te/texture-synthesis/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/texture-synthesis/default.nix b/third_party/nixpkgs/pkgs/by-name/te/texture-synthesis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/texture-synthesis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/texture-synthesis/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tezos-rust-libs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/tezos-rust-libs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix b/third_party/nixpkgs/pkgs/by-name/tf/tf-summarize/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tf/tf-summarize/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/tf2pulumi/default.nix b/third_party/nixpkgs/pkgs/by-name/tf/tf2pulumi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/tf2pulumi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tf/tf2pulumi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfautomv/default.nix b/third_party/nixpkgs/pkgs/by-name/tf/tfautomv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/tfautomv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tf/tfautomv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix b/third_party/nixpkgs/pkgs/by-name/tf/tfk8s/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tf/tfk8s/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/default.nix b/third_party/nixpkgs/pkgs/by-name/tf/tfk8s/tests/sample1/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tf/tfk8s/tests/sample1/default.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml b/third_party/nixpkgs/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml
rename to third_party/nixpkgs/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/output.tf b/third_party/nixpkgs/pkgs/by-name/tf/tfk8s/tests/sample1/output.tf
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/output.tf
rename to third_party/nixpkgs/pkgs/by-name/tf/tfk8s/tests/sample1/output.tf
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/by-name/tf/tfsec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tf/tfsec/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfswitch/default.nix b/third_party/nixpkgs/pkgs/by-name/tf/tfswitch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/tfswitch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tf/tfswitch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix b/third_party/nixpkgs/pkgs/by-name/tf/tftp-hpa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tf/tftp-hpa/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfupdate/default.nix b/third_party/nixpkgs/pkgs/by-name/tf/tfupdate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/tfupdate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tf/tfupdate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tgswitch/default.nix b/third_party/nixpkgs/pkgs/by-name/tg/tgswitch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/tgswitch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tg/tgswitch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix b/third_party/nixpkgs/pkgs/by-name/tg/tgt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tg/tgt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thc-hydra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thc-hydra/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/thc-ipv6/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thc-ipv6/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/thc-ipv6/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thc-ipv6/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/the-foundation/default.nix b/third_party/nixpkgs/pkgs/by-name/th/the-foundation/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/the-foundation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/the-foundation/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/the-neue-black/default.nix b/third_party/nixpkgs/pkgs/by-name/th/the-neue-black/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/the-neue-black/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/the-neue-black/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix b/third_party/nixpkgs/pkgs/by-name/th/the-way/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/the-way/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/the-way/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/theano/default.nix b/third_party/nixpkgs/pkgs/by-name/th/theano/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/theano/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/theano/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thedesk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thedesk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/theft/default.nix b/third_party/nixpkgs/pkgs/by-name/th/theft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/theft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/theft/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/theharvester/default.nix b/third_party/nixpkgs/pkgs/by-name/th/theharvester/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/theharvester/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/theharvester/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thelounge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thelounge/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/packages-path.patch b/third_party/nixpkgs/pkgs/by-name/th/thelounge/packages-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/packages-path.patch
rename to third_party/nixpkgs/pkgs/by-name/th/thelounge/packages-path.patch
diff --git a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix b/third_party/nixpkgs/pkgs/by-name/th/theme-jade1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/jade1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/theme-jade1/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix b/third_party/nixpkgs/pkgs/by-name/th/theme-obsidian2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/theme-obsidian2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/theme-sh/default.nix b/third_party/nixpkgs/pkgs/by-name/th/theme-sh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/theme-sh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/theme-sh/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/vertex/default.nix b/third_party/nixpkgs/pkgs/by-name/th/theme-vertex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/vertex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/theme-vertex/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix b/third_party/nixpkgs/pkgs/by-name/th/themechanger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/themechanger/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thepeg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thepeg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/therion/default.nix b/third_party/nixpkgs/pkgs/by-name/th/therion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/therion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/therion/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thermald/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/thermald/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thermald/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/thicket/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thicket/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/thicket/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thicket/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/thiefmd/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thiefmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/thiefmd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thiefmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/th/thin-provisioning-tools/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/th/thin-provisioning-tools/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thin-provisioning-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thin-provisioning-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thinkfan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thinkfan/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thinkingRock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thinkingRock/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/thokr/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thokr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/thokr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thokr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/threatest/default.nix b/third_party/nixpkgs/pkgs/by-name/th/threatest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/threatest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/threatest/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/th/threema-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/threema-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/thrift/disable-failing-test.patch b/third_party/nixpkgs/pkgs/by-name/th/thrift/disable-failing-test.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/thrift/disable-failing-test.patch
rename to third_party/nixpkgs/pkgs/by-name/th/thrift/disable-failing-test.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thrift/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thrift/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix b/third_party/nixpkgs/pkgs/by-name/th/throttled/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/throttled/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/throttled/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/thttpd/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thttpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/thttpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thttpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/thumbs/fix.patch b/third_party/nixpkgs/pkgs/by-name/th/thumbs/fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/thumbs/fix.patch
rename to third_party/nixpkgs/pkgs/by-name/th/thumbs/fix.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/thumbs/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thumbs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/thumbs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thumbs/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/thunderbolt/default.nix b/third_party/nixpkgs/pkgs/by-name/th/thunderbolt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/thunderbolt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/th/thunderbolt/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/tibetan-machine/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tibetan-machine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/tibetan-machine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tibetan-machine/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/ticker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/ticker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tickrs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tickrs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/ticktick/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/ticktick/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/ticktick/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/ticktick/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ticpp/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/ticpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ticpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/ticpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tidal-hifi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tidal-hifi/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tidb/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tidb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tidb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tidb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/tidy-viewer/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tidy-viewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/tidy-viewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tidy-viewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tidyp/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tidyp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tidyp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tidyp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tie/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tig/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tigervnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tigervnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tijolo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tijolo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/tijolo/shards.nix b/third_party/nixpkgs/pkgs/by-name/ti/tijolo/shards.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/tijolo/shards.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tijolo/shards.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tile38/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tile38/package.nix
index 72194aebfb..23034db5fe 100644
--- a/third_party/nixpkgs/pkgs/by-name/ti/tile38/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ti/tile38/package.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tile38";
- version = "1.33.3";
+ version = "1.33.4";
src = fetchFromGitHub {
owner = "tidwall";
repo = pname;
rev = version;
- hash = "sha256-r13STmaDJz4OGboNPsrJSi668q72Bzffe5TRXJk6pdI=";
+ hash = "sha256-8Qu1tuNAqO/XFcfSJ0fXMWFY4UhViV3CFsfAZ2zUsxE=";
};
vendorHash = "sha256-nnamNwowRPWQBKUMg800bFgijv8iHbdh/wUwTfX0NcY=";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch b/third_party/nixpkgs/pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch
rename to third_party/nixpkgs/pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tiledb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tiledb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/tilem/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tilem/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/tilem/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tilem/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/assets.nix b/third_party/nixpkgs/pkgs/by-name/ti/tilt/assets.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/assets.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tilt/assets.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/binary.nix b/third_party/nixpkgs/pkgs/by-name/ti/tilt/binary.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/binary.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tilt/binary.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tilt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tilt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/time-decode/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/time-decode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/time-decode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/time-decode/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/time-ghc-modules/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/time-ghc-modules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/time-ghc-modules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/time-ghc-modules/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/time/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/time/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/time/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/time/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timelapse-deflicker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timelapse-deflicker/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/timelens/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timelens/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/timelens/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timelens/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/timelimit/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timelimit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/timelimit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timelimit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timeline/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/timeline/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timeline/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/timemachine/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timemachine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/timemachine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timemachine/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/timer/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/timer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timer/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/times-newer-roman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/times-newer-roman/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timescaledb-parallel-copy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timescaledb-parallel-copy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timescaledb-tune/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timescaledb-tune/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/timetagger/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timetagger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/timetagger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timetagger/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/timetagger_cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timetagger_cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/timetagger_cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timetagger_cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timeular/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/timeular/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timeular/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timew-sync-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timew-sync-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timewarrior/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timewarrior/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/timezonemap/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timezonemap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/timezonemap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timezonemap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/timg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/timg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/tini/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tini/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/tini/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tini/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tint2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tint2/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tintin/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tintin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tintin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tintin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tiny-cuda-nn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tiny-cuda-nn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinycbor/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinycbor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tinycbor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tinycbor/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinycdb/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinycdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tinycdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tinycdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinyfecvpn/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinyfecvpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tinyfecvpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyfecvpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tinyfugue/001-darwin-fixes.patch b/third_party/nixpkgs/pkgs/by-name/ti/tinyfugue/001-darwin-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tinyfugue/001-darwin-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyfugue/001-darwin-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/games/tinyfugue/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinyfugue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tinyfugue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyfugue/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinyobjloader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyobjloader/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinyprog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyprog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinyproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch b/third_party/nixpkgs/pkgs/by-name/ti/tinyscheme/01-remove-macOS-main.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyscheme/01-remove-macOS-main.patch
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch b/third_party/nixpkgs/pkgs/by-name/ti/tinyscheme/02-use-toolchain-env-vars.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyscheme/02-use-toolchain-env-vars.patch
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch b/third_party/nixpkgs/pkgs/by-name/ti/tinyscheme/03-macOS-SOsuf.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyscheme/03-macOS-SOsuf.patch
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinyscheme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyscheme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinyssh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tinyssh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinystatus/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinystatus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tinystatus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tinystatus/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/tipa/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tipa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/tipa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tipa/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tiptop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tiptop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tiramisu/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tiramisu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tiramisu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tiramisu/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tiscamera/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tiscamera/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/titanion/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/titanion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/titanion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/titanion/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/mobile/titanium-alloy/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/titanium-alloy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/mobile/titanium-alloy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/titanium-alloy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/mobile/titanium/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/titanium/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/mobile/titanium/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/titanium/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tiv/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tiv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tiv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tiv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/tivodecode/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tivodecode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/tivodecode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ti/tivodecode/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tkman/default.nix b/third_party/nixpkgs/pkgs/by-name/tk/tkman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tkman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tk/tkman/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/tkrev/default.nix b/third_party/nixpkgs/pkgs/by-name/tk/tkrev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/tkrev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tk/tkrev/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix b/third_party/nixpkgs/pkgs/by-name/tk/tkrzw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tk/tkrzw/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tl-expected/default.nix b/third_party/nixpkgs/pkgs/by-name/tl/tl-expected/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tl-expected/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tl/tl-expected/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/arch/configure-tmpdir.patch b/third_party/nixpkgs/pkgs/by-name/tl/tla/configure-tmpdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/arch/configure-tmpdir.patch
rename to third_party/nixpkgs/pkgs/by-name/tl/tla/configure-tmpdir.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/arch/default.nix b/third_party/nixpkgs/pkgs/by-name/tl/tla/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/arch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tl/tla/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tldr/default.nix b/third_party/nixpkgs/pkgs/by-name/tl/tldr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tldr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tl/tldr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/tlf/default.nix b/third_party/nixpkgs/pkgs/by-name/tl/tlf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/tlf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tl/tlf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/tlsclient/default.nix b/third_party/nixpkgs/pkgs/by-name/tl/tlsclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/tlsclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tl/tlsclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix b/third_party/nixpkgs/pkgs/by-name/tl/tlsx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tl/tlsx/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/tlwg/default.nix b/third_party/nixpkgs/pkgs/by-name/tl/tlwg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/tlwg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tl/tlwg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/tm/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/tm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tm/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tmate-ssh-server/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmate-ssh-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tmate-ssh-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmate-ssh-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmate/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tmate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tmatrix/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmatrix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tmatrix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmatrix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/tml/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/tml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tml/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/tmpmail/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmpmail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/tmpmail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmpmail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmpwatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmpwatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmux-xpanes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmux-xpanes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmux/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmuxinator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmuxinator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmuxp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmuxp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tnat64/default.nix b/third_party/nixpkgs/pkgs/by-name/tn/tnat64/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tnat64/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tn/tnat64/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/tncattach/default.nix b/third_party/nixpkgs/pkgs/by-name/tn/tncattach/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/tncattach/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tn/tncattach/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tnef/default.nix b/third_party/nixpkgs/pkgs/by-name/tn/tnef/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tnef/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tn/tnef/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tnt/default.nix b/third_party/nixpkgs/pkgs/by-name/tn/tnt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tnt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tn/tnt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tntdb/default.nix b/third_party/nixpkgs/pkgs/by-name/tn/tntdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tntdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tn/tntdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tntnet/default.nix b/third_party/nixpkgs/pkgs/by-name/tn/tntnet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tntnet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tn/tntnet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/to-html/default.nix b/third_party/nixpkgs/pkgs/by-name/to/to-html/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/to-html/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/to-html/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/toast/default.nix b/third_party/nixpkgs/pkgs/by-name/to/toast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/toast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/toast/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tockloader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tockloader/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/todiff/default.nix b/third_party/nixpkgs/pkgs/by-name/to/todiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/todiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/todiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/to/todo-txt-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/todo-txt-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/todo/default.nix b/third_party/nixpkgs/pkgs/by-name/to/todo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/todo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/todo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/todofi.sh/default.nix b/third_party/nixpkgs/pkgs/by-name/to/todofi-sh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/todofi.sh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/todofi-sh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix b/third_party/nixpkgs/pkgs/by-name/to/todoist-electron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/todoist-electron/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/todoist/default.nix b/third_party/nixpkgs/pkgs/by-name/to/todoist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/todoist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/todoist/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix b/third_party/nixpkgs/pkgs/by-name/to/todoman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/todoman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/todoman/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tofi/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tofi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tofi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tofi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/toilet/default.nix b/third_party/nixpkgs/pkgs/by-name/to/toilet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/toilet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/toilet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/toipe/default.nix b/third_party/nixpkgs/pkgs/by-name/to/toipe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/toipe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/toipe/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/tokio-console/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tokio-console/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/tokio-console/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tokio-console/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tokyocabinet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tokyocabinet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tokyotyrant/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tokyotyrant/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tomcat_mysql_jdbc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/tomcat/jdbc/mysql/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tomcat_mysql_jdbc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tome2/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tome2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tome2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tome2/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tome4/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tome4/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tome4/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tome4/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/toml-f/default.nix b/third_party/nixpkgs/pkgs/by-name/to/toml-f/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/toml-f/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/toml-f/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/toml2json/default.nix b/third_party/nixpkgs/pkgs/by-name/to/toml2json/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/toml2json/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/toml2json/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/toml2nix/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/to/toml2nix/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/toml2nix/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/to/toml2nix/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/toml2nix/default.nix b/third_party/nixpkgs/pkgs/by-name/to/toml2nix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/toml2nix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/toml2nix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix b/third_party/nixpkgs/pkgs/by-name/to/ton/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/ton/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tone/nuget-deps.nix b/third_party/nixpkgs/pkgs/by-name/to/tone/nuget-deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tone/nuget-deps.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tone/nuget-deps.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tone/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tone/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-gfx/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tonelib-gfx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tonelib-gfx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tonelib-gfx/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-jam/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tonelib-jam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tonelib-jam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tonelib-jam/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-metal/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tonelib-metal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tonelib-metal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tonelib-metal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-noisereducer/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tonelib-noisereducer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tonelib-noisereducer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tonelib-noisereducer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-zoom/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tonelib-zoom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tonelib-zoom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tonelib-zoom/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/toolbox/glibc.patch b/third_party/nixpkgs/pkgs/by-name/to/toolbox/glibc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/toolbox/glibc.patch
rename to third_party/nixpkgs/pkgs/by-name/to/toolbox/glibc.patch
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/toolbox/default.nix b/third_party/nixpkgs/pkgs/by-name/to/toolbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/toolbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/toolbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/topgit/default.nix b/third_party/nixpkgs/pkgs/by-name/to/top-git/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/topgit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/top-git/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/topfew-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/to/topfew-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/topfew-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/topfew-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/topfew/default.nix b/third_party/nixpkgs/pkgs/by-name/to/topfew/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/topfew/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/topfew/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/topiary/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/to/topiary/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/topiary/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/to/topiary/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/topiary/default.nix b/third_party/nixpkgs/pkgs/by-name/to/topiary/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/topiary/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/topiary/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix b/third_party/nixpkgs/pkgs/by-name/to/topicctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/topicctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix b/third_party/nixpkgs/pkgs/by-name/to/topydo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/topydo/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/torcs/default.nix b/third_party/nixpkgs/pkgs/by-name/to/torcs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/torcs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/torcs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix b/third_party/nixpkgs/pkgs/by-name/to/torq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/torq/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/torrent7z/default.nix b/third_party/nixpkgs/pkgs/by-name/to/torrent7z/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/torrent7z/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/torrent7z/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix b/third_party/nixpkgs/pkgs/by-name/to/torrential/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/torrential/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tortoisehg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tortoisehg/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/torus-trooper/default.nix b/third_party/nixpkgs/pkgs/by-name/to/torus-trooper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/torus-trooper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/torus-trooper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/toss/default.nix b/third_party/nixpkgs/pkgs/by-name/to/toss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/toss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/toss/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix b/third_party/nixpkgs/pkgs/by-name/to/totem-pl-parser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/totem-pl-parser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix b/third_party/nixpkgs/pkgs/by-name/to/touchegg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/touchegg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/third_party/nixpkgs/pkgs/by-name/to/tox-node/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/tox-node/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/to/toxiproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/toxiproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/toxvpn/bootstrap.json b/third_party/nixpkgs/pkgs/by-name/to/toxvpn/bootstrap.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/toxvpn/bootstrap.json
rename to third_party/nixpkgs/pkgs/by-name/to/toxvpn/bootstrap.json
diff --git a/third_party/nixpkgs/pkgs/tools/networking/toxvpn/default.nix b/third_party/nixpkgs/pkgs/by-name/to/toxvpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/toxvpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/to/toxvpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/tp-auto-kbbl/default.nix b/third_party/nixpkgs/pkgs/by-name/tp/tp-auto-kbbl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/tp-auto-kbbl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tp/tp-auto-kbbl/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpacpi-bat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tp/tpacpi-bat/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm-luks/openssl-1.1.patch b/third_party/nixpkgs/pkgs/by-name/tp/tpm-luks/openssl-1.1.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tpm-luks/openssl-1.1.patch
rename to third_party/nixpkgs/pkgs/by-name/tp/tpm-luks/openssl-1.1.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm-luks/default.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpm-luks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tpm-luks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tp/tpm-luks/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm-luks/signed-ptr.patch b/third_party/nixpkgs/pkgs/by-name/tp/tpm-luks/signed-ptr.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tpm-luks/signed-ptr.patch
rename to third_party/nixpkgs/pkgs/by-name/tp/tpm-luks/signed-ptr.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpm-quote-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tp/tpm-quote-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpm-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tpm-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tp/tpm-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpm2-abrmd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tp/tpm2-abrmd/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch b/third_party/nixpkgs/pkgs/by-name/tp/tpm2-pkcs11/graceful-fapi-fail.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch
rename to third_party/nixpkgs/pkgs/by-name/tp/tpm2-pkcs11/graceful-fapi-fail.patch
diff --git a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpm2-pkcs11/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tp/tpm2-pkcs11/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/version.patch b/third_party/nixpkgs/pkgs/by-name/tp/tpm2-pkcs11/version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/version.patch
rename to third_party/nixpkgs/pkgs/by-name/tp/tpm2-pkcs11/version.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpm2-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tp/tpm2-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tptp/default.nix b/third_party/nixpkgs/pkgs/by-name/tp/tptp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/tptp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tp/tptp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/tqsl/default.nix b/third_party/nixpkgs/pkgs/by-name/tq/tqsl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/tqsl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tq/tqsl/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tr-patcher/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tr-patcher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tr-patcher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tr-patcher/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tracebox/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tracebox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tracebox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tracebox/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch b/third_party/nixpkgs/pkgs/by-name/tr/tracefilegen/gcc7.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch
rename to third_party/nixpkgs/pkgs/by-name/tr/tracefilegen/gcc7.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tracefilegen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tracefilegen/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tracefilesim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tracefilesim/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/traceroute/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/traceroute/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/traceroute/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/traceroute/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/trackballs/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trackballs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/trackballs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trackballs/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/tradcpp/aarch64.patch b/third_party/nixpkgs/pkgs/by-name/tr/tradcpp/aarch64.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/tradcpp/aarch64.patch
rename to third_party/nixpkgs/pkgs/by-name/tr/tradcpp/aarch64.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/tradcpp/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tradcpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/tradcpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tradcpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/tradcpp/tradcpp-configure.patch b/third_party/nixpkgs/pkgs/by-name/tr/tradcpp/tradcpp-configure.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/tradcpp/tradcpp-configure.patch
rename to third_party/nixpkgs/pkgs/by-name/tr/tradcpp/tradcpp-configure.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/traefik-certs-dumper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/traefik-certs-dumper/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/traefik/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/traefik/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/traefik/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trafficserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trafficserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/traitor/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/traitor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/traitor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/traitor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tran/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tran/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tran/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tran/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/transcode/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/transcode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/transcode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/transcode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/transcribe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/transcribe/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/transcrypt/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/transcrypt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/transcrypt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/transcrypt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/transgui/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/transgui/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/transifex-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/transifex-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/translate-shell/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/translate-shell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/translate-shell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/translate-shell/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/translatelocally/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/translatelocally/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/translatelocally/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/translatelocally/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/translatelocally/version_without_git.patch b/third_party/nixpkgs/pkgs/by-name/tr/translatelocally/version_without_git.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/translatelocally/version_without_git.patch
rename to third_party/nixpkgs/pkgs/by-name/tr/translatelocally/version_without_git.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/transmission-remote-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/transmission-remote-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/transmission-rss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/transmission-rss/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/update-cargo-lock-version.patch b/third_party/nixpkgs/pkgs/by-name/tr/transmission-rss/update-cargo-lock-version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/transmission-rss/update-cargo-lock-version.patch
rename to third_party/nixpkgs/pkgs/by-name/tr/transmission-rss/update-cargo-lock-version.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trash-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trash-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/trashy/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trashy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/trashy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trashy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/trayer/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trayer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/trayer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trayer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/trdl-client/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trdl-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/trdl-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trdl-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tre-command/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tre-command/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tre/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tre/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tre/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tre/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/tree/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/tree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tree/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/treemix/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/treemix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/treemix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/treemix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trellis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trellis/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tremc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tremc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tremor/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tremor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tremor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tremor/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trezor-suite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trezor-suite/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/trezor-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trezor-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/trezor-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trezor-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/trf/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/trf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/trickle/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trickle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/trickle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trickle/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/trigger/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trigger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/trigger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trigger/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/triggerhappy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/triggerhappy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/trillian-im/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trillian-im/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/trillian-im/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trillian-im/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trillian/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trillian/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/trimal/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trimal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/trimal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trimal/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/trinity/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trinity/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/trinity/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trinity/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trino-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trino-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/trippy/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trippy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/trippy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trippy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/triton/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/triton/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/triton/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/triton/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trivy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trivy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trompeloeil/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trompeloeil/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch b/third_party/nixpkgs/pkgs/by-name/tr/trousers/allow-non-tss-config-file-owner.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
rename to third_party/nixpkgs/pkgs/by-name/tr/trousers/allow-non-tss-config-file-owner.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/trousers/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trousers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/trousers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trousers/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/truecrack/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/truecrack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/truecrack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/truecrack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/trueseeing/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trueseeing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/trueseeing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trueseeing/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trurl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trurl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/trustymail/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trustymail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/trustymail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trustymail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch b/third_party/nixpkgs/pkgs/by-name/tr/trx/add_bctoolbox_ldlib.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch
rename to third_party/nixpkgs/pkgs/by-name/tr/trx/add_bctoolbox_ldlib.patch
diff --git a/third_party/nixpkgs/pkgs/tools/audio/trx/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/trx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/trx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/trx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/try/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/try/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/try/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/try/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tryton/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/tryton/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tr/tryton/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ts/default.nix b/third_party/nixpkgs/pkgs/by-name/ts/ts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ts/ts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/tsduck/default.nix b/third_party/nixpkgs/pkgs/by-name/ts/tsduck/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/tsduck/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ts/tsduck/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tsocks/default.nix b/third_party/nixpkgs/pkgs/by-name/ts/tsocks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tsocks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ts/tsocks/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tsocks/poll.patch b/third_party/nixpkgs/pkgs/by-name/ts/tsocks/poll.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tsocks/poll.patch
rename to third_party/nixpkgs/pkgs/by-name/ts/tsocks/poll.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tsukae/default.nix b/third_party/nixpkgs/pkgs/by-name/ts/tsukae/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tsukae/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ts/tsukae/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/tsung/default.nix b/third_party/nixpkgs/pkgs/by-name/ts/tsung/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/tsung/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ts/tsung/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tt-rss/plugin-feediron/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tt-rss/plugin-feediron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/tt2020/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/tt2020/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/tt2020/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/tt2020/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ttags/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/ttags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttags/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttchat/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttchat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ttchat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttchat/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttdl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttdl/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ttf-envy-code-r/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttf-envy-code-r/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ttf-envy-code-r/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttf-envy-code-r/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttf-tw-moe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttf-tw-moe/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch b/third_party/nixpkgs/pkgs/by-name/tt/ttf2pt1/gentoo-makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch
rename to third_party/nixpkgs/pkgs/by-name/tt/ttf2pt1/gentoo-makefile.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttf2pt1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttf2pt1/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttf_bitstream_vera/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttf_bitstream_vera/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttfb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttfb/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tthsum/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/tthsum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tthsum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/tthsum/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttmkfdir/cstring.patch b/third_party/nixpkgs/pkgs/by-name/tt/ttmkfdir/cstring.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ttmkfdir/cstring.patch
rename to third_party/nixpkgs/pkgs/by-name/tt/ttmkfdir/cstring.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttmkfdir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttmkfdir/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/tts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/tts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/tts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttwatch/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttwatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ttwatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttwatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tty-clock/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/tty-clock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tty-clock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/tty-clock/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/tty-share/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/tty-share/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttyd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ttyd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttyd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttygif/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttygif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ttygif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttygif/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttylog/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttylog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ttylog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttylog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttyper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttyper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttyplot/default.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttyplot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ttyplot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tt/ttyplot/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuba/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuba/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/tuc/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/tuc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuckr/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuckr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tuckr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuckr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/tudu/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tudu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/tudu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tudu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuhi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuhi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tui-journal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tui-journal/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tuic/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/tu/tuic/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tuic/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/tu/tuic/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tuic/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tuic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuic/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuir/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tumiki-fighters/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tumiki-fighters/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tumiki-fighters/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tumiki-fighters/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tun2socks/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tun2socks/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tun2socks/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tun2socks/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tuna/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuna/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/tuna/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuna/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tunctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tunctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tuner/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/tuner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuner/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/gis/tunnelx/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tunnelx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/gis/tunnelx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tunnelx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tuntox/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuntox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tuntox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuntox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tunwg/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tunwg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/tunwg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tunwg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuptime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuptime/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/turses/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/turses/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/turso-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/turso-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/turtle-build/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/turtle-build/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/turtle-build/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/turtle-build/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/tusk/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tusk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/tusk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tusk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tut/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tut/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tut/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tutanota-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tutanota-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuxedo-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuxedo-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tuxpaint/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuxpaint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tuxpaint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuxpaint/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/tuxpaint/tuxpaint-completion.diff b/third_party/nixpkgs/pkgs/by-name/tu/tuxpaint/tuxpaint-completion.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tuxpaint/tuxpaint-completion.diff
rename to third_party/nixpkgs/pkgs/by-name/tu/tuxpaint/tuxpaint-completion.diff
diff --git a/third_party/nixpkgs/pkgs/games/tuxtype/default.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuxtype/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/tuxtype/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tu/tuxtype/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/tv/default.nix b/third_party/nixpkgs/pkgs/by-name/tv/tv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/tv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tv/tv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix b/third_party/nixpkgs/pkgs/by-name/tv/tvbrowser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tv/tvbrowser/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/test.nix b/third_party/nixpkgs/pkgs/by-name/tv/tvbrowser/test.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tvbrowser/test.nix
rename to third_party/nixpkgs/pkgs/by-name/tv/tvbrowser/test.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/tvm/default.nix b/third_party/nixpkgs/pkgs/by-name/tv/tvm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/tvm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tv/tvm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tvnamer/default.nix b/third_party/nixpkgs/pkgs/by-name/tv/tvnamer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tvnamer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tv/tvnamer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/twa/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/twa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/twa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/twa/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/tweak/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/tweak/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/tweak/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/tweak/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tweeny/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/tweeny/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/tweeny/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/tweeny/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/twelf/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/twelf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/twelf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/twelf/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/twemoji-color-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/twemoji-color-font/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/twemoji-color-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/twilio-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/twilio-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/twingate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/twingate/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/twitter-color-emoji/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/twitter-color-emoji/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/twitterBootstrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/twitterBootstrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/twspace-crawler/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/twspace-crawler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/twspace-crawler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/twspace-crawler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/twspace-dl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tw/twspace-dl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/txt2man/default.nix b/third_party/nixpkgs/pkgs/by-name/tx/txt2man/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/txt2man/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tx/txt2man/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/txt2tags/default.nix b/third_party/nixpkgs/pkgs/by-name/tx/txt2tags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/txt2tags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tx/txt2tags/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/txtw/default.nix b/third_party/nixpkgs/pkgs/by-name/tx/txtw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/txtw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tx/txtw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tydra/default.nix b/third_party/nixpkgs/pkgs/by-name/ty/tydra/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tydra/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ty/tydra/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix b/third_party/nixpkgs/pkgs/by-name/ty/tym/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ty/tym/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/typer/default.nix b/third_party/nixpkgs/pkgs/by-name/ty/typer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/typer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ty/typer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch b/third_party/nixpkgs/pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch
rename to third_party/nixpkgs/pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/typescript/default.nix b/third_party/nixpkgs/pkgs/by-name/ty/typescript/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/typescript/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ty/typescript/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/typeshare/default.nix b/third_party/nixpkgs/pkgs/by-name/ty/typeshare/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/rust/typeshare/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ty/typeshare/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/typespeed/default.nix b/third_party/nixpkgs/pkgs/by-name/ty/typespeed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/typespeed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ty/typespeed/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/typespeed/typespeed-config-in-home.patch b/third_party/nixpkgs/pkgs/by-name/ty/typespeed/typespeed-config-in-home.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/typespeed/typespeed-config-in-home.patch
rename to third_party/nixpkgs/pkgs/by-name/ty/typespeed/typespeed-config-in-home.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/typical/default.nix b/third_party/nixpkgs/pkgs/by-name/ty/typical/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/typical/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ty/typical/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix b/third_party/nixpkgs/pkgs/by-name/ty/typioca/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ty/typioca/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix b/third_party/nixpkgs/pkgs/by-name/ty/typora/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/typora/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ty/typora/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix
index 748e18ae23..8d8b04efa0 100644
--- a/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix
@@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec {
pname = "typos-lsp";
# Please update the corresponding VSCode extension too.
# See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
- version = "0.1.27";
+ version = "0.1.30";
src = fetchFromGitHub {
owner = "tekumara";
repo = "typos-lsp";
rev = "refs/tags/v${version}";
- hash = "sha256-WiU6SRhW7LBDFJ/6qv0X/H86FiTYadN02iyi87oQRBY=";
+ hash = "sha256-MnN7cMbvQef3UEQzsrH6i0O+f1nnfHJVI8O8NmBUpuo=";
};
- cargoHash = "sha256-v9CwoLfqww5UNsVONAWb2D9F/ljq/YXTCCjrJaJWENE=";
+ cargoHash = "sha256-F9e6GLWcZNJZo2kc8f2o1tCvv0JeAJnmltAuSTqQKwY=";
# fix for compilation on aarch64
# see https://github.com/NixOS/nixpkgs/issues/145726
diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typos/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typos/package.nix
index 69daacd138..07231664a3 100644
--- a/third_party/nixpkgs/pkgs/by-name/ty/typos/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ty/typos/package.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
- version = "1.26.0";
+ version = "1.27.3";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
- hash = "sha256-yfQSGmLWXyOI5slB8AMcVTfQQKUXY3mBaeDPya4KtKo=";
+ hash = "sha256-4vIRhhBvK2R0nAdG4zDTJ+6F3WOI9sAB/ongBMnzsWk=";
};
- cargoHash = "sha256-WuYAE2msctMf+7C1h5pNGyjrEInnT6PxfZ94bZhzB5w=";
+ cargoHash = "sha256-cn1jy8kQ6R+JU6w/sqcNP+uzSKKg3V4H97qnJAIESd0=";
meta = with lib; {
description = "Source code spell checker";
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tyson/default.nix b/third_party/nixpkgs/pkgs/by-name/ty/tyson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/tyson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ty/tyson/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix b/third_party/nixpkgs/pkgs/by-name/tz/tz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tz/tz/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch b/third_party/nixpkgs/pkgs/by-name/tz/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch
rename to third_party/nixpkgs/pkgs/by-name/tz/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch
diff --git a/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix b/third_party/nixpkgs/pkgs/by-name/tz/tzdata/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tz/tzdata/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/tzdata/tzdata-setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/tz/tzdata/tzdata-setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/tzdata/tzdata-setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/tz/tzdata/tzdata-setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tzupdate/default.nix b/third_party/nixpkgs/pkgs/by-name/tz/tzupdate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/tzupdate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tz/tzupdate/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/u001/default.nix b/third_party/nixpkgs/pkgs/by-name/u0/u001-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/u001/default.nix
rename to third_party/nixpkgs/pkgs/by-name/u0/u001-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/u2ps/default.nix b/third_party/nixpkgs/pkgs/by-name/u2/u2ps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/u2ps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/u2/u2ps/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/u3/u3-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/u3/u3-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/u9fs/default.nix b/third_party/nixpkgs/pkgs/by-name/u9/u9fs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/u9fs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/u9/u9fs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ua/default.nix b/third_party/nixpkgs/pkgs/by-name/ua/ua/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ua/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ua/ua/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix b/third_party/nixpkgs/pkgs/by-name/ua/uacme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ua/uacme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/uade/default.nix b/third_party/nixpkgs/pkgs/by-name/ua/uade/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/uade/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ua/uade/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/uae/default.nix b/third_party/nixpkgs/pkgs/by-name/ua/uae/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/uae/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ua/uae/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/uair/default.nix b/third_party/nixpkgs/pkgs/by-name/ua/uair/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/uair/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ua/uair/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/uarmsolver/default.nix b/third_party/nixpkgs/pkgs/by-name/ua/uarmsolver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/machine-learning/uarmsolver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ua/uarmsolver/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix b/third_party/nixpkgs/pkgs/by-name/ua/uasm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ua/uasm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix b/third_party/nixpkgs/pkgs/by-name/ub/ubertooth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ub/ubertooth/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ubi_reader/default.nix b/third_party/nixpkgs/pkgs/by-name/ub/ubi_reader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/ubi_reader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ub/ubi_reader/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix b/third_party/nixpkgs/pkgs/by-name/ub/ubuntu-themes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/ubuntu-themes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ub/ubuntu-themes/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ubus/default.nix b/third_party/nixpkgs/pkgs/by-name/ub/ubus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ubus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ub/ubus/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ucarp/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/ucarp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ucarp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uc/ucarp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/ucc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uc/ucc/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/uchess/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/uchess/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/uchess/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uc/uchess/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/uci/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/uci/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/uci/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uc/uci/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucl/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/ucl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ucl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uc/ucl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/uclient/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/uclient/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/uclient/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uc/uclient/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucommon/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/ucommon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ucommon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uc/ucommon/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/ucs-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uc/ucs-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/ucspi-tcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uc/ucspi-tcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch b/third_party/nixpkgs/pkgs/by-name/uc/ucspi-tcp/remove-setuid.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch
rename to third_party/nixpkgs/pkgs/by-name/uc/ucspi-tcp/remove-setuid.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/ucx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uc/ucx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/uddup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/uddup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/uddup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/udftools/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udftools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/udftools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udftools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch b/third_party/nixpkgs/pkgs/by-name/ud/udict/0001-update-version-in-lock-file.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch
rename to third_party/nixpkgs/pkgs/by-name/ud/udict/0001-update-version-in-lock-file.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/udict/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udict/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/udict/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udict/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/gis/udig/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/gis/udig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udig/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/udis86/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udis86/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/udis86/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udis86/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/udns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udns/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/udocker/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udocker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/udocker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udocker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/udp2raw/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udp2raw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/udp2raw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udp2raw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/udpreplay/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udpreplay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/udpreplay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udpreplay/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/udpt/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udpt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/udpt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udpt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/udptunnel/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udptunnel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/udptunnel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udptunnel/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/udpx/default.nix b/third_party/nixpkgs/pkgs/by-name/ud/udpx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/udpx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ud/udpx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/uefi-run/default.nix b/third_party/nixpkgs/pkgs/by-name/ue/uefi-run/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/uefi-run/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ue/uefi-run/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/ufiformat/default.nix b/third_party/nixpkgs/pkgs/by-name/uf/ufiformat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/ufiformat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uf/ufiformat/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/ufoai/default.nix b/third_party/nixpkgs/pkgs/by-name/uf/ufoai/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/ufoai/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uf/ufoai/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/uftp/default.nix b/third_party/nixpkgs/pkgs/by-name/uf/uftp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/uftp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uf/uftp/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ftp/uftpd/default.nix b/third_party/nixpkgs/pkgs/by-name/uf/uftpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ftp/uftpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uf/uftpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/uftrace/default.nix b/third_party/nixpkgs/pkgs/by-name/uf/uftrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/uftrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uf/uftrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix b/third_party/nixpkgs/pkgs/by-name/ug/uget-integrator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ug/uget-integrator/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/uget/default.nix b/third_party/nixpkgs/pkgs/by-name/ug/uget/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/uget/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ug/uget/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix b/third_party/nixpkgs/pkgs/by-name/ug/ugrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ug/ugrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ugs/default.nix b/third_party/nixpkgs/pkgs/by-name/ug/ugs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ugs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ug/ugs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ugtrain/default.nix b/third_party/nixpkgs/pkgs/by-name/ug/ugtrain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ugtrain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ug/ugtrain/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix b/third_party/nixpkgs/pkgs/by-name/uh/uhdm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uh/uhdm/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/uhexen2/default.nix b/third_party/nixpkgs/pkgs/by-name/uh/uhexen2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/uhexen2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uh/uhexen2/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/uh/uhk-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uh/uhk-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/uh/uhk-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/uhk-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uh/uhk-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix b/third_party/nixpkgs/pkgs/by-name/uh/uhttpmock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uh/uhttpmock/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/uhub/default.nix b/third_party/nixpkgs/pkgs/by-name/uh/uhub/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/uhub/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uh/uhub/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/uhubctl/default.nix b/third_party/nixpkgs/pkgs/by-name/uh/uhubctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/uhubctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uh/uhubctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix b/third_party/nixpkgs/pkgs/by-name/ui/uid_wrapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ui/uid_wrapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix b/third_party/nixpkgs/pkgs/by-name/ui/uif2iso/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ui/uif2iso/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/uisp/default.nix b/third_party/nixpkgs/pkgs/by-name/ui/uisp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/uisp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ui/uisp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/uivonim/default.nix b/third_party/nixpkgs/pkgs/by-name/ui/uivonim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/uivonim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ui/uivonim/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/ukmm/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/uk/ukmm/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/ukmm/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/uk/ukmm/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/games/ukmm/default.nix b/third_party/nixpkgs/pkgs/by-name/uk/ukmm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/ukmm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uk/ukmm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/fix-extensions.patch b/third_party/nixpkgs/pkgs/by-name/ul/ulauncher/fix-extensions.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ulauncher/fix-extensions.patch
rename to third_party/nixpkgs/pkgs/by-name/ul/ulauncher/fix-extensions.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/fix-path.patch b/third_party/nixpkgs/pkgs/by-name/ul/ulauncher/fix-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ulauncher/fix-path.patch
rename to third_party/nixpkgs/pkgs/by-name/ul/ulauncher/fix-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/third_party/nixpkgs/pkgs/by-name/ul/ulauncher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ul/ulauncher/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ulid/default.nix b/third_party/nixpkgs/pkgs/by-name/ul/ulid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ulid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ul/ulid/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ulogd/default.nix b/third_party/nixpkgs/pkgs/by-name/ul/ulogd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ulogd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ul/ulogd/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/third_party/nixpkgs/pkgs/by-name/ul/ultimate-oldschool-pc-font-pack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ul/ultimate-oldschool-pc-font-pack/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/ultimatestunts/default.nix b/third_party/nixpkgs/pkgs/by-name/ul/ultimatestunts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/ultimatestunts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ul/ultimatestunts/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ultrablue-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ul/ultrablue-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/ultrablue-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ul/ultrablue-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ultralist/default.nix b/third_party/nixpkgs/pkgs/by-name/ul/ultralist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ultralist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ul/ultralist/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/ultrastardx/default.nix b/third_party/nixpkgs/pkgs/by-name/ul/ultrastardx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/ultrastardx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ul/ultrastardx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/umlet/default.nix b/third_party/nixpkgs/pkgs/by-name/um/umlet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/umlet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/um/umlet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix b/third_party/nixpkgs/pkgs/by-name/um/umoci/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix
rename to third_party/nixpkgs/pkgs/by-name/um/umoci/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/hardcode-paths.patch b/third_party/nixpkgs/pkgs/by-name/um/umockdev/hardcode-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/umockdev/hardcode-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/um/umockdev/hardcode-paths.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/by-name/um/umockdev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/um/umockdev/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/substitute-udevadm.patch b/third_party/nixpkgs/pkgs/by-name/um/umockdev/substitute-udevadm.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/umockdev/substitute-udevadm.patch
rename to third_party/nixpkgs/pkgs/by-name/um/umockdev/substitute-udevadm.patch
diff --git a/third_party/nixpkgs/pkgs/games/umoria/default.nix b/third_party/nixpkgs/pkgs/by-name/um/umoria/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/umoria/default.nix
rename to third_party/nixpkgs/pkgs/by-name/um/umoria/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/misc/umr/default.nix b/third_party/nixpkgs/pkgs/by-name/um/umr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/misc/umr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/um/umr/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ums/default.nix b/third_party/nixpkgs/pkgs/by-name/um/ums/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ums/default.nix
rename to third_party/nixpkgs/pkgs/by-name/um/ums/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix b/third_party/nixpkgs/pkgs/by-name/um/umurmur/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix
rename to third_party/nixpkgs/pkgs/by-name/um/umurmur/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unclutter-xfixes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unclutter-xfixes/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/unclutter/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unclutter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/unclutter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unclutter/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/unconvert/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unconvert/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/unconvert/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unconvert/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/uncover/default.nix b/third_party/nixpkgs/pkgs/by-name/un/uncover/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/uncover/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/uncover/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/third_party/nixpkgs/pkgs/by-name/un/uncrustify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/uncrustify/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/undaemonize/default.nix b/third_party/nixpkgs/pkgs/by-name/un/undaemonize/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/undaemonize/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/undaemonize/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix b/third_party/nixpkgs/pkgs/by-name/un/undefined-medium/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/undefined-medium/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix b/third_party/nixpkgs/pkgs/by-name/un/undervolt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/undervolt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/undervolt/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/bash/undistract-me/default.nix b/third_party/nixpkgs/pkgs/by-name/un/undistract-me/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/bash/undistract-me/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/undistract-me/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/undmg/default.nix b/third_party/nixpkgs/pkgs/by-name/un/undmg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/undmg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/undmg/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/undmg/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/un/undmg/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/undmg/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/un/undmg/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/tools/misc/undocker/default.nix b/third_party/nixpkgs/pkgs/by-name/un/undocker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/undocker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/undocker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/unflac/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unflac/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/unflac/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unflac/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/unfonts-core/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unfonts-core/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/unfonts-core/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unfonts-core/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/unfs3/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unfs3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/unfs3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unfs3/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/unfurl/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unfurl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/unfurl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unfurl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ungit/default.nix b/third_party/nixpkgs/pkgs/by-name/un/ungit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/ungit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/ungit/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/uni-vga/default.nix b/third_party/nixpkgs/pkgs/by-name/un/uni-vga/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/uni-vga/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/uni-vga/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/uni/default.nix b/third_party/nixpkgs/pkgs/by-name/un/uni/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/uni/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/uni/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/uni2ascii/default.nix b/third_party/nixpkgs/pkgs/by-name/un/uni2ascii/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/uni2ascii/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/uni2ascii/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/unibilium/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unibilium/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/unibilium/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unibilium/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/unicap/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unicap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/unicap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unicap/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unicode-character-database/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unicode-character-database/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unicode-emoji/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unicode-emoji/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/unicode/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unicode-paracode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/unicode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unicode-paracode/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unicon-lang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unicon-lang/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unifdef/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unifdef/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unifi-protect-backup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unifi-protect-backup/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unifont/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unifont/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unifont_upper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unifont_upper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/unigine-heaven/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unigine-heaven/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/unigine-heaven/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unigine-heaven/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unigine-valley/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unigine-valley/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/unihan-database/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unihan-database/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/unihan-database/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unihan-database/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unionfs-fuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unionfs-fuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch b/third_party/nixpkgs/pkgs/by-name/un/unionfs-fuse/prevent-kill-on-shutdown.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch
rename to third_party/nixpkgs/pkgs/by-name/un/unionfs-fuse/prevent-kill-on-shutdown.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unison-ucm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/unison/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unison-ucm/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/unit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unit/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unittest-cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unittest-cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/unixODBC/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unixODBC/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/unixODBC/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unixODBC/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/unixbench/common.patch b/third_party/nixpkgs/pkgs/by-name/un/unixbench/common.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/unixbench/common.patch
rename to third_party/nixpkgs/pkgs/by-name/un/unixbench/common.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/unixbench/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unixbench/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/unixbench/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unixbench/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unnaturalscrollwheels/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unnaturalscrollwheels/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/unnethack/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unnethack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/unnethack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unnethack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/unoconv/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unoconv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/unoconv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unoconv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unp/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unpaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unpaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/unparam/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unparam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/unparam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unparam/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/unpfs/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unpfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/unpfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unpfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unpoller/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unpoller/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/unrtf/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unrtf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/unrtf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unrtf/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch b/third_party/nixpkgs/pkgs/by-name/un/unscd/0001-adjust-socket-paths-for-nixos.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch
rename to third_party/nixpkgs/pkgs/by-name/un/unscd/0001-adjust-socket-paths-for-nixos.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/unscd/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unscd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/unscd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unscd/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/unscii/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unscii/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/unscii/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unscii/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unshield/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unshield/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unshield/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unshield/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/unstick/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unstick/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/unstick/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unstick/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/untex/default.nix b/third_party/nixpkgs/pkgs/by-name/un/untex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/untex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/untex/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/untie/default.nix b/third_party/nixpkgs/pkgs/by-name/un/untie/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/untie/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/untie/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/untrunc-anthwlock/default.nix b/third_party/nixpkgs/pkgs/by-name/un/untrunc-anthwlock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/untrunc-anthwlock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/untrunc-anthwlock/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/unused/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unused/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/unused/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unused/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/unvanquished/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unvanquished/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/unvanquished/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unvanquished/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8139.diff b/third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2014-8139.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8139.diff
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2014-8139.diff
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8140.diff b/third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2014-8140.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8140.diff
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2014-8140.diff
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8141.diff b/third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2014-8141.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-8141.diff
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2014-8141.diff
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-9636.diff b/third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2014-9636.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-9636.diff
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2014-9636.diff
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-9913.patch b/third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2014-9913.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2014-9913.patch
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2014-9913.patch
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2015-7696.diff b/third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2015-7696.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2015-7696.diff
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2015-7696.diff
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2015-7697.diff b/third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2015-7697.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2015-7697.diff
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2015-7697.diff
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2016-9844.patch b/third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2016-9844.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2016-9844.patch
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2016-9844.patch
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2018-18384.patch b/third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2018-18384.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/CVE-2018-18384.patch
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/CVE-2018-18384.patch
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch b/third_party/nixpkgs/pkgs/by-name/un/unzip/dont-hardcode-cc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/dont-hardcode-cc.patch
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/implicit-declarations-fix.patch b/third_party/nixpkgs/pkgs/by-name/un/unzip/implicit-declarations-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/implicit-declarations-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/implicit-declarations-fix.patch
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unzip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/un/unzip/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/unzip/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/un/unzip/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/tools/compression/unzrip/default.nix b/third_party/nixpkgs/pkgs/by-name/un/unzrip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/unzrip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/un/unzrip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/up/default.nix b/third_party/nixpkgs/pkgs/by-name/up/up/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/up/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/up/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/default.nix b/third_party/nixpkgs/pkgs/by-name/up/update-python-libraries/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/update-python-libraries/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/third_party/nixpkgs/pkgs/by-name/up/update-python-libraries/update-python-libraries.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
rename to third_party/nixpkgs/pkgs/by-name/up/update-python-libraries/update-python-libraries.py
diff --git a/third_party/nixpkgs/pkgs/development/libraries/updfparser/default.nix b/third_party/nixpkgs/pkgs/by-name/up/updfparser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/updfparser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/updfparser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/updog/default.nix b/third_party/nixpkgs/pkgs/by-name/up/updog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/updog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/updog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix b/third_party/nixpkgs/pkgs/by-name/up/upnp-router-control/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/upnp-router-control/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/upower/i686-test-remove-battery-check.patch b/third_party/nixpkgs/pkgs/by-name/up/upower/i686-test-remove-battery-check.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/upower/i686-test-remove-battery-check.patch
rename to third_party/nixpkgs/pkgs/by-name/up/upower/i686-test-remove-battery-check.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/upower/installed-tests-path.patch b/third_party/nixpkgs/pkgs/by-name/up/upower/installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/upower/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/by-name/up/upower/installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix b/third_party/nixpkgs/pkgs/by-name/up/upower/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/upower/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/upspin/default.nix b/third_party/nixpkgs/pkgs/by-name/up/upspin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/upspin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/upspin/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix b/third_party/nixpkgs/pkgs/by-name/up/upterm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/upterm/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/fix-database-permissions.patch b/third_party/nixpkgs/pkgs/by-name/up/uptime-kuma/fix-database-permissions.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/fix-database-permissions.patch
rename to third_party/nixpkgs/pkgs/by-name/up/uptime-kuma/fix-database-permissions.patch
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix b/third_party/nixpkgs/pkgs/by-name/up/uptime-kuma/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/uptime-kuma/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/uptimed/no-var-spool-install.patch b/third_party/nixpkgs/pkgs/by-name/up/uptimed/no-var-spool-install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/uptimed/no-var-spool-install.patch
rename to third_party/nixpkgs/pkgs/by-name/up/uptimed/no-var-spool-install.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix b/third_party/nixpkgs/pkgs/by-name/up/uptimed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/uptimed/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix b/third_party/nixpkgs/pkgs/by-name/up/upwork/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/upwork/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/upx/default.nix b/third_party/nixpkgs/pkgs/by-name/up/upx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/upx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/up/upx/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/uq/default.nix b/third_party/nixpkgs/pkgs/by-name/uq/uq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/uq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uq/uq/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/uqm/3dovideo.nix b/third_party/nixpkgs/pkgs/by-name/uq/uqm/3dovideo.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/uqm/3dovideo.nix
rename to third_party/nixpkgs/pkgs/by-name/uq/uqm/3dovideo.nix
diff --git a/third_party/nixpkgs/pkgs/games/uqm/default.nix b/third_party/nixpkgs/pkgs/by-name/uq/uqm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/uqm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uq/uqm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/uqmi/default.nix b/third_party/nixpkgs/pkgs/by-name/uq/uqmi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/uqmi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uq/uqmi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/backup/urbackup-client/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urbackup-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/urbackup-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urbackup-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/urbanterror/Makefile.local b/third_party/nixpkgs/pkgs/by-name/ur/urbanterror/Makefile.local
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/urbanterror/Makefile.local
rename to third_party/nixpkgs/pkgs/by-name/ur/urbanterror/Makefile.local
diff --git a/third_party/nixpkgs/pkgs/games/urbanterror/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urbanterror/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/urbanterror/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urbanterror/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/urdfdom-headers/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urdfdom-headers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/urdfdom-headers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urdfdom-headers/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/urdfdom/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urdfdom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/urdfdom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urdfdom/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/urh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/uri/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/uri/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/uri/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/uri/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/uriparser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/uriparser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/url-parser/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/url-parser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/url-parser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/url-parser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/urlencode/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urlencode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/urlencode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urlencode/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/urlhunter/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urlhunter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/urlhunter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urlhunter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urlscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urlscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urlwatch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urlwatch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/urn-timer/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urn-timer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/urn-timer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urn-timer/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/urn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/uroboros/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/uroboros/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/uroboros/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/uroboros/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ursadb/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/ursadb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ursadb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/ursadb/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/urserver/default.nix b/third_party/nixpkgs/pkgs/by-name/ur/urserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/urserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ur/urserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usb-blaster-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usb-blaster-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules b/third_party/nixpkgs/pkgs/by-name/us/usb-blaster-udev-rules/usb-blaster.rules
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules
rename to third_party/nixpkgs/pkgs/by-name/us/usb-blaster-udev-rules/usb-blaster.rules
diff --git a/third_party/nixpkgs/pkgs/applications/misc/usb-reset/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usb-reset/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/usb-reset/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usb-reset/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbguard-notifier/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbguard-notifier/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/usbguard-notifier/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbguard-notifier/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbguard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbguard/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbimager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbimager/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/usbmuxd/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbmuxd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/usbmuxd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbmuxd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/usbmuxd2/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbmuxd2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/usbmuxd2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbmuxd2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbredir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbredir/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/usbrip/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbrip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/usbrip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbrip/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/usbsdmux/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbsdmux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/usbsdmux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbsdmux/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbtop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbtop/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbutils/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/us/usbutils/fix-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/usbutils/fix-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/us/usbutils/fix-paths.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbutils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbutils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/usbview/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usbview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/usbview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usbview/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/userhosts/default.nix b/third_party/nixpkgs/pkgs/by-name/us/userhosts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/userhosts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/userhosts/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usermount/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usermount/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/usermount/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usermount/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/usrsctp/clang-fix-build.patch b/third_party/nixpkgs/pkgs/by-name/us/usrsctp/clang-fix-build.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/usrsctp/clang-fix-build.patch
rename to third_party/nixpkgs/pkgs/by-name/us/usrsctp/clang-fix-build.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/usrsctp/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usrsctp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/usrsctp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usrsctp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix b/third_party/nixpkgs/pkgs/by-name/us/ustreamer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/ustreamer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/usync/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usync/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/usync/default.nix
rename to third_party/nixpkgs/pkgs/by-name/us/usync/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/ut/utf8cpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ut/utf8cpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/third_party/nixpkgs/pkgs/by-name/ut/utf8proc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ut/utf8proc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/uthash/default.nix b/third_party/nixpkgs/pkgs/by-name/ut/uthash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/uthash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ut/uthash/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/uthenticode/default.nix b/third_party/nixpkgs/pkgs/by-name/ut/uthenticode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/uthenticode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ut/uthenticode/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/by-name/ut/util-linux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ut/util-linux/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/third_party/nixpkgs/pkgs/by-name/ut/util-linux/rtcwake-search-PATH-for-shutdown.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
rename to third_party/nixpkgs/pkgs/by-name/ut/util-linux/rtcwake-search-PATH-for-shutdown.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix b/third_party/nixpkgs/pkgs/by-name/ut/utm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ut/utm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix b/third_party/nixpkgs/pkgs/by-name/ut/utox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ut/utox/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix b/third_party/nixpkgs/pkgs/by-name/ut/utterly-round-plasma-style/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ut/utterly-round-plasma-style/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/uucp/default.nix b/third_party/nixpkgs/pkgs/by-name/uu/uucp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/uucp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uu/uucp/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/uudeview/matherr.patch b/third_party/nixpkgs/pkgs/by-name/uu/uudeview/matherr.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/uudeview/matherr.patch
rename to third_party/nixpkgs/pkgs/by-name/uu/uudeview/matherr.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/uudeview/default.nix b/third_party/nixpkgs/pkgs/by-name/uu/uudeview/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/uudeview/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uu/uudeview/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/uvccapture/default.nix b/third_party/nixpkgs/pkgs/by-name/uv/uvccapture/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/uvccapture/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uv/uvccapture/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix b/third_party/nixpkgs/pkgs/by-name/uv/uvcdynctrl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uv/uvcdynctrl/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/uw-ttyp0/determinism.patch b/third_party/nixpkgs/pkgs/by-name/uw/uw-ttyp0/determinism.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/uw-ttyp0/determinism.patch
rename to third_party/nixpkgs/pkgs/by-name/uw/uw-ttyp0/determinism.patch
diff --git a/third_party/nixpkgs/pkgs/data/fonts/uw-ttyp0/default.nix b/third_party/nixpkgs/pkgs/by-name/uw/uw-ttyp0/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/uw-ttyp0/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uw/uw-ttyp0/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/uwc/default.nix b/third_party/nixpkgs/pkgs/by-name/uw/uwc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/uwc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uw/uwc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/uwimap/clang-fix.patch b/third_party/nixpkgs/pkgs/by-name/uw/uwimap/clang-fix.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/uwimap/clang-fix.patch
rename to third_party/nixpkgs/pkgs/by-name/uw/uwimap/clang-fix.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/uwimap/default.nix b/third_party/nixpkgs/pkgs/by-name/uw/uwimap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/uwimap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uw/uwimap/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/additional-php-ldflags.patch b/third_party/nixpkgs/pkgs/by-name/uw/uwsgi/additional-php-ldflags.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/uwsgi/additional-php-ldflags.patch
rename to third_party/nixpkgs/pkgs/by-name/uw/uwsgi/additional-php-ldflags.patch
diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/nixos.ini b/third_party/nixpkgs/pkgs/by-name/uw/uwsgi/nixos.ini
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/uwsgi/nixos.ini
rename to third_party/nixpkgs/pkgs/by-name/uw/uwsgi/nixos.ini
diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch b/third_party/nixpkgs/pkgs/by-name/uw/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
rename to third_party/nixpkgs/pkgs/by-name/uw/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix b/third_party/nixpkgs/pkgs/by-name/uw/uwsgi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/uwsgi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uw/uwsgi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/uwufetch/default.nix b/third_party/nixpkgs/pkgs/by-name/uw/uwufetch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/uwufetch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uw/uwufetch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix b/third_party/nixpkgs/pkgs/by-name/uw/uwuify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/uw/uwuify/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/third_party/nixpkgs/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix
rename to third_party/nixpkgs/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix b/third_party/nixpkgs/pkgs/by-name/v2/v2ray-geoip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/v2/v2ray-geoip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/third_party/nixpkgs/pkgs/by-name/v2/v2ray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/v2/v2ray/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2raya/default.nix b/third_party/nixpkgs/pkgs/by-name/v2/v2raya/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/v2raya/default.nix
rename to third_party/nixpkgs/pkgs/by-name/v2/v2raya/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/v4l2-relayd/default.nix b/third_party/nixpkgs/pkgs/by-name/v4/v4l2-relayd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/v4l2-relayd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/v4/v4l2-relayd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/v4l2-relayd/upstream-v4l2loopback-compatibility.patch b/third_party/nixpkgs/pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/v4l2-relayd/upstream-v4l2loopback-compatibility.patch
rename to third_party/nixpkgs/pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/third_party/nixpkgs/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
rename to third_party/nixpkgs/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/third_party/nixpkgs/pkgs/by-name/va/vagrant/0004-Support-system-installed-plugins.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch
rename to third_party/nixpkgs/pkgs/by-name/va/vagrant/0004-Support-system-installed-plugins.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix b/third_party/nixpkgs/pkgs/by-name/va/vagrant/gemset.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vagrant/gemset.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix b/third_party/nixpkgs/pkgs/by-name/va/vagrant/gemset_libvirt.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vagrant/gemset_libvirt.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vagrant/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vagrant/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/third_party/nixpkgs/pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch
rename to third_party/nixpkgs/pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/third_party/nixpkgs/pkgs/by-name/va/vagrant/use-system-bundler-version.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch
rename to third_party/nixpkgs/pkgs/by-name/va/vagrant/use-system-bundler-version.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/vagrant-libvirt.json.in b/third_party/nixpkgs/pkgs/by-name/va/vagrant/vagrant-libvirt.json.in
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vagrant/vagrant-libvirt.json.in
rename to third_party/nixpkgs/pkgs/by-name/va/vagrant/vagrant-libvirt.json.in
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/vala-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vala-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/vala-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vala-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vala-lint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vala-lint/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/va/vale/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vale/package.nix
index 4ece69a6f1..7a849967fe 100644
--- a/third_party/nixpkgs/pkgs/by-name/va/vale/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/va/vale/package.nix
@@ -10,7 +10,7 @@
buildGoModule rec {
pname = "vale";
- version = "3.8.0";
+ version = "3.9.0";
subPackages = [ "cmd/vale" ];
@@ -18,7 +18,7 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
- hash = "sha256-0opa8F0cpC0uh51JDgofxl6e0oecxgkEufnLfxtkaOw=";
+ hash = "sha256-4zDngF2K6Fsn/Ml4rhHQxDXOD7meXePoqZ9+XPrHO0g=";
};
vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk=";
diff --git a/third_party/nixpkgs/pkgs/tools/text/validator-nu/default.nix b/third_party/nixpkgs/pkgs/by-name/va/validator-nu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/validator-nu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/validator-nu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/vals/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vals/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/vals/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vals/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/valum/default.nix b/third_party/nixpkgs/pkgs/by-name/va/valum/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/valum/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/valum/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vamp-plugin-sdk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vamp-plugin-sdk/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vanilla-dmz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vanilla-dmz/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/varscan/default.nix b/third_party/nixpkgs/pkgs/by-name/va/varscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/varscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/varscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vassal/package.nix
similarity index 93%
rename from third_party/nixpkgs/pkgs/games/vassal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vassal/package.nix
index 4b68bc53d0..a15c581ffc 100644
--- a/third_party/nixpkgs/pkgs/games/vassal/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/va/vassal/package.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "VASSAL";
- version = "3.7.14";
+ version = "3.7.15";
src = fetchzip {
url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2";
- sha256 = "sha256-3P3f6X2c5lF1AizEs9z59MhLy0Ntg203rkPAkv+SBtw=";
+ sha256 = "sha256-eFFzUssElsLkCLgbojF6VQ8hzn15NYljBH/I7k98LMk=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/security/vault-medusa/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vault-medusa/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/vault-medusa/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vault-medusa/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/vault-ssh-plus/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vault-ssh-plus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/vault-ssh-plus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vault-ssh-plus/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vazir-code-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vazir-code-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/va/vazir-fonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/va/vazir-fonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix b/third_party/nixpkgs/pkgs/by-name/vb/vbam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vb/vbam/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/vbetool/default.nix b/third_party/nixpkgs/pkgs/by-name/vb/vbetool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/vbetool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vb/vbetool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vbindiff/default.nix b/third_party/nixpkgs/pkgs/by-name/vb/vbindiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/vbindiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vb/vbindiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/vboot_reference/default.nix b/third_party/nixpkgs/pkgs/by-name/vb/vboot_reference/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/vboot_reference/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vb/vboot_reference/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/vcal/default.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/vcal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vc/vcal/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vcdimager/default.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcdimager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vcdimager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vc/vcdimager/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcftools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vc/vcftools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vc/vcg/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/vcs/fonts.patch b/third_party/nixpkgs/pkgs/by-name/vc/vcs/fonts.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/vcs/fonts.patch
rename to third_party/nixpkgs/pkgs/by-name/vc/vcs/fonts.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/vcs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vc/vcs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vcs_query/default.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcs_query/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vcs_query/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vc/vcs_query/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/vcsh/default.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/vcsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vc/vcsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/vcsi/default.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcsi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/vcsi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vc/vcsi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcstool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vc/vcstool/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcv-rack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vc/vcv-rack/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/third_party/nixpkgs/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
rename to third_party/nixpkgs/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/vde2/default.nix b/third_party/nixpkgs/pkgs/by-name/vd/vde2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/vde2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vd/vde2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/backup/vdmfec/default.nix b/third_party/nixpkgs/pkgs/by-name/vd/vdmfec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/backup/vdmfec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vd/vdmfec/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/vdo/default.nix b/third_party/nixpkgs/pkgs/by-name/vd/vdo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/vdo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vd/vdo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/vdpauinfo/default.nix b/third_party/nixpkgs/pkgs/by-name/vd/vdpauinfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/vdpauinfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vd/vdpauinfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch b/third_party/nixpkgs/pkgs/by-name/vd/vdrift/0001-Ignore-missing-data-for-installation.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch
rename to third_party/nixpkgs/pkgs/by-name/vd/vdrift/0001-Ignore-missing-data-for-installation.patch
diff --git a/third_party/nixpkgs/pkgs/games/vdrift/default.nix b/third_party/nixpkgs/pkgs/by-name/vd/vdrift/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/vdrift/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vd/vdrift/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix b/third_party/nixpkgs/pkgs/by-name/vd/vdrsymbols/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vd/vdrsymbols/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/vectoroids/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/vectoroids/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/vectoroids/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/vectoroids/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vectorscan/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/vectorscan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vectorscan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/vectorscan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/vegeta/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/vegeta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/vegeta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/vegeta/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vegur/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/vegur/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vegur/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/vegur/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vendir/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/vendir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vendir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/vendir/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/venta/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/venta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/venta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/venta/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/verbiste/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/verbiste/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/verbiste/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/verbiste/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/verco/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/verco/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/verifast/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/verifast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/verifast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/verifast/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/verilator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/verilator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/versus/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/versus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/versus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/versus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/veryfasttree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/veryfasttree/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/vexctl/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/vexctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/vexctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/vexctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix b/third_party/nixpkgs/pkgs/by-name/vg/vgmplay-libvgm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vg/vgmplay-libvgm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/vgmtools/default.nix b/third_party/nixpkgs/pkgs/by-name/vg/vgmtools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/vgmtools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vg/vgmtools/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/vg/vgmtrans/package.nix b/third_party/nixpkgs/pkgs/by-name/vg/vgmtrans/package.nix
new file mode 100644
index 0000000000..8feb722e11
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/vg/vgmtrans/package.nix
@@ -0,0 +1,74 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ fetchpatch2,
+ cmake,
+ ninja,
+ qt6,
+ spdlog,
+ zlib-ng,
+ minizip-ng,
+ libbass,
+ libbassmidi,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "vgmtrans";
+ version = "1.2";
+
+ src = fetchFromGitHub {
+ owner = "vgmtrans";
+ repo = "vgmtrans";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-HVC45B1DFThZRkPVrroiay+9ufkOrTMUZoNIuC1CjjM=";
+ };
+
+ patches = [
+ # https://github.com/vgmtrans/vgmtrans/pull/567
+ (fetchpatch2 {
+ name = "fix-version-string.patch";
+ url = "https://github.com/vgmtrans/vgmtrans/commit/5ad8a60a19476d2ae9a7c409b83ab6d5e1ff827f.patch?full_index=1";
+ hash = "sha256-I5ykYzj3tUBQ2e3TAnCm5Ry1Hmmi2IVneFQCe5/JV/A=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ qt6.wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ qt6.qtbase
+ qt6.qtsvg
+ libbass
+ libbassmidi
+ ];
+
+ preConfigure = ''
+ rm -r lib/{spdlog,zlib-ng,minizip-ng}
+ ln -s ${spdlog.src} lib/spdlog
+ ln -s ${zlib-ng.src} lib/zlib-ng
+ ln -s ${minizip-ng.src} lib/minizip-ng
+ '';
+
+ meta = {
+ description = "Tool to convert proprietary, sequenced videogame music to industry-standard formats";
+ homepage = "https://github.com/vgmtrans/vgmtrans";
+ license = with lib.licenses; [
+ zlib
+ libpng
+ bsd3 # oki_adpcm_state
+ ];
+ # See CMakePresets.json
+ platforms = [
+ "x86_64-linux"
+ "x86_64-darwin"
+ "aarch64-darwin"
+ "x86_64-windows"
+ "aarch64-windows"
+ ];
+ maintainers = with lib.maintainers; [ pluiedev ];
+ mainProgram = "vgmtrans";
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix b/third_party/nixpkgs/pkgs/by-name/vg/vgrep/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vg/vgrep/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix b/third_party/nixpkgs/pkgs/by-name/vh/vhd2vl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vh/vhd2vl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/third_party/nixpkgs/pkgs/by-name/vh/vhdl-ls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/vhdl-ls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vh/vhdl-ls/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix b/third_party/nixpkgs/pkgs/by-name/vh/vhs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vh/vhs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/via/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/via/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/via/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/via/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vial/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vial/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vial/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vial/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vice/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/victor-mono/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/victor-mono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/victor-mono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/victor-mono/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/viennarna/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/viennarna/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/viennarna/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/viennarna/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/viewnior/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/viewnior/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/vifm/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vifm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/vifm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vifm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/viking/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/viking/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/viking/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vim-vint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vim-vint/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vimb-unwrapped/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vimb-unwrapped/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vimer/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vimer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vimer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vimer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vimiv-qt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vimiv-qt/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/vimix-cursor-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vimix-cursor-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/vimix-cursor-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vimix-cursor-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vimix-gtk-themes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/vimix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vimix-gtk-themes/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vimix-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vimix-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/vimpc/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vimpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/vimpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vimpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vimv-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vimv-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vimv-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vimv-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vimv/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vimv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vimv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vimv/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vintagestory/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/vintagestory/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vintagestory/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/viper4linux/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/viper4linux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/viper4linux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/viper4linux/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vipsdisp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vipsdisp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/virglrenderer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/virglrenderer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/virt-viewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/virt-viewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/virt-what/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/virt-what/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virter/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/virter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/virter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/virter/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/virtiofsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/virtiofsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/virtual-ans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/virtual-ans/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/virtualpg/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/virtualpg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/virtualpg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/virtualpg/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/no-op.conf b/third_party/nixpkgs/pkgs/by-name/vi/vistafonts-chs/no-op.conf
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/no-op.conf
rename to third_party/nixpkgs/pkgs/by-name/vi/vistafonts-chs/no-op.conf
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vistafonts-chs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vistafonts-chs/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-cht/no-op.conf b/third_party/nixpkgs/pkgs/by-name/vi/vistafonts-cht/no-op.conf
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vista-fonts-cht/no-op.conf
rename to third_party/nixpkgs/pkgs/by-name/vi/vistafonts-cht/no-op.conf
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-cht/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vistafonts-cht/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vista-fonts-cht/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vistafonts-cht/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts/no-op.conf b/third_party/nixpkgs/pkgs/by-name/vi/vistafonts/no-op.conf
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vista-fonts/no-op.conf
rename to third_party/nixpkgs/pkgs/by-name/vi/vistafonts/no-op.conf
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vistafonts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vistafonts/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/visualvm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/visualvm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/vit/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/vit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/vital/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vital/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/vital/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vital/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vitess/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vitess/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/vitetris/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vitetris/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/vitetris/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vitetris/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/viu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/viu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vivid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vivid/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vix/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vi/vix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vk-bootstrap/default.nix b/third_party/nixpkgs/pkgs/by-name/vk/vk-bootstrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vk-bootstrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vk/vk-bootstrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/vk/vk-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vk/vk-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/third_party/nixpkgs/pkgs/by-name/vk/vk-messenger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vk/vk-messenger/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vkbasalt-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/vk/vkbasalt-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/vkbasalt-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vk/vkbasalt-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vkdisplayinfo/default.nix b/third_party/nixpkgs/pkgs/by-name/vk/vkdisplayinfo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/vkdisplayinfo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vk/vkdisplayinfo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vkdt/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/vk/vkdt/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/vkdt/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/vk/vkdt/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vkdt/default.nix b/third_party/nixpkgs/pkgs/by-name/vk/vkdt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/vkdt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vk/vkdt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/vkeybd/default.nix b/third_party/nixpkgs/pkgs/by-name/vk/vkeybd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/vkeybd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vk/vkeybd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vkmark/default.nix b/third_party/nixpkgs/pkgs/by-name/vk/vkmark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/vkmark/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vk/vkmark/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/vlan/default.nix b/third_party/nixpkgs/pkgs/by-name/vl/vlan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/vlan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vl/vlan/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix b/third_party/nixpkgs/pkgs/by-name/vl/vlang/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vl/vlang/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/vlock/eintr.patch b/third_party/nixpkgs/pkgs/by-name/vl/vlock/eintr.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/vlock/eintr.patch
rename to third_party/nixpkgs/pkgs/by-name/vl/vlock/eintr.patch
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/vlock/default.nix b/third_party/nixpkgs/pkgs/by-name/vl/vlock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/vlock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vl/vlock/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/vmfs-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/vm/vmfs-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/vmfs-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vm/vmfs-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vmime/default.nix b/third_party/nixpkgs/pkgs/by-name/vm/vmime/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vmime/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vm/vmime/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vmtouch/default.nix b/third_party/nixpkgs/pkgs/by-name/vm/vmtouch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vmtouch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vm/vmtouch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/default.nix b/third_party/nixpkgs/pkgs/by-name/vm/vmware-workstation/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vm/vmware-workstation/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap b/third_party/nixpkgs/pkgs/by-name/vm/vmware-workstation/vmware-bootstrap
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap
rename to third_party/nixpkgs/pkgs/by-name/vm/vmware-workstation/vmware-bootstrap
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/vmware-config b/third_party/nixpkgs/pkgs/by-name/vm/vmware-workstation/vmware-config
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/vmware-config
rename to third_party/nixpkgs/pkgs/by-name/vm/vmware-workstation/vmware-config
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap b/third_party/nixpkgs/pkgs/by-name/vm/vmware-workstation/vmware-installer-bootstrap
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap
rename to third_party/nixpkgs/pkgs/by-name/vm/vmware-workstation/vmware-installer-bootstrap
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig b/third_party/nixpkgs/pkgs/by-name/vm/vmware-workstation/vmware-modconfig
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig
rename to third_party/nixpkgs/pkgs/by-name/vm/vmware-workstation/vmware-modconfig
diff --git a/third_party/nixpkgs/pkgs/tools/video/vncrec/default.nix b/third_party/nixpkgs/pkgs/by-name/vn/vncrec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/vncrec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vn/vncrec/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix b/third_party/nixpkgs/pkgs/by-name/vn/vnstat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vn/vnstat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vo-aacenc/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vo-aacenc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vo-aacenc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vo-aacenc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vo-amrwbenc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vo-amrwbenc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vobcopy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vobcopy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vobsub2srt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vobsub2srt/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vocal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vocal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/vocproc/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vocproc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/vocproc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vocproc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/void/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/void/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/void/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/void/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/volantes-cursors/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/volantes-cursors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/volantes-cursors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/volantes-cursors/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/volatility3/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/volatility3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/volatility3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/volatility3/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/volctl/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/volctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/volctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/volctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vollkorn/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vollkorn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/vollkorn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vollkorn/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/volnoti/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/volnoti/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/volta/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/vo/volta/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/volta/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/vo/volta/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/volta/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/volta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/volta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/volta/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/volume_key/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/volume_key/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/volumeicon/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/volumeicon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/volumeicon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/volumeicon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/vopono/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vopono/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/vopono/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vopono/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vorbisgain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vorbisgain/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vouch-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vouch-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/vowpal-wabbit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/vowpal-wabbit/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/voxelands/default.nix b/third_party/nixpkgs/pkgs/by-name/vo/voxelands/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/voxelands/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vo/voxelands/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix b/third_party/nixpkgs/pkgs/by-name/vp/vpnc-scripts/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vp/vpnc-scripts/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/vpnc/default.nix b/third_party/nixpkgs/pkgs/by-name/vp/vpnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/vpnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vp/vpnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix b/third_party/nixpkgs/pkgs/by-name/vp/vpv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vp/vpv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vrb/default.nix b/third_party/nixpkgs/pkgs/by-name/vr/vrb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vrb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vr/vrb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vrb/removed_options.patch b/third_party/nixpkgs/pkgs/by-name/vr/vrb/removed_options.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vrb/removed_options.patch
rename to third_party/nixpkgs/pkgs/by-name/vr/vrb/removed_options.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vrb/unused-but-set-variable.patch b/third_party/nixpkgs/pkgs/by-name/vr/vrb/unused-but-set-variable.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vrb/unused-but-set-variable.patch
rename to third_party/nixpkgs/pkgs/by-name/vr/vrb/unused-but-set-variable.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vrpn/default.nix b/third_party/nixpkgs/pkgs/by-name/vr/vrpn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vrpn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vr/vrpn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/vrrtest/default.nix b/third_party/nixpkgs/pkgs/by-name/vr/vrrtest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/vrrtest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vr/vrrtest/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vsc-leetcode-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/vs/vsc-leetcode-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vsc-leetcode-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vs/vsc-leetcode-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/third_party/nixpkgs/pkgs/by-name/vs/vscode-langservers-extracted/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vs/vscode-langservers-extracted/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch b/third_party/nixpkgs/pkgs/by-name/vs/vsftpd/CVE-2015-1419.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch
rename to third_party/nixpkgs/pkgs/by-name/vs/vsftpd/CVE-2015-1419.patch
diff --git a/third_party/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix b/third_party/nixpkgs/pkgs/by-name/vs/vsftpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vs/vsftpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vsh/default.nix b/third_party/nixpkgs/pkgs/by-name/vs/vsh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vsh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vs/vsh/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vsqlite/default.nix b/third_party/nixpkgs/pkgs/by-name/vs/vsqlite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vsqlite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vs/vsqlite/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/vt-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/vt/vt-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/vt-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vt/vt-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix b/third_party/nixpkgs/pkgs/by-name/vt/vtable-dumper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vt/vtable-dumper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix b/third_party/nixpkgs/pkgs/by-name/vt/vte/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vte/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vt/vte/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix b/third_party/nixpkgs/pkgs/by-name/vt/vtm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vt/vtm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix b/third_party/nixpkgs/pkgs/by-name/vt/vttest/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vt/vttest/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/vue/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vue/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/vue/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vue/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/vul/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vul/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/vul/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vul/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vulkan-extension-layer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vulkan-extension-layer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-helper/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vulkan-helper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/vulkan-helper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vulkan-helper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/third_party/nixpkgs/pkgs/by-name/vu/vulkan-loader/fix-pkgconfig.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch
rename to third_party/nixpkgs/pkgs/by-name/vu/vulkan-loader/fix-pkgconfig.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vulkan-loader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vulkan-loader/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vulkan-validation-layers/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vulkan-validation-layers/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix b/third_party/nixpkgs/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vulnix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vulnix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vultr-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vultr-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr/default.nix b/third_party/nixpkgs/pkgs/by-name/vu/vultr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/vultr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vu/vultr/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/vwm/default.nix b/third_party/nixpkgs/pkgs/by-name/vw/vwm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/vwm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vw/vwm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix b/third_party/nixpkgs/pkgs/by-name/vx/vxl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vx/vxl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch b/third_party/nixpkgs/pkgs/by-name/w3/w3m/RAND_egd.libressl.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch
rename to third_party/nixpkgs/pkgs/by-name/w3/w3m/RAND_egd.libressl.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix b/third_party/nixpkgs/pkgs/by-name/w3/w3m/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix
rename to third_party/nixpkgs/pkgs/by-name/w3/w3m/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/w_scan/default.nix b/third_party/nixpkgs/pkgs/by-name/w_/w_scan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/w_scan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/w_/w_scan/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/w_scan2/default.nix b/third_party/nixpkgs/pkgs/by-name/w_/w_scan2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/w_scan2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/w_/w_scan2/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wabt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wabt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wabt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/wad/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/wad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wad/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/waf-tester/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waf-tester/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/waf-tester/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/waf-tester/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waffle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/waffle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/wafw00f/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wafw00f/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/wafw00f/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wafw00f/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/waitron/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waitron/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/waitron/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/waitron/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch b/third_party/nixpkgs/pkgs/by-name/wa/waitron/staticfiles-directory.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch
rename to third_party/nixpkgs/pkgs/by-name/wa/waitron/staticfiles-directory.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wakelan/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wakelan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wakelan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wakelan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wakeonlan/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wakeonlan/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wal-g/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wal-g/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/walk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/walk/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wallabag/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wallabag/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/third_party/nixpkgs/pkgs/by-name/wa/wallabag/wallabag-data.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/wallabag/wallabag-data.patch
rename to third_party/nixpkgs/pkgs/by-name/wa/wallabag/wallabag-data.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wally-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wally-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wambo/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wambo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wambo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wambo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wander/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/wander/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wander/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/waon/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/waon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/waon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wapiti/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wapiti/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/wargus/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wargus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/wargus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wargus/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/wargus/stratagus.nix b/third_party/nixpkgs/pkgs/by-name/wa/wargus/stratagus.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/wargus/stratagus.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wargus/stratagus.nix
diff --git a/third_party/nixpkgs/pkgs/games/warmux/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/warmux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/warmux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/warmux/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/warpd/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/warpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/warpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/warpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/warzone2100/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/warzone2100/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/warzone2100/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/deps.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasabibackend/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wasabibackend/deps.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasabibackend/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wasabibackend/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasabiwallet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wasabiwallet/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasm-pack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wasm-pack/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasm-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wasm-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasm3/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasm3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/wasm3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wasm3/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/wasmer-pack/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasmer-pack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/wasmer-pack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wasmer-pack/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasmi/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/wa/wasmi/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wasmi/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/wa/wasmi/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasmi/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasmi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wasmi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wasmi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasmserve/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasmserve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wasmserve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wasmserve/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasynth/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/wa/wasynth/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wasynth/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/wa/wasynth/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasynth/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasynth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wasynth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wasynth/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/watchlog/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/watchlog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/watchlog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/watchlog/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/watchmate/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/wa/watchmate/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/watchmate/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/wa/watchmate/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/misc/watchmate/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/watchmate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/watchmate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/watchmate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/watershot/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/watershot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/watershot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/watershot/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/watson/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/watson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/watson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/watson/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wavebox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wavebox/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wavefunctioncollapse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wavefunctioncollapse/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/wavegain/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wavegain/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/wavegain/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wavegain/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wavemon/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wavemon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wavemon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wavemon/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wavpack/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wavpack/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/wavpack/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wavpack/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wavrsocvt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wavrsocvt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/way-displays/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/way-displays/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/way-displays/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/way-displays/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wayback-machine-archiver/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayback-machine-archiver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wayback-machine-archiver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wayback-machine-archiver/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wayback/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayback/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wayback/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wayback/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wayland-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayland-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wayland-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wayland-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/waylevel/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waylevel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/waylevel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/waylevel/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waylock/build.zig.zon.nix b/third_party/nixpkgs/pkgs/by-name/wa/waylock/build.zig.zon.nix
index 2ee83bc20c..75cb2579ad 100644
--- a/third_party/nixpkgs/pkgs/by-name/wa/waylock/build.zig.zon.nix
+++ b/third_party/nixpkgs/pkgs/by-name/wa/waylock/build.zig.zon.nix
@@ -1,20 +1,107 @@
-# generated by zon2nix (https://github.com/nix-community/zon2nix)
+# generated by zon2nix (https://github.com/Cloudef/zig2nix)
-{ linkFarm, fetchzip }:
+{
+ lib,
+ linkFarm,
+ fetchurl,
+ fetchgit,
+ runCommandLocal,
+ zig,
+ name ? "zig-packages",
+}:
-linkFarm "zig-packages" [
+with builtins;
+with lib;
+
+let
+ unpackZigArtifact =
+ { name, artifact }:
+ runCommandLocal name
+ {
+ nativeBuildInputs = [ zig ];
+ }
+ ''
+ hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
+ mv "$TMPDIR/p/$hash" "$out"
+ chmod 755 "$out"
+ '';
+
+ fetchZig =
+ {
+ name,
+ url,
+ hash,
+ }:
+ let
+ artifact = fetchurl { inherit url hash; };
+ in
+ unpackZigArtifact { inherit name artifact; };
+
+ fetchGitZig =
+ {
+ name,
+ url,
+ hash,
+ }:
+ let
+ parts = splitString "#" url;
+ url_base = elemAt parts 0;
+ url_without_query = elemAt (splitString "?" url_base) 0;
+ rev_base = elemAt parts 1;
+ rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
+ in
+ fetchgit {
+ inherit name rev hash;
+ url = url_without_query;
+ deepClone = false;
+ };
+
+ fetchZigArtifact =
+ {
+ name,
+ url,
+ hash,
+ }:
+ let
+ parts = splitString "://" url;
+ proto = elemAt parts 0;
+ path = elemAt parts 1;
+ fetcher = {
+ "git+http" = fetchGitZig {
+ inherit name hash;
+ url = "http://${path}";
+ };
+ "git+https" = fetchGitZig {
+ inherit name hash;
+ url = "https://${path}";
+ };
+ http = fetchZig {
+ inherit name hash;
+ url = "http://${path}";
+ };
+ https = fetchZig {
+ inherit name hash;
+ url = "https://${path}";
+ };
+ };
+ in
+ fetcher.${proto};
+in
+linkFarm name [
{
name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
- path = fetchzip {
+ path = fetchZigArtifact {
+ name = "zig-wayland";
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz";
- hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE=";
+ hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA=";
};
}
{
name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f";
- path = fetchzip {
+ path = fetchZigArtifact {
+ name = "zig-xkbcommon";
url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz";
- hash = "sha256-T+EZiStBfmxFUjaX05WhYkFJ8tRok/UQtpc9QY9NxZk=";
+ hash = "sha256-f5oEJU5i2qeVN3GBrnQcqzEJCiOT7l4ak7GQ6gw5cH0=";
};
}
]
diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waylock/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/waylock/package.nix
index 42e5df0618..53f8ff52e8 100644
--- a/third_party/nixpkgs/pkgs/by-name/wa/waylock/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/wa/waylock/package.nix
@@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "waylock";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitea {
domain = "codeberg.org";
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
repo = "waylock";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
- hash = "sha256-i1Nd39666xrkzi7r08ZRIXJXvK9wmzb8zdmvmWEQaHE=";
+ hash = "sha256-jfMSar+Y3inu1Cly6rIDw+akBJIQ6huL0smAstgQmEo=";
};
deps = callPackage ./build.zig.zon.nix { };
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace pam.d/waylock --replace-fail "system-auth" "login"
'';
- passthru.updateScript = ./update.nu;
+ passthru.updateScript = ./update.sh;
meta = {
homepage = "https://codeberg.org/ifreund/waylock";
diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waylock/update.nu b/third_party/nixpkgs/pkgs/by-name/wa/waylock/update.nu
deleted file mode 100755
index e227fb6465..0000000000
--- a/third_party/nixpkgs/pkgs/by-name/wa/waylock/update.nu
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i nu -p nushell common-updater-scripts zon2nix
-
-let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last
-update-source-version waylock $latest_tag
-
-http get $"https://codeberg.org/ifreund/waylock/raw/tag/v($latest_tag)/build.zig.zon" | save build.zig.zon
-zon2nix > pkgs/by-name/wa/waylock/build.zig.zon.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waylock/update.sh b/third_party/nixpkgs/pkgs/by-name/wa/waylock/update.sh
new file mode 100755
index 0000000000..5916fa4439
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/wa/waylock/update.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash common-updater-scripts gnused nixfmt-rfc-style zon2nix
+
+latest_tag=$(list-git-tags --url=https://codeberg.org/ifreund/waylock | sed 's/^v//' | tail -n 1)
+
+update-source-version waylock "$latest_tag"
+
+wget "https://codeberg.org/ifreund/waylock/raw/tag/v${latest_tag}/build.zig.zon"
+nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon >pkgs/by-name/wa/waylock/build.zig.zon.nix
+# strip file protocol
+sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/wa/waylock/build.zig.zon.nix
+nixfmt pkgs/by-name/wa/waylock/build.zig.zon.nix
+
+rm -f build.zig.zon build.zig.zon2json-lock
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/waylogout/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waylogout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/waylogout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/waylogout/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/waylyrics/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waylyrics/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/waylyrics/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/waylyrics/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/waynergy/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waynergy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/waynergy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/waynergy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wayout/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayout/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wayout/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wayout/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/waypaper/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waypaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/waypaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/waypaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/waypipe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/waypipe/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wayshot/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayshot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wayshot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wayshot/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayst/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wayst/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/wayv/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/wayv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wayv/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayvnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wayvnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wazero/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wazero/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/wazero/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wa/wazero/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wbox/default.nix b/third_party/nixpkgs/pkgs/by-name/wb/wbox/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wbox/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wb/wbox/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wcalc/default.nix b/third_party/nixpkgs/pkgs/by-name/wc/wcalc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wcalc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wc/wcalc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/wcc/default.nix b/third_party/nixpkgs/pkgs/by-name/wc/wcc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/wcc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wc/wcc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/wch-isp/default.nix b/third_party/nixpkgs/pkgs/by-name/wc/wch-isp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/wch-isp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wc/wch-isp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/wcpg/default.nix b/third_party/nixpkgs/pkgs/by-name/wc/wcpg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/wcpg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wc/wcpg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/third_party/nixpkgs/pkgs/by-name/wc/wcslib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wc/wcslib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix b/third_party/nixpkgs/pkgs/by-name/wd/wdfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wd/wdfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/wdiff/default.nix b/third_party/nixpkgs/pkgs/by-name/wd/wdiff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/wdiff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wd/wdiff/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix b/third_party/nixpkgs/pkgs/by-name/wd/wdisplays/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wd/wdisplays/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wdomirror/default.nix b/third_party/nixpkgs/pkgs/by-name/wd/wdomirror/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wdomirror/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wd/wdomirror/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix b/third_party/nixpkgs/pkgs/by-name/wd/wdt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wd/wdt/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/weather-icons/default.nix b/third_party/nixpkgs/pkgs/by-name/we/weather-icons/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/weather-icons/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/weather-icons/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix b/third_party/nixpkgs/pkgs/by-name/we/weather/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/weather/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/weather/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix b/third_party/nixpkgs/pkgs/by-name/we/weave-gitops/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/weave-gitops/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix b/third_party/nixpkgs/pkgs/by-name/we/weaviate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/weaviate/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/web-ext/default.nix b/third_party/nixpkgs/pkgs/by-name/we/web-ext/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/web-ext/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/web-ext/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/webalizer/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webalizer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/webalizer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webalizer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/webanalyze/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webanalyze/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/webanalyze/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webanalyze/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/webcat/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/webcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/webdav-server-rs/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webdav-server-rs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/webdav-server-rs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webdav-server-rs/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/webdav/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webdav/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/webdav/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webdav/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webdis/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webdis/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webex/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/webhook/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webhook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/webhook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webhook/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/webmesh/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webmesh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/webmesh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webmesh/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/webmetro/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webmetro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/webmetro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webmetro/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/webp-pixbuf-loader/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webp-pixbuf-loader/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/webp-pixbuf-loader/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webp-pixbuf-loader/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/websocketd/default.nix b/third_party/nixpkgs/pkgs/by-name/we/websocketd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/websocketd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/websocketd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/websocket++/default.nix b/third_party/nixpkgs/pkgs/by-name/we/websocketpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/websocket++/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/websocketpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webtorrent_desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webtorrent_desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/webwormhole/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webwormhole/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/webwormhole/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webwormhole/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/weggli/default.nix b/third_party/nixpkgs/pkgs/by-name/we/weggli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/weggli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/weggli/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wego/default.nix b/third_party/nixpkgs/pkgs/by-name/we/wego/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wego/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/wego/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/games/weidu/default.nix b/third_party/nixpkgs/pkgs/by-name/we/weidu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/games/weidu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/weidu/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/welkin/default.nix b/third_party/nixpkgs/pkgs/by-name/we/welkin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/welkin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/welkin/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wemux/default.nix b/third_party/nixpkgs/pkgs/by-name/we/wemux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wemux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/wemux/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/wesher/default.nix b/third_party/nixpkgs/pkgs/by-name/we/wesher/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/wesher/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/wesher/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix b/third_party/nixpkgs/pkgs/by-name/we/weston/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/weston/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wev/default.nix b/third_party/nixpkgs/pkgs/by-name/we/wev/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wev/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/wev/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix b/third_party/nixpkgs/pkgs/by-name/wf/wf-recorder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wf/wf-recorder/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix b/third_party/nixpkgs/pkgs/by-name/wf/wfa2-lib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wf/wfa2-lib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/wg-bond/default.nix b/third_party/nixpkgs/pkgs/by-name/wg/wg-bond/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/wg-bond/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wg/wg-bond/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wg-friendly-peer-names/default.nix b/third_party/nixpkgs/pkgs/by-name/wg/wg-friendly-peer-names/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wg-friendly-peer-names/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wg/wg-friendly-peer-names/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wgautomesh/default.nix b/third_party/nixpkgs/pkgs/by-name/wg/wgautomesh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wgautomesh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wg/wgautomesh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/wgcf/default.nix b/third_party/nixpkgs/pkgs/by-name/wg/wgcf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/wgcf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wg/wgcf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix b/third_party/nixpkgs/pkgs/by-name/wg/wget/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wget/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wg/wget/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch b/third_party/nixpkgs/pkgs/by-name/wg/wget/remove-runtime-dep-on-openssl-headers.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch
rename to third_party/nixpkgs/pkgs/by-name/wg/wget/remove-runtime-dep-on-openssl-headers.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix b/third_party/nixpkgs/pkgs/by-name/wg/wget2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wg/wget2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/wgetpaste/default.nix b/third_party/nixpkgs/pkgs/by-name/wg/wgetpaste/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/wgetpaste/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wg/wgetpaste/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix b/third_party/nixpkgs/pkgs/by-name/wg/wgo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wgo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wg/wgo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/whatip/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whatip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/whatip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whatip/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/whatsapp-chat-exporter/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/whatsapp-chat-exporter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whatsapp-for-linux/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whatsapp-for-linux/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/whereami/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whereami/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/whereami/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whereami/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/which/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/which/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/which/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/which/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whipper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whipper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whisper-ctranslate2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whisper-ctranslate2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/whisper/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whisper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/whisper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whisper/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whitebophir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whitebophir/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whitesur-cursors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whitesur-cursors/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whitesur-icon-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whitesur-icon-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whois/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/whois/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whois/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/whsniff/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whsniff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/sniffers/whsniff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wh/whsniff/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/widelands/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/widelands/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/widelands/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/widelands/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/wifi-password/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wifi-password/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/darwin/wifi-password/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wifi-password/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wiggle/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiggle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wiggle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wiggle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wiiload/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiiload/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wiiload/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wiiload/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff b/third_party/nixpkgs/pkgs/by-name/wi/wiimms-iso-tools/fix-paths.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff
rename to third_party/nixpkgs/pkgs/by-name/wi/wiimms-iso-tools/fix-paths.diff
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiimms-iso-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wiimms-iso-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/wily/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wily/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/wily/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wily/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wimboot/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wimboot/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wimlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wimlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/driver/win-spice/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/win-spice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/driver/win-spice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/win-spice/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/windowchef/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowchef/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/windowchef/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/windowchef/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowlab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/windowlab/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix
index bd873bd7ba..1baf11642e 100644
--- a/third_party/nixpkgs/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix
@@ -4,15 +4,15 @@
fetchFromGitHub,
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "wine-discord-ipc-bridge";
- version = "unstable-2023-08-09";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "0e4ef622";
repo = "wine-discord-ipc-bridge";
- rev = "f8198c9d52e708143301017a296f7557c4387127";
- hash = "sha256-tAknITFlG63+gI5cN9SfUIUZkbIq/MgOPoGIcvoNo4Q=";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-jzsbOKMakNQ6RNMlioX088fGzFBDxOP45Atlsfm2RKg=";
};
postPatch = ''
@@ -33,6 +33,6 @@ stdenv.mkDerivation {
license = licenses.mit;
maintainers = [ maintainers.uku3lig ];
mainProgram = "winediscordipcbridge";
- platforms = [ "mingw32" ];
+ platforms = [ "i686-windows" ];
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wineasio/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wineasio/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/wineasio/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wineasio/package.nix
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch b/third_party/nixpkgs/pkgs/by-name/wi/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/wi/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wingpanel-indicator-ayatana/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wingpanel-indicator-ayatana/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/wings/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wings/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/wings/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wings/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/winhelpcgi/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/winhelpcgi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/winhelpcgi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/winhelpcgi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/wipe/fix-install.patch b/third_party/nixpkgs/pkgs/by-name/wi/wipe/fix-install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/wipe/fix-install.patch
rename to third_party/nixpkgs/pkgs/by-name/wi/wipe/fix-install.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/wipe/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wipe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/wipe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wipe/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wipefreespace/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wipefreespace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/wipefreespace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wipefreespace/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wire-desktop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wire-desktop/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wire/go-modules.patch b/third_party/nixpkgs/pkgs/by-name/wi/wire/go-modules.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wire/go-modules.patch
rename to third_party/nixpkgs/pkgs/by-name/wi/wire/go-modules.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/wire/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wire/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wire/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wire/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiredtiger/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wiredtiger/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wireless-regdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wireless-regdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wireless-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wirelesstools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/wireless-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wirelesstools/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/wireworld/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wireworld/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/wireworld/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wireworld/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wiringpi/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiringpi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/wiringpi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wiringpi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/wishbone-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wishbone-tool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/wishbone-tool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wishbone-tool/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/wishlist/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wishlist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/wishlist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/wishlist/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix
index 7404dd9063..d619491020 100644
--- a/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "wit-bindgen";
- version = "0.33.0";
+ version = "0.34.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wit-bindgen";
rev = "v${version}";
- hash = "sha256-+3tWqNdDZagJa9cLSz1OBaPtCr2F1joYyzB//BPqV34=";
+ hash = "sha256-ZnMQpIfKN6ByEZasvy+UM12ZBsrhTM1s3TN1dF/3YMY=";
};
- cargoHash = "sha256-3TrnSU7qXC8INlEZMbYTNwZsqiKMZ6j7tdGmz3DFl1g=";
+ cargoHash = "sha256-eF1qJ0fH3ODG1u9tUD3dj/2i7+0BJ4fJPlaYjS3XiGU=";
# Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
# However, GitHub Actions ensures a proper build.
diff --git a/third_party/nixpkgs/pkgs/tools/security/witness/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/witness/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/witness/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wi/witness/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix b/third_party/nixpkgs/pkgs/by-name/wk/wkhtmltopdf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wk/wkhtmltopdf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard-x11/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wl-clipboard-x11/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard-x11/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wl-clipboard-x11/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wl-clipboard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wl-clipboard/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wl-color-picker/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wl-color-picker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wl-color-picker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wl-color-picker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff b/third_party/nixpkgs/pkgs/by-name/wl/wl-gammactl/dont-need-wlroots.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff
rename to third_party/nixpkgs/pkgs/by-name/wl/wl-gammactl/dont-need-wlroots.diff
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wl-gammactl/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wl-gammactl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wl-gammactl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wl-gammactl/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-rs/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-rs/Cargo.lock
index 0df34b9852..9725cbb75c 100644
--- a/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-rs/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-rs/Cargo.lock
@@ -1,36 +1,36 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4
[[package]]
name = "anstyle"
-version = "1.0.6"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
[[package]]
name = "anyhow"
-version = "1.0.81"
+version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
[[package]]
name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bitflags"
-version = "2.4.2"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "bytemuck"
-version = "1.15.0"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
[[package]]
name = "cfg-if"
@@ -46,9 +46,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
[[package]]
name = "clap"
-version = "4.5.3"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -56,9 +56,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.2"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
dependencies = [
"anstyle",
"clap_lex",
@@ -66,9 +66,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.3"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck",
"proc-macro2",
@@ -78,9 +78,9 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.7.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
[[package]]
name = "equivalent"
@@ -90,9 +90,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "hashbrown"
-version = "0.14.3"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
[[package]]
name = "heck"
@@ -102,9 +102,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "indexmap"
-version = "2.2.5"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
"hashbrown",
@@ -112,30 +112,30 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.153"
+version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
dependencies = [
"libc",
]
[[package]]
name = "memoffset"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
dependencies = [
"autocfg",
]
@@ -155,36 +155,36 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
dependencies = [
"toml_edit",
]
[[package]]
name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quick-xml"
-version = "0.31.0"
+version = "0.36.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
dependencies = [
"memchr",
]
[[package]]
name = "quote"
-version = "1.0.35"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -239,9 +239,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.53"
+version = "2.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
dependencies = [
"proc-macro2",
"quote",
@@ -250,18 +250,18 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.58"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
dependencies = [
"proc-macro2",
"quote",
@@ -270,15 +270,15 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
[[package]]
name = "toml_edit"
-version = "0.21.1"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap",
"toml_datetime",
@@ -287,26 +287,36 @@ dependencies = [
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "wayrs-client"
-version = "1.0.3"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae384b841a260a5d86f471b21c22639a6fd41fe37c407be72a6d714fd3433bae"
+checksum = "38de237bedae071e5557d126e1baa1b88ae7512c725fdd54617453f3b544f3e0"
dependencies = [
- "nix",
"thiserror",
+ "wayrs-core",
"wayrs-scanner",
]
[[package]]
-name = "wayrs-proto-parser"
-version = "2.0.0"
+name = "wayrs-core"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1406ebeb6ba4a201745a92c221eca3dcec5b404fcbe948acf8a166b323582fa9"
+checksum = "e8bb65fd8a7197918772a8622547b380d4ca62c53a6c43c2b176dcb3f8b69246"
+dependencies = [
+ "libc",
+ "thiserror",
+]
+
+[[package]]
+name = "wayrs-proto-parser"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "076ab8342497b77753c4f882f6d1654e1f8f4bd648ce72d045f237b8a727f4c9"
dependencies = [
"quick-xml",
"thiserror",
@@ -314,20 +324,19 @@ dependencies = [
[[package]]
name = "wayrs-protocols"
-version = "0.13.2"
+version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b37562eeb522e6cbc9fb9e4e96a8622e10d0f31fec780ed5c12c1fc15d127a47"
+checksum = "28591a3ed941f8db9a747f4256ac65efda2cfae983315fd8cbe046bea91f2518"
dependencies = [
"wayrs-client",
]
[[package]]
name = "wayrs-scanner"
-version = "0.13.2"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e387d47549e37bd2a6f03973a77578bb003f661559a096c9274b5b9bcd78bf1f"
+checksum = "21f171cbfea7942eb5a4648496730cc7757536fa5ac77774652a13b1570085c5"
dependencies = [
- "proc-macro-crate",
"proc-macro2",
"quote",
"syn",
@@ -336,16 +345,16 @@ dependencies = [
[[package]]
name = "winnow"
-version = "0.5.40"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
[[package]]
name = "wl-gammarelay-rs"
-version = "0.4.1"
+version = "1.0.0"
dependencies = [
"anyhow",
"bytemuck",
diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
index 202fcf7c7d..e569ff58df 100644
--- a/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
@@ -5,13 +5,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "wl-gammarelay-rs";
- version = "0.4.1";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "MaxVerevkin";
repo = "wl-gammarelay-rs";
rev = "v${version}";
- hash = "sha256-36u2s+Yv+0/lZErHonVvzyBuZ2xES2MGMG4PRjaM74k=";
+ hash = "sha256-zmtC4xNNAK/TiB5TU6qsY5y0Z3roaEnTwHMZPjq6SbE=";
};
cargoLock = {
@@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec {
license = lib.licenses.gpl3Plus;
mainProgram = "wl-gammarelay-rs";
maintainers = with lib.maintainers; [ quantenzitrone ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
+ badPlatforms = lib.platforms.darwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wl-mirror/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wl-mirror/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wl-mirror/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wl-mirror/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wl-screenrec/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wl-screenrec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wl-screenrec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wl-screenrec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/wla-dx/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wla-dx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/wla-dx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wla-dx/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wlc/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wlc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wlc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wlclock/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlclock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wlclock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wlclock/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlcs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wlcs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wleave/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wleave/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wleave/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wleave/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wllvm/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wllvm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wllvm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wllvm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlopm/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlopm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wlopm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wlopm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlprop/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlprop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wlprop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wlprop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlr-randr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wlr-randr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlr-which-key/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlr-which-key/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wlr-which-key/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wlr-which-key/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlrctl/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlrctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wlrctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wlrctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlsunset/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wlsunset/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix b/third_party/nixpkgs/pkgs/by-name/wl/wluma/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wl/wluma/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/wmctrl/64-bit-data.patch b/third_party/nixpkgs/pkgs/by-name/wm/wmctrl/64-bit-data.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/wmctrl/64-bit-data.patch
rename to third_party/nixpkgs/pkgs/by-name/wm/wmctrl/64-bit-data.patch
diff --git a/third_party/nixpkgs/pkgs/tools/X11/wmctrl/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmctrl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/wmctrl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmctrl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wmderland/0001-remove-flto.patch b/third_party/nixpkgs/pkgs/by-name/wm/wmderland/0001-remove-flto.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/wmderland/0001-remove-flto.patch
rename to third_party/nixpkgs/pkgs/by-name/wm/wmderland/0001-remove-flto.patch
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wmderland/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmderland/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/wmderland/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmderland/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wmderlandc/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmderlandc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/wmderlandc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmderlandc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wmenu/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wmenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/wmic-bin/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmic-bin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/wmic-bin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmic-bin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wmii/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmii/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/wmii/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmii/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/wml/dynaloader.patch b/third_party/nixpkgs/pkgs/by-name/wm/wml/dynaloader.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/wml/dynaloader.patch
rename to third_party/nixpkgs/pkgs/by-name/wm/wml/dynaloader.patch
diff --git a/third_party/nixpkgs/pkgs/development/web/wml/no_bitvector.patch b/third_party/nixpkgs/pkgs/by-name/wm/wml/no_bitvector.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/wml/no_bitvector.patch
rename to third_party/nixpkgs/pkgs/by-name/wm/wml/no_bitvector.patch
diff --git a/third_party/nixpkgs/pkgs/development/web/wml/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/wml/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wml/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/wml/redhat-with-thr.patch b/third_party/nixpkgs/pkgs/by-name/wm/wml/redhat-with-thr.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/wml/redhat-with-thr.patch
rename to third_party/nixpkgs/pkgs/by-name/wm/wml/redhat-with-thr.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wmname/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmname/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wmname/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmname/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmutils-core/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmutils-core/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/wmutils-libwm/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmutils-libwm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/wmutils-libwm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmutils-libwm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix b/third_party/nixpkgs/pkgs/by-name/wm/wmutils-opt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wm/wmutils-opt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wob/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wob/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/woeusb-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/woeusb-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/woeusb-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/woeusb-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/woeusb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/woeusb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/woff2/brotli-static.patch b/third_party/nixpkgs/pkgs/by-name/wo/woff2/brotli-static.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/woff2/brotli-static.patch
rename to third_party/nixpkgs/pkgs/by-name/wo/woff2/brotli-static.patch
diff --git a/third_party/nixpkgs/pkgs/development/web/woff2/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/woff2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/woff2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/woff2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi-emoji/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wofi-emoji/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wofi-emoji/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wofi-emoji/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch b/third_party/nixpkgs/pkgs/by-name/wo/wofi/do_not_follow_symlinks.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch
rename to third_party/nixpkgs/pkgs/by-name/wo/wofi/do_not_follow_symlinks.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wofi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wofi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wol/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wol/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/wolf-shaper/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wolf-shaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/wolf-shaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wolf-shaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wolfebin/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wolfebin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wolfebin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wolfebin/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/wolfstoneextract/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wolfstoneextract/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/wolfstoneextract/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wolfstoneextract/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/woof/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/woof/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/woof/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/woof/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wootility/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wootility/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wooting-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wooting-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/third_party/nixpkgs/pkgs/by-name/wo/wooting-udev-rules/wooting.rules
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules
rename to third_party/nixpkgs/pkgs/by-name/wo/wooting-udev-rules/wooting.rules
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wordbook/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wordbook/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wordbook/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wordbook/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/wordgrinder/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wordgrinder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/wordgrinder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wordgrinder/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/work-sans/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/work-sans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/work-sans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/work-sans/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/workcraft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/workcraft/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/worldofgoo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/worldofgoo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/worldofgoo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wormhole-william/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wormhole-william/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix b/third_party/nixpkgs/pkgs/by-name/wo/wownero/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wo/wownero/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wp4nix/default.nix b/third_party/nixpkgs/pkgs/by-name/wp/wp4nix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wp4nix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wp/wp4nix/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix b/third_party/nixpkgs/pkgs/by-name/wp/wpgtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wp/wpgtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wpm/default.nix b/third_party/nixpkgs/pkgs/by-name/wp/wpm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wpm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wp/wpm/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/wprecon/default.nix b/third_party/nixpkgs/pkgs/by-name/wp/wprecon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/wprecon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wp/wprecon/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix b/third_party/nixpkgs/pkgs/by-name/wq/wqy_microhei/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wq/wqy_microhei/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix b/third_party/nixpkgs/pkgs/by-name/wq/wqy_zenhei/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wq/wqy_zenhei/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/wrap/default.nix b/third_party/nixpkgs/pkgs/by-name/wr/wrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/wrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wr/wrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/write-good/default.nix b/third_party/nixpkgs/pkgs/by-name/wr/write-good/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/write-good/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wr/write-good/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/writedisk/default.nix b/third_party/nixpkgs/pkgs/by-name/wr/writedisk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/writedisk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wr/writedisk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wrk/default.nix b/third_party/nixpkgs/pkgs/by-name/wr/wrk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wrk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wr/wrk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wrk2/default.nix b/third_party/nixpkgs/pkgs/by-name/wr/wrk2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wrk2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wr/wrk2/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/wsdd/default.nix b/third_party/nixpkgs/pkgs/by-name/ws/wsdd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/wsdd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ws/wsdd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix b/third_party/nixpkgs/pkgs/by-name/ws/wshowkeys/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ws/wshowkeys/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wsl-open/default.nix b/third_party/nixpkgs/pkgs/by-name/ws/wsl-open/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wsl-open/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ws/wsl-open/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wsl-vpnkit/default.nix b/third_party/nixpkgs/pkgs/by-name/ws/wsl-vpnkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wsl-vpnkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ws/wsl-vpnkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/wsmancli/default.nix b/third_party/nixpkgs/pkgs/by-name/ws/wsmancli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/wsmancli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ws/wsmancli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/wsysmon/dependencies.patch b/third_party/nixpkgs/pkgs/by-name/ws/wsysmon/dependencies.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/wsysmon/dependencies.patch
rename to third_party/nixpkgs/pkgs/by-name/ws/wsysmon/dependencies.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/wsysmon/install.patch b/third_party/nixpkgs/pkgs/by-name/ws/wsysmon/install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/wsysmon/install.patch
rename to third_party/nixpkgs/pkgs/by-name/ws/wsysmon/install.patch
diff --git a/third_party/nixpkgs/pkgs/tools/system/wsysmon/default.nix b/third_party/nixpkgs/pkgs/by-name/ws/wsysmon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/wsysmon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ws/wsysmon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix b/third_party/nixpkgs/pkgs/by-name/wt/wtf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wt/wtf/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wthrr/default.nix b/third_party/nixpkgs/pkgs/by-name/wt/wthrr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/wthrr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wt/wthrr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wtk/builder.sh b/third_party/nixpkgs/pkgs/by-name/wt/wtk/builder.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/wtk/builder.sh
rename to third_party/nixpkgs/pkgs/by-name/wt/wtk/builder.sh
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wtk/default.nix b/third_party/nixpkgs/pkgs/by-name/wt/wtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/wtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wt/wtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix b/third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix
index 0110caec8e..752592da69 100644
--- a/third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix
@@ -8,18 +8,18 @@
rustPlatform.buildRustPackage rec {
pname = "wttrbar";
- version = "0.10.6";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "bjesus";
repo = "wttrbar";
rev = version;
- hash = "sha256-fuLKWooXn966RORH20D9wwbjNtyLEZOO8Y8RcjsFwqM=";
+ hash = "sha256-EEc64pTAdVZZJtzHzACxZktUJMz10yuqdYG+N1CAD8k=";
};
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]);
- cargoHash = "sha256-Of1tHKIL2XbzA6YFxtvaP9sa+KMw8uJTFG0n84g2Eog=";
+ cargoHash = "sha256-UXC7b0FDyKSRpYGJOLcG0mqZgKTLJA+eTqKMp1Zo1so=";
passthru.updateScript = nix-update-script { };
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wtype/default.nix b/third_party/nixpkgs/pkgs/by-name/wt/wtype/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/wayland/wtype/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wt/wtype/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wuzz/default.nix b/third_party/nixpkgs/pkgs/by-name/wu/wuzz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/wuzz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wu/wuzz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wv/default.nix b/third_party/nixpkgs/pkgs/by-name/wv/wv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wv/wv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wv2/fix-include.patch b/third_party/nixpkgs/pkgs/by-name/wv/wv2/fix-include.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wv2/fix-include.patch
rename to third_party/nixpkgs/pkgs/by-name/wv/wv2/fix-include.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wv2/default.nix b/third_party/nixpkgs/pkgs/by-name/wv/wv2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wv2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wv/wv2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix b/third_party/nixpkgs/pkgs/by-name/wv/wvkbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wv/wvkbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wwcd/default.nix b/third_party/nixpkgs/pkgs/by-name/ww/wwcd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/wwcd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ww/wwcd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix b/third_party/nixpkgs/pkgs/by-name/wx/wxformbuilder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wx/wxformbuilder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/third_party/nixpkgs/pkgs/by-name/wx/wxmacmolplt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wx/wxmacmolplt/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/wyvern/cargo-lock.patch b/third_party/nixpkgs/pkgs/by-name/wy/wyvern/cargo-lock.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/wyvern/cargo-lock.patch
rename to third_party/nixpkgs/pkgs/by-name/wy/wyvern/cargo-lock.patch
diff --git a/third_party/nixpkgs/pkgs/games/wyvern/default.nix b/third_party/nixpkgs/pkgs/by-name/wy/wyvern/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/wyvern/default.nix
rename to third_party/nixpkgs/pkgs/by-name/wy/wyvern/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/x-create-mouse-void/default.nix b/third_party/nixpkgs/pkgs/by-name/x-/x-create-mouse-void/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/window-managers/x-create-mouse-void/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x-/x-create-mouse-void/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix b/third_party/nixpkgs/pkgs/by-name/x1/x11_ssh_askpass/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x1/x11_ssh_askpass/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/third_party/nixpkgs/pkgs/by-name/x1/x11docker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x1/x11docker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/x11idle/default.nix b/third_party/nixpkgs/pkgs/by-name/x1/x11idle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/x11idle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x1/x11idle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/x11spice/default.nix b/third_party/nixpkgs/pkgs/by-name/x1/x11spice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/x11spice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x1/x11spice/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/x11vnc/default.nix b/third_party/nixpkgs/pkgs/by-name/x1/x11vnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/x11vnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x1/x11vnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/x264/disable-arm-neon-default.patch b/third_party/nixpkgs/pkgs/by-name/x2/x264/disable-arm-neon-default.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/x264/disable-arm-neon-default.patch
rename to third_party/nixpkgs/pkgs/by-name/x2/x264/disable-arm-neon-default.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix b/third_party/nixpkgs/pkgs/by-name/x2/x264/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/x264/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x2/x264/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/x265/darwin-__rdtsc.patch b/third_party/nixpkgs/pkgs/by-name/x2/x265/darwin-__rdtsc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/x265/darwin-__rdtsc.patch
rename to third_party/nixpkgs/pkgs/by-name/x2/x265/darwin-__rdtsc.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix b/third_party/nixpkgs/pkgs/by-name/x2/x265/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/x265/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x2/x265/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix b/third_party/nixpkgs/pkgs/by-name/x2/x2goserver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x2/x2goserver/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/x2vnc/default.nix b/third_party/nixpkgs/pkgs/by-name/x2/x2vnc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/x2vnc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x2/x2vnc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/x2x/default.nix b/third_party/nixpkgs/pkgs/by-name/x2/x2x/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/x2x/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x2/x2x/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix b/third_party/nixpkgs/pkgs/by-name/x3/x3270/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x3/x3270/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/x42-avldrums/default.nix b/third_party/nixpkgs/pkgs/by-name/x4/x42-avldrums/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/x42-avldrums/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x4/x42-avldrums/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/x42-gmsynth/default.nix b/third_party/nixpkgs/pkgs/by-name/x4/x42-gmsynth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/x42-gmsynth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x4/x42-gmsynth/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix b/third_party/nixpkgs/pkgs/by-name/x4/x42-plugins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x4/x42-plugins/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/x86info/default.nix b/third_party/nixpkgs/pkgs/by-name/x8/x86info/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/x86info/default.nix
rename to third_party/nixpkgs/pkgs/by-name/x8/x86info/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix b/third_party/nixpkgs/pkgs/by-name/xa/Xaw3d/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xa/Xaw3d/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xalanc/default.nix b/third_party/nixpkgs/pkgs/by-name/xa/xalanc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xalanc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xa/xalanc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xannotate/default.nix b/third_party/nixpkgs/pkgs/by-name/xa/xannotate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xannotate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xa/xannotate/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/xa/xar/package.nix b/third_party/nixpkgs/pkgs/by-name/xa/xar/package.nix
index 3b4aafa43b..455576526d 100644
--- a/third_party/nixpkgs/pkgs/by-name/xa/xar/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/xa/xar/package.nix
@@ -48,7 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
# # …
# rm -r ../pkgs/by-name/xa/xar/patches
# git format-patch --zero-commit --output-directory ../pkgs/by-name/xa/xar/patches main
- patches = lib.filesystem.listFilesRecursive ./patches;
+ patches =
+ # Avoid Darwin rebuilds on staging-next
+ lib.filter (
+ p: stdenv.hostPlatform.isDarwin -> baseNameOf p != "0020-Fall-back-to-readlink-on-Linux.patch"
+ ) (lib.filesystem.listFilesRecursive ./patches);
# We do not use or modify files outside of the xar subdirectory.
patchFlags = [ "-p2" ];
diff --git a/third_party/nixpkgs/pkgs/by-name/xa/xar/patches/0020-Fall-back-to-readlink-on-Linux.patch b/third_party/nixpkgs/pkgs/by-name/xa/xar/patches/0020-Fall-back-to-readlink-on-Linux.patch
new file mode 100644
index 0000000000..02b96aee1b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/xa/xar/patches/0020-Fall-back-to-readlink-on-Linux.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode
+Date: Wed, 30 Oct 2024 20:19:20 -0400
+Subject: [PATCH 20/20] Fall back to readlink on Linux
+
+---
+ xar/lib/archive.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/xar/lib/archive.c b/xar/lib/archive.c
+index b7f9cbf..3a79c74 100644
+--- a/xar/lib/archive.c
++++ b/xar/lib/archive.c
+@@ -507,10 +507,31 @@ xar_t xar_fdopen_digest_verify(int fd, int32_t flags, void *expected_toc_digest,
+ // If there are hardlinks, the path we pick is the most recently opened by
+ // the filesystem; which is effectively random.
+ char path_buff[PATH_MAX];
++#if defined(__APPLE__)
+ if (fcntl(fd, F_GETPATH, path_buff) < 0) {
+ close(fd);
+ return NULL;
+ }
++#elif defined(__linux__)
++ // Linux has to get the path to the file via `/proc`.
++ char proc_buff[PATH_MAX];
++ if (snprintf(proc_buff, PATH_MAX, "/proc/self/fd/%i", fd) < 0) {
++ close(fd);
++ return NULL;
++ }
++ if (readlink(proc_buff, &path_buff, PATH_MAX) < 0) {
++ close(fd);
++ return NULL;
++ }
++ // The filename is the file’s when the fd was created. Check to make sure it still exists.
++ struct stat stat_buff;
++ if (stat(path_buff, &stat_buff) < 0) {
++ close(fd);
++ return NULL;
++ }
++#else
++#error "Unknown platform. Please update with an implementation of `F_GETPATH`."
++#endif
+
+ // Don't trust the position of the descriptor we were given, reset it back to 0
+ if (lseek(fd, 0, SEEK_SET) != 0) {
+--
+2.47.0
+
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix b/third_party/nixpkgs/pkgs/by-name/xa/xarchiver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xa/xarchiver/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix b/third_party/nixpkgs/pkgs/by-name/xa/xastir/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xa/xastir/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xautoclick/default.nix b/third_party/nixpkgs/pkgs/by-name/xa/xautoclick/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xautoclick/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xa/xautoclick/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix b/third_party/nixpkgs/pkgs/by-name/xa/xautolock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xa/xautolock/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xautomation/default.nix b/third_party/nixpkgs/pkgs/by-name/xa/xautomation/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xautomation/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xa/xautomation/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xavs/default.nix b/third_party/nixpkgs/pkgs/by-name/xa/xavs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xavs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xa/xavs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch b/third_party/nixpkgs/pkgs/by-name/xa/xawtv/0001-Fix-build-for-glibc-2.32.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch
rename to third_party/nixpkgs/pkgs/by-name/xa/xawtv/0001-Fix-build-for-glibc-2.32.patch
diff --git a/third_party/nixpkgs/pkgs/applications/video/xawtv/default.nix b/third_party/nixpkgs/pkgs/by-name/xa/xawtv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/xawtv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xa/xawtv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xbanish/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xbanish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xbanish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xbanish/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xbase/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xbase/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xbase/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xbase/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xbase/xbase-fixes.patch b/third_party/nixpkgs/pkgs/by-name/xb/xbase/xbase-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xbase/xbase-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/xb/xbase/xbase-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xbattbar/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xbattbar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xbattbar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xbattbar/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xbattbar/sys-by-default.patch b/third_party/nixpkgs/pkgs/by-name/xb/xbattbar/sys-by-default.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xbattbar/sys-by-default.patch
rename to third_party/nixpkgs/pkgs/by-name/xb/xbattbar/sys-by-default.patch
diff --git a/third_party/nixpkgs/pkgs/games/xbill/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xbill/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xbill/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xbill/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xbindkeys/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xbindkeys/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xboard/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xboard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xboard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xboard/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xbomb/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xbomb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xbomb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xbomb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xborders/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xborders/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xborders/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xborders/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xborders/setup.py b/third_party/nixpkgs/pkgs/by-name/xb/xborders/setup.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xborders/setup.py
rename to third_party/nixpkgs/pkgs/by-name/xb/xborders/setup.py
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch b/third_party/nixpkgs/pkgs/by-name/xb/xboxdrv/fix-60-sec-delay.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch
rename to third_party/nixpkgs/pkgs/by-name/xb/xboxdrv/fix-60-sec-delay.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xboxdrv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xboxdrv/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-py3.patch b/third_party/nixpkgs/pkgs/by-name/xb/xboxdrv/scons-py3.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-py3.patch
rename to third_party/nixpkgs/pkgs/by-name/xb/xboxdrv/scons-py3.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch b/third_party/nixpkgs/pkgs/by-name/xb/xboxdrv/scons-v4.2.0.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch
rename to third_party/nixpkgs/pkgs/by-name/xb/xboxdrv/scons-v4.2.0.patch
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch b/third_party/nixpkgs/pkgs/by-name/xb/xboxdrv/xboxdrvctl-py3.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch
rename to third_party/nixpkgs/pkgs/by-name/xb/xboxdrv/xboxdrvctl-py3.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/xbps/cert-paths.patch b/third_party/nixpkgs/pkgs/by-name/xb/xbps/cert-paths.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/xbps/cert-paths.patch
rename to third_party/nixpkgs/pkgs/by-name/xb/xbps/cert-paths.patch
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/xbps/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xbps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/package-management/xbps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xbps/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xbrightness/default.nix b/third_party/nixpkgs/pkgs/by-name/xb/xbrightness/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xbrightness/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xb/xbrightness/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/xc/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/xc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xc3sprog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xc3sprog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xcalib/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcalib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xcalib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcalib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xcape/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcape/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xcape/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcape/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/xcat/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/xcat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcb-imdkit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcb-imdkit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xcd/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xcd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcftools/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcftools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/xcftools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcftools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcfun/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcfun/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xchainkeys/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xchainkeys/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xchainkeys/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xchainkeys/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/xcircuit/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcircuit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/xcircuit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcircuit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xclip/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xclip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xclip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xclip/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcodes/generated/default.nix
similarity index 80%
rename from third_party/nixpkgs/pkgs/development/tools/xcodes/generated/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcodes/generated/default.nix
index 669a8e3000..910f134c5b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/xc/xcodes/generated/default.nix
@@ -2,6 +2,7 @@
{
workspaceStateFile = ./workspace-state.json;
hashes = {
+ "big-num" = "0wj45pmiafhbj5ch7b4s41ldycps0hcj29d0z6fanhiy7ljlhk35";
"data" = "1jf2y9dbg1qvxkkabdkihdnr1kmznq79h18j65a7iw1hljdp8hyg";
"Foundation" = "0hcpc15v38l32qc2sh4gqj909b1f90knln9yz3mfiyf6xi7iy6q7";
"KeychainAccess" = "0m57pq1vn5qarmlx5x4kfv0yzjylafl3ipih5p60zyfsx6k5b55l";
@@ -10,6 +11,8 @@
"PromiseKit" = "19pkhk505pz03hqmv8h1lgm83iw5jha6j1v06fyzz0xar2ywv6vg";
"Rainbow" = "0iv31azny668vpsjgmldgkgn9cp8i5h9rlc6w5bs8q63nwq19wb0";
"swift-argument-parser" = "19b4pkcx4xf0iwg0nbr7wvkkbwl6h8sch848gid6l98728glmcw9";
+ "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";
+ "swift-srp" = "0nsinkgf050z1wkzmaxaf5qkvplsgyqwps9xi9zkbcg6y7143xy1";
"SwiftSoup" = "14klizw8jhmxhxays1b1yh4bp0nbb3l4l1pj6sdnf0iqs0wladv8";
"Version" = "0s5bwr1li6dnsnalfyraq1kzhqmmn9qwp1mld4msrn3q5vvjmql9";
"Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76";
diff --git a/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/workspace-state.json b/third_party/nixpkgs/pkgs/by-name/xc/xcodes/generated/workspace-state.json
similarity index 78%
rename from third_party/nixpkgs/pkgs/development/tools/xcodes/generated/workspace-state.json
rename to third_party/nixpkgs/pkgs/by-name/xc/xcodes/generated/workspace-state.json
index cddcff1700..68cc38c3c7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/xcodes/generated/workspace-state.json
+++ b/third_party/nixpkgs/pkgs/by-name/xc/xcodes/generated/workspace-state.json
@@ -2,6 +2,23 @@
"object": {
"artifacts": [],
"dependencies": [
+ {
+ "basedOn": null,
+ "packageRef": {
+ "identity": "big-num",
+ "kind": "remoteSourceControl",
+ "location": "https://github.com/adam-fowler/big-num",
+ "name": "big-num"
+ },
+ "state": {
+ "checkoutState": {
+ "revision": "5c5511ad06aeb2b97d0868f7394e14a624bfb1c7",
+ "version": "2.0.2"
+ },
+ "name": "sourceControlCheckout"
+ },
+ "subpath": "big-num"
+ },
{
"basedOn": null,
"packageRef": {
@@ -137,6 +154,40 @@
},
"subpath": "swift-argument-parser"
},
+ {
+ "basedOn": null,
+ "packageRef": {
+ "identity": "swift-crypto",
+ "kind": "remoteSourceControl",
+ "location": "https://github.com/apple/swift-crypto",
+ "name": "swift-crypto"
+ },
+ "state": {
+ "checkoutState": {
+ "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",
+ "version": "1.1.7"
+ },
+ "name": "sourceControlCheckout"
+ },
+ "subpath": "swift-crypto"
+ },
+ {
+ "basedOn": null,
+ "packageRef": {
+ "identity": "swift-srp",
+ "kind": "remoteSourceControl",
+ "location": "https://github.com/xcodesOrg/swift-srp",
+ "name": "swift-srp"
+ },
+ "state": {
+ "checkoutState": {
+ "branch": "main",
+ "revision": "543aa0122a0257b992f6c7d62d18a26e3dffb8fe"
+ },
+ "name": "sourceControlCheckout"
+ },
+ "subpath": "swift-srp"
+ },
{
"basedOn": null,
"packageRef": {
diff --git a/third_party/nixpkgs/pkgs/development/tools/xcodes/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcodes/package.nix
similarity index 61%
rename from third_party/nixpkgs/pkgs/development/tools/xcodes/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcodes/package.nix
index 3b92959d2f..bd5a56ce14 100644
--- a/third_party/nixpkgs/pkgs/development/tools/xcodes/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/xc/xcodes/package.nix
@@ -1,35 +1,32 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, swift
-, swiftpm
-, swiftpm2nix
-, makeWrapper
-, CryptoKit
-, LocalAuthentication
-, libcompression
-, aria2
+{
+ lib,
+ fetchFromGitHub,
+ swiftPackages,
+ swift,
+ swiftpm,
+ swiftpm2nix,
+ makeWrapper,
+ aria2,
}:
let
generated = swiftpm2nix.helpers ./generated;
+ stdenv = swiftPackages.stdenv;
in
stdenv.mkDerivation (finalAttrs: {
pname = "xcodes";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "XcodesOrg";
repo = "xcodes";
rev = finalAttrs.version;
- hash = "sha256-vksfvrx0TqtjcOHn38Ey3P6jIFYF4CbD3SVICVFINSU=";
+ hash = "sha256-TwPfASRU98rifyA/mINFfoY0MbbwmAh8JneVpJa38CA=";
};
- nativeBuildInputs = [ swift swiftpm makeWrapper ];
-
- buildInputs = [
- CryptoKit
- LocalAuthentication
- libcompression
+ nativeBuildInputs = [
+ swift
+ swiftpm
+ makeWrapper
];
configurePhase = generated.configure;
@@ -45,16 +42,19 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
- meta = with lib; {
+ meta = {
changelog = "https://github.com/XcodesOrg/xcodes/releases/tag/${finalAttrs.version}";
description = "Command-line tool to install and switch between multiple versions of Xcode";
homepage = "https://github.com/XcodesOrg/xcodes";
- license = with licenses; [
+ license = with lib.licenses; [
mit
# unxip
lgpl3Only
];
- maintainers = with maintainers; [ _0x120581f emilytrau ];
- platforms = platforms.darwin;
+ maintainers = with lib.maintainers; [
+ _0x120581f
+ emilytrau
+ ];
+ platforms = lib.platforms.darwin;
};
})
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcolor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcolor/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xconq/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xconq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xconq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xconq/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xcowsay/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcowsay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xcowsay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcowsay/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xcp/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/xcpc/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcpc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/emulators/xcpc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcpc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/xcrawl3r/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcrawl3r/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/xcrawl3r/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcrawl3r/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xcruiser/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcruiser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xcruiser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcruiser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/malloc.diff b/third_party/nixpkgs/pkgs/by-name/xc/xcur2png/malloc.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/xcur2png/malloc.diff
rename to third_party/nixpkgs/pkgs/by-name/xc/xcur2png/malloc.diff
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcur2png/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcur2png/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xcwd/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcwd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xcwd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xc/xcwd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdaliclock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdaliclock/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-dbus-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdg-dbus-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xdg-launch/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-launch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xdg-launch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdg-launch/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xdg-ninja/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-ninja/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xdg-ninja/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdg-ninja/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xdg-utils/allow-forcing-portal-use.patch b/third_party/nixpkgs/pkgs/by-name/xd/xdg-utils/allow-forcing-portal-use.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xdg-utils/allow-forcing-portal-use.patch
rename to third_party/nixpkgs/pkgs/by-name/xd/xdg-utils/allow-forcing-portal-use.patch
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xdg-utils/enable-xdg-terminal.patch b/third_party/nixpkgs/pkgs/by-name/xd/xdg-utils/enable-xdg-terminal.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xdg-utils/enable-xdg-terminal.patch
rename to third_party/nixpkgs/pkgs/by-name/xd/xdg-utils/enable-xdg-terminal.patch
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdg-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdgmenumaker/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdgmenumaker/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xdiskusage/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdiskusage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xdiskusage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdiskusage/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xdo/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xdo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xdotool/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdotool/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xdotool/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdotool/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xdummy/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdummy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xdummy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdummy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdxf2slob/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xd/xdxf2slob/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/third_party/nixpkgs/pkgs/by-name/xe/xe-guest-utilities/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xe/xe-guest-utilities/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/xe/default.nix b/third_party/nixpkgs/pkgs/by-name/xe/xe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/xe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xe/xe/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix b/third_party/nixpkgs/pkgs/by-name/xe/xearth/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xe/xearth/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix b/third_party/nixpkgs/pkgs/by-name/xe/xed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xe/xed/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/xedit/default.nix b/third_party/nixpkgs/pkgs/by-name/xe/xedit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/xedit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xe/xedit/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/xenomapper/default.nix b/third_party/nixpkgs/pkgs/by-name/xe/xenomapper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/biology/xenomapper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xe/xenomapper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xercesc/default.nix b/third_party/nixpkgs/pkgs/by-name/xe/xercesc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xercesc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xe/xercesc/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix b/third_party/nixpkgs/pkgs/by-name/xe/xeus-zmq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xe/xeus-zmq/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xeus/default.nix b/third_party/nixpkgs/pkgs/by-name/xe/xeus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xeus/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xe/xeus/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/third_party/nixpkgs/pkgs/by-name/xf/xf86_input_cmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-cmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xf/xf86_input_cmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/third_party/nixpkgs/pkgs/by-name/xf/xf86_input_wacom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-wacom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xf/xf86_input_wacom/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix b/third_party/nixpkgs/pkgs/by-name/xf/xf86_video_nested/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xf/xf86_video_nested/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xfig/default.nix b/third_party/nixpkgs/pkgs/by-name/xf/xfig/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/xfig/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xf/xfig/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch b/third_party/nixpkgs/pkgs/by-name/xf/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
rename to third_party/nixpkgs/pkgs/by-name/xf/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix b/third_party/nixpkgs/pkgs/by-name/xf/xfitter/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xf/xfitter/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xfontsel/default.nix b/third_party/nixpkgs/pkgs/by-name/xf/xfontsel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xfontsel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xf/xfontsel/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix b/third_party/nixpkgs/pkgs/by-name/xf/xfractint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xf/xfractint/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/xfsdump/default.nix b/third_party/nixpkgs/pkgs/by-name/xf/xfsdump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/xfsdump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xf/xfsdump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix b/third_party/nixpkgs/pkgs/by-name/xf/xfsprogs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xf/xfsprogs/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xfstests/default.nix b/third_party/nixpkgs/pkgs/by-name/xf/xfstests/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xfstests/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xf/xfstests/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xgalaga++/default.nix b/third_party/nixpkgs/pkgs/by-name/xg/xgalagapp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xgalaga++/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xg/xgalagapp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/third_party/nixpkgs/pkgs/by-name/xg/xgboost/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xg/xgboost/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix b/third_party/nixpkgs/pkgs/by-name/xg/xgeometry-select/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xg/xgeometry-select/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix b/third_party/nixpkgs/pkgs/by-name/xh/xh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/xh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xh/xh/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/third_party/nixpkgs/pkgs/by-name/xh/xhtml1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xh/xhtml1/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xiccd/default.nix b/third_party/nixpkgs/pkgs/by-name/xi/xiccd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xiccd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xi/xiccd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xidel/default.nix b/third_party/nixpkgs/pkgs/by-name/xi/xidel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xidel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xi/xidel/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/xinetd/default.nix b/third_party/nixpkgs/pkgs/by-name/xi/xinetd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/xinetd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xi/xinetd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix b/third_party/nixpkgs/pkgs/by-name/xi/xinput_calibrator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xi/xinput_calibrator/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/xits-math/default.nix b/third_party/nixpkgs/pkgs/by-name/xi/xits-math/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/xits-math/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xi/xits-math/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/xjadeo/default.nix b/third_party/nixpkgs/pkgs/by-name/xj/xjadeo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/xjadeo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xj/xjadeo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xjobs/default.nix b/third_party/nixpkgs/pkgs/by-name/xj/xjobs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xjobs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xj/xjobs/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xjump/darwin.patch b/third_party/nixpkgs/pkgs/by-name/xj/xjump/darwin.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xjump/darwin.patch
rename to third_party/nixpkgs/pkgs/by-name/xj/xjump/darwin.patch
diff --git a/third_party/nixpkgs/pkgs/games/xjump/default.nix b/third_party/nixpkgs/pkgs/by-name/xj/xjump/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xjump/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xj/xjump/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xkb-switch-i3/default.nix b/third_party/nixpkgs/pkgs/by-name/xk/xkb-switch-i3/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xkb-switch-i3/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xk/xkb-switch-i3/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix b/third_party/nixpkgs/pkgs/by-name/xk/xkb-switch/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xk/xkb-switch/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xkbd/default.nix b/third_party/nixpkgs/pkgs/by-name/xk/xkbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xkbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xk/xkbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xkblayout-state/default.nix b/third_party/nixpkgs/pkgs/by-name/xk/xkblayout-state/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xkblayout-state/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xk/xkblayout-state/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xkbmon/default.nix b/third_party/nixpkgs/pkgs/by-name/xk/xkbmon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xkbmon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xk/xkbmon/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xkbset/default.nix b/third_party/nixpkgs/pkgs/by-name/xk/xkbset/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xkbset/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xk/xkbset/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xkbvalidate/default.nix b/third_party/nixpkgs/pkgs/by-name/xk/xkbvalidate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xkbvalidate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xk/xkbvalidate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/third_party/nixpkgs/pkgs/by-name/xk/xkbvalidate/xkbvalidate.c
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
rename to third_party/nixpkgs/pkgs/by-name/xk/xkbvalidate/xkbvalidate.c
diff --git a/third_party/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix b/third_party/nixpkgs/pkgs/by-name/xk/xkcd-font/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xk/xkcd-font/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py b/third_party/nixpkgs/pkgs/by-name/xk/xkeysnail/browser-emacs-bindings.py
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py
rename to third_party/nixpkgs/pkgs/by-name/xk/xkeysnail/browser-emacs-bindings.py
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xkeysnail/default.nix b/third_party/nixpkgs/pkgs/by-name/xk/xkeysnail/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xkeysnail/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xk/xkeysnail/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix b/third_party/nixpkgs/pkgs/by-name/xl/xl2tpd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xl/xl2tpd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix b/third_party/nixpkgs/pkgs/by-name/xl/xlayoutdisplay/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xl/xlayoutdisplay/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/xlibinput_calibrator/default.nix b/third_party/nixpkgs/pkgs/by-name/xl/xlibinput-calibrator/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/xlibinput_calibrator/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xl/xlibinput-calibrator/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xlife/default.nix b/third_party/nixpkgs/pkgs/by-name/xl/xlife/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/xlife/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xl/xlife/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xloadimage/default.nix b/third_party/nixpkgs/pkgs/by-name/xl/xloadimage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xloadimage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xl/xloadimage/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/by-name/xl/xlockmore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xl/xlockmore/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix b/third_party/nixpkgs/pkgs/by-name/xl/xlog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xl/xlog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xlogo/default.nix b/third_party/nixpkgs/pkgs/by-name/xl/xlogo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xlogo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xl/xlogo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xlslib/default.nix b/third_party/nixpkgs/pkgs/by-name/xl/xlslib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xlslib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xl/xlslib/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xmacro/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmacro/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xmacro/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmacro/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xmage/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmage/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xmage/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmage/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xmagnify/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmagnify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xmagnify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmagnify/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xmcp/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmcp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xmcp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmcp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmedcon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmedcon/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmenu/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmenu/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xmenu/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmenu/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmind/java-env-config-fixes.patch b/third_party/nixpkgs/pkgs/by-name/xm/xmind/java-env-config-fixes.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xmind/java-env-config-fixes.patch
rename to third_party/nixpkgs/pkgs/by-name/xm/xmind/java-env-config-fixes.patch
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmind/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmind/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xmind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmind/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xml-security-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xml-security-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/xml2/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xml2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xml/xml2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xml2/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xmlbeans/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmlbeans/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xmlbeans/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmlbeans/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/xmlformat/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmlformat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xml/xmlformat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmlformat/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/web/xmlindent/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmlindent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/web/xmlindent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmlindent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/xmloscopy/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmloscopy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xml/xmloscopy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmloscopy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmlroff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmlroff/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmlrpc_c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmlrpc_c/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch b/third_party/nixpkgs/pkgs/by-name/xm/xmlsec/lt_dladdsearchdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch
rename to third_party/nixpkgs/pkgs/by-name/xm/xmlsec/lt_dladdsearchdir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmlsec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmlsec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch b/third_party/nixpkgs/pkgs/by-name/xm/xmlsec/remove_bsd_base64_decode_flag.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch
rename to third_party/nixpkgs/pkgs/by-name/xm/xmlsec/remove_bsd_base64_decode_flag.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmlstarlet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmlstarlet/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xmoto/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmoto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xmoto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmoto/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xmountains/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmountains/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/xmountains/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmountains/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xmousepasteblock/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmousepasteblock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xmousepasteblock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmousepasteblock/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/xmppc/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmppc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/xmppc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xm/xmppc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch b/third_party/nixpkgs/pkgs/by-name/xn/xnbd/0001-Fix-build-for-glibc-2.28.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch
rename to third_party/nixpkgs/pkgs/by-name/xn/xnbd/0001-Fix-build-for-glibc-2.28.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/xnbd/default.nix b/third_party/nixpkgs/pkgs/by-name/xn/xnbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/xnbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xn/xnbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix b/third_party/nixpkgs/pkgs/by-name/xn/xnec2c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xn/xnec2c/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xnee/default.nix b/third_party/nixpkgs/pkgs/by-name/xn/xnee/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xnee/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xn/xnee/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xneur/default.nix b/third_party/nixpkgs/pkgs/by-name/xn/xneur/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xneur/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xn/xneur/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xnotify/default.nix b/third_party/nixpkgs/pkgs/by-name/xn/xnotify/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xnotify/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xn/xnotify/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xob/default.nix b/third_party/nixpkgs/pkgs/by-name/xo/xob/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xob/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xo/xob/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/xorex/default.nix b/third_party/nixpkgs/pkgs/by-name/xo/xorex/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/xorex/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xo/xorex/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/xorg-autoconf/default.nix b/third_party/nixpkgs/pkgs/by-name/xo/xorg-autoconf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/xorg-autoconf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xo/xorg-autoconf/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix b/third_party/nixpkgs/pkgs/by-name/xo/xorg-rgb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xo/xorg-rgb/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/third_party/nixpkgs/pkgs/by-name/xo/xorg_sys_opengl/builder.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
rename to third_party/nixpkgs/pkgs/by-name/xo/xorg_sys_opengl/builder.sh
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/third_party/nixpkgs/pkgs/by-name/xo/xorg_sys_opengl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xo/xorg_sys_opengl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix b/third_party/nixpkgs/pkgs/by-name/xo/xoscope/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xo/xoscope/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/xosd/default.nix b/third_party/nixpkgs/pkgs/by-name/xo/xosd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/xosd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xo/xosd/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/third_party/nixpkgs/pkgs/by-name/xo/xow_dongle-firmware/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xo/xow_dongle-firmware/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xpad/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xpad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xpad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xpad/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xpano/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xpano/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xpaste/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xpaste/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xpaste/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xpaste/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/xpipe/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xpipe/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/xpipe/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xpipe/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/xplanet/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xplanet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/astronomy/xplanet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xplanet/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/xp/xplorer/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/xplorer/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/xp/xplorer/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xplorer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xplorer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xplugd/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xplugd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xplugd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xplugd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch b/third_party/nixpkgs/pkgs/by-name/xp/xprintidle-ng/fix-config_h-includes-should-be-first.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch
rename to third_party/nixpkgs/pkgs/by-name/xp/xprintidle-ng/fix-config_h-includes-should-be-first.patch
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xprintidle-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xprintidle-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xprintidle/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xprintidle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xprintidle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xprintidle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xprompt/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xprompt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xprompt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xprompt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/mobile/xpwn/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xpwn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/mobile/xpwn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xp/xpwn/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/xq/default.nix b/third_party/nixpkgs/pkgs/by-name/xq/xq-xml/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xml/xq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xq/xq-xml/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xq/default.nix b/third_party/nixpkgs/pkgs/by-name/xq/xq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xq/xq/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/xqilla/default.nix b/third_party/nixpkgs/pkgs/by-name/xq/xqilla/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/xqilla/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xq/xqilla/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xquartz/10-fontdir.sh b/third_party/nixpkgs/pkgs/by-name/xq/xquartz/10-fontdir.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/x11/xquartz/10-fontdir.sh
rename to third_party/nixpkgs/pkgs/by-name/xq/xquartz/10-fontdir.sh
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xquartz/98-user.sh b/third_party/nixpkgs/pkgs/by-name/xq/xquartz/98-user.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/x11/xquartz/98-user.sh
rename to third_party/nixpkgs/pkgs/by-name/xq/xquartz/98-user.sh
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xquartz/font_cache b/third_party/nixpkgs/pkgs/by-name/xq/xquartz/font_cache
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/x11/xquartz/font_cache
rename to third_party/nixpkgs/pkgs/by-name/xq/xquartz/font_cache
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist b/third_party/nixpkgs/pkgs/by-name/xq/xquartz/org.nixos.xquartz.privileged_startx.plist
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist
rename to third_party/nixpkgs/pkgs/by-name/xq/xquartz/org.nixos.xquartz.privileged_startx.plist
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist b/third_party/nixpkgs/pkgs/by-name/xq/xquartz/org.nixos.xquartz.startx.plist
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist
rename to third_party/nixpkgs/pkgs/by-name/xq/xquartz/org.nixos.xquartz.startx.plist
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xquartz/default.nix b/third_party/nixpkgs/pkgs/by-name/xq/xquartz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/x11/xquartz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xq/xquartz/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xquartz/system-fonts.nix b/third_party/nixpkgs/pkgs/by-name/xq/xquartz/system-fonts.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/x11/xquartz/system-fonts.nix
rename to third_party/nixpkgs/pkgs/by-name/xq/xquartz/system-fonts.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix b/third_party/nixpkgs/pkgs/by-name/xr/xrandr-invert-colors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xr/xrandr-invert-colors/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/xray/default.nix b/third_party/nixpkgs/pkgs/by-name/xr/xray/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/xray/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xr/xray/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xrectsel/default.nix b/third_party/nixpkgs/pkgs/by-name/xr/xrectsel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xrectsel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xr/xrectsel/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xrestop/default.nix b/third_party/nixpkgs/pkgs/by-name/xr/xrestop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xrestop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xr/xrestop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xrq/default.nix b/third_party/nixpkgs/pkgs/by-name/xr/xrq/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xrq/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xr/xrq/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xscast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/video/xscast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xscast/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xscope/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xscope/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xscope/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xscope/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsecurelock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsecurelock/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xsel/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsel/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xsel/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsel/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsensors/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsensors/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch b/third_party/nixpkgs/pkgs/by-name/xs/xsensors/remove-unused-variables.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch
rename to third_party/nixpkgs/pkgs/by-name/xs/xsensors/remove-unused-variables.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch b/third_party/nixpkgs/pkgs/by-name/xs/xsensors/replace-deprecated-gtk.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch
rename to third_party/nixpkgs/pkgs/by-name/xs/xsensors/replace-deprecated-gtk.patch
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsettingsd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsettingsd/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xskat/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xskat/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xskat/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xskat/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xsnow/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsnow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xsnow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsnow/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xsok/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsok/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xsok/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsok/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xsokoban/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsokoban/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xsokoban/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsokoban/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xsos/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsos/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/xsos/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsos/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/xspim/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xspim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/xspim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xspim/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xss-lock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xss-lock/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xssproxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xssproxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xssstate/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xssstate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xssstate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xssstate/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xstow/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xstow/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xstow/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xstow/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/xsubfind3r/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsubfind3r/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/xsubfind3r/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsubfind3r/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xsuspender/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsuspender/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xsuspender/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsuspender/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsynth_dssi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xs/xsynth_dssi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xteddy/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xteddy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xteddy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xteddy/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xtensor/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xtensor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xtensor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xtensor/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xterm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xterm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch b/third_party/nixpkgs/pkgs/by-name/xt/xterm/sixel-256.support.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch
rename to third_party/nixpkgs/pkgs/by-name/xt/xterm/sixel-256.support.patch
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xtermcontrol/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xtermcontrol/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/xtermcontrol/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xtermcontrol/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/xteve/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xteve/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/xteve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xteve/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xtitle/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xtitle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xtitle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xtitle/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xtl/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xtl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xtl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xtl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xtrace/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xtrace/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xtrace/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xtrace/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/xtris/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xtris/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/xtris/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xtris/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xtrlock-pam/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xtrlock-pam/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xtruss/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xtruss/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xtruss/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xtruss/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/xtuner/default.nix b/third_party/nixpkgs/pkgs/by-name/xt/xtuner/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/xtuner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xt/xtuner/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/xurls/default.nix b/third_party/nixpkgs/pkgs/by-name/xu/xurls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/xurls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xu/xurls/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix b/third_party/nixpkgs/pkgs/by-name/xv/xv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xv/xv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix b/third_party/nixpkgs/pkgs/by-name/xv/xva-img/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xv/xva-img/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xvidcore/default.nix b/third_party/nixpkgs/pkgs/by-name/xv/xvidcore/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xvidcore/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xv/xvidcore/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xvkbd/default.nix b/third_party/nixpkgs/pkgs/by-name/xv/xvkbd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xvkbd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xv/xvkbd/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix b/third_party/nixpkgs/pkgs/by-name/xw/xwallpaper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xw/xwallpaper/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix b/third_party/nixpkgs/pkgs/by-name/xw/xwinmosaic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xw/xwinmosaic/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix b/third_party/nixpkgs/pkgs/by-name/xw/xwinwrap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xw/xwinwrap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xxHash/default.nix b/third_party/nixpkgs/pkgs/by-name/xx/xxHash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xxHash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xx/xxHash/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/xxgdb/default.nix b/third_party/nixpkgs/pkgs/by-name/xx/xxgdb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/xxgdb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xx/xxgdb/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch b/third_party/nixpkgs/pkgs/by-name/xx/xxgdb/xxgdb-pty.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch
rename to third_party/nixpkgs/pkgs/by-name/xx/xxgdb/xxgdb-pty.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/xxh/default.nix b/third_party/nixpkgs/pkgs/by-name/xx/xxh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/xxh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xx/xxh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xxkb/default.nix b/third_party/nixpkgs/pkgs/by-name/xx/xxkb/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/xxkb/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xx/xxkb/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xxv/default.nix b/third_party/nixpkgs/pkgs/by-name/xx/xxv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/xxv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xx/xxv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xylib/default.nix b/third_party/nixpkgs/pkgs/by-name/xy/xylib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/xylib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xy/xylib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xzgv/default.nix b/third_party/nixpkgs/pkgs/by-name/xz/xzgv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/xzgv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xz/xzgv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xzoom/default.nix b/third_party/nixpkgs/pkgs/by-name/xz/xzoom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/xzoom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xz/xzoom/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/yad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yad/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yadm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yadm/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/yaegi/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaegi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/yaegi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaegi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/yaft/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/yaft/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaft/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yai/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yai/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/yai/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yai/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/yajl/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yajl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/yajl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yajl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yajsv/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yajsv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/yajsv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yajsv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/yallback/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yallback/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/yallback/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yallback/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/yambar-hyprland-wses/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/yambar-hyprland-wses/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/video/yamdi/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yamdi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/video/yamdi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yamdi/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/package.json b/third_party/nixpkgs/pkgs/by-name/ya/yaml-language-server/package.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/package.json
rename to third_party/nixpkgs/pkgs/by-name/ya/yaml-language-server/package.json
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaml-language-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaml-language-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/yaml-merge/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaml-merge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/yaml-merge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaml-merge/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/yaml2json/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaml2json/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/yaml2json/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaml2json/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yamlfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yamlfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/yamlpath/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yamlpath/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/yamlpath/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yamlpath/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/yams/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yams/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/yams/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yams/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yandex-browser/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yandex-browser/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yandex-disk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yandex-disk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yank/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yank/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/yank/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yank/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yanone-kaffeesatz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yanone-kaffeesatz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/yap/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/yap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/yarGen/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yarGen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/yarGen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yarGen/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/yara/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yara/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/yara/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yara/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/yaralyzer/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaralyzer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/yaralyzer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaralyzer/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/bash/yarn-completion/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yarn-bash-completion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/bash/yarn-completion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yarn-bash-completion/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yarn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/yarn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yarn/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/yarp/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yarp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/robotics/yarp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yarp/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/yarr/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yarr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/feedreaders/yarr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yarr/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/yaru-remix/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaru-remix-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/yaru-remix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaru-remix-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaru-theme/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/yaru/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaru-theme/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/yas/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/yas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yas/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/yascreen/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yascreen/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/yascreen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yascreen/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/yash/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yash/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/yash/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yash/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/yasm/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yasm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/yasm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yasm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch b/third_party/nixpkgs/pkgs/by-name/ya/yasr/10_fix_openpty_forkpty_declarations.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch
rename to third_party/nixpkgs/pkgs/by-name/ya/yasr/10_fix_openpty_forkpty_declarations.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/yasr/20_maxpathlen.patch b/third_party/nixpkgs/pkgs/by-name/ya/yasr/20_maxpathlen.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/yasr/20_maxpathlen.patch
rename to third_party/nixpkgs/pkgs/by-name/ya/yasr/20_maxpathlen.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/yasr/30_conf.patch b/third_party/nixpkgs/pkgs/by-name/ya/yasr/30_conf.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/yasr/30_conf.patch
rename to third_party/nixpkgs/pkgs/by-name/ya/yasr/30_conf.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch b/third_party/nixpkgs/pkgs/by-name/ya/yasr/40_dectalk_extended_chars.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch
rename to third_party/nixpkgs/pkgs/by-name/ya/yasr/40_dectalk_extended_chars.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/yasr/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yasr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/yasr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yasr/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/yatas/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yatas/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/yatas/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yatas/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/yate/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yate/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/yate/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yate/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/yaup/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/yaup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaup/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/http/yaws/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaws/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/yaws/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaws/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/yaxg/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yaxg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/yaxg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ya/yaxg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch b/third_party/nixpkgs/pkgs/by-name/yd/yder/fix-pkgconfig.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch
rename to third_party/nixpkgs/pkgs/by-name/yd/yder/fix-pkgconfig.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix b/third_party/nixpkgs/pkgs/by-name/yd/yder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/yder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yd/yder/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix b/third_party/nixpkgs/pkgs/by-name/yd/ydict/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yd/ydict/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix b/third_party/nixpkgs/pkgs/by-name/ye/yed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ye/yed/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yeetgif/default.nix b/third_party/nixpkgs/pkgs/by-name/ye/yeetgif/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/yeetgif/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ye/yeetgif/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/ye/yelp-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ye/yelp-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/yersinia/default.nix b/third_party/nixpkgs/pkgs/by-name/ye/yersinia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/yersinia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ye/yersinia/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/yeshup/default.nix b/third_party/nixpkgs/pkgs/by-name/ye/yeshup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/yeshup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ye/yeshup/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix b/third_party/nixpkgs/pkgs/by-name/ye/yewtube/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ye/yewtube/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/third_party/nixpkgs/pkgs/by-name/yl/yle-dl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yl/yle-dl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ympd/default.nix b/third_party/nixpkgs/pkgs/by-name/ym/ympd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ympd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ym/ympd/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ymuse/default.nix b/third_party/nixpkgs/pkgs/by-name/ym/ymuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/ymuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ym/ymuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/yo/default.nix b/third_party/nixpkgs/pkgs/by-name/yo/yo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/yo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yo/yo/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/yodl/default.nix b/third_party/nixpkgs/pkgs/by-name/yo/yodl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/yodl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yo/yodl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/yojimbo/default.nix b/third_party/nixpkgs/pkgs/by-name/yo/yojimbo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/yojimbo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yo/yojimbo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix b/third_party/nixpkgs/pkgs/by-name/yo/yoshimi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yo/yoshimi/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/you-get/ffmpeg-path.patch b/third_party/nixpkgs/pkgs/by-name/yo/you-get/ffmpeg-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/you-get/ffmpeg-path.patch
rename to third_party/nixpkgs/pkgs/by-name/yo/you-get/ffmpeg-path.patch
diff --git a/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix b/third_party/nixpkgs/pkgs/by-name/yo/you-get/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yo/you-get/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/by-name/yq/yq-go/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yq/yq-go/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ytalk/default.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytalk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ytalk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yt/ytalk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytarchive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yt/ytarchive/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytcast/default.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytcast/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ytcast/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yt/ytcast/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytcc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yt/ytcc/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytfzf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yt/ytfzf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytmdl/default.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytmdl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ytmdl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yt/ytmdl/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ytt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yt/ytt/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/yubihsm-connector/default.nix b/third_party/nixpkgs/pkgs/by-name/yu/yubihsm-connector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/yubihsm-connector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yu/yubihsm-connector/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix b/third_party/nixpkgs/pkgs/by-name/yu/yubihsm-shell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yu/yubihsm-shell/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/yu/yubikey-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yu/yubikey-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/third_party/nixpkgs/pkgs/by-name/yu/yubikey-manager/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yu/yubikey-manager/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix b/third_party/nixpkgs/pkgs/by-name/yu/yubikey-personalization/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yu/yubikey-personalization/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix b/third_party/nixpkgs/pkgs/by-name/yu/yubikey-touch-detector/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yu/yubikey-touch-detector/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix b/third_party/nixpkgs/pkgs/by-name/yu/yubioath-flutter/helper.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix
rename to third_party/nixpkgs/pkgs/by-name/yu/yubioath-flutter/helper.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix b/third_party/nixpkgs/pkgs/by-name/yu/yubioath-flutter/package.nix
similarity index 96%
rename from third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yu/yubioath-flutter/package.nix
index 23fa019d75..a13c6e623d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/yu/yubioath-flutter/package.nix
@@ -13,13 +13,13 @@
flutter324.buildFlutterApplication rec {
pname = "yubioath-flutter";
- version = "7.1.0";
+ version = "7.1.1";
src = fetchFromGitHub {
owner = "Yubico";
repo = "yubioath-flutter";
rev = version;
- hash = "sha256-sAs/tglLt1igovtfs07+7G5/xeMcQgfR9G4b7VzyDVY=";
+ hash = "sha256-MpY6yJvGBaFiEwuGEme2Uvyi5INCYhZJHyaRpC9pCuk=";
};
passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; };
diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json b/third_party/nixpkgs/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json
rename to third_party/nixpkgs/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
diff --git a/third_party/nixpkgs/pkgs/development/tools/yuicompressor/default.nix b/third_party/nixpkgs/pkgs/by-name/yu/yuicompressor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/yuicompressor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yu/yuicompressor/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/yx/0001-Don-t-strip-binary-when-installing.patch b/third_party/nixpkgs/pkgs/by-name/yx/yx/0001-Don-t-strip-binary-when-installing.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/yx/0001-Don-t-strip-binary-when-installing.patch
rename to third_party/nixpkgs/pkgs/by-name/yx/yx/0001-Don-t-strip-binary-when-installing.patch
diff --git a/third_party/nixpkgs/pkgs/tools/text/yx/default.nix b/third_party/nixpkgs/pkgs/by-name/yx/yx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/yx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yx/yx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/yyjson/default.nix b/third_party/nixpkgs/pkgs/by-name/yy/yyjson/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/yyjson/default.nix
rename to third_party/nixpkgs/pkgs/by-name/yy/yyjson/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/third_party/nixpkgs/pkgs/by-name/z-/z-lua/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
rename to third_party/nixpkgs/pkgs/by-name/z-/z-lua/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/z88dk/default.nix b/third_party/nixpkgs/pkgs/by-name/z8/z88dk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/z88dk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/z8/z88dk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix b/third_party/nixpkgs/pkgs/by-name/za/zabbixctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/za/zabbixctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zalgo/default.nix b/third_party/nixpkgs/pkgs/by-name/za/zalgo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zalgo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/za/zalgo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix b/third_party/nixpkgs/pkgs/by-name/za/zam-plugins/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix
rename to third_party/nixpkgs/pkgs/by-name/za/zam-plugins/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/zap/default.nix b/third_party/nixpkgs/pkgs/by-name/za/zap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/zap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/za/zap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zarchive/default.nix b/third_party/nixpkgs/pkgs/by-name/za/zarchive/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/zarchive/default.nix
rename to third_party/nixpkgs/pkgs/by-name/za/zarchive/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix b/third_party/nixpkgs/pkgs/by-name/za/zarf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/za/zarf/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/zasm/default.nix b/third_party/nixpkgs/pkgs/by-name/za/zasm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/zasm/default.nix
rename to third_party/nixpkgs/pkgs/by-name/za/zasm/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/zaz/default.nix b/third_party/nixpkgs/pkgs/by-name/za/zaz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/zaz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/za/zaz/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/admin/zbctl/default.nix b/third_party/nixpkgs/pkgs/by-name/zb/zbctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/zbctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zb/zbctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/zchaff/default.nix b/third_party/nixpkgs/pkgs/by-name/zc/zchaff/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/zchaff/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zc/zchaff/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/zchaff/sat_solver.patch b/third_party/nixpkgs/pkgs/by-name/zc/zchaff/sat_solver.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/science/logic/zchaff/sat_solver.patch
rename to third_party/nixpkgs/pkgs/by-name/zc/zchaff/sat_solver.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix b/third_party/nixpkgs/pkgs/by-name/zd/zd1211fw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/firmware/zd1211/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zd/zd1211fw/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/zdelta/default.nix b/third_party/nixpkgs/pkgs/by-name/zd/zdelta/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/zdelta/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zd/zdelta/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/zdns/default.nix b/third_party/nixpkgs/pkgs/by-name/zd/zdns/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/zdns/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zd/zdns/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zecwallet-lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zecwallet-lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix
index 8b4b57dfad..e0c1383b6a 100644
--- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix
@@ -34,6 +34,8 @@
git,
apple-sdk_15,
darwinMinVersionHook,
+ makeWrapper,
+ nodePackages_latest,
withGLES ? false,
}:
@@ -138,17 +140,20 @@ rustPlatform.buildRustPackage rec {
};
};
- nativeBuildInputs = [
- clang
- cmake
- copyDesktopItems
- curl
- perl
- pkg-config
- protobuf
- rustPlatform.bindgenHook
- cargo-about
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];
+ nativeBuildInputs =
+ [
+ clang
+ cmake
+ copyDesktopItems
+ curl
+ perl
+ pkg-config
+ protobuf
+ rustPlatform.bindgenHook
+ cargo-about
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];
dontUseCmakeConfigure = true;
@@ -215,6 +220,9 @@ rustPlatform.buildRustPackage rec {
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf --add-rpath ${gpu-lib}/lib $out/libexec/*
patchelf --add-rpath ${wayland}/lib $out/libexec/*
+ wrapProgram $out/libexec/zed-editor --suffix PATH : ${
+ lib.makeBinPath [ nodePackages_latest.nodejs ]
+ }
'';
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/zed/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zed/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/zed/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zed/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/zeekscript/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zeekscript/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/zeekscript/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zeekscript/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zeitgeist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zeitgeist/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zenmonitor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zenmonitor/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zenstates/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zenstates/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/zenstates/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zenstates/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/zerobin/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zerobin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/zerobin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zerobin/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zeroc-ice/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zeroc-ice/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zerofree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zerofree/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zeronet-conservancy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zeronet-conservancy/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zeronet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zeronet/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/zet/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zet/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/zet/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zet/package.nix
diff --git a/third_party/nixpkgs/pkgs/misc/zeyple/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zeyple/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/misc/zeyple/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zeyple/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zf/deps.nix b/third_party/nixpkgs/pkgs/by-name/zf/zf/deps.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zf/deps.nix
rename to third_party/nixpkgs/pkgs/by-name/zf/zf/deps.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zf/default.nix b/third_party/nixpkgs/pkgs/by-name/zf/zf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zf/zf/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix b/third_party/nixpkgs/pkgs/by-name/zf/zfs-autobackup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zf/zfs-autobackup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/zfs-prune-snapshots/default.nix b/third_party/nixpkgs/pkgs/by-name/zf/zfs-prune-snapshots/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/zfs-prune-snapshots/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zf/zfs-prune-snapshots/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix b/third_party/nixpkgs/pkgs/by-name/zf/zfsbackup/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zf/zfsbackup/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/zfsnap/default.nix b/third_party/nixpkgs/pkgs/by-name/zf/zfsnap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/zfsnap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zf/zfsnap/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix b/third_party/nixpkgs/pkgs/by-name/zf/zfstools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zf/zfstools/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/zfxtop/default.nix b/third_party/nixpkgs/pkgs/by-name/zf/zfxtop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/zfxtop/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zf/zfxtop/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/zgrab2/fix-go-version-error.patch b/third_party/nixpkgs/pkgs/by-name/zg/zgrab2/fix-go-version-error.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/zgrab2/fix-go-version-error.patch
rename to third_party/nixpkgs/pkgs/by-name/zg/zgrab2/fix-go-version-error.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/zgrab2/default.nix b/third_party/nixpkgs/pkgs/by-name/zg/zgrab2/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/zgrab2/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zg/zgrab2/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix b/third_party/nixpkgs/pkgs/by-name/zg/zgrviewer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zg/zgrviewer/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zi/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zi/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zigbee2mqtt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zigbee2mqtt/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/fonts/zilla-slab/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zilla-slab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/fonts/zilla-slab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zilla-slab/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/zim-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zim-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/zim-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zim-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zim/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/zim/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zim/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zimfw/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zimfw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zimfw/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zimfw/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zimg/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zimg/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zimg/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zimg/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zimlib/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zimlib/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zimlib/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zimlib/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zine/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/zine/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zine/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zine/update-time-crate.patch b/third_party/nixpkgs/pkgs/by-name/zi/zine/update-time-crate.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/zine/update-time-crate.patch
rename to third_party/nixpkgs/pkgs/by-name/zi/zine/update-time-crate.patch
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zinit/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zinit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zinit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zinit/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zinnia/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zinnia/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch b/third_party/nixpkgs/pkgs/by-name/zi/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
rename to third_party/nixpkgs/pkgs/by-name/zi/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zip/fix-implicit-declarations.patch b/third_party/nixpkgs/pkgs/by-name/zi/zip/fix-implicit-declarations.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/zip/fix-implicit-declarations.patch
rename to third_party/nixpkgs/pkgs/by-name/zi/zip/fix-implicit-declarations.patch
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zip/fix-memset-detection.patch b/third_party/nixpkgs/pkgs/by-name/zi/zip/fix-memset-detection.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/zip/fix-memset-detection.patch
rename to third_party/nixpkgs/pkgs/by-name/zi/zip/fix-memset-detection.patch
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zip/fix-time.h-not-included.patch b/third_party/nixpkgs/pkgs/by-name/zi/zip/fix-time.h-not-included.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/zip/fix-time.h-not-included.patch
rename to third_party/nixpkgs/pkgs/by-name/zi/zip/fix-time.h-not-included.patch
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2 b/third_party/nixpkgs/pkgs/by-name/zi/zip/natspec-gentoo.patch.bz2
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2
rename to third_party/nixpkgs/pkgs/by-name/zi/zip/natspec-gentoo.patch.bz2
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zip/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/archivers/zip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zip/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zipkin/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zipkin/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/zita-ajbridge/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zita-ajbridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/zita-ajbridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zita-ajbridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zita-alsa-pcmi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zita-alsa-pcmi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/zita-at1/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zita-at1/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/zita-at1/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zita-at1/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zita-convolver/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zita-convolver/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zita-njbridge/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zita-njbridge/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zita-resampler/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zita-resampler/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zitadel-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zitadel-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zitadel-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zitadel-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zi/zix/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/zk/default.nix b/third_party/nixpkgs/pkgs/by-name/zk/zk/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/zk/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zk/zk/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/zkar/default.nix b/third_party/nixpkgs/pkgs/by-name/zk/zkar/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/zkar/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zk/zkar/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix b/third_party/nixpkgs/pkgs/by-name/zk/zkfuse/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zk/zkfuse/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zktree/default.nix b/third_party/nixpkgs/pkgs/by-name/zk/zktree/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/zktree/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zk/zktree/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/zld/default.nix b/third_party/nixpkgs/pkgs/by-name/zl/zld/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/zld/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zl/zld/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/zl/zlib-ng/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zl/zlib-ng/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/zlint/default.nix b/third_party/nixpkgs/pkgs/by-name/zl/zlint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/zlint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zl/zlint/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zlog/default.nix b/third_party/nixpkgs/pkgs/by-name/zl/zlog/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zlog/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zl/zlog/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/security/zmap/default.nix b/third_party/nixpkgs/pkgs/by-name/zm/zmap/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/zmap/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zm/zmap/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zmqpp/default.nix b/third_party/nixpkgs/pkgs/by-name/zm/zmqpp/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zmqpp/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zm/zmqpp/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zmusic/fluidsynth.patch b/third_party/nixpkgs/pkgs/by-name/zm/zmusic/fluidsynth.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zmusic/fluidsynth.patch
rename to third_party/nixpkgs/pkgs/by-name/zm/zmusic/fluidsynth.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zmusic/default.nix b/third_party/nixpkgs/pkgs/by-name/zm/zmusic/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zmusic/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zm/zmusic/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix b/third_party/nixpkgs/pkgs/by-name/zn/zn_poly/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zn/zn_poly/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/znapzend/default.nix b/third_party/nixpkgs/pkgs/by-name/zn/znapzend/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/znapzend/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zn/znapzend/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/zod/0002-add-scaling-factor-to-source.patch b/third_party/nixpkgs/pkgs/by-name/zo/zod/0002-add-scaling-factor-to-source.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/zod/0002-add-scaling-factor-to-source.patch
rename to third_party/nixpkgs/pkgs/by-name/zo/zod/0002-add-scaling-factor-to-source.patch
diff --git a/third_party/nixpkgs/pkgs/games/zod/default.nix b/third_party/nixpkgs/pkgs/by-name/zo/zod/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/zod/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zod/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/zon2nix/default.nix b/third_party/nixpkgs/pkgs/by-name/zo/zon2nix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/zon2nix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zon2nix/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch b/third_party/nixpkgs/pkgs/by-name/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
rename to third_party/nixpkgs/pkgs/by-name/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
diff --git a/third_party/nixpkgs/pkgs/servers/zoneminder/default-to-http-1dot1.patch b/third_party/nixpkgs/pkgs/by-name/zo/zoneminder/default-to-http-1dot1.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/zoneminder/default-to-http-1dot1.patch
rename to third_party/nixpkgs/pkgs/by-name/zo/zoneminder/default-to-http-1dot1.patch
diff --git a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix b/third_party/nixpkgs/pkgs/by-name/zo/zoneminder/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/zoneminder/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zoneminder/package.nix
diff --git a/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix b/third_party/nixpkgs/pkgs/by-name/zo/zookeeper/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/zookeeper/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zookeeper/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix b/third_party/nixpkgs/pkgs/by-name/zo/zookeeper_mt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zookeeper_mt/package.nix
diff --git a/third_party/nixpkgs/pkgs/games/zoom/default.nix b/third_party/nixpkgs/pkgs/by-name/zo/zoom/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/zoom/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zoom/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/compression/zopfli/default.nix b/third_party/nixpkgs/pkgs/by-name/zo/zopfli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/compression/zopfli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zopfli/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zotero-translation-server/default.nix b/third_party/nixpkgs/pkgs/by-name/zo/zotero-translation-server/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zotero-translation-server/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zotero-translation-server/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/darwin.nix b/third_party/nixpkgs/pkgs/by-name/zo/zotero/darwin.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/zotero/darwin.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zotero/darwin.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/linux.nix b/third_party/nixpkgs/pkgs/by-name/zo/zotero/linux.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/zotero/linux.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zotero/linux.nix
diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/by-name/zo/zotero/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/office/zotero/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zotero/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/third_party/nixpkgs/pkgs/by-name/zo/zoxide/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zo/zoxide/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zplug/default.nix b/third_party/nixpkgs/pkgs/by-name/zp/zplug/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zplug/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zp/zplug/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/zpool-auto-expand-partitions/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/zp/zpool-auto-expand-partitions/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/zpool-auto-expand-partitions/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/zp/zpool-auto-expand-partitions/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/third_party/nixpkgs/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/zpool-iostat-viz/default.nix b/third_party/nixpkgs/pkgs/by-name/zp/zpool-iostat-viz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/filesystems/zpool-iostat-viz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zp/zpool-iostat-viz/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix b/third_party/nixpkgs/pkgs/by-name/zp/zprint/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/zprint/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zp/zprint/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/zps/default.nix b/third_party/nixpkgs/pkgs/by-name/zp/zps/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/zps/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zp/zps/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/backup/zrepl/default.nix b/third_party/nixpkgs/pkgs/by-name/zr/zrepl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/backup/zrepl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zr/zrepl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/zs-wait4host/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zs-wait4host/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/zs-wait4host/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zs-wait4host/package.nix
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zsa-udev-rules/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsa-udev-rules/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/linux/zsa-udev-rules/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsa-udev-rules/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zscroll/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zscroll/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/misc/zscroll/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zscroll/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-abbr/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-abbr/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-autocomplete/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-autocomplete/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-autocomplete/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-autocomplete/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-autoenv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-autoenv/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-autopair/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-autopair/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-autopair/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-autosuggestions/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-autosuggestions/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-bd/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-bd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-bd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-bd/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-better-npm-completion/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-better-npm-completion/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-better-npm-completion/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-better-npm-completion/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh b/third_party/nixpkgs/pkgs/by-name/zs/zsh-clipboard/clipboard.plugin.zsh
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-clipboard/clipboard.plugin.zsh
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-clipboard/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-clipboard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-clipboard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-clipboard/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-command-time/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-command-time/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-completions/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-completions/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-defer/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-defer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-defer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-defer/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-edit/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-edit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-edit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-edit/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-f-sy-h/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-f-sy-h/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-f-sy-h/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-f-sy-h/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-forgit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-forgit/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-history-search/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-fzf-history-search/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-history-search/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-fzf-history-search/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-fzf-tab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-fzf-tab/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-git-prompt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-git-prompt/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-history-search-multi-word/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-history-search-multi-word/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-history-substring-search/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-history-substring-search/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zsh-history-to-fish/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-history-to-fish/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zsh-history-to-fish/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-history-to-fish/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-history/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-history/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-navigation-tools/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-navigation-tools/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-nix-shell/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-nix-shell/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch b/third_party/nixpkgs/pkgs/by-name/zs/zsh-powerlevel10k/gitstatusd.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-powerlevel10k/gitstatusd.patch
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-powerlevel9k/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-powerlevel9k/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-prezto/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-prezto/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-system-clipboard/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-system-clipboard/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-vi-mode/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-vi-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-vi-mode/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-vi-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-you-should-use/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-you-should-use/package.nix
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-z/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsh-z/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/zsh/zsh-z/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsh-z/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/zssh/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zssh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/zssh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zssh/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/zstxtns-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zstxtns-utils/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/zstxtns-utils/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zstxtns-utils/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix b/third_party/nixpkgs/pkgs/by-name/zs/zsv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/zsv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zs/zsv/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ztags/default.nix b/third_party/nixpkgs/pkgs/by-name/zt/ztags/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/misc/ztags/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zt/ztags/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/misc/zthrottle/default.nix b/third_party/nixpkgs/pkgs/by-name/zt/zthrottle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/zthrottle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zt/zthrottle/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/zuki/default.nix b/third_party/nixpkgs/pkgs/by-name/zu/zuki-themes/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/data/themes/zuki/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zu/zuki-themes/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/third_party/nixpkgs/pkgs/by-name/zu/zulip-term/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zu/zulip-term/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch b/third_party/nixpkgs/pkgs/by-name/zu/zulip-term/pytest-executable-name.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch
rename to third_party/nixpkgs/pkgs/by-name/zu/zulip-term/pytest-executable-name.patch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/third_party/nixpkgs/pkgs/by-name/zu/zulip/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zu/zulip/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix b/third_party/nixpkgs/pkgs/by-name/zu/zuo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zu/zuo/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/zx/default.nix b/third_party/nixpkgs/pkgs/by-name/zx/zx/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/zx/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zx/zx/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix b/third_party/nixpkgs/pkgs/by-name/zx/zxcvbn-c/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zx/zxcvbn-c/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/system/zxfer/default.nix b/third_party/nixpkgs/pkgs/by-name/zx/zxfer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/system/zxfer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zx/zxfer/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/zxing/java-zxing.sh b/third_party/nixpkgs/pkgs/by-name/zx/zxing/java-zxing.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/zxing/java-zxing.sh
rename to third_party/nixpkgs/pkgs/by-name/zx/zxing/java-zxing.sh
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/zxing/default.nix b/third_party/nixpkgs/pkgs/by-name/zx/zxing/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/zxing/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zx/zxing/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh b/third_party/nixpkgs/pkgs/by-name/zx/zxing/zxing-cmdline-encoder.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh
rename to third_party/nixpkgs/pkgs/by-name/zx/zxing/zxing-cmdline-encoder.sh
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh b/third_party/nixpkgs/pkgs/by-name/zx/zxing/zxing-cmdline-runner.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh
rename to third_party/nixpkgs/pkgs/by-name/zx/zxing/zxing-cmdline-runner.sh
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/zxing/zxing.sh b/third_party/nixpkgs/pkgs/by-name/zx/zxing/zxing.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/zxing/zxing.sh
rename to third_party/nixpkgs/pkgs/by-name/zx/zxing/zxing.sh
diff --git a/third_party/nixpkgs/pkgs/tools/security/zzuf/default.nix b/third_party/nixpkgs/pkgs/by-name/zz/zzuf/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/zzuf/default.nix
rename to third_party/nixpkgs/pkgs/by-name/zz/zzuf/package.nix
diff --git a/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix
index 0a3d994586..6c404d8c53 100644
--- a/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix
@@ -1,31 +1,41 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
-, kdeclarative
-, plasma-framework
-, plasma-workspace
, unstableGitUpdater
}:
+# NOTE:
+#
+# In order to use the qogir sddm theme, the packages
+# kdePackages.plasma-desktop and kdePackages.qtsvg should be added to
+# the option services.displayManager.sddm.extraPackages of the sddm
+# module:
+#
+# environment.systemPackages = with pkgs; [
+# qogir-kde
+# ];
+#
+# services.displayManager.sddm = {
+# enable = true;
+# package = pkgs.kdePackages.sddm;
+# theme = "Qogir";
+# extraPackages = with pkgs; [
+# kdePackages.plasma-desktop
+# kdePackages.qtsvg
+# ];
+# };
+
stdenvNoCC.mkDerivation rec {
pname = "qogir-kde";
- version = "0-unstable-2024-09-21";
+ version = "0-unstable-2024-10-30";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
- rev = "9f665cc10ded4fe0a3100c9151a5bd12d1ac50ca";
- hash = "sha256-3WdDzOKO962RykLS8P4paxEiA1keGhuah/GhAKdsuhA=";
+ rev = "f2fdab049c403a356a79c9c3b9d45ec4357c1649";
+ hash = "sha256-6Hl2ozxqufin0fe33HZVuofk61E8Vggyk8/XX2R+2H0=";
};
- # Propagate sddm theme dependencies to user env otherwise sddm does
- # not find them. Putting them in buildInputs is not enough.
- propagatedUserEnvPkgs = [
- kdeclarative.bin
- plasma-framework
- plasma-workspace
- ];
-
postPatch = ''
patchShebangs install.sh
@@ -52,11 +62,11 @@ stdenvNoCC.mkDerivation rec {
passthru.updateScript = unstableGitUpdater { };
- meta = with lib; {
+ meta = {
description = "Flat Design theme for KDE Plasma desktop";
homepage = "https://github.com/vinceliuice/Qogir-kde";
- license = licenses.gpl3Only;
- platforms = platforms.all;
- maintainers = [ maintainers.romildo ];
+ license = lib.licenses.gpl3Only;
+ platforms = lib.platforms.all;
+ maintainers = [ lib.maintainers.romildo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix
index 299e4c89a1..2a7cada3a4 100644
--- a/third_party/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix
@@ -1,29 +1,41 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
-, plasma-desktop
-, qtsvg
, unstableGitUpdater
}:
+# NOTE:
+#
+# In order to use the whitesur sddm themes, the packages
+# kdePackages.plasma-desktop and kdePackages.qtsvg should be added to
+# the option services.displayManager.sddm.extraPackages of the sddm
+# module:
+#
+# environment.systemPackages = with pkgs; [
+# whitesur-kde
+# ];
+#
+# services.displayManager.sddm = {
+# enable = true;
+# package = pkgs.kdePackages.sddm;
+# theme = "WhiteSur-dark";
+# extraPackages = with pkgs; [
+# kdePackages.plasma-desktop
+# kdePackages.qtsvg
+# ];
+# };
+
stdenvNoCC.mkDerivation {
pname = "whitesur-kde";
- version = "2022-05-01-unstable-2024-09-26";
+ version = "2022-05-01-unstable-2024-11-01";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "whitesur-kde";
- rev = "8cbb617049ad79ecff63eb62770d360b73fed656";
- hash = "sha256-uNRO/r8kJByS4BDq0jXth+y0rg3GtGsbXoNLOZHpuNU=";
+ rev = "efba411e11f8f4d3219bffb393d25afae62eacf2";
+ hash = "sha256-052mKpf8e5pSecMzaWB3McOZ/uAqp/XGJjcVWnlKPLE=";
};
- # Propagate sddm theme dependencies to user env otherwise sddm does
- # not find them. Putting them in buildInputs is not enough.
- propagatedUserEnvPkgs = [
- plasma-desktop
- qtsvg
- ];
-
postPatch = ''
patchShebangs install.sh sddm/install.sh
@@ -55,11 +67,11 @@ stdenvNoCC.mkDerivation {
passthru.updateScript = unstableGitUpdater { };
- meta = with lib; {
+ meta = {
description = "MacOS big sur like theme for KDE Plasma desktop";
homepage = "https://github.com/vinceliuice/WhiteSur-kde";
- license = licenses.gpl3Only;
- platforms = platforms.all;
- maintainers = [ maintainers.romildo ];
+ license = lib.licenses.gpl3Only;
+ platforms = lib.platforms.all;
+ maintainers = [ lib.maintainers.romildo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/development/u1db-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/development/u1db-qt/default.nix
index 9bba0d914c..9e8d6b20f2 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/development/u1db-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/development/u1db-qt/default.nix
@@ -10,6 +10,7 @@
pkg-config,
qtbase,
qtdeclarative,
+ qttools,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -26,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [
"out"
"dev"
+ "doc"
"examples"
];
@@ -56,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
cmake
pkg-config
qtdeclarative # qmlplugindump
+ qttools # qdoc
];
buildInputs = [
@@ -66,8 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeCheckInputs = [ dbus-test-runner ];
cmakeFlags = [
- # Needs qdoc, see https://github.com/NixOS/nixpkgs/pull/245379
- (lib.cmakeBool "BUILD_DOCS" false)
+ (lib.cmakeBool "BUILD_DOCS" true)
];
dontWrapQtApps = true;
@@ -101,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Qt5 binding and QtQuick2 plugin for U1DB";
homepage = "https://gitlab.com/ubports/development/core/u1db-qt";
+ changelog = "https://gitlab.com/ubports/development/core/u1db-qt/-/blob/${finalAttrs.version}/ChangeLog";
license = lib.licenses.lgpl3Only;
maintainers = lib.teams.lomiri.members;
platforms = lib.platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
index 35eccd8971..8493e89f8f 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
@@ -1,15 +1,18 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, gitUpdater
-, testers
-, cmake
-, dbus
-, dbus-test-runner
-, pkg-config
-, qtbase
-, qtdeclarative
-, validatePkgConfig
+{
+ stdenv,
+ lib,
+ fetchFromGitLab,
+ gitUpdater,
+ testers,
+ cmake,
+ dbus,
+ dbus-test-runner,
+ doxygen,
+ pkg-config,
+ qtbase,
+ qtdeclarative,
+ qttools,
+ validatePkgConfig,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -26,20 +29,27 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [
"out"
"dev"
+ "doc"
];
postPatch = ''
# Queries QMake for broken Qt variable: '/build/qtbase-/$(out)/$(qtQmlPrefix)'
substituteInPlace qml/Lomiri/Action/CMakeLists.txt \
- --replace 'exec_program(''${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)' 'set(QT_IMPORTS_DIR "''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}")'
+ --replace-fail 'exec_program(''${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)' 'set(QT_IMPORTS_DIR "''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}")'
+
+ # Fix section labels
+ substituteInPlace documentation/qml/pages/* \
+ --replace-warn '\part' '\section1'
'';
strictDeps = true;
nativeBuildInputs = [
cmake
+ doxygen
pkg-config
qtdeclarative
+ qttools # qdoc
validatePkgConfig
];
@@ -55,10 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "ENABLE_TESTING" finalAttrs.finalPackage.doCheck)
+ (lib.cmakeBool "GENERATE_DOCUMENTATION" true)
# Use vendored libhud2, TODO package libhud2 separately?
(lib.cmakeBool "use_libhud2" false)
- # QML docs need qdoc, https://github.com/NixOS/nixpkgs/pull/245379
- (lib.cmakeBool "GENERATE_DOCUMENTATION" false)
];
dontWrapQtApps = true;
@@ -82,8 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.lgpl3Only;
maintainers = teams.lomiri.members;
platforms = platforms.linux;
- pkgConfigModules = [
- "lomiri-action-qt-1"
- ];
+ pkgConfigModules = [ "lomiri-action-qt-1" ];
};
})
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
index 8767534d36..d0bedb67bd 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -1,36 +1,46 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, gitUpdater
-, substituteAll
-, testers
-, dbus-test-runner
-, dpkg
-, gdb
-, glib
-, lttng-ust
-, perl
-, pkg-config
-, python3
-, qmake
-, qtbase
-, qtdeclarative
-, qtfeedback
-, qtgraphicaleffects
-, qtpim
-, qtquickcontrols2
-, qtsvg
-, qtsystems
-, suru-icon-theme
-, validatePkgConfig
-, wrapQtAppsHook
-, xvfb-run
+{
+ stdenv,
+ lib,
+ fetchFromGitLab,
+ gitUpdater,
+ substituteAll,
+ testers,
+ dbus-test-runner,
+ dpkg,
+ gdb,
+ glib,
+ lttng-ust,
+ perl,
+ pkg-config,
+ python3,
+ qmake,
+ qtbase,
+ qtdeclarative,
+ qtfeedback,
+ qtgraphicaleffects,
+ qtpim,
+ qtquickcontrols2,
+ qtsvg,
+ qtsystems,
+ qttools,
+ suru-icon-theme,
+ validatePkgConfig,
+ wrapQtAppsHook,
+ xvfb-run,
}:
let
listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix;
- qtPluginPaths = listToQtVar qtbase.qtPluginPrefix [ qtbase qtpim qtsvg ];
- qtQmlPaths = listToQtVar qtbase.qtQmlPrefix [ qtdeclarative qtfeedback qtgraphicaleffects ];
+ qtPluginPaths = listToQtVar qtbase.qtPluginPrefix [
+ qtbase
+ qtpim
+ qtsvg
+ ];
+ qtQmlPaths = listToQtVar qtbase.qtQmlPrefix [
+ qtdeclarative
+ qtfeedback
+ qtgraphicaleffects
+ ];
in
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-ui-toolkit";
@@ -43,10 +53,15 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-r+wUCl+ywFcgFYo7BjBoXiulQptd1Zd3LJchXiMtx4I=";
};
- outputs = [ "out" "dev" ];
+ outputs = [
+ "out"
+ "dev"
+ "doc"
+ ];
patches = [
./2001-Mark-problematic-tests.patch
+
(substituteAll {
src = ./2002-Nixpkgs-versioned-QML-path.patch.in;
name = "2002-Nixpkgs-versioned-QML-path.patch";
@@ -67,6 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace apicheck/apicheck.pro \
--replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin"
+ substituteInPlace documentation/documentation.pro \
+ --replace-fail '/usr/share/doc' '$$PREFIX/share/doc' \
+ --replace-fail '$$[QT_INSTALL_DOCS]' '$$PREFIX/share/doc/lomiri-ui-toolkit'
+
# Causes redefinition error with our own fortify hardening
sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf
@@ -105,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
python3
qmake
+ qttools # qdoc, qhelpgenerator
validatePkgConfig
wrapQtAppsHook
];
@@ -133,8 +153,6 @@ stdenv.mkDerivation (finalAttrs: {
];
qmakeFlags = [
- # docs require Qt5's qdoc, which we don't have before https://github.com/NixOS/nixpkgs/pull/245379
- "CONFIG+=no_docs"
# Ubuntu UITK compatibility, for older / not-yet-migrated applications
"CONFIG+=ubuntu-uitk-compat"
"QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}"
@@ -201,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = gitUpdater { };
};
- meta = with lib; {
+ meta = {
description = "QML components to ease the creation of beautiful applications in QML";
longDescription = ''
This project consists of a set of QML components to ease the creation of beautiful applications in QML for Lomiri.
@@ -219,9 +237,12 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit";
changelog = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/${finalAttrs.version}/ChangeLog";
- license = with licenses; [ gpl3Only cc-by-sa-30 ];
- maintainers = teams.lomiri.members;
- platforms = platforms.linux;
+ license = with lib.licenses; [
+ gpl3Only
+ cc-by-sa-30
+ ];
+ maintainers = lib.teams.lomiri.members;
+ platforms = lib.platforms.linux;
pkgConfigModules = [
"LomiriGestures"
"LomiriMetrics"
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index dd2f6d3ab2..a2bb443400 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -1,30 +1,32 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, gitUpdater
-, testers
-, cmake
-, cmake-extras
-, dbus-test-runner
-, gettext
-, glib
-, gsettings-qt
-, gtest
-, libapparmor
-, libnotify
-, lomiri-api
-, lomiri-app-launch
-, lomiri-download-manager
-, lomiri-ui-toolkit
-, pkg-config
-, properties-cpp
-, qtbase
-, qtdeclarative
-, qtfeedback
-, qtgraphicaleffects
-, validatePkgConfig
-, wrapGAppsHook3
-, xvfb-run
+{
+ stdenv,
+ lib,
+ fetchFromGitLab,
+ gitUpdater,
+ testers,
+ cmake,
+ cmake-extras,
+ dbus-test-runner,
+ gettext,
+ glib,
+ gsettings-qt,
+ gtest,
+ libapparmor,
+ libnotify,
+ lomiri-api,
+ lomiri-app-launch,
+ lomiri-download-manager,
+ lomiri-ui-toolkit,
+ pkg-config,
+ properties-cpp,
+ qtbase,
+ qtdeclarative,
+ qtfeedback,
+ qtgraphicaleffects,
+ qttools,
+ validatePkgConfig,
+ wrapGAppsHook3,
+ xvfb-run,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -41,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [
"out"
"dev"
+ "doc"
"examples"
];
@@ -64,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
gettext
pkg-config
qtdeclarative # qmlplugindump
+ qttools # qdoc
validatePkgConfig
wrapGAppsHook3
];
@@ -90,9 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
xvfb-run
];
- checkInputs = [
- gtest
- ];
+ checkInputs = [ gtest ];
dontWrapQtApps = true;
@@ -100,17 +102,27 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "GSETTINGS_COMPILE" true)
(lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
- (lib.cmakeBool "ENABLE_DOC" false) # needs Qt5 qdoc: https://github.com/NixOS/nixpkgs/pull/245379
+ (lib.cmakeBool "ENABLE_DOC" true)
(lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # in case something still depends on it
];
- preBuild = let
- listToQtVar = list: suffix: lib.strings.concatMapStringsSep ":" (drv: "${lib.getBin drv}/${suffix}") list;
- in ''
- # Executes qmlplugindump
- export QT_PLUGIN_PATH=${listToQtVar [ qtbase ] qtbase.qtPluginPrefix}
- export QML2_IMPORT_PATH=${listToQtVar [ qtdeclarative lomiri-ui-toolkit qtfeedback qtgraphicaleffects ] qtbase.qtQmlPrefix}
- '';
+ preBuild =
+ let
+ listToQtVar =
+ list: suffix: lib.strings.concatMapStringsSep ":" (drv: "${lib.getBin drv}/${suffix}") list;
+ in
+ ''
+ # Executes qmlplugindump
+ export QT_PLUGIN_PATH=${listToQtVar [ qtbase ] qtbase.qtPluginPrefix}
+ export QML2_IMPORT_PATH=${
+ listToQtVar [
+ qtdeclarative
+ lomiri-ui-toolkit
+ qtfeedback
+ qtgraphicaleffects
+ ] qtbase.qtQmlPrefix
+ }
+ '';
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
@@ -145,7 +157,10 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://gitlab.com/ubports/development/core/lomiri-content-hub";
changelog = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/blob/${finalAttrs.version}/ChangeLog";
- license = with lib.licenses; [ gpl3Only lgpl3Only ];
+ license = with lib.licenses; [
+ gpl3Only
+ lgpl3Only
+ ];
mainProgram = "lomiri-content-hub-service";
maintainers = lib.teams.lomiri.members;
platforms = lib.platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 6174bd9c54..acd5647a62 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -1,28 +1,29 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, fetchpatch
-, gitUpdater
-, testers
-, boost
-, cmake
-, cmake-extras
-, dbus
-, dbus-test-runner
-# Needs qdoc, https://github.com/NixOS/nixpkgs/pull/245379
-, withDocumentation ? false
-, doxygen
-, glog
-, graphviz
-, gtest
-, lomiri-api
-, pkg-config
-, python3
-, qtbase
-, qtdeclarative
-, validatePkgConfig
-, wrapQtAppsHook
-, xvfb-run
+{
+ stdenv,
+ lib,
+ fetchFromGitLab,
+ fetchpatch,
+ gitUpdater,
+ testers,
+ boost,
+ cmake,
+ cmake-extras,
+ dbus,
+ dbus-test-runner,
+ withDocumentation ? true,
+ doxygen,
+ glog,
+ graphviz,
+ gtest,
+ lomiri-api,
+ pkg-config,
+ python3,
+ qtbase,
+ qtdeclarative,
+ qttools,
+ validatePkgConfig,
+ wrapQtAppsHook,
+ xvfb-run,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -39,9 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [
"out"
"dev"
- ] ++ lib.optionals withDocumentation [
- "doc"
- ];
+ ] ++ lib.optionals withDocumentation [ "doc" ];
patches = [
# This change seems incomplete, potentially breaks things on systems that don't use AppArmor mediation
@@ -69,15 +68,18 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
- nativeBuildInputs = [
- cmake
- pkg-config
- validatePkgConfig
- wrapQtAppsHook
- ] ++ lib.optionals withDocumentation [
- doxygen
- graphviz
- ];
+ nativeBuildInputs =
+ [
+ cmake
+ pkg-config
+ validatePkgConfig
+ wrapQtAppsHook
+ ]
+ ++ lib.optionals withDocumentation [
+ doxygen
+ graphviz
+ qttools # qdoc
+ ];
buildInputs = [
boost
@@ -95,9 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
xvfb-run
];
- checkInputs = [
- gtest
- ];
+ checkInputs = [ gtest ];
cmakeFlags = [
(lib.cmakeBool "ENABLE_DOC" withDocumentation)
@@ -106,11 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "ENABLE_WERROR" false)
];
- makeTargets = [
- "all"
- ] ++ lib.optionals withDocumentation [
- "doc"
- ];
+ makeTargets = [ "all" ] ++ lib.optionals withDocumentation [ "doc" ];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
@@ -127,13 +123,13 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = gitUpdater { };
};
- meta = with lib; {
+ meta = {
description = "Performs uploads and downloads from a centralized location";
homepage = "https://gitlab.com/ubports/development/core/lomiri-download-manager";
changelog = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/blob/${finalAttrs.version}/ChangeLog";
- license = licenses.lgpl3Only;
- maintainers = teams.lomiri.members;
- platforms = platforms.linux;
+ license = lib.licenses.lgpl3Only;
+ maintainers = lib.teams.lomiri.members;
+ platforms = lib.platforms.linux;
pkgConfigModules = [
"ldm-common"
"lomiri-download-manager-client"
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
index 41d5e81611..58ca6d2087 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
@@ -28,6 +28,7 @@
python3,
qtdeclarative,
qtbase,
+ qttools,
validatePkgConfig,
}:
@@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
intltool
pkg-config
qtdeclarative
+ qttools # qdoc
validatePkgConfig
];
@@ -106,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "GSETTINGS_COMPILE" true)
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # just in case something needs it
- (lib.cmakeBool "BUILD_DOC" true) # lacks QML docs, needs qdoc: https://github.com/NixOS/nixpkgs/pull/245379
+ (lib.cmakeBool "BUILD_DOC" true)
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index de8c8eb3c5..7c410237e1 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, nix-update-script
, meson
, ninja
@@ -20,24 +19,15 @@
stdenv.mkDerivation rec {
pname = "elementary-onboarding";
- version = "8.0.1";
+ version = "8.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "onboarding";
rev = version;
- sha256 = "sha256-p9N8Pblt15+BHcvlLjdPRyquM8w7ipieTcmUHpcMd6k=";
+ sha256 = "sha256-tLqLGkcryXGe1wsupgwtnNtFj5aXXUPrwkpxUQmyJFM=";
};
- patches = [
- # WelcomeView: Fix missing handler when a row activated
- # https://github.com/elementary/onboarding/pull/243
- (fetchpatch {
- url = "https://github.com/elementary/onboarding/commit/391fab7867885578015abbebbe678e8d4f0f331d.patch";
- hash = "sha256-NnnvPQV2GBe8A6TiW5lq3J8hb4ruCSmri5UZ2W0fBIA=";
- })
- ];
-
nativeBuildInputs = [
meson
ninja
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix
index d89bf7b7b2..c98712f5d9 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "ispc";
- version = "1.25.0";
+ version = "1.25.3";
dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-DT8YjyAOdtAaWnCUvKRQGhPOazUkuRWkajBVK279Qhk=";
+ sha256 = "sha256-baTJNfhOSYfJJnrutkW06AIMXpVP3eBpEes0GSI1yGY=";
};
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/generic.nix
index 9ffa9becb9..0d03be2a95 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/generic.nix
@@ -636,10 +636,13 @@ stdenv.mkDerivation (finalAttrs: {
description = "Open-source Java Development Kit";
homepage = "https://openjdk.java.net/";
license = lib.licenses.gpl2Only;
- maintainers = with lib.maintainers; [
- edwtjo
- infinidoge
- ];
+ maintainers =
+ with lib.maintainers;
+ [
+ edwtjo
+ infinidoge
+ ]
+ ++ lib.teams.java.members;
mainProgram = "java";
platforms =
[
diff --git a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix
index 886c92ba2e..836b282b0e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix
@@ -69,7 +69,7 @@ let
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
description = "${brand-name}, prebuilt OpenJDK binary";
platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms
- maintainers = with maintainers; [ taku0 ];
+ maintainers = with maintainers; [ taku0 ] ++ lib.teams.java.members;
inherit knownVulnerabilities;
mainProgram = "java";
};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
index 9d9033506a..b166d3c073 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
@@ -127,7 +127,7 @@ let
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
description = "${brand-name}, prebuilt OpenJDK binary";
platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms
- maintainers = with maintainers; [ taku0 ];
+ maintainers = with maintainers; [ taku0 ] ++ lib.teams.java.members;
inherit knownVulnerabilities;
mainProgram = "java";
};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix
index cdb23470ca..617e6b862f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix
@@ -75,13 +75,13 @@ let
in stdenv.mkDerivation (finalAttrs: {
pname = "yosys";
- version = "0.46";
+ version = "0.47";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "refs/tags/${finalAttrs.version}";
- hash = "sha256-OnSKsX5G8Tc6AMFCmuWg6AekJvvG+K5Zr5rZZll+c/o=";
+ hash = "sha256-9u9aAPTZyt9vzZwryor3GRCGzs/mu2/XtM0XzV7uHfk=";
fetchSubmodules = true;
leaveDotGit = true;
postFetch = ''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/synlig.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/synlig.nix
index 0cfaac2212..079c22aedb 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/synlig.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/synlig.nix
@@ -87,5 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.asl20;
maintainers = with maintainers; [ hzeller ];
platforms = platforms.all;
+ broken = versionAtLeast yosys.version "0.47";
};
})
diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/common.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/common.nix
index f8127b2b74..6b20c71c54 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/zulu/common.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/common.nix
@@ -164,7 +164,7 @@ let
homepage = "https://www.azul.com/products/zulu/";
license = lib.licenses.gpl2Only;
mainProgram = "java";
- maintainers = [ ];
+ maintainers = [ ] ++ lib.teams.java.members;
platforms = builtins.attrNames dists;
sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ];
};
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix
index cc7d87038a..43dbc2ce03 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.3.12";
- hash = "sha256-gHYzSWzNs3CokFRY24K9ZzZumKbVlyiRS3l7h+nK7L8=";
+ version = "8.3.13";
+ hash = "sha256-x3kcguGlVMyvhKQLpxzBQXupr2f7Wzl4CDf9fH628SQ=";
});
in
base.withExtensions ({ all, ... }: with all; ([
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.4.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.4.nix
index c794e39637..e5abb67609 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.4.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.4.nix
@@ -4,10 +4,10 @@ let
base = callPackage ./generic.nix (
_args
// {
- version = "8.4.0RC3";
+ version = "8.4.0RC4";
phpSrc = fetchurl {
- url = "https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz";
- hash = "sha256-6eA5w7NRfH5k+AyoIvuSEY9JgjtQqYwyZXTRSuKHBvY=";
+ url = "https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz";
+ hash = "sha256-s/ihnYRfSqVlAV/4YZZAfrUzKE60NlrFlT9edK5h3LA=";
};
}
);
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
index c4b3f96123..46b6875579 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
@@ -1,29 +1,26 @@
-{ stdenv
-, lib
-, rustPlatform
-, fetchFromGitHub
-, llvmPackages
-, libffi
-, libxml2
-, CoreFoundation
-, SystemConfiguration
-, Security
-, withLLVM ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
-, withSinglepass ? true
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ llvmPackages,
+ libffi,
+ libxml2,
+ withLLVM ? true,
+ withSinglepass ? true,
}:
rustPlatform.buildRustPackage rec {
pname = "wasmer";
- version = "5.0.0";
+ version = "5.0.1";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-zTz4UK+A4HWf+XGaTh7FOUFEeB9JnZooFnxZ4K3AFGw=";
+ hash = "sha256-tfAGPBc36o5/XtVZ8IW6SFr+iWOkFzVTfe9jI4PpuA0=";
};
- cargoHash = "sha256-YSnGGd2uIxvhxDTJjtQMdv4Qx1DE7RA05Z+q4emJAKg=";
+ cargoHash = "sha256-zvQJpAjZNfa54se2xaRPWCWoCWsWw1btaHYrWlyUIZY=";
nativeBuildInputs = [
rustPlatform.bindgenHook
@@ -33,10 +30,6 @@ rustPlatform.buildRustPackage rec {
llvmPackages.llvm
libffi
libxml2
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- CoreFoundation
- SystemConfiguration
- Security
];
# check references to `compiler_features` in Makefile on update
@@ -46,11 +39,14 @@ rustPlatform.buildRustPackage rec {
"static-artifact-create"
"wasmer-artifact-load"
"static-artifact-load"
- ]
- ++ lib.optional withLLVM "llvm"
- ++ lib.optional withSinglepass "singlepass";
+ ] ++ lib.optional withLLVM "llvm" ++ lib.optional withSinglepass "singlepass";
- cargoBuildFlags = [ "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ];
+ cargoBuildFlags = [
+ "--manifest-path"
+ "lib/cli/Cargo.toml"
+ "--bin"
+ "wasmer"
+ ];
env.LLVM_SYS_180_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev;
@@ -69,6 +65,10 @@ rustPlatform.buildRustPackage rec {
homepage = "https://wasmer.io/";
license = lib.licenses.mit;
platforms = with lib.platforms; linux ++ darwin;
- maintainers = with lib.maintainers; [ Br1ght0ne shamilton nickcao ];
+ maintainers = with lib.maintainers; [
+ Br1ght0ne
+ shamilton
+ nickcao
+ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix
index ee0585e591..691f017ec6 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
- version = "26.0.0";
+ version = "26.0.1";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
- hash = "sha256-zcAYF/accq0Z0aKZLquFY+iDs1uh57sbZ/zXGqZ3KZI=";
+ hash = "sha256-Q7f35Y3ZZ7BHLwmdsa0I5gtlNMObscVD/3jKrVetGnA=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
- cargoHash = "sha256-ufojfTrChL363AX/W8hT3pJYeYijqJ7azECuUGGmBx0=";
+ cargoHash = "sha256-kaE+LoqnWPZcM9H5FM7SRPRq2J78yrL5zWdV2klVLDU=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/accounts-qml-module/default.nix b/third_party/nixpkgs/pkgs/development/libraries/accounts-qml-module/default.nix
index 858f9c0d57..2ac4663652 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/accounts-qml-module/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/accounts-qml-module/default.nix
@@ -1,19 +1,22 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, accounts-qt
-, dbus-test-runner
-, pkg-config
-, qmake
-, qtbase
-, qtdeclarative
-, signond
-, xvfb-run
+{
+ stdenv,
+ lib,
+ fetchFromGitLab,
+ unstableGitUpdater,
+ accounts-qt,
+ dbus-test-runner,
+ pkg-config,
+ qmake,
+ qtbase,
+ qtdeclarative,
+ qttools,
+ signond,
+ xvfb-run,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "accounts-qml-module";
- version = "0.7-unstable-2022-10-28";
+ version = "0.7-unstable-2023-10-28";
src = fetchFromGitLab {
owner = "accounts-sso";
@@ -22,17 +25,28 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-ZpnkZauowLPBnO3DDDtG/x07XoQGVNqEF8AQB5TZK84=";
};
- postPatch = ''
- substituteInPlace src/src.pro \
- --replace '$$[QT_INSTALL_BINS]/qmlplugindump' 'qmlplugindump' \
- --replace '$$[QT_INSTALL_QML]' '${placeholder "out"}/${qtbase.qtQmlPrefix}'
+ outputs = [
+ "out"
+ "doc"
+ ];
- # Don't install test binary
- sed -i tests/tst_plugin.pro \
- -e '/TARGET = tst_plugin/a INSTALLS -= target'
- '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
- sed -i accounts-qml-module.pro -e '/tests/d'
- '';
+ postPatch =
+ ''
+ substituteInPlace src/src.pro \
+ --replace '$$[QT_INSTALL_BINS]/qmlplugindump' 'qmlplugindump' \
+ --replace '$$[QT_INSTALL_QML]' '${placeholder "out"}/${qtbase.qtQmlPrefix}'
+
+ # Find qdoc
+ substituteInPlace doc/doc.pri \
+ --replace-fail 'QDOC = $$[QT_INSTALL_BINS]/qdoc' 'QDOC = qdoc'
+
+ # Don't install test binary
+ sed -i tests/tst_plugin.pro \
+ -e '/TARGET = tst_plugin/a INSTALLS -= target'
+ ''
+ + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+ sed -i accounts-qml-module.pro -e '/tests/d'
+ '';
# QMake can't find Qt modules in buildInputs
strictDeps = false;
@@ -41,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
qmake
qtdeclarative # qmlplugindump
+ qttools # qdoc
];
buildInputs = [
@@ -57,11 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
dontWrapQtApps = true;
- qmakeFlags = [
- # Needs qdoc, https://github.com/NixOS/nixpkgs/pull/245379
- "CONFIG+=no_docs"
- ];
-
postConfigure = ''
make qmake_all
'';
@@ -78,11 +88,19 @@ stdenv.mkDerivation (finalAttrs: {
export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
'';
- meta = with lib; {
+ postFixup = ''
+ moveToOutput share/accounts-qml-module/doc $doc
+ '';
+
+ passthru.updateScript = unstableGitUpdater {
+ tagPrefix = "VERSION_";
+ };
+
+ meta = {
description = "QML bindings for libaccounts-qt + libsignon-qt";
homepage = "https://gitlab.com/accounts-sso/accounts-qml-module";
- license = licenses.lgpl21Only;
- maintainers = with maintainers; [ OPNA2608 ];
- platforms = platforms.linux;
+ license = lib.licenses.lgpl21Only;
+ maintainers = with lib.maintainers; [ OPNA2608 ];
+ platforms = lib.platforms.linux;
};
})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix
index 2f44827af9..364ba305d5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix
@@ -35,6 +35,19 @@ let
hash = "sha256-Hul2ELwnaDV8TDRMDXoFisle31GATDkf3PdkR2K9QTs=";
};
+ bassmidi = {
+ h = "bassmidi.h";
+ version = "2.4.15.3";
+ so = {
+ i686_linux = "libs/x86/libbassmidi.so";
+ x86_64-linux = "libs/x86_64/libbassmidi.so";
+ armv7l-linux = "libs/armhf/libbassmidi.so";
+ aarch64-linux = "libs/aarch64/libbassmidi.so";
+ };
+ url = "https://web.archive.org/web/20240501180447/http://www.un4seen.com/files/bassmidi24-linux.zip";
+ hash = "sha256-HrF1chhGk32bKN3jwal44Tz/ENGe/zORsrLPeGAv1OE=";
+ };
+
bassmix = {
h = "bassmix.h";
version = "2.4.12";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix
index f6e5807f69..b1e565266f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix
@@ -34,7 +34,7 @@
, stdenv
, substituteAll
, xhtml1
-, yajl
+, json_c
, writeScript
, nixosTests
@@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
# NOTE: You must also bump:
#
# SysVirt in
- version = "10.5.0";
+ version = "10.9.0";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-Nku4l1f34NOUr23KWDH9uZu72OgMK3KfYjsRRbuTvf8=";
+ hash = "sha256-LYQYA5UIKYs+8rSNZDymmrxuTWsgmukP5Y17lGB5UQs=";
fetchSubmodules = true;
};
@@ -163,6 +163,9 @@ stdenv.mkDerivation rec {
sed -i '/qemuvhostusertest/d' tests/meson.build
sed -i '/qemuxml2xmltest/d' tests/meson.build
sed -i '/domaincapstest/d' tests/meson.build
+ # virshtest frequently times out on Darwin
+ substituteInPlace tests/meson.build \
+ --replace-fail "data.get('timeout', 30)" "data.get('timeout', 120)"
'' + lib.optionalString enableXen ''
# Has various hardcoded paths that don't exist outside of a Xen dom0.
sed -i '/libxlxml2domconfigtest/d' tests/meson.build
@@ -202,7 +205,7 @@ stdenv.mkDerivation rec {
python3
readline
xhtml1
- yajl
+ json_c
] ++ lib.optionals isLinux [
acl
attr
@@ -312,7 +315,7 @@ stdenv.mkDerivation rec {
(feat "ssh_proxy" isLinux)
(feat "tests" true)
(feat "udev" isLinux)
- (feat "yajl" true)
+ (feat "json_c" true)
(driver "ch" isLinux)
(driver "esx" true)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix
index dd5375ef8d..acdb76cc52 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix
@@ -13,28 +13,27 @@
, runCommand
, python3
, quarto
-, extraPythonPackages ? ps: with ps; []
+, extraPythonPackages ? ps: []
, sysctl
}:
stdenv.mkDerivation (final: {
pname = "quarto";
- version = "1.6.30";
+ version = "1.6.33";
+
src = fetchurl {
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
- sha256 = "sha256-2gzpQbaFLUox4EMo8RO3bwVjhsm239w5hv4Z0UuS1Qs=";
+ hash = "sha256-0qCQswtBC8R1Q7pHLhJtqCncllqgXo1t9pG97VwCtAI=";
};
+ patches = [
+ ./deno2.patch
+ ];
+
nativeBuildInputs = [
makeWrapper
];
- postPatch = ''
- # Compat for Deno >=1.26
- substituteInPlace bin/quarto.js \
- --replace-fail ']))?.trim();' ']))?.trim().split(" ")[0];'
- '';
-
dontStrip = true;
preFixup = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/quarto/deno2.patch b/third_party/nixpkgs/pkgs/development/libraries/quarto/deno2.patch
new file mode 100644
index 0000000000..1ece9ae954
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/quarto/deno2.patch
@@ -0,0 +1,149 @@
+diff --git a/bin/quarto.js b/bin/quarto.js
+index f854281..0b78f6e 100644
+--- a/bin/quarto.js
++++ b/bin/quarto.js
+@@ -28511,7 +28511,7 @@ function jupyterHubServicePrefix() {
+ return Deno.env.get("JUPYTERHUB_SERVICE_PREFIX");
+ }
+ function isInteractiveTerminal() {
+- return Deno.isatty(Deno.stderr.rid);
++ return Deno.stderr.isTerminal();
+ }
+ function isInteractiveSession() {
+ return isRStudio() || isInteractiveTerminal() || isVSCodeOutputChannel();
+@@ -83562,7 +83562,7 @@ function writeFileToStdout(file) {
+ });
+ const contents = readAllSync(df);
+ writeAllSync1(Deno.stdout, contents);
+- Deno.close(df.rid);
++ df.close();
+ }
+ function clearLine() {
+ info(ansi.eraseLine.cursorLeft(), {
+@@ -96154,6 +96154,7 @@ class ParserBase {
+ class SAXParser extends ParserBase {
+ _listeners = {};
+ _controller;
++ _encoding;
+ fireListeners(event) {
+ const [name, ...args] = event;
+ const list = this._listeners[name] || [];
+@@ -96189,33 +96190,23 @@ class SAXParser extends ParserBase {
+ write(chunk, controller) {
+ try {
+ this._controller = controller;
+- this.chunk = new TextDecoder().decode(chunk);
++ this.chunk = new TextDecoder(this._encoding).decode(chunk);
+ this.run();
+ } finally{
+ this._controller = undefined;
+ }
+ }
+- getStream() {
+- return new WritableStream(this);
+- }
+- getWriter() {
+- const streamWriter = this.getStream().getWriter();
+- return {
+- async write (p) {
+- await streamWriter.ready;
+- await streamWriter.write(p);
+- return p.length;
+- }
+- };
+- }
+- async parse(source) {
++ async parse(source, encoding) {
++ this._encoding = encoding;
+ if (typeof source === 'string') {
+ this.chunk = source;
+ this.run();
+ } else if (source instanceof Uint8Array) {
+ this.write(source);
+ } else {
+- await Deno.copy(source, this.getWriter());
++ await source.pipeThrough(new TextDecoderStream(this._encoding)).pipeTo(new WritableStream({
++ write: (str)=>this.parse(str, encoding)
++ }));
+ }
+ }
+ on(event, listener) {
+@@ -96326,8 +96317,7 @@ async function readSitemap(sitemapPath) {
+ }
+ });
+ const reader = await Deno.open(sitemapPath);
+- await parser.parse(reader);
+- reader.close();
++ await parser.parse(reader.readable);
+ return urlset;
+ }
+ function writeSitemap(sitemapPath, urlset, draftMode) {
+@@ -98407,21 +98397,21 @@ async function generateFeed(feed, feedItems, path) {
+ feed,
+ escape: __VIRTUAL_FILE172
+ });
+- await Deno.write(feedFile.rid, textEncoder.encode(preamble));
++ await feedFile.write(textEncoder.encode(preamble));
+ for (const feedItem of feedItems){
+ const item = renderEjs(resourcePath("projects/website/listing/feed/item.ejs.md"), {
+ item: feedItem,
+ escape: __VIRTUAL_FILE172
+ });
+- await Deno.write(feedFile.rid, textEncoder.encode(item));
++ await feedFile.write(textEncoder.encode(item));
+ }
+ const postamble = renderEjs(resourcePath("projects/website/listing/feed/postamble.ejs.md"), {
+ feed,
+ escape: __VIRTUAL_FILE172
+ });
+- await Deno.write(feedFile.rid, textEncoder.encode(postamble));
++ await feedFile.write(textEncoder.encode(postamble));
+ } finally{
+- Deno.close(feedFile.rid);
++ feedFile.close();
+ }
+ }
+ function prepareItems(items, options) {
+@@ -112277,7 +112267,7 @@ async function renderForPublish(render, providerName, type, title, siteUrl) {
+ }
+ function stageDocumentPublish(title, publishFiles) {
+ const publishDir = globalTempContext().createDir();
+- const stagedFiles = window.structuredClone(publishFiles);
++ const stagedFiles = globalThis.structuredClone(publishFiles);
+ stagedFiles.baseDir = publishDir;
+ for (const file of publishFiles.files){
+ const src = join2(publishFiles.baseDir, file);
+@@ -126377,33 +126367,6 @@ function reportPeformanceMetrics() {
+ console.log("Performance metrics");
+ console.log("Quarto:");
+ console.log(JSON.stringify(quartoPerformanceMetrics(), null, 2));
+- console.log();
+- console.log("Deno:");
+- const denoMetrics = JSON.parse(JSON.stringify(Deno.metrics()));
+- denoMetrics.ops = Object.fromEntries(Object.entries(denoMetrics.ops).map(([key, opMetrics])=>{
+- for (const key of Object.keys(opMetrics)){
+- if (opMetrics[key] === 0) {
+- delete opMetrics[key];
+- }
+- }
+- return [
+- key,
+- opMetrics
+- ];
+- }).filter(([_key, opMetrics])=>Object.keys(opMetrics).length > 0).map(([key, opMetrics])=>{
+- if (opMetrics.opsDispatched === opMetrics.opsDispatchedSync && opMetrics.opsDispatched === opMetrics.opsCompleted && opMetrics.opsDispatched === opMetrics.opsCompletedSync || opMetrics.opsDispatched === opMetrics.opsDispatchedAsync && opMetrics.opsDispatched === opMetrics.opsCompleted && opMetrics.opsDispatched === opMetrics.opsCompletedAsync) {
+- return [
+- key,
+- opMetrics.opsDispatched
+- ];
+- } else {
+- return [
+- key,
+- opMetrics
+- ];
+- }
+- }));
+- console.log(JSON.stringify(denoMetrics, null, 2));
+ }
+ async function mainRunner(runner) {
+ try {
diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
index b1f18061bd..8074651f39 100644
--- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
@@ -3406,14 +3406,14 @@ buildLuarocksPackage {
toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }:
buildLuarocksPackage {
pname = "toml-edit";
- version = "0.6.0-1";
+ version = "0.6.1-1";
knownRockspec = (fetchurl {
- url = "mirror://luarocks/toml-edit-0.6.0-1.rockspec";
- sha256 = "10mmxaw2nxg80zx7idfy3sjj4d4ma2g2bja14bnk1qx584dy7m4k";
+ url = "mirror://luarocks/toml-edit-0.6.1-1.rockspec";
+ sha256 = "0crvmigffka3n7583r1a7fgcjfq5b0819a7d155q50m52b7afc4z";
}).outPath;
src = fetchzip {
- url = "https://github.com/nvim-neorocks/toml-edit.lua/archive/v0.6.0.zip";
- sha256 = "1f574g0c5h40jr0l1gzniz3qzxn1pcnfyzrizqp311i1qnkz05ir";
+ url = "https://github.com/nvim-neorocks/toml-edit.lua/archive/v0.6.1.zip";
+ sha256 = "03gxfj2km4j08cx8yv70wvzwynnlwai6cdprrxnbf76mwy877hpg";
};
disabled = luaOlder "5.1";
diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix
index 8ad01a57b1..5e9adc307a 100644
--- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix
+++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix
@@ -831,7 +831,7 @@ in
cargoDeps = rustPlatform.fetchCargoTarball {
src = oa.src;
- hash = "sha256-+LiqX4ZUyr6qj0Q91TB1eu6SWgAx/kps9tOkDW18tMo=";
+ hash = "sha256-lguGj8fDqztrvqvEYVcJLmiuxPDaCpXU8aztInKjF+E=";
};
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin
diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/toml.patch b/third_party/nixpkgs/pkgs/development/lua-modules/toml.patch
deleted file mode 100644
index e04fc5d630..0000000000
--- a/third_party/nixpkgs/pkgs/development/lua-modules/toml.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab3884c..c0fd356 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,32 +38,23 @@ include(FetchContent)
-
- FetchContent_Declare(
- ${TOML++}
-- GIT_REPOSITORY "https://github.com/marzer/tomlplusplus.git"
-- GIT_SHALLOW ON
-- GIT_SUBMODULES ""
-- GIT_TAG "v3.3.0"
-+ DOWNLOAD_COMMAND true
- )
-
- FetchContent_Declare(
- ${SOL2}
-- GIT_REPOSITORY "https://github.com/ThePhD/sol2.git"
-- GIT_SHALLOW ON
-- GIT_SUBMODULES ""
-- GIT_TAG "v3.3.0"
-+ DOWNLOAD_COMMAND true
- )
-
- FetchContent_Declare(
- ${MAGIC_ENUM}
-- GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git"
-- GIT_SHALLOW ON
-- GIT_SUBMODULES ""
-- GIT_TAG "v0.8.2"
-+ DOWNLOAD_COMMAND true
- )
-
- FetchContent_GetProperties(${TOML++})
- if(NOT ${TOML++}_POPULATED)
- message(STATUS "Cloning ${TOML++}")
-- FetchContent_Populate(${TOML++})
-+ FetchContent_Populate(${TOML++})
- FetchContent_MakeAvailable(${TOML++})
- endif()
-
-@@ -113,7 +104,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES))
- find_package(Lua)
- endif()
-
--include_directories(${LUA_INCLUDE_DIR} src src/include ${${TOML++}_SOURCE_DIR} ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include)
-+include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include MAGIC_ENUM_SRC)
-
- set(SOURCES
- src/toml.cpp
-@@ -129,8 +120,8 @@ source_group(src FILES ${SOURCES})
-
- if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- target_link_options(toml.lua PUBLIC ${PROJECT_SOURCE_DIR}\\libs\\lua51.lib)
--else()
-- target_link_libraries(toml.lua ${LUA_LIBRARIES})
-+else()
-+ target_link_libraries(toml.lua ${LUA_LIBRARIES})
- endif()
-
- if (LINK_FLAGS)
diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/zip.patch b/third_party/nixpkgs/pkgs/development/lua-modules/zip.patch
deleted file mode 100644
index c3f88f451e..0000000000
--- a/third_party/nixpkgs/pkgs/development/lua-modules/zip.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Makefile 2007-10-30 01:59:10.000000000 +0300
-+++ b/Makefile 2014-09-18 11:04:53.176320021 +0400
-@@ -6,10 +6,6 @@
-
- include $(CONFIG)
-
--ifeq "$(LUA_VERSION_NUM)" "500"
--COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
--endif
--
- SRCS= src/lua$T.c
- OBJS= src/lua$T.o $(COMPAT_O)
-
-@@ -19,9 +15,6 @@
- src/$(LIBNAME): $(OBJS)
- export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -lzzip
-
--$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
-- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
--
- install: src/$(LIBNAME)
- mkdir -p $(LUA_LIBDIR)
- cp src/$(LIBNAME) $(LUA_LIBDIR)
diff --git a/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix b/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix
index f9490ac1d2..644017a886 100644
--- a/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix
@@ -86,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-newlib-retargetable-locking"
]);
+ enableParallelBuilding = true;
dontDisableStatic = true;
# apply necessary nano changes from https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/manifest/copy_nano_libraries.sh?rev=4c50be6ccb9c4205a5262a3925317073&hash=1375A7B0A1CD0DB9B9EB0D2B574ADF66
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix
index fa089d1176..d5c1cb39cf 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix
@@ -16,13 +16,13 @@
buildDunePackage rec {
pname = "http-mirage-client";
- version = "0.0.7";
+ version = "0.0.8";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz";
- hash = "sha256-GKPJKVtHEbt8L922y/G1oewqGVBO4f313XadzImMtFM=";
+ hash = "sha256-/1eguh2dYLDVNW+XWNKcwm5IgQWfEFUuQRYS205Ox+c=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff b/third_party/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff
deleted file mode 100644
index baad34ce08..0000000000
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/elf_locations.ml b/src/elf_locations.ml
-index a08b359..0db9274 100644
---- a/src/elf_locations.ml
-+++ b/src/elf_locations.ml
-@@ -37,7 +37,8 @@ let resolve_from_dwarf t ~program_counter =
- | Some section ->
- let body = Owee_buf.cursor (Owee_elf.section_body t.map section) in
- let rec aux () =
-- match Owee_debug_line.read_chunk body with
-+ let pointers_to_other_sections = Owee_elf.debug_line_pointers t.map t.sections in
-+ match Owee_debug_line.read_chunk body ~pointers_to_other_sections with
- | None -> ()
- | Some (header, chunk) ->
- (* CR-soon mshinwell: fix owee .mli to note that [state] is
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
index 7cbe3449b8..3fb23cba1c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.2.126";
+ version = "9.2.127";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "ailment";
rev = "refs/tags/v${version}";
- hash = "sha256-C5hOeMdZ0D8T61TyJ8uEhuy+VnVc/6GQ3PteuicUpzA=";
+ hash = "sha256-yd4O4REUjTRYZ3lODlsxmbbPHY7Z2X217wQWSn3Uv3U=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix
index 0ed8b3fa7a..0f9b596680 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "aiofile" ];
disabledTests = [
- # Tests (SystemError) fails randomly during nix-review
+ # Tests (SystemError) fails randomly during nixpkgs-review
"test_async_open_fp"
"test_async_open_iter_chunked"
"test_async_open_iter_chunked"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix
index 9c0021c0a7..afd1bcd625 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix
@@ -28,16 +28,16 @@
buildPythonPackage rec {
pname = "aiogram";
- version = "3.13.1";
+ version = "3.14.0";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "aiogram";
repo = "aiogram";
rev = "refs/tags/v${version}";
- hash = "sha256-uTFh1ncIPF9SmAEVGeBnXEKrYzgifZan1sxk5UiG92U=";
+ hash = "sha256-SEq88e5MLNqssJhxPPwI2ZdpNdTCBomNpI0xmbmz3Pw=";
};
build-system = [ hatchling ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix
index 410ea8cfbf..d38b0f8896 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "aiortm";
- version = "0.9.24";
+ version = "0.9.25";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "MartinHjelmare";
repo = "aiortm";
rev = "refs/tags/v${version}";
- hash = "sha256-+IIZRHyrt01FfFsMfvZ+0oetSwT8YpqxgZwQpt3MK70=";
+ hash = "sha256-rw86RzP8AI+zWchC9c01vdedc6r4gfF5A8DltWW5YRY=";
};
pythonRelaxDeps = [ "typer" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix
index 5e1f96da14..d07c2530a4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "androidtv";
- version = "0.0.74";
+ version = "0.0.75";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "python-androidtv";
rev = "refs/tags/v${version}";
- hash = "sha256-aURHor+7E0Z4DyN/s1/BMBJo/FmvAlRsKs9Q0Thelyc=";
+ hash = "sha256-2WFfGGEZkM3fWyTo5P6H3ha04Qyx2OiYetlGWv0jXac=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
index dc9e0a19a3..68f100536e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
@@ -36,7 +36,7 @@
buildPythonPackage rec {
pname = "angr";
- version = "9.2.126";
+ version = "9.2.127";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "angr";
rev = "refs/tags/v${version}";
- hash = "sha256-M74RNmjld7nuybotPjNZ1bYMDlYnOn1c/clS2ZlMe/o=";
+ hash = "sha256-hGKxLgXOL+PhhYxxJJQIMcEmFjG4WC9PQE4yP+/QuBg=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix
index 2c38ef988f..dc5f11c6ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "anthropic";
- version = "0.35.0";
+ version = "0.39.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "anthropics";
repo = "anthropic-sdk-python";
rev = "refs/tags/v${version}";
- hash = "sha256-/lA44YwUWwm8ZswCBneT3sutcpQ2GPv0S2bHTUGiwwg=";
+ hash = "sha256-lpW+waHvwgbhK7EnPZy/XI8gK3a8JjFflPqUFbDN1z8=";
};
build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
index 47eb444d07..7b0f033ec8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.2.126";
+ version = "9.2.127";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "archinfo";
rev = "refs/tags/v${version}";
- hash = "sha256-LMRZMZeQZVDnIUyqtE90WI9uFHIPSm5d0duWw5ew054=";
+ hash = "sha256-hIjL0pa4/TNnyFq61R0ND8o2mEjeRwUJ/S1wP1VglYg=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arelle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arelle/default.nix
index 7ecdc1bb8a..0b5c3cbcf1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/arelle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/arelle/default.nix
@@ -1,87 +1,160 @@
{
- gui ? true,
+ lib,
buildPythonPackage,
fetchFromGitHub,
- lib,
- sphinx,
- lxml,
+
+ setuptools,
+ setuptools-scm,
+
+ certifi,
+ filelock,
isodate,
+ lxml,
numpy,
openpyxl,
- tkinter ? null,
- py3to2,
- isPy3k,
- python,
- ...
+ pyparsing,
+ python-dateutil,
+ regex,
+
+ gui ? true,
+ tkinter,
+
+ pycryptodome,
+ pg8000,
+ pymysql,
+ pyodbc,
+ rdflib,
+ holidays,
+ pytz,
+ tinycss2,
+ graphviz,
+ cheroot,
+ cherrypy,
+ tornado,
+
+ sphinxHook,
+ sphinx-autodoc2,
+ myst-parser,
+ sphinx-copybutton,
+ furo,
+
+ pytestCheckHook,
+ boto3,
}:
buildPythonPackage rec {
pname = "arelle${lib.optionalString (!gui) "-headless"}";
- version = "18.3";
- format = "setuptools";
+ version = "2.30.25";
+ pyproject = true;
- disabled = !isPy3k;
-
- # Releases are published at http://arelle.org/download/ but sadly no
- # tags are published on github.
src = fetchFromGitHub {
owner = "Arelle";
repo = "Arelle";
- rev = "edgr${version}";
- sha256 = "12a94ipdp6xalqyds7rcp6cjwps6fbj3byigzfy403hlqc9n1g33";
+ rev = "refs/tags/${version}";
+ hash = "sha256-xzTrFie97HDIqPZ4nzCh+0p/w0bTK12cS0FSsuIi7tY=";
};
+
outputs = [
"out"
"doc"
];
- patches = [ ./tests.patch ];
- postPatch = "rm testParser2.py";
- nativeBuildInputs = [
- sphinx
- py3to2
+
+ postPatch = ''
+ substituteInPlace pyproject.toml --replace-fail \
+ 'requires = ["setuptools~=73.0", "wheel~=0.44", "setuptools_scm[toml]~=8.1"]' \
+ 'requires = ["setuptools", "wheel", "setuptools_scm[toml]"]'
+
+ # Darwin currently doesn't have the native `_decimal` module
+ # Instead, we'll use the wrapper `decimal` module that can fall back to python based implementation
+ # These lines can be removed after https://github.com/NixOS/nixpkgs/pull/354125 hits master
+ substituteInPlace arelle/Validate{DuplicateFacts,XbrlCalcs}.py tests/unit_tests/arelle/test_{xmlvalidate,validatexbrlcalcs}.py \
+ --replace-fail 'from _decimal import' 'from decimal import'
+ '';
+
+ build-system = [
+ setuptools
+ setuptools-scm
];
- propagatedBuildInputs = [
- lxml
+
+ dependencies = [
+ certifi
+ filelock
isodate
+ lxml
numpy
openpyxl
+ pyparsing
+ python-dateutil
+ regex
] ++ lib.optionals gui [ tkinter ];
- # arelle-gui is useless without gui dependencies, so delete it when !gui.
- postInstall =
- lib.optionalString (!gui) ''
- find $out/bin -name "*arelle-gui*" -delete
- ''
- +
- # By default, not the entirety of the src dir is copied. This means we don't
- # copy the `images` dir, which is needed for the gui version.
- lib.optionalString (gui) ''
- targetDir=$out/${python.sitePackages}
- cp -vr $src/arelle $targetDir
- '';
+ optional-dependencies = {
+ crypto = [ pycryptodome ];
+ db = [
+ pg8000
+ pymysql
+ pyodbc
+ rdflib
+ ];
+ efm = [
+ holidays
+ pytz
+ ];
+ esef = [ tinycss2 ];
+ objectmaker = [ graphviz ];
+ webserver = [
+ cheroot
+ cherrypy
+ tornado
+ ];
+ };
- # Documentation
- postBuild = ''
- (cd apidocs && make html && cp -r _build $doc)
+ nativeBuildInputs = [
+ # deps for docs
+ sphinxHook
+ sphinx-autodoc2
+ myst-parser
+ sphinx-copybutton
+ furo
+ ];
+
+ # the arelleGUI executable doesn't work when the gui option is false
+ postInstall = lib.optionalString (!gui) ''
+ find $out/bin -name "*arelleGUI*" -delete
'';
- doCheck = false;
+ nativeCheckInputs = [
+ pytestCheckHook
+ boto3
+ ] ++ lib.flatten (lib.attrValues optional-dependencies);
- checkPhase = ''
- py.test
+ preCheck = ''
+ export HOME=$(mktemp -d)
'';
- meta = with lib; {
- description =
- ''
- An open source facility for XBRL, the eXtensible Business Reporting
- Language supporting various standards, exposed through a Python or
- REST API''
- + lib.optionalString gui " and a graphical user interface";
+ disabledTestPaths =
+ [
+ "tests/integration_tests"
+ ]
+ ++ lib.optionals (!gui) [
+ # these tests import tkinter
+ "tests/unit_tests/arelle/test_updater.py"
+ "tests/unit_tests/arelle/test_import.py"
+ ];
+
+ meta = {
+ description = "Open source XBRL platform";
+ longDescription = ''
+ An open source facility for XBRL, the eXtensible Business Reporting
+ Language supporting various standards, exposed through a Python or
+ REST API ${lib.optionalString gui " and a graphical user interface"}.
+ '';
mainProgram = "arelle";
homepage = "http://arelle.org/";
- license = licenses.asl20;
- platforms = platforms.all;
- maintainers = with maintainers; [ roberth ];
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [
+ tomasajt
+ roberth
+ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arelle/tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/arelle/tests.patch
deleted file mode 100644
index e34cda99b2..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/arelle/tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git c/arelle/CntlrProfiler.py i/arelle/CntlrProfiler.py
-index a64bb1b..dc0299d 100644
---- c/arelle/CntlrProfiler.py
-+++ i/arelle/CntlrProfiler.py
-@@ -1,5 +1,6 @@
-
--import Cntlr, ModelManager, FileSource, time
-+from arelle import Cntlr, ModelManager, FileSource
-+import time
- from optparse import OptionParser
- import cProfile
- import gettext
-diff --git c/arelle/ValidateFilingText.py i/arelle/ValidateFilingText.py
-index 12dbbbb..c0e98c3 100644
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/babelfont/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/babelfont/default.nix
index cc64639537..cfaad92423 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/babelfont/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/babelfont/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "babelfont";
- version = "3.0.5";
+ version = "3.0.6";
pyproject = true;
# PyPI source tarballs omit tests, fetch from Github instead
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "simoncozens";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-9PEOkkm7qH4ExiJJKrTZX5Ph/urtOyFsy7jjtFepncU=";
+ hash = "sha256-kbL6z5610A41bfbDm0nyyh1tv+7SeXx8vvXxwLcTZL0=";
};
build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix
index 1ad855c1a1..5d3bf14d75 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "bsdiff4";
- version = "1.2.4";
+ version = "1.2.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-HXEpqBIYYHMejM4pAdMYPhSuxwJE9k6PdFYyddw4gGc=";
+ hash = "sha256-zdg/gg7Ljx72ek5fCxUsYdMnyver81qpp2NBORWyE2g=";
};
pythonImportsCheck = [ "bsdiff4" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix
index 81f990fe75..b8d6cfcafc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "chess";
- version = "1.11.0";
+ version = "1.11.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "niklasf";
repo = "python-${pname}";
rev = "refs/tags/v${version}";
- hash = "sha256-+YNEm1QppXeeIjOKfCSQoQmuSzBsW4ws0ej/whjTAPg=";
+ hash = "sha256-OAYQ/XtM4AHfbpA+gVa/AjB3tyMtvgykpHc39WaU2CI=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix
index 1be9ca1502..f562bbcaf7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix
@@ -52,7 +52,7 @@
buildPythonPackage rec {
pname = "chromadb";
- version = "0.5.17";
+ version = "0.5.18";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -61,13 +61,13 @@ buildPythonPackage rec {
owner = "chroma-core";
repo = "chroma";
rev = "refs/tags/${version}";
- hash = "sha256-ui4wUV9jIvgPtnY5L8mHg9k3l3ccL4u1rir426wwuMg=";
+ hash = "sha256-kJzBwUaA46HenwTn24AMy0xfgVmBtubJUujDS5/kYXs=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-lF+TpoQF6vZoxjPX3CN6TnWiY72qoxrVu2hilWgNx2E=";
+ hash = "sha256-iW68C3Vp9C1gR7hF2x4VhBIKWX9wlnT8jPj+zMRUC7w=";
};
pythonRelaxDeps = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
index a182aaf8da..1b474003ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.2.126";
+ version = "9.2.127";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "claripy";
rev = "refs/tags/v${version}";
- hash = "sha256-clS7O0WVY9jtuG1RF8c+14nlN9/U/29fEtVNnmGslQU=";
+ hash = "sha256-uiB67+5zfLig1TgAzniWaRhibJKmdOPMDAfDVVfMs/0=";
};
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
index 1029b65c8b..c87cad4fad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
@@ -18,14 +18,14 @@
let
# The binaries are following the argr projects release cycle
- version = "9.2.126";
+ version = "9.2.127";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
owner = "angr";
repo = "binaries";
rev = "refs/tags/v${version}";
- hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO0=";
+ hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO1=";
};
in
buildPythonPackage rec {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "cle";
rev = "refs/tags/v${version}";
- hash = "sha256-aOt5ba/F05FMiH+HpTVHOD2sfQY/yFoO9A90MZlF7So=";
+ hash = "sha256-DcfFOzP7Ylms1/kAX5CIhujzj6Vpma8sb0Qyq6tSJq0=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmsdials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmsdials/default.nix
index eaf436af2e..2578839351 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cmsdials/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cmsdials/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "cmsdials";
- version = "1.3.0";
+ version = "1.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "cms-DQM";
repo = "dials-py";
rev = "refs/tags/v${version}";
- hash = "sha256-tV802rz8V9zkjxOoGDXuYGD9FNWjdPb3Grp2khwxC9I=";
+ hash = "sha256-/5XgNPtjJgJEOaqvq7Z7XCXh2n+DbZqFbqnZddxxFpc=";
};
build-system = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix
index dca06fcf55..c19fb148e5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix
@@ -3,6 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
+ setuptools,
dissononce,
python-axolotl-curve25519,
transitions,
@@ -14,14 +15,14 @@
buildPythonPackage rec {
pname = "consonance";
version = "0.1.5";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tgalal";
repo = "consonance";
- rev = version;
+ rev = "refs/tags/${version}";
hash = "sha256-BhgxLxjKZ4dSL7DqkaoS+wBPCd1SYZomRKrtDLdGmYQ=";
};
@@ -34,7 +35,15 @@ buildPythonPackage rec {
})
];
- propagatedBuildInputs = [
+ env = {
+ # make protobuf compatible with old versions
+ # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+ PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [
dissononce
python-axolotl-curve25519
transitions
@@ -47,10 +56,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "consonance" ];
- meta = with lib; {
+ meta = {
description = "WhatsApp's handshake implementation using Noise Protocol";
homepage = "https://github.com/tgalal/consonance";
- license = licenses.gpl3Plus;
+ license = lib.licenses.gpl3Plus;
maintainers = [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cyclopts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cyclopts/default.nix
index 5948f95843..703a139ed7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cyclopts/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cyclopts/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclopts";
- version = "2.9.9";
+ version = "3.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "BrianPugh";
repo = "cyclopts";
rev = "refs/tags/v${version}";
- hash = "sha256-gU/oqFrOzA6PQTwwGS9si19F+LIondO3MozNDwPDtgs=";
+ hash = "sha256-aTFas+3+veky+pyz2T1SytMNGwxlF9dAc3E03PKqvrM=";
};
build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
index cce50d3b7e..d9b3dfce72 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "debugpy";
- version = "1.8.7";
+ version = "1.8.8";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "microsoft";
repo = "debugpy";
rev = "refs/tags/v${version}";
- hash = "sha256-JFVhEAfdSfl2ACfXLMdoO/1otdif9bHialdQXucTM5A=";
+ hash = "sha256-zkNV+tFRAxTdl+lCPD4XYI1Oz0dVyX4GGuNdfzy2sJU=";
};
patches =
@@ -73,13 +73,12 @@ buildPythonPackage rec {
})
];
- # Remove pre-compiled "attach" libraries and recompile for host platform
- # Compile flags taken from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh
+ # Compile attach library for host platform
+ # Derived from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh
preBuild = ''
(
set -x
cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process
- rm *.so *.dylib *.dll *.exe *.pdb
$CXX linux_and_mac/attach.cpp -Ilinux_and_mac -std=c++11 -fPIC -nostartfiles ${
{
"x86_64-linux" = "-shared -o attach_linux_amd64.so";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix
index 451f4c6578..a59b541282 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "dinghy";
- version = "1.3.2";
+ version = "1.3.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "nedbat";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-0U08QHQuNm7qaxhU8sNxeN0fZ4S8N0RYRsWjFUqhZSU=";
+ hash = "sha256-fn8SRzhFJyyr2Wr9/cp8Sm6kbVARq2LEeKSE0HU9V74=";
};
nativeBuildInputs = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docling-parse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docling-parse/default.nix
index d03385c1a0..745d010ed1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/docling-parse/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/docling-parse/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "docling-parse";
- version = "2.0.2";
+ version = "2.0.3";
pyproject = true;
src = fetchFromGitHub {
owner = "DS4SD";
repo = "docling-parse";
rev = "refs/tags/v${version}";
- hash = "sha256-unXGmMp5xyRCqSoFmqcQAZOBzpE0EzgEEBIfZUHhRcQ=";
+ hash = "sha256-pZJ7lneg4ftAoWS5AOflkkKCwZGF4TJIuqDjq4W4VBw=";
};
dontUseCmakeConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastcrc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcrc/default.nix
new file mode 100644
index 0000000000..78076c6527
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcrc/default.nix
@@ -0,0 +1,59 @@
+{
+ lib,
+ buildPythonPackage,
+ pythonOlder,
+ fetchFromGitHub,
+ rustPlatform,
+ pytestCheckHook,
+ pytest-benchmark,
+ nix-update-script,
+}:
+let
+ pname = "fastcrc";
+ version = "0.3.2";
+
+ src = fetchFromGitHub {
+ owner = "overcat";
+ repo = "fastcrc";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-yLrv/zqsjgygJAIJtztwxlm4s9o9EBVsCyx1jUXd7hA=";
+ };
+in
+buildPythonPackage {
+ inherit pname version src;
+ pyproject = true;
+
+ disabled = pythonOlder "3.7";
+
+ nativeBuildInputs = with rustPlatform; [
+ cargoSetupHook
+ maturinBuildHook
+ ];
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-wSE7548L+ymNjN9TfygAGY1BrssXOPGXlmE83wV7zb4=";
+ };
+
+ pythonImportsCheck = [ "fastcrc" ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ pytest-benchmark
+ ];
+
+ # Python source files interfere with testing
+ preCheck = ''
+ rm -r fastcrc
+ '';
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Hyper-fast Python module for computing CRC(8, 16, 32, 64) checksum";
+ homepage = "https://fastcrc.readthedocs.io/en/latest/";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ pluiedev ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/free-proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/free-proxy/default.nix
index 4d67d28961..8db5b1483a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/free-proxy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/free-proxy/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "free-proxy";
- version = "1.1.2";
+ version = "1.1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "jundymek";
repo = "free-proxy";
rev = "refs/tags/v${version}";
- hash = "sha256-5eYioshdqUC5QWHqMIU6+GvInihSOJxWvMlJ/xad/3I=";
+ hash = "sha256-8SxKGGifQTU0CUrtUQUtrmeq+Do4GIqNUWAdCt++eUA=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix
index 84e5eea815..a6aad3f632 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "gehomesdk";
- version = "0.5.28";
+ version = "0.5.29";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
- hash = "sha256-TAPuP0VFhKuWDzko/+Upq6GDGZJO9y6GuuV6GsSqi2I=";
+ hash = "sha256-sV5V+D0K02qmP9Z0WqYSvNsKTeXkdrY9CsRtvYq1JcE=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/githubkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/githubkit/default.nix
index 773c498ead..7a0fae0991 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/githubkit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/githubkit/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "githubkit";
- version = "0.11.11";
+ version = "0.11.14";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "yanyongyu";
repo = "githubkit";
rev = "refs/tags/v${version}";
- hash = "sha256-/jtTNQ9r4JJAXLIEEO7lR0IhpJ5vzbV0mNTdKgkH1FE=";
+ hash = "sha256-nZzsBxPRmqHTaYVogWsdaGbzwBsVr08qcvAekk3O4FM=";
};
pythonRelaxDeps = [ "hishel" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix
index 97297e657f..ecace1bee2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix
@@ -29,6 +29,10 @@ buildPythonPackage rec {
build-system = [ setuptools ];
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
dependencies = [
cryptography
requests
@@ -44,10 +48,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "globus_sdk" ];
- meta = with lib; {
+ meta = {
description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API";
homepage = "https://github.com/globus/globus-sdk-python";
changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}";
- license = licenses.asl20;
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ bot-wxt1221 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
index 9cb6cbd749..162500b8f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "google-ai-generativelanguage";
- version = "0.6.10";
+ version = "0.6.12";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_ai_generativelanguage";
inherit version;
- hash = "sha256-b6ZCyWTYcoAG/n6HcQJvwLWZrg6+r4PK9VCUHo5pNFU=";
+ hash = "sha256-v6A3iIAwYcgMAF4o+rXZb0Zfzxx9KKHu+xYx+0oqtn8=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
index 7f671c9eff..81739ef91b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-logging";
- version = "1.4.5";
+ version = "1.5.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_bigquery_logging";
inherit version;
- hash = "sha256-XrBXr0Y1vpxWceSR59ERQJKziMBI4+QBoHWK0Wt1cec=";
+ hash = "sha256-4eDfCpkZBDZySWq92C/fr0FKeKdbkymN6sbl+/qzKfg=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix
index 70d7da0936..ae82378dfa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-generativeai";
- version = "0.8.2";
+ version = "0.8.3";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "google";
repo = "generative-ai-python";
rev = "refs/tags/v${version}";
- hash = "sha256-7l7Tg4sCdRtYnDwrQBA4rUIz4gO2YGf+3qn7OQRMCDc=";
+ hash = "sha256-XHYO2bH95Naoha2ZLpkP0YCq60qqiQPz+YzU6O4pInQ=";
};
pythonRelaxDeps = [ "google-ai-generativelanguage" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guidata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guidata/default.nix
index 5ff6a5f372..3026e96884 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/guidata/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/guidata/default.nix
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "guidata";
- version = "3.6.3";
+ version = "3.7.1";
pyproject = true;
src = fetchFromGitHub {
owner = "PlotPyStack";
repo = "guidata";
rev = "refs/tags/v${version}";
- hash = "sha256-KfeA6XNbzHZM4dyvAYlPOQIwWHwFT3Akj34zmgf8tb8=";
+ hash = "sha256-Qao10NyqFLysx/9AvORX+EIrQlnQJQhSYkVHeTwIutQ=";
};
build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
index caec0be06c..4699055253 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
@@ -229,7 +229,7 @@ stdenv.mkDerivation rec {
map (dep: {
name = dep.name;
value = dep;
- }) list
+ }) (lib.filter (x: x != null) list)
);
saturateDependencies =
deps:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
index 21a9f2607e..c6c0f3f438 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "imap-tools";
- version = "1.7.3";
+ version = "1.7.4";
disabled = pythonOlder "3.5";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "refs/tags/v${version}";
- hash = "sha256-orzU5jTFTj8O1zYDUDJYbXGpfZ60Egz0/eUttvej08k=";
+ hash = "sha256-2qSmnJnjwXNysUh0xeXshLZklCIOd92aM3gXtL8JhlI=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix
index e67d04be02..c4574b6ea0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "jedi-language-server";
- version = "0.41.4";
+ version = "0.42.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "pappasam";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-RDLwL9AZ3G8CzVwDtWqFFZNH/ulpHeFBhglbWNv/ZIk=";
+ hash = "sha256-KWkKIKiaRR26CctDFrHJAITM+nmRKGxLeC5HHwVZz4s=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kornia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kornia/default.nix
index 013ccbd901..93a783bdba 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kornia/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/kornia/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "kornia";
- version = "0.7.3";
+ version = "0.7.4";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-iEg27b2JVLtAYLFncaSqIh5FyvmmitKAKP7Tl0WWNdk=";
+ hash = "sha256-Ecps1KniiL1WOGk+i/UAVuXJ2W7cgHSzAKCkZokyWIM=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix
index e59214a373..f589399afa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix
@@ -17,16 +17,16 @@
buildPythonPackage rec {
pname = "lacuscore";
- version = "1.11.3";
+ version = "1.12.0";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "ail-project";
repo = "LacusCore";
rev = "refs/tags/v${version}";
- hash = "sha256-eVcfJXkjrS752T18wKrIwfwEkCuR1eIoVZERMk/stgQ=";
+ hash = "sha256-83OD/oGzjLsW0FRFyW6Yh9pwh/lcCfZDIe6uahhTRVc=";
};
pythonRelaxDeps = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix
index 65f4e3aa23..3750ff2621 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix
@@ -88,8 +88,6 @@ buildPythonPackage rec {
postgresqlTestHook
];
- pytestFlagsArray = [ "tests/unit_tests" ];
-
disabledTests = [
# test is flaky due to pydantic error on the exception
"test_doesnt_warn_valid_schema"
@@ -116,9 +114,7 @@ buildPythonPackage rec {
"tests/test_pregel.py"
];
- passthru = {
- updateScript = langgraph-sdk.updateScript;
- };
+ passthru.updateScript = langgraph-sdk.updateScript;
meta = {
description = "Build resilient language agents as graphs";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix
index 6dbb2c8671..d2a4acd727 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "libvirt";
- version = "10.5.0";
+ version = "10.9.0";
pyproject = true;
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-python";
rev = "v${version}";
- hash = "sha256-dPjT9PRoUzNrY79yejAW/sbkMr0fpLif7IKZIW/K3KI=";
+ hash = "sha256-/kjpB19X90btIewW+hjLjLagJvI5X2oIHXpcSZVtu2I=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix
index 5f1174763f..35dcd72230 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix
@@ -2,13 +2,17 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
+ setuptools-scm,
dill,
dnslib,
dnspython,
plux,
pyaes,
+ pyotp,
python-jose,
requests,
+ python-dateutil,
tabulate,
# Sensitive downstream dependencies
@@ -18,7 +22,7 @@
buildPythonPackage rec {
pname = "localstack-ext";
version = "3.7.2";
- format = "setuptools";
+ pyproject = true;
src = fetchPypi {
pname = "localstack_ext";
@@ -26,32 +30,31 @@ buildPythonPackage rec {
hash = "sha256-gd+HyZnezgtKrSKJOYtxUZHTPMrrpKWQHGvaIs9FyVs=";
};
- postPatch = ''
+ build-system = [
+ setuptools
+ setuptools-scm
+ ];
+
+ pythonRemoveDeps = [
# Avoid circular dependency
- sed -i '/localstack>=/d' setup.cfg
+ "localstack"
+ "build"
+ ];
- # Pip is unable to resolve attr logic, so it will emit version as 0.0.0
- substituteInPlace setup.cfg \
- --replace "version = attr: localstack_ext.__version__" "version = ${version}"
- cat setup.cfg
-
- substituteInPlace setup.cfg \
- --replace "dill==0.3.2" "dill~=0.3.0" \
- --replace "requests>=2.20.0,<2.26" "requests~=2.20"
- '';
-
- propagatedBuildInputs = [
+ dependencies = [
dill
dnslib
dnspython
plux
pyaes
+ pyotp
python-jose
requests
tabulate
- ];
+ python-dateutil
+ ] ++ python-jose.optional-dependencies.cryptography;
- pythonImportsCheck = [ "localstack_ext" ];
+ pythonImportsCheck = [ "localstack" ];
# No tests in repo
doCheck = false;
@@ -60,10 +63,10 @@ buildPythonPackage rec {
inherit localstack;
};
- meta = with lib; {
+ meta = {
description = "Extensions for LocalStack";
homepage = "https://github.com/localstack/localstack";
- license = licenses.asl20;
+ license = lib.licenses.asl20;
maintainers = [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix
index a48d8abefa..08f03e1856 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix
@@ -19,6 +19,7 @@
rich,
semver,
setuptools,
+ setuptools-scm,
tailer,
}:
@@ -34,7 +35,10 @@ buildPythonPackage rec {
hash = "sha256-8xdP/qpmfqmXDt1gNhzkAGlBR6dJYznKr9+/Un6N7mA=";
};
- build-system = [ setuptools ];
+ build-system = [
+ setuptools
+ setuptools-scm
+ ];
dependencies = [
apispec
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
index 89366bc43f..761e7deff0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
@@ -4,7 +4,6 @@
fetchPypi,
setuptools,
autobahn,
- mock,
twisted,
python,
pytestCheckHook,
@@ -12,12 +11,12 @@
buildPythonPackage rec {
pname = "magic-wormhole-transit-relay";
- version = "0.3.1";
+ version = "0.4.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-LvLvvk008OYkhw+EIln9czuncVLtMQr0NJd0piiEkA4=";
+ hash = "sha256-kS2DXaIbESZsdxEdybXlgAJj/AuY8KF5liJn30GBnow=";
};
postPatch = ''
@@ -39,7 +38,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
- mock
twisted
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix
index 3f37279070..7aedc6cd21 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix
@@ -5,12 +5,13 @@
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
+ setuptools,
}:
buildPythonPackage rec {
pname = "millheater";
- version = "0.11.8";
- format = "setuptools";
+ version = "0.12.0";
+ pyproject = true;
disabled = pythonOlder "3.10";
@@ -18,10 +19,12 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pymill";
rev = "refs/tags/${version}";
- hash = "sha256-BSrnUhe6SFtalUGldC24eJTqJAF5FdUWo3rwWNT1uCw=";
+ hash = "sha256-8PrTypJuWNuFz1NZLuyqOpWFsN5OLshj7S10YgcGusQ=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
aiohttp
async-timeout
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mirakuru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mirakuru/default.nix
index e208daa625..58c74cd3ca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mirakuru/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mirakuru/default.nix
@@ -1,4 +1,5 @@
{
+ stdenv,
lib,
buildPythonPackage,
fetchFromGitHub,
@@ -13,18 +14,23 @@
buildPythonPackage rec {
pname = "mirakuru";
- version = "2.5.2";
+ version = "2.5.3";
format = "pyproject";
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "ClearcodeHQ";
repo = "mirakuru";
rev = "refs/tags/v${version}";
- hash = "sha256-I1TKP0ESuBMTcReZf0tryjvGpSpwzofwmOiQqhyr6Zg=";
+ hash = "sha256-blk4Oclb3+Cj3RH7BhzacfoPFDBIP/zgv4Ct7fawGnQ=";
};
+ patches = [
+ # https://github.com/ClearcodeHQ/mirakuru/pull/810
+ ./tmpdir.patch
+ ];
+
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [ psutil ];
@@ -37,6 +43,20 @@ buildPythonPackage rec {
];
pythonImportsCheck = [ "mirakuru" ];
+ # Necessary for the tests to pass on Darwin with sandbox enabled.
+ __darwinAllowLocalNetworking = true;
+
+ # Those are failing in the darwin sandbox with:
+ # > ps: %mem: requires entitlement
+ # > ps: vsz: requires entitlement
+ # > ps: rss: requires entitlement
+ # > ps: time: requires entitlement
+ disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+ "test_forgotten_stop"
+ "test_mirakuru_cleanup"
+ "test_daemons_killing"
+ ];
+
meta = with lib; {
homepage = "https://pypi.org/project/mirakuru";
description = "Process orchestration tool designed for functional and integration tests";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mirakuru/tmpdir.patch b/third_party/nixpkgs/pkgs/development/python-modules/mirakuru/tmpdir.patch
new file mode 100644
index 0000000000..2fd6fcfd27
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mirakuru/tmpdir.patch
@@ -0,0 +1,19 @@
+--- a/tests/executors/test_unixsocket_executor.py
++++ b/tests/executors/test_unixsocket_executor.py
+@@ -4,6 +4,7 @@ Some of these tests run ``nc``: when running Debian, make sure the
+ ``netcat-openbsd`` package is used, not ``netcat-traditional``.
+ """
+
++import os
+ import sys
+
+ import pytest
+@@ -12,7 +13,7 @@ from mirakuru import TimeoutExpired
+ from mirakuru.unixsocket import UnixSocketExecutor
+ from tests import TEST_SOCKET_SERVER_PATH
+
+-SOCKET_PATH = "/tmp/mirakuru.sock"
++SOCKET_PATH = os.path.join(os.getenv("TMPDIR", "/tmp"), "mirakuru.sock")
+
+ SOCKET_SERVER_CMD = f"{sys.executable} {TEST_SOCKET_SERVER_PATH} {SOCKET_PATH}"
+
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix
index a2112408e5..29fea1295d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "mitogen";
- version = "0.3.16";
+ version = "0.3.18";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "mitogen-hq";
repo = "mitogen";
rev = "refs/tags/v${version}";
- hash = "sha256-Rmf4uS18J+AWyobcG7iJHCvciLyj1euvIGqlTMjxaOs=";
+ hash = "sha256-dSG8yBeutd2loIuoeLC1B3bC9kIeVitK3jD1J27E0SM=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/morecantile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/morecantile/default.nix
index d7e31fa4af..948d742845 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/morecantile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/morecantile/default.nix
@@ -17,15 +17,15 @@
buildPythonPackage rec {
pname = "morecantile";
- version = "5.4.2";
+ version = "6.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "developmentseed";
repo = "morecantile";
- rev = version;
- hash = "sha256-kUAde+6IUu95tFHFCB6kWoYsRf9GxR+gRJki/tvhIaY=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-l+fQQXOrhqRanB695nR4okfmPYP05NdrGOvgG+jK2uo=";
};
nativeBuildInputs = [ flit ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix
index b5cc00a669..b851ad6c8e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "msgraph-sdk";
- version = "1.11.0";
+ version = "1.12.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "microsoftgraph";
repo = "msgraph-sdk-python";
rev = "refs/tags/v${version}";
- hash = "sha256-SBQ99NJFVwsqyExadw/jvToeZuUzi7+/wQxS8YMwrNM=";
+ hash = "sha256-RB5DxcddMmByWZ4XA/SaIVVxPXdqSRCUbTeWIR5YW2g=";
};
build-system = [ flit-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msprime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msprime/default.nix
index 83e1314a55..c0cd877cca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/msprime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/msprime/default.nix
@@ -28,6 +28,12 @@ buildPythonPackage rec {
hash = "sha256-2K55gHYWf2Mrj9fszVCJ+qqEyQNMppQi+IZCX5SlsBs=";
};
+ postPatch = ''
+ # build-time constriant, used to ensure forward and backward compat
+ substituteInPlace pyproject.toml \
+ --replace-fail "numpy>=2" "numpy"
+ '';
+
nativeBuildInputs = [
gsl
oldest-supported-numpy
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multiscale-spatial-image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multiscale-spatial-image/default.nix
index 939e144c2c..fbd798d3f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/multiscale-spatial-image/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/multiscale-spatial-image/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "multiscale-spatial-image";
- version = "2.0.0";
+ version = "2.0.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "spatial-image";
repo = "multiscale-spatial-image";
rev = "refs/tags/v${version}";
- hash = "sha256-SNAbkFgShb1FSM4tXoyf2L27LmpWznMThgAVfJwI00A=";
+ hash = "sha256-oxxPXzItM7uXtyLoLyUHVf4YOoAYvI40kU7lVgp4gAg=";
};
build-system = [ hatchling ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix
index 5535f18aca..d900824c48 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -150,8 +150,8 @@ rec {
"sha256-nr00I/1oqR16ZIw3+iA2BrS0C0Wr7UlJ48VnuOFIcb0=";
mypy-boto3-autoscaling =
- buildMypyBoto3Package "autoscaling" "1.35.53"
- "sha256-cknZ2hZ8hV7gnOqBD6XWxrJZS7j3B4TiP29y6QBGCoQ=";
+ buildMypyBoto3Package "autoscaling" "1.35.56"
+ "sha256-UmJt7Yp7Nf5M/PV6c077GMYVdKbFT9XGV/o6Y7HSbs0=";
mypy-boto3-autoscaling-plans =
buildMypyBoto3Package "autoscaling-plans" "1.35.0"
@@ -166,8 +166,8 @@ rec {
"sha256-8IRkY4sMGkj2ZxZBM4n/7clzQHwuon8wmXIOAGa4nEI=";
mypy-boto3-batch =
- buildMypyBoto3Package "batch" "1.35.53"
- "sha256-1qJvWSYN94rV8xiIOoGO5FVKl2Q1hcLfooOfMYEp5M0=";
+ buildMypyBoto3Package "batch" "1.35.57"
+ "sha256-1tWJD780ioswhtdCB1ETlRwEVExCJbwjtLcDg1x/HG0=";
mypy-boto3-billingconductor =
buildMypyBoto3Package "billingconductor" "1.35.0"
@@ -194,8 +194,8 @@ rec {
"sha256-BAHAhOT7WanSavOe4iNVeJ0I4+QW2Ymn6C915sTQbwU=";
mypy-boto3-chime-sdk-media-pipelines =
- buildMypyBoto3Package "chime-sdk-media-pipelines" "1.35.0"
- "sha256-eXgK8DJugHC1r9qPVK5ajdr/ppDnfxBHxB0tSld0icw=";
+ buildMypyBoto3Package "chime-sdk-media-pipelines" "1.35.57"
+ "sha256-VmHywaRFz8GJW/wde6ULj6iDfMH8+qDcoH6FamN77Dg=";
mypy-boto3-chime-sdk-meetings =
buildMypyBoto3Package "chime-sdk-meetings" "1.35.0"
@@ -210,8 +210,8 @@ rec {
"sha256-O7mrqn+S0rDcOnhxXI10mB/NHzI+f23HqNXoO5gxiPc=";
mypy-boto3-cleanrooms =
- buildMypyBoto3Package "cleanrooms" "1.35.51"
- "sha256-InSA/7IwpeCcIaPa/S+a3l+POGmcL1O5RG+ANPFfqrE=";
+ buildMypyBoto3Package "cleanrooms" "1.35.56"
+ "sha256-9klgPrVKNaG6PWOIZkvsXNP98+TOgJfVPT5aPV3SDtI=";
mypy-boto3-cloud9 =
buildMypyBoto3Package "cloud9" "1.35.0"
@@ -266,8 +266,8 @@ rec {
"sha256-wCjyRnd7RlnLRQrADd2Xmh74IsQxBfUgLIJuaZW7kjw=";
mypy-boto3-codebuild =
- buildMypyBoto3Package "codebuild" "1.35.49"
- "sha256-KsO/4MFJA3J53FMrbodO8bIw8FV3PmwZOaADxoo5bjI=";
+ buildMypyBoto3Package "codebuild" "1.35.55"
+ "sha256-qZ0POshM6WseOoeinzEkGiZP4UxkRvyf2Y83Vv6UYas=";
mypy-boto3-codecatalyst =
buildMypyBoto3Package "codecatalyst" "1.35.0"
@@ -470,8 +470,8 @@ rec {
"sha256-6o825Pz7Vbg/xuFXR7mTLv3zWcLoRIqbFqjRcQtZOJ8=";
mypy-boto3-eks =
- buildMypyBoto3Package "eks" "1.35.45"
- "sha256-Dl9pCZc5WX6HC0LbXznGrpSc32KtPvHNMFD9Ru8Ay6k=";
+ buildMypyBoto3Package "eks" "1.35.57"
+ "sha256-efYfxn51rtR6LCnAU3k7ct78OuNnSecGSwYi0OIidt8=";
mypy-boto3-elastic-inference =
buildMypyBoto3Package "elastic-inference" "1.35.38"
@@ -534,8 +534,8 @@ rec {
"sha256-KQqb3NdsN8SloK7kIbJoy5I3zhO5CUr9rB8ZqtVLaDc=";
mypy-boto3-firehose =
- buildMypyBoto3Package "firehose" "1.35.0"
- "sha256-7ibqWrvc1mwCDzsm/tqha/2Y2EbfxTpsf7omIZg/EbM=";
+ buildMypyBoto3Package "firehose" "1.35.57"
+ "sha256-QsLASn6dGIQs/nedmPXwzHeZRPIEqWjPqfDKMbaFOmM=";
mypy-boto3-fis =
buildMypyBoto3Package "fis" "1.35.12"
@@ -594,8 +594,8 @@ rec {
"sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM=";
mypy-boto3-guardduty =
- buildMypyBoto3Package "guardduty" "1.35.39"
- "sha256-6+k3i6IdCsHW8xTy/AG2JcfDqpGGj67JSihC6OPjXYE=";
+ buildMypyBoto3Package "guardduty" "1.35.55"
+ "sha256-4iTPGfSTkel+xJtH/7/oPxbtmuZJk6p9FrZR3rKMaLA=";
mypy-boto3-health =
buildMypyBoto3Package "health" "1.35.0"
@@ -766,12 +766,12 @@ rec {
"sha256-oGpeVJ4uuNUAIsZwc2k0QKLtzLSHC+ULM1f3Pcm+ZPk=";
mypy-boto3-lakeformation =
- buildMypyBoto3Package "lakeformation" "1.35.0"
- "sha256-d6dz+lqK8RJ4kwDvK8WYf5U3N9oic5s+4KJgW08/3oU=";
+ buildMypyBoto3Package "lakeformation" "1.35.55"
+ "sha256-QuVCDfj8bAtFhEnrsGqDYHFbl6awqAjLDjeJn5Rq0IM=";
mypy-boto3-lambda =
- buildMypyBoto3Package "lambda" "1.35.49"
- "sha256-7TPYB348lSMXAxZuDR2uhGCyUA6zqFiKDvBQuh3M5uE=";
+ buildMypyBoto3Package "lambda" "1.35.57"
+ "sha256-m6zdSyQbRTiCuoWH7GX7CQnZe0A2SMPb8gglgzzldYc=";
mypy-boto3-lex-models =
buildMypyBoto3Package "lex-models" "1.35.0"
@@ -1042,8 +1042,8 @@ rec {
"sha256-AYfD/JY1//vPw1obZAmwqW3NYwSpqg1zjQqTpIk80Rw=";
mypy-boto3-pinpoint-sms-voice-v2 =
- buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.43"
- "sha256-Wiue58JJyi8Td4H+byVkmjUEkuZdM4zeyJ4CAwk/+Z8=";
+ buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.57"
+ "sha256-pjvecs9LfkOQXiobtZ/OQVMKXGl/ATMy7ZiRjNJFclQ=";
mypy-boto3-pipes =
buildMypyBoto3Package "pipes" "1.35.43"
@@ -1074,8 +1074,8 @@ rec {
"sha256-mtpp+ro3b7tOrN4TrWr8BjLzaPo264ty8Sng6wtciMs=";
mypy-boto3-quicksight =
- buildMypyBoto3Package "quicksight" "1.35.43"
- "sha256-rcIdJWamEYS6M/aLO9oLe2vwyipzNra5cIrt1pFWn5Y=";
+ buildMypyBoto3Package "quicksight" "1.35.56"
+ "sha256-wiAo7FwQYo4oL8qiE3KOlpeuo4uOCacLZwBf5vel88M=";
mypy-boto3-ram =
buildMypyBoto3Package "ram" "1.35.0"
@@ -1114,8 +1114,8 @@ rec {
"sha256-zqBEwEnaCrmUl9xRlYOQHFSwZcXR1zj42Pd0Lik9SIQ=";
mypy-boto3-resource-explorer-2 =
- buildMypyBoto3Package "resource-explorer-2" "1.35.25"
- "sha256-49Ysavsq6tDUQAcJiP4GQkt5zgBz36qufByA88bltco=";
+ buildMypyBoto3Package "resource-explorer-2" "1.35.56"
+ "sha256-b6H2qsCgpX9j7yWWtPTV2CcPbtXit4HLaCH8YwAJH1A=";
mypy-boto3-resource-groups =
buildMypyBoto3Package "resource-groups" "1.35.30"
@@ -1166,8 +1166,8 @@ rec {
"sha256-8Ah6N2XRA7LbVlzYBl68Kw9w8t1OksEy9kuJRd2GmUA=";
mypy-boto3-s3control =
- buildMypyBoto3Package "s3control" "1.35.12"
- "sha256-GpZ3lr2WenLA+FNOBnot9X7DQKtmxWxvP85bTM5l1+g=";
+ buildMypyBoto3Package "s3control" "1.35.55"
+ "sha256-9gTlb+iIU+IT+2jAIU7l62gN4VenI4JLaTEFJCbgiAc=";
mypy-boto3-s3outposts =
buildMypyBoto3Package "s3outposts" "1.35.0"
@@ -1346,8 +1346,8 @@ rec {
"sha256-72VjJGOWAphFUZfMxzSaYyycUtoL1St08G/SAEhDriQ=";
mypy-boto3-synthetics =
- buildMypyBoto3Package "synthetics" "1.35.18"
- "sha256-p/jKkj4a1vUkgfmUAkKY6nbDKKaBNAJeuFOea7Uvq7M=";
+ buildMypyBoto3Package "synthetics" "1.35.56"
+ "sha256-QRYicbaZ/2a7aXB42v9WrHR56O4A+4eEnoaoo7OMaGc=";
mypy-boto3-textract =
buildMypyBoto3Package "textract" "1.35.0"
@@ -1378,8 +1378,8 @@ rec {
"sha256-j9ZU1UHzKNo1+gb+uUYiMTIwjGi9OEg0jAmKGx+mGno=";
mypy-boto3-verifiedpermissions =
- buildMypyBoto3Package "verifiedpermissions" "1.35.30"
- "sha256-wOoPXyHx/yCdGtLFLFyO9WJLSx0XyIiwMWMLff3v25U=";
+ buildMypyBoto3Package "verifiedpermissions" "1.35.55"
+ "sha256-ptQXmGLaWRtOqAL3iunKubP5gQHHAezQAubG3Z3m6BI=";
mypy-boto3-voice-id =
buildMypyBoto3Package "voice-id" "1.35.0"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netifaces2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netifaces2/default.nix
new file mode 100644
index 0000000000..379e1efc14
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/netifaces2/default.nix
@@ -0,0 +1,46 @@
+{
+ lib,
+ buildPythonPackage,
+ rustPlatform,
+ fetchFromGitHub,
+ pythonOlder,
+ pytestCheckHook,
+}:
+let
+ pname = "netifaces2";
+ version = "0.0.22";
+
+ src = fetchFromGitHub {
+ owner = "SamuelYvon";
+ repo = "netifaces-2";
+ rev = "refs/tags/V${version}";
+ hash = "sha256-XO3HWq8FOVzvpbK8mIBOup6hFMnhDpqOK/5bPziPZQ8=";
+ };
+in
+buildPythonPackage {
+ inherit pname version src;
+ pyproject = true;
+
+ disabled = pythonOlder "3.7";
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit pname version src;
+ hash = "sha256-dkqI0P61ciGqPtBc/6my7osaxxO9pEgovZhlpo1HdkU=";
+ };
+
+ nativeBuildInputs = with rustPlatform; [
+ cargoSetupHook
+ maturinBuildHook
+ ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+ pythonImportsCheck = [ "netifaces" ];
+
+ meta = {
+ description = "Portable network interface information";
+ homepage = "https://github.com/SamuelYvon/netifaces-2";
+ license = with lib.licenses; [ mit ];
+ platforms = with lib.platforms; unix ++ windows;
+ maintainers = with lib.maintainers; [ pluiedev ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nice-go/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nice-go/default.nix
index 946d129e95..6e80edf9ba 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nice-go/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nice-go/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "nice-go";
- version = "0.3.9";
+ version = "0.3.10";
pyproject = true;
src = fetchFromGitHub {
owner = "IceBotYT";
repo = "nice-go";
rev = "refs/tags/${version}";
- hash = "sha256-Gb6VDHADtqmVXMPwic0NokWm5GmhTpy7g+o/rYxrBZk=";
+ hash = "sha256-LPH6U0D/JSi8zASlirfkNgfWOh/ArPHoccniNjy2hJc=";
};
build-system = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/objprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/objprint/default.nix
index 23460fe5ff..f7721b6afa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/objprint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/objprint/default.nix
@@ -8,31 +8,26 @@
buildPythonPackage rec {
pname = "objprint";
- version = "0.2.3";
+ version = "0.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "gaogaotiantian";
repo = "objprint";
- rev = version;
- hash = "sha256-IGYjDdi3JzYk53ITVOhVnm9EDsa+4HXSVtVUE3wQWTo=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-+OS034bikrKy4F27b6ic97fHTW6rSMxQ0dx4caF6cUM=";
};
- build-system = [
- setuptools
- ];
+ build-system = [ setuptools ];
- pythonImportsCheck = [
- "objprint"
- ];
+ nativeCheckInputs = [ pytestCheckHook ];
- nativeCheckInputs = [
- pytestCheckHook
- ];
+ pythonImportsCheck = [ "objprint" ];
meta = {
description = "Library that can print Python objects in human readable format";
homepage = "https://github.com/gaogaotiantian/objprint";
+ changelog = "https://github.com/gaogaotiantian/objprint/releases/tag/${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ drupol ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
index 7f1c482977..df957c92c6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
@@ -20,6 +20,9 @@ buildPythonPackage rec {
unittestCheckHook
postgresql
];
+
+ unittestFlagsArray = [ "test" ];
+
propagatedBuildInputs = [ postgresql ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
index 7a0deabae3..561088b606 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
@@ -10,22 +10,22 @@
dlinfo,
typing-extensions,
espeak-ng,
+ setuptools,
+ pytest,
}:
buildPythonPackage rec {
pname = "phonemizer";
version = "3.3.0";
- format = "setuptools";
+ pyproject = true;
+
+ build-system = [ setuptools ];
src = fetchPypi {
inherit pname version;
hash = "sha256-Xgw4Ei7/4LMxok5nSv8laHTs4WnXCpzxEgM3tW+OPQw=";
};
- postPatch = ''
- sed -i '/pytest-runner/d' setup.py
- '';
-
patches = [
(substituteAll {
src = ./backend-paths.patch;
@@ -46,12 +46,12 @@ buildPythonPackage rec {
# so let's disable related tests.
doCheck = false;
- meta = with lib; {
+ meta = {
homepage = "https://github.com/bootphon/phonemizer";
changelog = "https://github.com/bootphon/phonemizer/blob/v${version}/CHANGELOG.md";
description = "Simple text to phones converter for multiple languages";
mainProgram = "phonemize";
- license = licenses.gpl3Plus;
- maintainers = [ ];
+ license = lib.licenses.gpl3Plus;
+ maintainers = with lib.maintainers; [ bot-wxt1221 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix
index 3e7629a313..a00929e3d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix
@@ -11,21 +11,35 @@
pytestCheckHook,
pythonOlder,
setuptools,
+ scikit-build-core,
+ cmake,
+ setuptools-scm,
+ ninja,
+ pkg-config,
+ nanobind,
}:
buildPythonPackage rec {
pname = "phonopy";
- version = "2.28.0";
+ version = "2.29.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-3BxFOT/nXuK++epTghrQxDm19JTMJm33D4uSQ/KS+aE=";
+ hash = "sha256-MabBtEOyM82R0NbdVaY+2f9GT8rT44xjOi/o38GSRp8=";
};
- nativeBuildInputs = [ setuptools ];
+ nativeBuildInputs = [
+ setuptools
+ scikit-build-core
+ nanobind
+ setuptools-scm
+ ninja
+ cmake
+ ];
+ dontUseCmakeConfigure = true;
propagatedBuildInputs = [
h5py
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix
index adcb9eec8d..6b2be979b1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -22,16 +22,16 @@
buildPythonPackage rec {
pname = "playwrightcapture";
- version = "1.26.3";
+ version = "1.27.0";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Lookyloo";
repo = "PlaywrightCapture";
rev = "refs/tags/v${version}";
- hash = "sha256-lZ0zteLZFKSeFBXWxUnPwlC9VVjUPulUCUocPGOUmuI=";
+ hash = "sha256-cfgNeUZh492SkgfSJZyaDDeqxC3vHopdIe5UcKHFVck=";
};
pythonRelaxDeps = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock
index 94a0a87e3d..37d2c8c371 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock
@@ -1,22 +1,16 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4
[[package]]
name = "addr2line"
-version = "0.22.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
dependencies = [
"gimli",
]
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
[[package]]
name = "adler2"
version = "2.0.0"
@@ -36,7 +30,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
- "const-random",
"getrandom",
"once_cell",
"version_check",
@@ -102,9 +95,9 @@ checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
[[package]]
name = "apache-avro"
@@ -134,9 +127,9 @@ dependencies = [
[[package]]
name = "arboard"
-version = "3.4.0"
+version = "3.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
+checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
dependencies = [
"clipboard-win",
"log",
@@ -164,9 +157,9 @@ checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76"
[[package]]
name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
[[package]]
name = "arrayvec"
@@ -174,51 +167,6 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-[[package]]
-name = "arrow-array"
-version = "52.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c"
-dependencies = [
- "ahash",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
- "chrono",
- "half",
- "hashbrown",
- "num",
-]
-
-[[package]]
-name = "arrow-buffer"
-version = "52.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1"
-dependencies = [
- "bytes",
- "half",
- "num",
-]
-
-[[package]]
-name = "arrow-data"
-version = "52.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5"
-dependencies = [
- "arrow-buffer",
- "arrow-schema",
- "half",
- "num",
-]
-
-[[package]]
-name = "arrow-schema"
-version = "52.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8"
-
[[package]]
name = "arrow2"
version = "0.17.4"
@@ -241,9 +189,9 @@ dependencies = [
[[package]]
name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
dependencies = [
"async-stream-impl",
"futures-core",
@@ -252,24 +200,24 @@ dependencies = [
[[package]]
name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
name = "async-trait"
-version = "0.1.81"
+version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -295,9 +243,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "avro-schema"
@@ -317,9 +265,9 @@ dependencies = [
[[package]]
name = "aws-config"
-version = "1.5.5"
+version = "1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697"
+checksum = "8191fb3091fa0561d1379ef80333c3c7191c6f0435d986e85821bcf7acbd1126"
dependencies = [
"aws-credential-types",
"aws-runtime",
@@ -347,9 +295,9 @@ dependencies = [
[[package]]
name = "aws-credential-types"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9"
+checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da"
dependencies = [
"aws-smithy-async",
"aws-smithy-runtime-api",
@@ -359,15 +307,16 @@ dependencies = [
[[package]]
name = "aws-runtime"
-version = "1.4.0"
+version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6"
+checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468"
dependencies = [
"aws-credential-types",
"aws-sigv4",
"aws-smithy-async",
"aws-smithy-eventstream",
"aws-smithy-http",
+ "aws-smithy-runtime",
"aws-smithy-runtime-api",
"aws-smithy-types",
"aws-types",
@@ -419,9 +368,9 @@ dependencies = [
[[package]]
name = "aws-sdk-sso"
-version = "1.39.0"
+version = "1.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11822090cf501c316c6f75711d77b96fba30658e3867a7762e5e2f5d32d31e81"
+checksum = "0b90cfe6504115e13c41d3ea90286ede5aa14da294f3fe077027a6e83850843c"
dependencies = [
"aws-credential-types",
"aws-runtime",
@@ -441,9 +390,9 @@ dependencies = [
[[package]]
name = "aws-sdk-ssooidc"
-version = "1.40.0"
+version = "1.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78a2a06ff89176123945d1bbe865603c4d7101bea216a550bb4d2e4e9ba74d74"
+checksum = "167c0fad1f212952084137308359e8e4c4724d1c643038ce163f06de9662c1d0"
dependencies = [
"aws-credential-types",
"aws-runtime",
@@ -463,9 +412,9 @@ dependencies = [
[[package]]
name = "aws-sdk-sts"
-version = "1.39.0"
+version = "1.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20a91795850826a6f456f4a48eff1dfa59a0e69bdbf5b8c50518fd372106574"
+checksum = "2cb5f98188ec1435b68097daa2a37d74b9d17c9caa799466338a8d1544e71b9d"
dependencies = [
"aws-credential-types",
"aws-runtime",
@@ -486,9 +435,9 @@ dependencies = [
[[package]]
name = "aws-sigv4"
-version = "1.2.3"
+version = "1.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be"
+checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68"
dependencies = [
"aws-credential-types",
"aws-smithy-eventstream",
@@ -547,9 +496,9 @@ dependencies = [
[[package]]
name = "aws-smithy-eventstream"
-version = "0.60.4"
+version = "0.60.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858"
+checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90"
dependencies = [
"aws-smithy-types",
"bytes",
@@ -558,9 +507,9 @@ dependencies = [
[[package]]
name = "aws-smithy-http"
-version = "0.60.9"
+version = "0.60.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e"
+checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6"
dependencies = [
"aws-smithy-eventstream",
"aws-smithy-runtime-api",
@@ -598,9 +547,9 @@ dependencies = [
[[package]]
name = "aws-smithy-runtime"
-version = "1.6.3"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225"
+checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87"
dependencies = [
"aws-smithy-async",
"aws-smithy-http",
@@ -642,9 +591,9 @@ dependencies = [
[[package]]
name = "aws-smithy-types"
-version = "1.2.2"
+version = "1.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cee7cadb433c781d3299b916fbf620fea813bf38f49db282fb6858141a05cc8"
+checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b"
dependencies = [
"base64-simd",
"bytes",
@@ -668,9 +617,9 @@ dependencies = [
[[package]]
name = "aws-smithy-xml"
-version = "0.60.8"
+version = "0.60.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55"
+checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc"
dependencies = [
"xmlparser",
]
@@ -691,17 +640,17 @@ dependencies = [
[[package]]
name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
- "cc",
"cfg-if",
"libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -822,17 +771,6 @@ dependencies = [
"alloc-stdlib",
]
-[[package]]
-name = "built"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4"
-dependencies = [
- "cargo-lock",
- "chrono",
- "git2",
-]
-
[[package]]
name = "bumpalo"
version = "3.16.0"
@@ -841,9 +779,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
-version = "1.17.0"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
dependencies = [
"bytemuck_derive",
]
@@ -856,7 +794,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -867,9 +805,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
[[package]]
name = "bytes-utils"
@@ -881,18 +819,6 @@ dependencies = [
"either",
]
-[[package]]
-name = "cargo-lock"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72"
-dependencies = [
- "semver",
- "serde",
- "toml",
- "url",
-]
-
[[package]]
name = "casey"
version = "0.4.0"
@@ -919,9 +845,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.1.14"
+version = "1.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
+checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
dependencies = [
"jobserver",
"libc",
@@ -998,18 +924,18 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.16"
+version = "4.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
-version = "4.5.15"
+version = "4.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
dependencies = [
"anstyle",
"clap_lex",
@@ -1072,31 +998,11 @@ version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-[[package]]
-name = "const-random"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
-dependencies = [
- "const-random-macro",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
-dependencies = [
- "getrandom",
- "once_cell",
- "tiny-keccak",
-]
-
[[package]]
name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
[[package]]
name = "core-foundation"
@@ -1125,9 +1031,9 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@@ -1402,7 +1308,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -1433,9 +1339,9 @@ dependencies = [
[[package]]
name = "error-code"
-version = "3.2.0"
+version = "3.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
+checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
[[package]]
name = "ethnum"
@@ -1473,13 +1379,13 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
"libz-ng-sys",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
]
[[package]]
@@ -1497,6 +1403,12 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
[[package]]
name = "foreign_vec"
version = "0.1.0"
@@ -1578,7 +1490,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -1646,22 +1558,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.29.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
-[[package]]
-name = "git2"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
-dependencies = [
- "bitflags",
- "libc",
- "libgit2-sys",
- "log",
- "url",
-]
+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
[[package]]
name = "glob"
@@ -1726,7 +1625,6 @@ checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
dependencies = [
"cfg-if",
"crunchy",
- "num-traits",
]
[[package]]
@@ -1735,7 +1633,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f"
dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
"serde",
]
@@ -1757,6 +1655,19 @@ dependencies = [
"serde",
]
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+ "rayon",
+ "serde",
+]
+
[[package]]
name = "heck"
version = "0.4.1"
@@ -1863,9 +1774,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
[[package]]
name = "httpdate"
@@ -1941,16 +1852,16 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
dependencies = [
"futures-util",
"http 1.1.0",
"hyper 1.4.1",
"hyper-util",
- "rustls 0.23.12",
- "rustls-native-certs 0.7.2",
+ "rustls 0.23.13",
+ "rustls-native-certs 0.8.0",
"rustls-pki-types",
"tokio",
"tokio-rustls 0.26.0",
@@ -1959,9 +1870,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.7"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
dependencies = [
"bytes",
"futures-channel",
@@ -1972,16 +1883,15 @@ dependencies = [
"pin-project-lite",
"socket2",
"tokio",
- "tower",
"tower-service",
"tracing",
]
[[package]]
name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@@ -2012,12 +1922,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown",
+ "hashbrown 0.15.0",
"serde",
]
@@ -2035,9 +1945,9 @@ checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
[[package]]
name = "ipnet"
-version = "2.9.0"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
[[package]]
name = "is-terminal"
@@ -2135,75 +2045,11 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-[[package]]
-name = "lexical-core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
-dependencies = [
- "lexical-parse-float",
- "lexical-parse-integer",
- "lexical-util",
- "lexical-write-float",
- "lexical-write-integer",
-]
-
-[[package]]
-name = "lexical-parse-float"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
-dependencies = [
- "lexical-parse-integer",
- "lexical-util",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-parse-integer"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
-dependencies = [
- "lexical-util",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-util"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
-dependencies = [
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-write-float"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
-dependencies = [
- "lexical-util",
- "lexical-write-integer",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-write-integer"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
-dependencies = [
- "lexical-util",
- "static_assertions",
-]
-
[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "libflate"
@@ -2245,22 +2091,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d"
dependencies = [
"core2",
- "hashbrown",
+ "hashbrown 0.14.5",
"rle-decode-fast",
]
-[[package]]
-name = "libgit2-sys"
-version = "0.17.0+1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "pkg-config",
-]
-
[[package]]
name = "libloading"
version = "0.8.5"
@@ -2268,7 +2102,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [
"cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -2297,18 +2131,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "libz-sys"
-version = "1.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
[[package]]
name = "linux-raw-sys"
version = "0.4.14"
@@ -2337,24 +2159,23 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
]
[[package]]
name = "lz4"
-version = "1.26.0"
+version = "1.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68"
+checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725"
dependencies = [
- "libc",
"lz4-sys",
]
[[package]]
name = "lz4-sys"
-version = "1.10.0"
+version = "1.11.1+lz4-1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
dependencies = [
"cc",
"libc",
@@ -2428,15 +2249,6 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.8.0"
@@ -2511,20 +2323,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "num"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
-dependencies = [
- "num-bigint",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
[[package]]
name = "num-bigint"
version = "0.4.6"
@@ -2560,28 +2358,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "num-iter"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
[[package]]
name = "num-traits"
version = "0.2.19"
@@ -2707,9 +2483,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.36.3"
+version = "0.36.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
dependencies = [
"memchr",
]
@@ -2735,7 +2511,7 @@ dependencies = [
"rand",
"reqwest",
"ring",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
"serde",
"serde_json",
"snafu",
@@ -2747,9 +2523,12 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
[[package]]
name = "oorandom"
@@ -2803,16 +2582,6 @@ dependencies = [
"windows-targets 0.52.6",
]
-[[package]]
-name = "parquet-format-safe"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f"
-dependencies = [
- "async-trait",
- "futures",
-]
-
[[package]]
name = "parse-zoneinfo"
version = "0.3.1"
@@ -2866,26 +2635,6 @@ dependencies = [
"siphasher",
]
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.76",
-]
-
[[package]]
name = "pin-project-lite"
version = "0.2.14"
@@ -2910,9 +2659,9 @@ dependencies = [
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "planus"
@@ -2925,9 +2674,9 @@ dependencies = [
[[package]]
name = "plotters"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
dependencies = [
"num-traits",
"plotters-backend",
@@ -2938,15 +2687,15 @@ dependencies = [
[[package]]
name = "plotters-backend"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
[[package]]
name = "plotters-svg"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
dependencies = [
"plotters-backend",
]
@@ -2957,7 +2706,6 @@ version = "0.43.1"
dependencies = [
"ahash",
"apache-avro",
- "arrow-buffer",
"avro-schema",
"either",
"ethnum",
@@ -2986,10 +2734,6 @@ name = "polars-arrow"
version = "0.43.1"
dependencies = [
"ahash",
- "arrow-array",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
"async-stream",
"atoi",
"atoi_simd",
@@ -3007,7 +2751,7 @@ dependencies = [
"flate2",
"futures",
"getrandom",
- "hashbrown",
+ "hashbrown 0.15.0",
"hex",
"indexmap",
"itoa",
@@ -3023,7 +2767,7 @@ dependencies = [
"proptest",
"rand",
"regex",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
"ryu",
"sample-arrow2",
"sample-std",
@@ -3032,6 +2776,7 @@ dependencies = [
"simdutf8",
"streaming-iterator",
"strength_reduce",
+ "strum_macros",
"tokio",
"tokio-util",
"version_check",
@@ -3070,7 +2815,6 @@ name = "polars-core"
version = "0.43.1"
dependencies = [
"ahash",
- "arrow-array",
"bincode",
"bitflags",
"bytemuck",
@@ -3078,7 +2822,8 @@ dependencies = [
"chrono-tz",
"comfy-table",
"either",
- "hashbrown",
+ "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
"indexmap",
"ndarray",
"num-traits",
@@ -3095,6 +2840,7 @@ dependencies = [
"regex",
"serde",
"serde_json",
+ "strum_macros",
"thiserror",
"version_check",
"xxhash-rust",
@@ -3132,6 +2878,8 @@ version = "0.43.1"
dependencies = [
"ahash",
"bitflags",
+ "hashbrown 0.15.0",
+ "num-traits",
"once_cell",
"polars-arrow",
"polars-compute",
@@ -3140,6 +2888,7 @@ dependencies = [
"polars-json",
"polars-ops",
"polars-plan",
+ "polars-row",
"polars-time",
"polars-utils",
"rayon",
@@ -3169,7 +2918,7 @@ dependencies = [
"fs4",
"futures",
"glob",
- "hashbrown",
+ "hashbrown 0.15.0",
"home",
"itoa",
"memchr",
@@ -3186,6 +2935,7 @@ dependencies = [
"polars-schema",
"polars-time",
"polars-utils",
+ "pyo3",
"rayon",
"regex",
"reqwest",
@@ -3209,7 +2959,7 @@ dependencies = [
"chrono",
"chrono-tz",
"fallible-streaming-iterator",
- "hashbrown",
+ "hashbrown 0.15.0",
"indexmap",
"itoa",
"num-traits",
@@ -3282,7 +3032,7 @@ dependencies = [
"chrono",
"chrono-tz",
"either",
- "hashbrown",
+ "hashbrown 0.15.0",
"hex",
"indexmap",
"jsonpath_lib_polars_vendor",
@@ -3299,8 +3049,10 @@ dependencies = [
"rand_distr",
"rayon",
"regex",
+ "regex-syntax 0.8.5",
"serde",
"serde_json",
+ "strum_macros",
"unicode-reverse",
"version_check",
]
@@ -3318,14 +3070,14 @@ dependencies = [
"fallible-streaming-iterator",
"flate2",
"futures",
- "hashbrown",
+ "hashbrown 0.15.0",
"lz4",
"lz4_flex",
"num-traits",
- "parquet-format-safe",
"polars-arrow",
"polars-compute",
"polars-error",
+ "polars-parquet-format",
"polars-utils",
"rand",
"serde",
@@ -3336,6 +3088,15 @@ dependencies = [
"zstd",
]
+[[package]]
+name = "polars-parquet-format"
+version = "2.10.0"
+source = "git+https://github.com/pola-rs/parquet-format#b96e00d2b054739ee02da06987bcd7f44b82a4ef"
+dependencies = [
+ "async-trait",
+ "futures",
+]
+
[[package]]
name = "polars-pipe"
version = "0.43.1"
@@ -3344,7 +3105,7 @@ dependencies = [
"crossbeam-queue",
"enum_dispatch",
"futures",
- "hashbrown",
+ "hashbrown 0.15.0",
"num-traits",
"polars-arrow",
"polars-compute",
@@ -3374,9 +3135,10 @@ dependencies = [
"ciborium",
"either",
"futures",
- "hashbrown",
+ "hashbrown 0.15.0",
"libloading",
"memmap2",
+ "num-traits",
"once_cell",
"percent-encoding",
"polars-arrow",
@@ -3417,8 +3179,10 @@ dependencies = [
"polars",
"polars-core",
"polars-error",
+ "polars-expr",
"polars-io",
"polars-lazy",
+ "polars-mem-engine",
"polars-ops",
"polars-parquet",
"polars-plan",
@@ -3517,6 +3281,7 @@ dependencies = [
"polars-utils",
"regex",
"serde",
+ "strum_macros",
]
[[package]]
@@ -3527,13 +3292,14 @@ dependencies = [
"bytemuck",
"bytes",
"compact_str",
- "hashbrown",
+ "hashbrown 0.15.0",
"indexmap",
"libc",
"memmap2",
"num-traits",
"once_cell",
"polars-error",
+ "pyo3",
"rand",
"raw-cpuid",
"rayon",
@@ -3545,9 +3311,9 @@ dependencies = [
[[package]]
name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "powerfmt"
@@ -3585,7 +3351,7 @@ dependencies = [
"rand",
"rand_chacha",
"rand_xorshift",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
"unarray",
]
@@ -3614,18 +3380,17 @@ dependencies = [
[[package]]
name = "psm"
-version = "0.1.21"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205"
dependencies = [
"cc",
]
[[package]]
name = "py-polars"
-version = "1.7.1"
+version = "1.12.0"
dependencies = [
- "built",
"jemallocator",
"libc",
"mimalloc",
@@ -3683,7 +3448,7 @@ dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -3696,20 +3461,20 @@ dependencies = [
"proc-macro2",
"pyo3-build-config",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
name = "quad-rand"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88"
+checksum = "b76f1009795ca44bb5aaae8fd3f18953e209259c33d9b059b1f53d58ab7511db"
[[package]]
name = "quick-xml"
-version = "0.36.1"
+version = "0.36.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
dependencies = [
"memchr",
"serde",
@@ -3728,16 +3493,16 @@ dependencies = [
[[package]]
name = "quinn"
-version = "0.11.3"
+version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
dependencies = [
"bytes",
"pin-project-lite",
"quinn-proto",
"quinn-udp",
"rustc-hash 2.0.0",
- "rustls 0.23.12",
+ "rustls 0.23.13",
"socket2",
"thiserror",
"tokio",
@@ -3754,7 +3519,7 @@ dependencies = [
"rand",
"ring",
"rustc-hash 2.0.0",
- "rustls 0.23.12",
+ "rustls 0.23.13",
"slab",
"thiserror",
"tinyvec",
@@ -3763,15 +3528,15 @@ dependencies = [
[[package]]
name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
dependencies = [
"libc",
"once_cell",
"socket2",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3844,9 +3609,9 @@ dependencies = [
[[package]]
name = "raw-cpuid"
-version = "11.1.0"
+version = "11.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
dependencies = [
"bitflags",
]
@@ -3894,14 +3659,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
dependencies = [
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
"bitflags",
]
@@ -3923,30 +3688,30 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
name = "regex"
-version = "1.10.6"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
]
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -3963,15 +3728,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "reqwest"
-version = "0.12.7"
+version = "0.12.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
dependencies = [
"base64 0.22.1",
"bytes",
@@ -3983,7 +3748,7 @@ dependencies = [
"http-body 1.0.1",
"http-body-util",
"hyper 1.4.1",
- "hyper-rustls 0.27.2",
+ "hyper-rustls 0.27.3",
"hyper-util",
"ipnet",
"js-sys",
@@ -3993,9 +3758,9 @@ dependencies = [
"percent-encoding",
"pin-project-lite",
"quinn",
- "rustls 0.23.12",
- "rustls-native-certs 0.7.2",
- "rustls-pemfile 2.1.3",
+ "rustls 0.23.13",
+ "rustls-native-certs 0.8.0",
+ "rustls-pemfile 2.2.0",
"rustls-pki-types",
"serde",
"serde_json",
@@ -4065,18 +3830,18 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[package]]
name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
dependencies = [
"semver",
]
[[package]]
name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags",
"errno",
@@ -4099,14 +3864,14 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.12"
+version = "0.23.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
dependencies = [
"once_cell",
"ring",
"rustls-pki-types",
- "rustls-webpki 0.102.6",
+ "rustls-webpki 0.102.8",
"subtle",
"zeroize",
]
@@ -4125,12 +3890,12 @@ dependencies = [
[[package]]
name = "rustls-native-certs"
-version = "0.7.2"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa"
+checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
dependencies = [
"openssl-probe",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
"rustls-pki-types",
"schannel",
"security-framework",
@@ -4147,19 +3912,18 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
dependencies = [
- "base64 0.22.1",
"rustls-pki-types",
]
[[package]]
name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
[[package]]
name = "rustls-webpki"
@@ -4173,9 +3937,9 @@ dependencies = [
[[package]]
name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
@@ -4251,11 +4015,11 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -4303,9 +4067,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
dependencies = [
"core-foundation-sys",
"libc",
@@ -4316,15 +4080,12 @@ name = "semver"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-dependencies = [
- "serde",
-]
[[package]]
name = "serde"
-version = "1.0.209"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
@@ -4340,20 +4101,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
name = "serde_json"
-version = "1.0.127"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"indexmap",
"itoa",
@@ -4362,15 +4123,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "serde_spanned"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "serde_urlencoded"
version = "0.7.1"
@@ -4432,14 +4184,13 @@ dependencies = [
[[package]]
name = "simd-json"
-version = "0.13.10"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa"
+checksum = "05f0b376aada35f30a0012f5790e50aed62f91804a0682669aefdbe81c7fcb91"
dependencies = [
"ahash",
"getrandom",
"halfbrown",
- "lexical-core",
"once_cell",
"ref-cast",
"serde",
@@ -4450,9 +4201,9 @@ dependencies = [
[[package]]
name = "simdutf8"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
[[package]]
name = "siphasher"
@@ -4549,15 +4300,15 @@ dependencies = [
[[package]]
name = "stacker"
-version = "0.1.16"
+version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a5daa25ea337c85ed954c0496e3bdd2c7308cc3b24cf7b50d04876654c579f"
+checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
dependencies = [
"cc",
"cfg-if",
"libc",
"psm",
- "windows-sys 0.36.1",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -4603,7 +4354,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -4625,9 +4376,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.76"
+version = "2.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
dependencies = [
"proc-macro2",
"quote",
@@ -4645,9 +4396,9 @@ dependencies = [
[[package]]
name = "sysinfo"
-version = "0.31.3"
+version = "0.31.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b92e0bdf838cbc1c4c9ba14f9c97a7ec6cdcd1ae66b10e1e42775a25553f45d"
+checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
dependencies = [
"core-foundation-sys",
"libc",
@@ -4670,9 +4421,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
"fastrand",
@@ -4683,22 +4434,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -4731,15 +4482,6 @@ dependencies = [
"time-core",
]
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
[[package]]
name = "tinytemplate"
version = "1.2.1"
@@ -4767,9 +4509,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.39.3"
+version = "1.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
dependencies = [
"backtrace",
"bytes",
@@ -4790,7 +4532,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -4809,16 +4551,16 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
- "rustls 0.23.12",
+ "rustls 0.23.13",
"rustls-pki-types",
"tokio",
]
[[package]]
name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
dependencies = [
"bytes",
"futures-core",
@@ -4828,61 +4570,6 @@ dependencies = [
"tokio",
]
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
[[package]]
name = "tower-service"
version = "0.3.3"
@@ -4908,7 +4595,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -4953,7 +4640,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -4970,21 +4657,21 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
[[package]]
name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
@@ -5000,15 +4687,15 @@ dependencies = [
[[package]]
name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "unindent"
@@ -5051,9 +4738,9 @@ dependencies = [
[[package]]
name = "value-trait"
-version = "0.8.1"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4"
+checksum = "bcaa56177466248ba59d693a048c0959ddb67f1151b963f904306312548cf392"
dependencies = [
"float-cmp",
"halfbrown",
@@ -5061,12 +4748,6 @@ dependencies = [
"ryu",
]
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
[[package]]
name = "version_check"
version = "0.9.5"
@@ -5126,7 +4807,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
"wasm-bindgen-shared",
]
@@ -5160,7 +4841,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -5173,9 +4854,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
[[package]]
name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
dependencies = [
"futures-util",
"js-sys",
@@ -5264,7 +4945,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -5275,7 +4956,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
@@ -5317,19 +4998,6 @@ dependencies = [
"windows-targets 0.52.6",
]
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
[[package]]
name = "windows-sys"
version = "0.52.0"
@@ -5391,12 +5059,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.5"
@@ -5409,12 +5071,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
[[package]]
name = "windows_i686_gnu"
version = "0.48.5"
@@ -5433,12 +5089,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
[[package]]
name = "windows_i686_msvc"
version = "0.48.5"
@@ -5451,12 +5101,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.5"
@@ -5481,12 +5125,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.5"
@@ -5499,15 +5137,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
[[package]]
name = "x11rb"
version = "0.13.1"
@@ -5555,7 +5184,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.76",
+ "syn 2.0.79",
]
[[package]]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix
index a1eeda11a3..e552bd6941 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix
@@ -2,98 +2,304 @@
lib,
stdenv,
buildPythonPackage,
- rustPlatform,
+ cargo,
cmake,
- libiconv,
+ darwin,
fetchFromGitHub,
+ pkg-config,
+ pkgs, # zstd hidden by python3Packages.zstd
+ pytestCheckHook,
+ pytest-codspeed ? null, # Not in Nixpkgs
+ pytest-cov,
+ pytest-xdist,
+ pytest-benchmark,
+ rustc,
+ rustPlatform,
+ runCommand,
+
+ mimalloc,
jemalloc,
rust-jemalloc-sys,
- darwin,
+ # Another alternative is to try `mimalloc`
+ polarsMemoryAllocator ? mimalloc, # polarsJemalloc,
+ polarsJemalloc ?
+ let
+ jemalloc' = rust-jemalloc-sys.override {
+ jemalloc = jemalloc.override {
+ # "libjemalloc.so.2: cannot allocate memory in static TLS block"
+
+ # https://github.com/pola-rs/polars/issues/5401#issuecomment-1300998316
+ disableInitExecTls = true;
+ };
+ };
+ in
+ assert builtins.elem "--disable-initial-exec-tls" jemalloc'.configureFlags;
+ jemalloc',
+
+ polars,
+ python,
}:
let
- rust-jemalloc-sys' = rust-jemalloc-sys.override {
- jemalloc = jemalloc.override { disableInitExecTls = true; };
- };
+ version = "1.12.0";
+
+ # Hide symbols to prevent accidental use
+ rust-jemalloc-sys = throw "polars: use polarsMemoryAllocator over rust-jemalloc-sys";
+ jemalloc = throw "polars: use polarsMemoryAllocator over jemalloc";
in
-buildPythonPackage rec {
+buildPythonPackage {
pname = "polars";
- version = "1.7.1";
- pyproject = true;
+ inherit version;
src = fetchFromGitHub {
owner = "pola-rs";
repo = "polars";
- rev = "refs/tags/py-${version}";
- hash = "sha256-vbligrFrCd7BiPV8n1iRIlurPNirJKOiD4/P5qEpirg=";
+ rev = "py-${version}";
+ hash = "sha256-q//vt8FvVKY9N/BOIoOwxaSB/F/tNX1Zl/9jd0AzSH4=";
};
- # Cargo.lock file is sometimes behind actual release which throws an error,
- # thus the `sed` command
- # Make sure to check that the right substitutions are made when updating the package
- preBuild = ''
- #sed -i 's/version = "0.18.0"/version = "${version}"/g' Cargo.lock
+ # Do not type-check assertions because some of them use unstable features (`is_none_or`)
+ postPatch = ''
+ while IFS= read -r -d "" path ; do
+ sed -i 's \(\s*\)debug_assert! \1#[cfg(debug_assertions)]\n\1debug_assert! ' "$path"
+ done < <( find -iname '*.rs' -print0 )
'';
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"numpy-0.21.0" = "sha256-u0Z+6L8pXSPaA3cE1sUpY6sCoaU1clXUcj/avnNzmsw=";
+ "polars-parquet-format-2.10.0" = "sha256-iB3KZ72JSp7tJCLn9moukpDEGf9MUos04rIQ9rDGWfI=";
};
};
- buildAndTestSubdir = "py-polars";
+ requiredSystemFeatures = [ "big-parallel" ];
- # Revisit this whenever package or Rust is upgraded
- RUSTC_BOOTSTRAP = 1;
+ build-system = [ rustPlatform.maturinBuildHook ];
- # trick taken from the polars repo since there seems to be a problem
- # with simd enabled with our stable rust (instead of nightly).
- maturinBuildFlags = [
- "--no-default-features"
- "--all-features"
+ nativeBuildInputs = [
+ cargo
+ pkg-config
+ cmake # libz-ng-sys
+ rustPlatform.cargoSetupHook
+ rustPlatform.cargoBuildHook
+ rustPlatform.cargoInstallHook
+ rustc
];
+ buildInputs =
+ [
+ polarsMemoryAllocator
+ (pkgs.__splicedPackages.zstd or pkgs.zstd)
+ ]
+ ++ lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.AppKit
+ darwin.apple_sdk.frameworks.IOKit
+ darwin.apple_sdk.frameworks.Security
+ ];
+
+ env = {
+ ZSTD_SYS_USE_PKG_CONFIG = true;
+
+ # https://github.com/NixOS/nixpkgs/blob/5c38beb516f8da3a823d94b746dd3bf3c6b9bbd7/doc/languages-frameworks/rust.section.md#using-community-maintained-rust-toolchains-using-community-maintained-rust-toolchains
+ # https://discourse.nixos.org/t/nixpkgs-rustplatform-and-nightly/22870
+ RUSTC_BOOTSTRAP = true;
+
+ # Several `debug_assert!` statements use the unstable `Option::is_none_or` method
+ RUSTFLAGS = lib.concatStringsSep " " (
+ [
+ "-Cdebug_assertions=n"
+ ]
+ ++ lib.optionals (polarsMemoryAllocator.pname == "mimalloc") [
+ "--cfg use_mimalloc"
+ ]
+ );
+ RUST_BACKTRACE = true;
+ };
+
dontUseCmakeConfigure = true;
- nativeBuildInputs =
- [
- # needed for libz-ng-sys
- # TODO: use pkgs.zlib-ng
- cmake
- ]
- ++ (with rustPlatform; [
- cargoSetupHook
- maturinBuildHook
- ]);
+ maturinBuildFlags = [
+ "-m"
+ "py-polars/Cargo.toml"
+ ];
- buildInputs =
- [ rust-jemalloc-sys' ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- libiconv
- darwin.apple_sdk.frameworks.AppKit
- darwin.apple_sdk.frameworks.Security
- darwin.apple_sdk.frameworks.SystemConfiguration
+ postInstall = ''
+ # Move polars.abi3.so -> polars.so
+ local polarsSo=""
+ local soName=""
+ while IFS= read -r -d "" p ; do
+ polarsSo=$p
+ soName="$(basename "$polarsSo")"
+ [[ "$soName" == polars.so ]] && break
+ done < <( find "$out" -iname "polars*.so" -print0 )
+ [[ -z "''${polarsSo:-}" ]] && echo "polars.so not found" >&2 && exit 1
+ if [[ "$soName" != polars.so ]] ; then
+ mv "$polarsSo" "$(dirname "$polarsSo")/polars.so"
+ fi
+ '';
+
+ pythonImportsCheck = [
+ "polars"
+ ];
+
+ passthru.tests.dynloading-1 =
+ runCommand "polars-dynloading-1"
+ {
+ nativeBuildInputs = [
+ (python.withPackages (ps: [
+ ps.pyarrow
+ polars
+ ]))
+ ];
+ }
+ ''
+ ((LD_DEBUG=libs python) |& tee $out | tail) << \EOF
+ import pyarrow
+ import polars
+ EOF
+ touch $out
+ '';
+ passthru.tests.dynloading-2 =
+ runCommand "polars-dynloading-2"
+ {
+ nativeBuildInputs = [
+ (python.withPackages (ps: [
+ ps.pyarrow
+ polars
+ ]))
+ ];
+ failureHook = ''
+ sed "s/^/ /" $out >&2
+ '';
+ }
+ ''
+ ((LD_DEBUG=libs python) |& tee $out | tail) << \EOF
+ import polars
+ import pyarrow
+ EOF
+ '';
+ passthru.tests.pytest = stdenv.mkDerivation {
+ pname = "${polars.pname}-pytest";
+
+ inherit (polars) version src;
+
+ requiredSystemFeatures = [ "big-parallel" ];
+
+ sourceRoot = "source/py-polars";
+ postPatch = ''
+ for f in * ; do
+ [[ "$f" == "tests" ]] || \
+ [[ "$f" == "pyproject.toml" ]] || \
+ rm -rf "$f"
+ done
+ for pat in "__pycache__" "*.pyc" ; do
+ find -iname "$pat" -exec rm "{}" ";"
+ done
+ '';
+ dontConfigure = true;
+ dontBuild = true;
+
+ doCheck = true;
+ checkPhase = "pytestCheckPhase";
+ nativeBuildInputs = [
+ (python.withPackages (ps: [
+ polars
+ ps.aiosqlite
+ ps.altair
+ ps.boto3
+ ps.deltalake
+ ps.flask
+ ps.flask-cors
+ ps.fsspec
+ ps.gevent
+ ps.hypothesis
+ ps.jax
+ ps.jaxlib
+ (ps.kuzu or null)
+ ps.moto
+ ps.nest-asyncio
+ ps.numpy
+ ps.openpyxl
+ ps.pandas
+ ps.pyarrow
+ ps.pydantic
+ (ps.pyiceberg or null)
+ ps.sqlalchemy
+ ps.torch
+ ps.xlsx2csv
+ ps.xlsxwriter
+ ps.zstandard
+ ps.cloudpickle
+ ]))
+ ];
+ nativeCheckInputs = [
+ pytestCheckHook
+ pytest-codspeed
+ pytest-cov
+ pytest-xdist
+ pytest-benchmark
];
- # nativeCheckInputs = [
- # pytestCheckHook
- # fixtures
- # graphviz
- # matplotlib
- # networkx
- # numpy
- # pydot
- # ];
+ pytestFlagsArray = [
+ "-n auto"
+ "--dist loadgroup"
+ ''-m "slow or not slow"''
+ ];
+ disabledTests = [
+ "test_read_kuzu_graph_database" # kuzu
+ "test_read_database_cx_credentials" # connectorx
- pythonImportsCheck = [ "polars" ];
+ # adbc_driver_.*
+ "test_write_database_append_replace"
+ "test_write_database_create"
+ "test_write_database_create_quoted_tablename"
+ "test_write_database_adbc_temporary_table"
+ "test_write_database_create"
+ "test_write_database_append_replace"
+ "test_write_database_errors"
+ "test_write_database_errors"
+ "test_write_database_create_quoted_tablename"
+
+ # Internet access:
+ "test_read_web_file"
+
+ # Untriaged
+ "test_pickle_lazyframe_nested_function_udf"
+ "test_serde_udf"
+ "test_hash_struct"
+ ];
+ disabledTestPaths = [
+ "tests/benchmark"
+ "tests/docs"
+
+ "tests/unit/io/test_iceberg.py" # Package pyiceberg
+ "tests/unit/io/test_spreadsheet.py" # Package fastexcel
+
+ # Wrong altair version
+ "tests/unit/operations/namespaces/test_plot.py"
+
+ # adbc
+ "tests/unit/io/database/test_read.py"
+
+ # Untriaged
+ "tests/unit/cloud/test_prepare_cloud_plan.py"
+ "tests/unit/io/cloud/test_cloud.py"
+ ];
+
+ installPhase = "touch $out";
+ };
meta = {
- description = "Fast multi-threaded DataFrame library";
+ description = "Dataframes powered by a multithreaded, vectorized query engine, written in Rust";
homepage = "https://github.com/pola-rs/polars";
- changelog = "https://github.com/pola-rs/polars/releases/tag/py-${version}";
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ happysalada ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ happysalada
+ SomeoneSerge
+ ];
+ mainProgram = "polars";
+ platforms = lib.platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/4.nix
index d58e21d195..2d1a3f9d86 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/4.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/4.nix
@@ -4,6 +4,7 @@
fetchpatch,
isPyPy,
lib,
+ stdenv,
numpy,
protobuf,
pytestCheckHook,
@@ -84,15 +85,21 @@ buildPythonPackage {
pytestCheckHook
] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ];
- disabledTests = lib.optionals isPyPy [
- # error message differs
- "testInvalidTimestamp"
- # requires tracemalloc which pypy does not implement
- # https://foss.heptapod.net/pypy/pypy/-/issues/3048
- "testUnknownFieldsNoMemoryLeak"
- # assertion is not raised for some reason
- "testStrictUtf8Check"
- ];
+ disabledTests =
+ lib.optionals isPyPy [
+ # error message differs
+ "testInvalidTimestamp"
+ # requires tracemalloc which pypy does not implement
+ # https://foss.heptapod.net/pypy/pypy/-/issues/3048
+ "testUnknownFieldsNoMemoryLeak"
+ # assertion is not raised for some reason
+ "testStrictUtf8Check"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.is32bit [
+ # OverflowError: timestamp out of range for platform time_t
+ "testTimezoneAwareDatetimeConversionWhereTimestampLosesPrecision"
+ "testTimezoneNaiveDatetimeConversionWhereTimestampLosesPrecision"
+ ];
disabledTestPaths =
lib.optionals (lib.versionAtLeast protobuf.version "23") [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix
index b98536954e..135c147c13 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "proton-vpn-api-core";
- version = "0.35.5";
+ version = "0.36.4";
pyproject = true;
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "python-proton-vpn-api-core";
rev = "v${version}";
- hash = "sha256-YdBsA8qKcWpR+L/I9rEFntR448kaxEjYuGDPS1ynsMU=";
+ hash = "sha256-K2uti5QPSK+er8pLiSTrdxRZeKtAaGPj/N3zoIpJhHw=";
};
build-system = [
@@ -67,6 +67,7 @@ buildPythonPackage rec {
disabledTests = [
# Permission denied: '/run'
"test_ensure_configuration_file_is_created"
+ "test_ovpnconfig_with_certificate"
"test_ovpnconfig_with_settings"
"test_wireguard_config_content_generation"
"test_wireguard_with_non_certificate"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
index 4e32a915fa..8575a37f78 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "proton-vpn-network-manager";
- version = "0.9.1";
+ version = "0.9.4";
pyproject = true;
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "python-proton-vpn-network-manager";
rev = "refs/tags/v${version}";
- hash = "sha256-dwWEcLowNlIoxeVQnEpmI+PK18DQRiW4A4qfWHSqRw8=";
+ hash = "sha256-9VoJyQfT9rUXK1vkQrUPvWogVYTbDLhSq3JDu3gJwg8=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix
index 4dd6aa9b6d..93bfb7a8ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix
@@ -3,6 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
stdenv,
+ setuptools,
boost,
freetype,
ftgl,
@@ -12,29 +13,30 @@
}:
let
-
pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
in
-
buildPythonPackage rec {
pname = "pyftgl";
version = "0.4b";
- format = "setuptools";
+ pyproject = true;
src = fetchFromGitHub {
owner = "umlaeute";
- repo = "${pname}-${version}";
- rev = version;
- sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
+ repo = "pyftgl";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-mbzXpIPMNe6wfwaAAw/Ri8xaW6Z6kuNUhFFyzsiW7Is=";
};
- postPatch = ''
- sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py
- '';
+ build-system = [ setuptools ];
- env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
- NIX_CFLAGS_COMPILE = "-L${libGL}/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries";
- };
+ postPatch =
+ ''
+ substituteInPlace setup.py \
+ --replace-fail boost_python boost_python${pythonVersion}
+ ''
+ + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ export NIX_CFLAGS_COMPILE+=" -L$SDKROOT/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"
+ '';
buildInputs = [
boost
@@ -44,8 +46,8 @@ buildPythonPackage rec {
libGL
];
- meta = with lib; {
+ meta = {
description = "Python bindings for FTGL (FreeType for OpenGL)";
- license = licenses.gpl2Plus;
+ license = lib.licenses.gpl2Plus;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix
index c1480a2732..f843876f70 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "pymc-devs";
repo = "pymc";
rev = "refs/tags/v${version}";
- hash = "sha256-XJWAzJ8B5MZlMA6gF8OAUeXUHfPH2/buvoGlthgc+Qw=";
+ hash = "sha256-rH6sh05rSrhakcfdc+BSR37kQYO/QEPuw8hHMZZGwdE=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix
index 19fe009ced..68b7d44064 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "pyosmium";
- version = "4.0.1";
+ version = "4.0.2";
pyproject = true;
disabled = pythonOlder "3.7" || isPyPy;
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "osmcode";
repo = "pyosmium";
rev = "refs/tags/v${version}";
- hash = "sha256-qi4GsjQVe2nIcvQThAlxQu3kUdWhRuJFHVPjKbMBxdM=";
+ hash = "sha256-pW2w/M4P4DtGhnTy72w0wjMtpLtSgvYGaemme/rRrwM=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix
index f69e18f431..1a7c541dae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix
@@ -9,6 +9,7 @@
poetry-core,
python-magic,
pytz,
+ six,
pytestCheckHook,
requests-oauthlib,
}:
@@ -25,6 +26,8 @@ buildPythonPackage rec {
hash = "sha256-nKOPCkS2b3ObmBnk/7FTv4o4vwUX+tOtZI5OQQ4HSTY=";
};
+ pythonRelaxDeps = [ "requests-oauthlib" ];
+
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
@@ -32,6 +35,7 @@ buildPythonPackage rec {
ijson
python-magic
pytz
+ six
requests-oauthlib
];
@@ -54,6 +58,10 @@ buildPythonPackage rec {
--replace 'ijson = "^2.5.1"' 'ijson = "*"' \
--replace 'pytz = "^2019.3"' 'pytz = "*"' \
--replace 'oauthlib = "^3.1.0"' 'oauthlib = "*"'
+
+ # https://github.com/rbw/pysnow/pull/201 doesn't apply via fetchpatch, so we recreate it
+ substituteInPlace tests/test_client.py tests/test_oauth_client.py tests/test_params_builder.py tests/test_resource.py \
+ --replace-fail "self.assertEquals" "self.assertEqual"
'';
pythonImportsCheck = [ "pysnow" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix
index a5da6bc330..e960018bd6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -8,6 +8,7 @@
fetchFromGitHub,
pyopenssl,
pythonOlder,
+ pytest-asyncio,
pytestCheckHook,
requests,
setuptools,
@@ -38,7 +39,10 @@ buildPythonPackage rec {
requests
];
- nativeCheckInputs = [ pytestCheckHook ];
+ nativeCheckInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
pythonImportsCheck = [ "switchbot" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix
index f45abf0941..16d75ace33 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -10,16 +10,16 @@
buildPythonPackage rec {
pname = "pytest-flake8";
- version = "1.2.2";
+ version = "1.3.0";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "coherent-oss";
repo = "pytest-flake8";
rev = "refs/tags/v${version}";
- hash = "sha256-FsJysBj5S5HHGay+YZKMgb9RdUN637J+FfNl+m9l6ik=";
+ hash = "sha256-uc5DOqqdoLfhzI2ogDOqhbJOHzdu+uqSOojIH+S1LZI=";
};
build-system = [ setuptools-scm ];
@@ -29,8 +29,6 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
meta = {
- # https://github.com/coherent-oss/pytest-flake8/issues/3
- broken = lib.versionAtLeast flake8.version "6";
changelog = "https://github.com/coherent-oss/pytest-flake8/blob/${src.rev}/NEWS.rst";
description = "py.test plugin for efficiently checking PEP8 compliance";
homepage = "https://github.com/coherent-oss/pytest-flake8";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
index cb2185845e..6dfdab632d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
@@ -2,22 +2,34 @@
lib,
buildPythonPackage,
fetchPypi,
+ fetchpatch,
+ setuptools,
}:
buildPythonPackage rec {
pname = "python-axolotl-curve25519";
version = "0.4.1.post2";
- format = "setuptools";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3";
};
- meta = with lib; {
+ patches = [
+ # https://github.com/tgalal/python-axolotl-curve25519/pull/26
+ (fetchpatch {
+ url = "https://github.com/tgalal/python-axolotl-curve25519/commit/901f4fb12e1290b72fbd26ea1f40755b079fa241.patch";
+ hash = "sha256-hdhaOysRXI9q5D9e/bfy0887bpEFSvUyrbl32nBgteQ=";
+ })
+ ];
+
+ build-system = [ setuptools ];
+
+ meta = {
homepage = "https://github.com/tgalal/python-axolotl-curve25519";
description = "Curve25519 with ed25519 signatures";
- maintainers = with maintainers; [ abbradar ];
- license = licenses.gpl3;
+ maintainers = with lib.maintainers; [ abbradar ];
+ license = lib.licenses.gpl3;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
index eb0b5a212c..acebbd90ef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.2.126";
+ version = "9.2.127";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchPypi {
inherit pname version;
- hash = "sha256-bi4DKqT+MFLCJgVN+EegED0d6XbUuZ2GS/vsHU6FMgw=";
+ hash = "sha256-pBbbYtI2ITky6xw09/MSMvCk7HZUCJaMP86GSFkSa1o=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix
index 96b1213ca5..6346c96c62 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix
@@ -50,21 +50,17 @@ buildPythonPackage rec {
];
checkPhase = ''
- # Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED
- export HOME=$TMPDIR
- # QStandardPaths: XDG_RUNTIME_DIR not set
- export XDG_RUNTIME_DIR=$HOME/xdg-runtime-dir
+ # a Qt wrapper is required to run the Qt backend
+ # since the upstream script does not have a way to disable tests individually pytest is used directly instead
+ makeQtWrapper "$(command -v pytest)" tests/run.sh \
+ --set PYWEBVIEW_LOG debug \
+ --add-flags "--deselect tests/test_js_api.py::test_concurrent"
- pushd tests
- substituteInPlace run.sh \
- --replace "PYTHONPATH=.." "PYTHONPATH=$PYTHONPATH" \
- --replace "pywebviewtest test_js_api.py::test_concurrent ''${PYTEST_OPTIONS}" "# skip flaky test_js_api.py::test_concurrent"
-
- patchShebangs run.sh
- wrapQtApp run.sh
-
- xvfb-run -s '-screen 0 800x600x24' ./run.sh
- popd
+ # HOME and XDG directories are required for the tests
+ env \
+ HOME=$TMPDIR \
+ XDG_RUNTIME_DIR=$TMPDIR/xdg-runtime-dir \
+ xvfb-run -s '-screen 0 800x600x24' tests/run.sh
'';
pythonImportsCheck = [ "webview" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix
index bae26634aa..550ce775a5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "qbittorrent-api";
- version = "2024.9.67";
+ version = "2024.10.68";
pyproject = true;
src = fetchPypi {
pname = "qbittorrent_api";
inherit version;
- hash = "sha256-+NfttxsUzNVg0YL6H0ULeDb/xobMvUeGwWY/egN9aWY=";
+ hash = "sha256-nOw/XtHx21njbXAr1fXSuRdn2UY2yoGkJqlZVXLkf3o=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix
index f9f5b3ff7f..4907fd5507 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix
@@ -32,6 +32,12 @@ buildPythonPackage rec {
hash = "sha256-KT5Mk0w6EKTUZzGRnQ6XQPZfH5ZXVuiD+EwSflNqHNo=";
};
+ postPatch = ''
+ # build-time constriant, used to ensure forward and backward compat
+ substituteInPlace pyproject.toml setup.cfg \
+ --replace-fail "numpy>=2.0.0" "numpy"
+ '';
+
nativeBuildInputs = [
cython_0
setuptools
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix
index 3a99b5ac56..495eff4e46 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -4,7 +4,6 @@
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
- fetchpatch2,
cmake,
cython,
ninja,
@@ -20,7 +19,7 @@
buildPythonPackage rec {
pname = "rapidfuzz";
- version = "3.10.0";
+ version = "3.10.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -29,18 +28,9 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "RapidFuzz";
rev = "refs/tags/v${version}";
- hash = "sha256-hLYidU09nCSOi42zgSh7dW83glxIjFY4C6BTmy/sf60=";
+ hash = "sha256-0L8nkjgWdP/w//M69ZRxYk9If3CIEcnAl9mkJKJ4o1g=";
};
- patches = [
- # https://github.com/rapidfuzz/RapidFuzz/pull/414
- (fetchpatch2 {
- name = "support-taskflow-3.8.0.patch";
- url = "https://github.com/rapidfuzz/RapidFuzz/commit/8f0429bbd970ccc036018b87108845c384911ff7.patch";
- hash = "sha256-1wizdCkXYEMe5JWXUHCOCuDdS0z76FKimR47B3s2oVU=";
- })
- ];
-
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "Cython >=3.0.11, <3.1.0" "Cython"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix
index c3f6455c72..089e3c72ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "redis-om";
- version = "0.3.2";
+ version = "0.3.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "redis";
repo = "redis-om-python";
rev = "refs/tags/v${version}";
- hash = "sha256-FN39Db94Z7z3luCDKi8b4Ku7bFwxEOXtBT5aXbDGVtw=";
+ hash = "sha256-Pp404HaFpYEPie9xknoabotFrqcI2ibDlPTM+MmnMbg=";
};
build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix
index a42a2b432e..e2bce0c56d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
- version = "0.10.4";
+ version = "0.11.0b1";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
- hash = "sha256-7dRwZKthEAtVvOsKUXgkCE5zwUtcJgSJZiaHXJwZ+9w=";
+ hash = "sha256-kLrdhwIUdmZh08I7XOHT2ciiVn8JE9lcfVcMJf05bkk=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix
index 88e126d4d5..99c7f3d12d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "rio-tiler";
- version = "6.7.0";
+ version = "7.0.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "cogeotiff";
repo = "rio-tiler";
rev = "refs/tags/${version}";
- hash = "sha256-i70Bh7RHPgLLaqBo9vHRrJylsNE3Ly3xJq9j12Ch58E=";
+ hash = "sha256-E8gKXPj1n9HZ+zvQPcG28+2Vuif4B6NBhtuS009x6rU=";
};
build-system = [ hatchling ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix
index 10a6c15d3c..0f8111f089 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "rioxarray";
- version = "0.17.0";
+ version = "0.18.1";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "corteva";
repo = "rioxarray";
rev = "refs/tags/${version}";
- hash = "sha256-mOXyfkreQ55vWmPCG2U/ijcKZqzHoQQLfKArSh2fDmA=";
+ hash = "sha256-0YsGu8JuYrb6lWuC3RQ4jCkulxxFpnd0eaRajCwtFHo=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix
index ef2f73c33b..f7fac9f639 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix
@@ -18,18 +18,18 @@ buildPythonPackage rec {
hash = "sha256-q6hqteXv600iH7xpCKHgRLkJYSpy9hIf/QnlsYI+jh4=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "oldest-supported-numpy" "numpy"
- '';
-
build-system = [ meson-python ];
dependencies = [ numpy ];
checkPhase = ''
+ runHook preCheck
+ # "Do not run the tests from the source directory"
mkdir testdir; cd testdir
- ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())"
+ (set -x
+ ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())"
+ )
+ runHook postCheck
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix
index 3cbaf5f39e..98e27b4b52 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix
@@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "scikit-rf";
- version = "1.3.0";
+ version = "1.4.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "scikit-rf";
repo = "scikit-rf";
rev = "refs/tags/v${version}";
- hash = "sha256-cYQDoEX33fjxekTA2COHMvcLxCFCD7g9bp3y9sE4uUU=";
+ hash = "sha256-tUMOTRazs531OKGUZbh+Ee1omkFY3CAUAMmpKcNCdZU=";
};
postPatch = ''
@@ -65,6 +65,7 @@ buildPythonPackage rec {
sphinx
nbsphinx
openpyxl
+ nbval
];
};
@@ -72,7 +73,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytest-mock
- nbval
matplotlib
pyvisa
openpyxl
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
index 373ffc0531..66eadefb44 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "soco";
- version = "0.30.5";
+ version = "0.30.6";
pyproject = true;
disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "SoCo";
repo = "SoCo";
rev = "refs/tags/v${version}";
- hash = "sha256-Lw/VXEfIb+avRpQHcy0TVhWDjdGQlHHtVs2gZZkAAM4=";
+ hash = "sha256-3/BDqCYNgICb8NGYR1VJM9MsMRmdvJVruqFXuyG6tIY=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc2/default.nix
new file mode 100644
index 0000000000..9442a660bc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc2/default.nix
@@ -0,0 +1,72 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ pythonOlder,
+
+ flit-core,
+
+ astroid,
+ typing-extensions,
+ typer,
+
+ pytestCheckHook,
+ pytest-regressions,
+ sphinx,
+ defusedxml,
+}:
+
+buildPythonPackage rec {
+ pname = "sphinx-autodoc2";
+ version = "0.5.0";
+ pyproject = true;
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "sphinx-extensions2";
+ repo = "sphinx-autodoc2";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-Wu079THK1mHVilD2Fx9dIzuIOOYOXpo/EMxVczNutCI=";
+ };
+
+ build-system = [ flit-core ];
+
+ dependencies = [
+ astroid
+ typing-extensions
+
+ # cli deps
+ typer
+ ] ++ typer.optional-dependencies.standard;
+
+ preCheck = ''
+ # make sphinx_path an alias of pathlib.Path, since sphinx_path was removed in Sphinx v7.2.0
+ substituteInPlace tests/test_render.py --replace-fail \
+ 'from sphinx.testing.util import path as sphinx_path' \
+ 'sphinx_path = Path'
+ '';
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ pytest-regressions
+ sphinx
+ defusedxml
+ ];
+
+ disabledTests = [
+ # some generated files differ in newer versions of Sphinx
+ "test_sphinx_build_directives"
+ ];
+
+ pythonImportsCheck = [ "autodoc2" ];
+
+ meta = {
+ changelog = "https://github.com/sphinx-extensions2/sphinx-autodoc2/releases/tag/v${version}";
+ homepage = "https://github.com/sphinx-extensions2/sphinx-autodoc2";
+ description = "Sphinx extension that automatically generates API documentation for your Python packages";
+ license = lib.licenses.mit;
+ mainProgram = "autodoc2";
+ maintainers = with lib.maintainers; [ tomasajt ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix
index f35593ecd9..bcf10fe99a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "stravalib";
- version = "2.0";
+ version = "2.1";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "stravalib";
repo = "stravalib";
rev = "refs/tags/v${version}";
- hash = "sha256-uF29fK+ZSSO688zKYYiSEygBUJZ6NBcvdgGgz3I1I6Q=";
+ hash = "sha256-VEVy9BAAoLsBCwMNFpsCjhacFbsgNswYoJ5tTcOQccw=";
};
build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
index 9ba1a5c1b9..038794ea14 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "stripe";
- version = "11.1.0";
+ version = "11.2.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-H6xmDcwwFCaMr8lKRevqxm8adSNl9gAZ0iY+DB4Plls=";
+ hash = "sha256-TFPWHXtZYHAyS/pdchWEMUX+VGbkiXPYKKq0GtIJtc4=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
index 23347af0ff..d9eb7d949f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
@@ -84,10 +84,5 @@ buildPythonPackage rec {
changelog = "https://github.com/Diaoul/subliminal/blob/${version}/HISTORY.rst";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ doronbehar ];
- # Too many tests fail ever since a certain python-updates merge, see:
- # https://github.com/Diaoul/subliminal/issues/1062 . Disabling tests
- # alltogether may produce a not completly failing executable, but that
- # executable apparently isn't able to download subtitles at all.
- broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index f490a7190d..f048b525f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
- version = "3.0.1261";
+ version = "3.0.1263";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
- hash = "sha256-p2gta5rQvo+4Gm7sr3W7dfNKZukpOPtCVa75ofKzls8=";
+ hash = "sha256-B61d8zyrOixqAy9sk4yiipB0xO3eHP5Pi8HfUVs/LeI=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
index 7b059969eb..862520463b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -39,7 +39,7 @@
}:
let
- version = "0.24.0";
+ version = "0.25.0";
pname = "tensorflow-probability";
# first build all binaries and generate setup.py using bazel
@@ -49,7 +49,7 @@ let
owner = "tensorflow";
repo = "probability";
rev = "refs/tags/v${version}";
- hash = "sha256-V6aw4NtGOHlvcbgLWMH29x81eck1PyzV93ANelvpL4c=";
+ hash = "sha256-LXQfGFgnM7WYUQjJ2Y3jskdeJ/dEKz+Afg+UOQjv5kc=";
};
nativeBuildInputs = [
absl-py
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix
index 25698776d8..578976fbb1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix
@@ -35,7 +35,7 @@
removeReferencesTo,
# Build inputs
- darwin,
+ apple-sdk_13,
numactl,
# dependencies
@@ -364,6 +364,9 @@ buildPythonPackage rec {
# NB technical debt: building without NNPACK as workaround for missing `six`
USE_NNPACK = 0;
+ # Explicitly enable MPS for Darwin
+ USE_MPS = setBool stdenv.hostPlatform.isDarwin;
+
cmakeFlags =
[
# (lib.cmakeBool "CMAKE_FIND_DEBUG_MODE" true)
@@ -519,9 +522,7 @@ buildPythonPackage rec {
++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ]
++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
- darwin.apple_sdk.frameworks.Accelerate
- darwin.apple_sdk.frameworks.CoreServices
- darwin.libobjc
+ apple-sdk_13
]
++ lib.optionals tritonSupport [ _tritonEffective ]
++ lib.optionals MPISupport [ mpi ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tsfresh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tsfresh/default.nix
index 96403101d8..3b8b7d75c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tsfresh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tsfresh/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ stdenv,
pythonOlder,
requests,
numpy,
@@ -45,7 +46,7 @@ buildPythonPackage rec {
./remove-pytest-coverage-flags.patch
];
- propagatedBuildInputs = [
+ dependencies = [
requests
numpy
pandas
@@ -71,25 +72,34 @@ buildPythonPackage rec {
pandas-datareader
];
- disabledTests = [
- # touches network
- "test_relevant_extraction"
- "test_characteristics_downloaded_robot_execution_failures"
- "test_index"
- "test_binary_target_is_default"
- "test_characteristics_downloaded_robot_execution_failures"
- "test_extraction_runs_through"
- "test_multilabel_target_on_request"
- ];
+ disabledTests =
+ [
+ # touches network
+ "test_relevant_extraction"
+ "test_characteristics_downloaded_robot_execution_failures"
+ "test_index"
+ "test_binary_target_is_default"
+ "test_characteristics_downloaded_robot_execution_failures"
+ "test_extraction_runs_through"
+ "test_multilabel_target_on_request"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # RuntimeError: Cluster failed to start: [Errno 1] Operation not permitted
+ # may require extra privileges on darwin
+ "test_local_dask_cluster_extraction_one_worker"
+ "test_local_dask_cluster_extraction_two_worker"
+ "test_dask_cluster_extraction_one_worker"
+ "test_dask_cluster_extraction_two_workers"
+ ];
pythonImportsCheck = [ "tsfresh" ];
- meta = with lib; {
+ meta = {
description = "Automatic extraction of relevant features from time series";
mainProgram = "run_tsfresh";
homepage = "https://github.com/blue-yonder/tsfresh";
changelog = "https://github.com/blue-yonder/tsfresh/blob/${src.rev}/CHANGES.rst";
- license = licenses.mit;
- maintainers = with maintainers; [ mbalatsko ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ mbalatsko ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tskit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tskit/default.nix
index 775284b899..e91fba90dc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tskit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tskit/default.nix
@@ -21,6 +21,12 @@ buildPythonPackage rec {
hash = "sha256-Wq7ar96w5hdAyKMMvK4zjYln74RmX1l/VhvS++CN+Xk=";
};
+ postPatch = ''
+ # build-time constriant, used to ensure forward and backward compat
+ substituteInPlace pyproject.toml \
+ --replace-fail "numpy>=2.0" "numpy"
+ '';
+
build-system = [ setuptools ];
dependencies = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix
index a510f0f468..1c506a92b6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "ucsmsdk";
- version = "0.9.20";
+ version = "0.9.21";
format = "setuptools";
src = fetchFromGitHub {
owner = "CiscoUcs";
repo = "ucsmsdk";
rev = "refs/tags/v${version}";
- hash = "sha256-X8lGpfVjIZIpNneOM/mE+9RvglW9FlYoGz7pFs7ellk=";
+ hash = "sha256-iqwU42Im4/YyxefkJZ8Zn5CddjUzuZk/7zjLD/0pHm4=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/us/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/us/default.nix
index d6d2b53731..aca1f00c68 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/us/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/us/default.nix
@@ -6,12 +6,15 @@
pytestCheckHook,
pythonOlder,
pytz,
+ setuptools,
}:
buildPythonPackage rec {
pname = "us";
version = "3.2.0";
- format = "setuptools";
+ pyproject = true;
+
+ build-system = [ setuptools ];
disabled = pythonOlder "3.6";
@@ -20,13 +23,9 @@ buildPythonPackage rec {
hash = "sha256-yyI+hTk9zFFx6tDdISutxH+WZ7I3AP6j5+pfMQ1UUzg=";
};
- postPatch = ''
- # Upstream spins jellyfish
- substituteInPlace setup.py \
- --replace "jellyfish==" "jellyfish>="
- '';
-
- propagatedBuildInputs = [ jellyfish ];
+ propagatedBuildInputs = [
+ jellyfish
+ ];
nativeCheckInputs = [
pytestCheckHook
@@ -35,7 +34,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "us" ];
- meta = with lib; {
+ meta = {
description = "Package for easily working with US and state metadata";
mainProgram = "states";
longDescription = ''
@@ -45,7 +44,7 @@ buildPythonPackage rec {
census, congressional districts, counties, and census tracts.
'';
homepage = "https://github.com/unitedstates/python-us/";
- license = licenses.bsd3;
- maintainers = [ ];
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ bot-wxt1221 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uuid6/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uuid6/default.nix
index e8ca415443..709f7156e6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/uuid6/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/uuid6/default.nix
@@ -15,6 +15,9 @@ buildPythonPackage rec {
hash = "sha256-LSnX9j9ZPKruoODQ3QrYEpycZjsp4ZvfiC6GS+3xj7A=";
};
+ # https://github.com/oittaa/uuid6-python/blob/e647035428d984452b9906b75bb007198533dfb1/setup.py#L12-L19
+ env.GITHUB_REF = "refs/tags/${version}";
+
build-system = [
setuptools
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weblate-language-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weblate-language-data/default.nix
index 1c9b23853f..a8f24fa0a1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/weblate-language-data/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/weblate-language-data/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "weblate-language-data";
- version = "2024.8";
+ version = "2024.13";
pyproject = true;
src = fetchPypi {
pname = "weblate_language_data";
inherit version;
- hash = "sha256-JwX3mDq6AbWorqc3nYlm1oySvzuu3IV6iBeS0ezx83U=";
+ hash = "sha256-fAT3dI3Tbu329BWaal/n4ka0JSVDzPrJLnzL7/LRjhs=";
};
build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whenever/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whenever/default.nix
index 02ab2362cf..8fe5daca87 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/whenever/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/whenever/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "whenever";
- version = "0.6.10";
+ version = "0.6.12";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "ariebovenberg";
repo = "whenever";
rev = "refs/tags/${version}";
- hash = "sha256-BstdrsOl1cGGxs5akpSoRQtuTfqmxNSlbLIZWu1d/Lc=";
+ hash = "sha256-fvLqdjbTuQ732qeVUu1f3dXXlFOuP9FGexEt4gZe0aI=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix
index 4146522d01..4f80b29385 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "wordcloud";
- version = "1.9.3";
+ version = "1.9.4";
pyproject = true;
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- hash = "sha256-qapzjWPtZ0pA8Mwxrbg/TKX8GV8Dpq/24BDR9YB9HFg=";
+ hash = "sha256-snPYpd7ZfT6tkEBGtJRk3LcRGe5534dQcqTBBcrdNHo=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
index 99cd521f6c..fc509b2013 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "wtforms";
- version = "3.1.2";
+ version = "3.2.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "wtforms";
repo = "wtforms";
rev = "refs/tags/${version}";
- hash = "sha256-L6DmB7iVpJR775oRxuEkCKWlUJnmw8VPZTr2dZbqeEc=";
+ hash = "sha256-jwjP/wkk8MdNJbPE8MlkrH4DyR304Ju41nN4lMo3jFs=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
index 8f6dd390ad..1119a300b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
@@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "xml2rfc";
- version = "3.23.2";
+ version = "3.24.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "ietf-tools";
repo = "xml2rfc";
rev = "refs/tags/v${version}";
- hash = "sha256-KL3kIntydUAOS7qGq6ZDrShEcyME1Qwf2VjM/9mw96Q=";
+ hash = "sha256-cymClLsXPeuWsRMbFJHO55ASzEbau++XvYoBsquDv+Y=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
index 06612b9632..75b05e352d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
@@ -26,13 +26,19 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "tgalal";
repo = "yowsup";
- rev = "v${version}";
+ rev = "refs/tags/v${version}";
sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q";
};
pythonRelaxDeps = true;
pythonRemoveDeps = [ "argparse" ];
+ env = {
+ # make protobuf compatible with old versions
+ # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+ PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+ };
+
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
@@ -45,11 +51,11 @@ buildPythonPackage rec {
six
] ++ lib.optionals (!pythonOlder "3.12") [ pyasyncore ];
- meta = with lib; {
+ meta = {
homepage = "https://github.com/tgalal/yowsup";
description = "Python WhatsApp library";
mainProgram = "yowsup-cli";
- license = licenses.gpl3Plus;
+ license = lib.licenses.gpl3Plus;
maintainers = [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix
index 4e92900f12..b40748d762 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix
@@ -1,5 +1,11 @@
-{ fetchurl, lib, stdenv, zstd
-, testers, buck2 # for passthru.tests
+{
+ fetchurl,
+ lib,
+ stdenv,
+ zstd,
+ installShellFiles,
+ testers,
+ buck2, # for passthru.tests
}:
# NOTE (aseipp): buck2 uses a precompiled binary build for good reason — the
@@ -74,7 +80,10 @@ in stdenv.mkDerivation {
version = "unstable-${version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made
inherit src;
- nativeBuildInputs = [ zstd ];
+ nativeBuildInputs = [
+ installShellFiles
+ zstd
+ ];
doCheck = true;
dontConfigure = true;
@@ -87,6 +96,12 @@ in stdenv.mkDerivation {
mkdir -p $out/bin
install -D buck2 $out/bin/buck2
'';
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ installShellCompletion --cmd buck2 \
+ --bash <( $out/bin/buck2 completion bash ) \
+ --fish <( $out/bin/buck2 completion fish ) \
+ --zsh <( $out/bin/buck2 completion zsh )
+ '';
passthru = {
prelude = prelude-src;
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
index e1087a476c..5f34894e8d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
@@ -174,7 +174,7 @@ rec {
binaryNativeCode
];
license = licenses.asl20;
- maintainers = with maintainers; [ lorenzleutgeb liff ];
+ maintainers = with maintainers; [ lorenzleutgeb liff ] ++ lib.teams.java.members;
mainProgram = "gradle";
} // meta;
});
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/ccls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/ccls/default.nix
index 122ebea7c0..0cb1e78840 100644
--- a/third_party/nixpkgs/pkgs/development/tools/language-servers/ccls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/ccls/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ccls";
- version = "0.20240505";
+ version = "0.20241108";
src = fetchFromGitHub {
owner = "MaskRay";
repo = "ccls";
rev = version;
- sha256 = "sha256-YZeP6sHYLNvlf49mvtymxHuH1lmIkqcanpqVMzeLeFQ=";
+ sha256 = "sha256-0hZ4VnscnKYBrXy58IjeoeDxja1oNq0mNaQGPmej5BA=";
};
nativeBuildInputs = [ cmake llvmPackages.llvm.dev ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch
deleted file mode 100644
index c2452414fc..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From cebc89b9328eab994f6b0314c263f94e7949a553 Mon Sep 17 00:00:00 2001
-From: Alan Modra
-Date: Mon, 21 Feb 2022 10:58:57 +1030
-Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel
-
-Commit b25f942e18d6 made .machine more strict. Weaken it again.
-
- * config/tc-ppc.c (ppc_machine): Treat an early .machine specially,
- keeping sticky options to work around gcc bugs.
----
- gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
-index 054f9c72161..89bc7d3f9b9 100644
---- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED)
- options do not count as a new machine, instead they add
- to currently selected opcodes. */
- ppc_cpu_t machine_sticky = 0;
-- new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+ /* Unfortunately, some versions of gcc emit a .machine
-+ directive very near the start of the compiler's assembly
-+ output file. This is bad because it overrides user -Wa
-+ cpu selection. Worse, there are versions of gcc that
-+ emit the *wrong* cpu, not even respecting the -mcpu given
-+ to gcc. See gcc pr101393. And to compound the problem,
-+ as of 20220222 gcc doesn't pass the correct cpu option to
-+ gas on the command line. See gcc pr59828. Hack around
-+ this by keeping sticky options for an early .machine. */
-+ asection *sec;
-+ for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+ {
-+ segment_info_type *info = seg_info (sec);
-+ /* Are the frags for this section perturbed from their
-+ initial state? Even .align will count here. */
-+ if (info != NULL
-+ && (info->frchainP->frch_root != info->frchainP->frch_last
-+ || info->frchainP->frch_root->fr_type != rs_fill
-+ || info->frchainP->frch_root->fr_fix != 0))
-+ break;
-+ }
-+ new_cpu = ppc_parse_cpu (ppc_cpu,
-+ sec == NULL ? &sticky : &machine_sticky,
-+ cpu_string);
- if (new_cpu != 0)
- ppc_cpu = new_cpu;
- else
---
-2.31.1
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix
index d74dfaa7e7..26aacff825 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix
@@ -16,14 +16,14 @@
buildPythonApplication rec {
pname = "cvise";
- version = "2.10.0";
+ version = "2.11.0";
format = "other";
src = fetchFromGitHub {
owner = "marxin";
repo = "cvise";
rev = "refs/tags/v${version}";
- hash = "sha256-0gk4O1q90eH1FMhj4ncNVqX/MfVyaU0nckh1xny2wlM=";
+ hash = "sha256-xaX3QMnTKXTXPuLzui0e0WgaQNvbz8u1JNRBkfe4QWg=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/8.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/8.nix
index 79ceb8a0aa..79f8f638c0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/8.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/8.nix
@@ -5,9 +5,8 @@
, fetchurl
, git
, cctools
-, DarwinTools
+, darwin
, makeWrapper
-, CoreServices
, bison
, openssl
, protobuf
@@ -34,8 +33,8 @@
let
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
- mysqlShellVersion = "8.4.1";
- mysqlServerVersion = "8.4.1";
+ mysqlShellVersion = "8.4.3";
+ mysqlServerVersion = "8.4.3";
in
stdenv.mkDerivation (finalAttrs: {
pname = "mysql-shell";
@@ -44,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
srcs = [
(fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
- hash = "sha256-20Hxl9cXDFTX7cDQyaJzDCJfSvBeztD2S+z5u2wRAT4=";
+ hash = "sha256-eslWTEeAIvcwBf+Ju7QPZ7OB/AbVUYQWvf/sdeYluBg=";
})
(fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
- hash = "sha256-wTwoaoaCrTQqaqgE35Sg8zn8HqjsjQowbtgMZTpkYQU=";
+ hash = "sha256-rO+cAfQzUobMrTLGHRbaXsG+vMcjVTtDoZwmyok+dS4=";
})
];
@@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ];
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
buildInputs = [
curl
@@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
antlr.runtime.cpp
] ++ pythonDeps
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
preConfigure = ''
# Build MySQL
diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix
index 14ff96542c..5732459550 100644
--- a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix
@@ -5,9 +5,8 @@
, fetchurl
, git
, cctools
-, DarwinTools
+, darwin
, makeWrapper
-, CoreServices
, bison
, openssl
, protobuf
@@ -34,8 +33,8 @@
let
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
- mysqlShellVersion = "9.0.1";
- mysqlServerVersion = "9.0.1";
+ mysqlShellVersion = "9.1.0";
+ mysqlServerVersion = "9.1.0";
in
stdenv.mkDerivation (finalAttrs: {
pname = "mysql-shell-innovation";
@@ -44,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
srcs = [
(fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
- hash = "sha256-GPpl8epq6nHkGP4FSFUtmijeaOK4vDupU2WZ60WaZgY=";
+ hash = "sha256-UsNnUjm/2dPIMiT/IAKqbihvq5e/WytcoahcnDR3Zvw=";
})
(fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
- hash = "sha256-F77W+cY1X29p4DIA1JOxJ6jAKT+8Qz4LkHh91MASlE0=";
+ hash = "sha256-YHlM/heqV8vQnIGxwEESXx+wRVr++TFjSb00tPwBb2s=";
})
];
@@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ];
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
buildInputs = [
curl
@@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
antlr.runtime.cpp
] ++ pythonDeps
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
preConfigure = ''
# Build MySQL
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
deleted file mode 100644
index e6fc96038f..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old/Makefile.conf 2014-05-19 16:53:09.263564921 +0200
-+++ new/Makefile.conf 2014-05-19 16:53:42.213152994 +0200
-@@ -1,6 +1,6 @@
-
- # Where binaries are installed:
--BINDIR := `dirname \`which ocamlc\``
-+BINDIR := $(out)/bin
-
- ####
-
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-cfgfile-path.patch b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-cfgfile-path.patch
deleted file mode 100644
index 268282e96e..0000000000
--- a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-cfgfile-path.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/src/spnavd.c b/src/spnavd.c
-index 2d4eca6..a5227ed 100644
---- a/src/spnavd.c
-+++ b/src/spnavd.c
-@@ -27,6 +27,8 @@ along with this program. If not, see .
- #include
- #include
- #include
-+#include
-+#include
- #include "spnavd.h"
- #include "logger.h"
- #include "dev.h"
-@@ -47,13 +49,39 @@ static void handle_events(fd_set *rset);
- static void sig_handler(int s);
- static char *fix_path(char *str);
-
--static char *cfgfile = DEF_CFGFILE;
-+static char* config_path;
-+char* cfg_path()
-+{
-+ char* buf;
-+ if((buf = getenv("XDG_CONFIG_HOME"))) {
-+ if(config_path == NULL) {
-+ config_path = malloc(strlen(buf) + strlen("/spnavrc") + 1);
-+ if ( config_path != NULL) {
-+ sprintf(config_path, "%s/spnavrc", buf);
-+ }
-+ };
-+ return config_path;
-+ } else {
-+ if (!(buf = getenv("HOME"))) {
-+ struct passwd *pw = getpwuid(getuid());
-+ buf = pw->pw_dir;
-+ }
-+ config_path = malloc(strlen(buf) + strlen("/.config/spnavrc") + 1);
-+ if ( config_path != NULL) {
-+ sprintf(config_path, "%s/.config/spnavrc", buf);
-+ }
-+ return config_path;
-+ }
-+}
-+
-+static char *cfgfile = NULL;
- static char *logfile = DEF_LOGFILE;
- static char *pidpath = NULL;
-
- int main(int argc, char **argv)
- {
- int i, pid, ret, become_daemon = 1;
-+ cfgfile = cfg_path();
-
- for(i=1; i: config file path (default: " DEF_CFGFILE ")\n");
-+ printf(" -c : config file path (default: %s)\n", cfg_path());
- printf(" -l |syslog: log file path or log to syslog (default: " DEF_LOGFILE ")\n");
- printf(" -v: verbose output\n");
- printf(" -V,-version: print version number and exit\n");
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-pidfile-path.patch b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-pidfile-path.patch
deleted file mode 100644
index bc2cad9784..0000000000
--- a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-pidfile-path.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/src/spnavd.c b/src/spnavd.c
-index 03080da..2d4eca6 100644
---- a/src/spnavd.c
-+++ b/src/spnavd.c
-@@ -42,12 +42,14 @@ static void cleanup(void);
- static void daemonize(void);
- static int write_pid_file(void);
- static int find_running_daemon(void);
-+static char *pidfile_path(void);
- static void handle_events(fd_set *rset);
- static void sig_handler(int s);
- static char *fix_path(char *str);
-
- static char *cfgfile = DEF_CFGFILE;
- static char *logfile = DEF_LOGFILE;
-+static char *pidpath = NULL;
-
- int main(int argc, char **argv)
- {
-@@ -270,7 +272,7 @@ static void cleanup(void)
- remove_device(tmp);
- }
-
-- remove(PIDFILE);
-+ remove(pidfile_path());
- }
-
- static void daemonize(void)
-@@ -314,7 +316,7 @@ static int write_pid_file(void)
- FILE *fp;
- int pid = getpid();
-
-- if(!(fp = fopen(PIDFILE, "w"))) {
-+ if(!(fp = fopen(pidfile_path(), "w"))) {
- return -1;
- }
- fprintf(fp, "%d\n", pid);
-@@ -329,7 +331,7 @@ static int find_running_daemon(void)
- struct sockaddr_un addr;
-
- /* try to open the pid-file */
-- if(!(fp = fopen(PIDFILE, "r"))) {
-+ if(!(fp = fopen(pidfile_path(), "r"))) {
- return -1;
- }
- if(fscanf(fp, "%d\n", &pid) != 1) {
-@@ -356,6 +358,22 @@ static int find_running_daemon(void)
- return pid;
- }
-
-+char *pidfile_path(void)
-+{
-+ char *xdg_runtime_dir;
-+ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
-+ if ( pidpath == NULL ) {
-+ pidpath = malloc(strlen(xdg_runtime_dir) + strlen("/spnavd.pid") + 1);
-+ if ( pidpath != NULL ) {
-+ sprintf(pidpath, "%s/spnavd.pid", xdg_runtime_dir);
-+ }
-+ };
-+ return pidpath;
-+ } else {
-+ return DEFAULT_PIDFILE;
-+ }
-+}
-+
- static void handle_events(fd_set *rset)
- {
- int dev_fd, hotplug_fd;
-diff --git a/src/spnavd.h b/src/spnavd.h
-index 2d1c48b..17d22d3 100644
---- a/src/spnavd.h
-+++ b/src/spnavd.h
-@@ -26,7 +26,7 @@ along with this program. If not, see .
- #define DEF_CFGFILE "/etc/spnavrc"
- #define DEF_LOGFILE "/var/log/spnavd.log"
-
--#define PIDFILE "/var/run/spnavd.pid"
-+#define DEFAULT_PIDFILE "/run/spnavd.pid"
- #define DEFAULT_SOCK_NAME "/run/spnav.sock"
- #define SYSLOG_ID "spnavd"
-
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch
deleted file mode 100644
index c59987dcc0..0000000000
--- a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/src/proto_unix.c b/src/proto_unix.c
-index 998f234..d38452c 100644
---- a/src/proto_unix.c
-+++ b/src/proto_unix.c
-@@ -36,11 +36,14 @@ enum {
-
- static int lsock = -1;
-
-+static char *spath = NULL;
-+
- int init_unix(void)
- {
- int s;
- mode_t prev_umask;
- struct sockaddr_un addr;
-+ char *sock_path;
-
- if(lsock >= 0) return 0;
-
-@@ -49,16 +52,18 @@ int init_unix(void)
- return -1;
- }
-
-- unlink(SOCK_NAME); /* in case it already exists */
-+ sock_path = socket_path();
-+
-+ unlink(sock_path); /* in case it already exists */
-
- memset(&addr, 0, sizeof addr);
- addr.sun_family = AF_UNIX;
-- strcpy(addr.sun_path, SOCK_NAME);
-+ strcpy(addr.sun_path, sock_path);
-
- prev_umask = umask(0);
-
- if(bind(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
-- logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", SOCK_NAME, strerror(errno));
-+ logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", sock_path, strerror(errno));
- close(s);
- return -1;
- }
-@@ -68,7 +73,7 @@ int init_unix(void)
- if(listen(s, 8) == -1) {
- logmsg(LOG_ERR, "listen failed: %s\n", strerror(errno));
- close(s);
-- unlink(SOCK_NAME);
-+ unlink(sock_path);
- return -1;
- }
-
-@@ -82,7 +87,7 @@ void close_unix(void)
- close(lsock);
- lsock = -1;
-
-- unlink(SOCK_NAME);
-+ unlink(socket_path());
- }
- }
-
-@@ -173,3 +178,19 @@ int handle_uevents(fd_set *rset)
-
- return 0;
- }
-+
-+char *socket_path(void)
-+{
-+ char *xdg_runtime_dir;
-+ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
-+ if ( spath == NULL ) {
-+ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1);
-+ if ( spath != NULL ) {
-+ sprintf(spath, "%s/spnav.sock", xdg_runtime_dir);
-+ }
-+ };
-+ return spath;
-+ } else {
-+ return DEFAULT_SOCK_NAME;
-+ }
-+}
-diff --git a/src/proto_unix.h b/src/proto_unix.h
-index 045b379..ec4509c 100644
---- a/src/proto_unix.h
-+++ b/src/proto_unix.h
-@@ -23,6 +23,7 @@ along with this program. If not, see .
- #include "event.h"
- #include "client.h"
-
-+char *socket_path(void);
- int init_unix(void);
- void close_unix(void);
- int get_unix_socket(void);
-diff --git a/src/spnavd.c b/src/spnavd.c
-index cbea191..03080da 100644
---- a/src/spnavd.c
-+++ b/src/spnavd.c
-@@ -344,7 +344,7 @@ static int find_running_daemon(void)
- }
- memset(&addr, 0, sizeof addr);
- addr.sun_family = AF_UNIX;
-- strncpy(addr.sun_path, SOCK_NAME, sizeof addr.sun_path);
-+ strncpy(addr.sun_path, socket_path(), sizeof addr.sun_path);
-
- if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
- close(s);
-diff --git a/src/spnavd.h b/src/spnavd.h
-index fa0a916..2d1c48b 100644
---- a/src/spnavd.h
-+++ b/src/spnavd.h
-@@ -26,8 +26,8 @@ along with this program. If not, see .
- #define DEF_CFGFILE "/etc/spnavrc"
- #define DEF_LOGFILE "/var/log/spnavd.log"
-
--#define SOCK_NAME "/var/run/spnav.sock"
- #define PIDFILE "/var/run/spnavd.pid"
-+#define DEFAULT_SOCK_NAME "/run/spnav.sock"
- #define SYSLOG_ID "spnavd"
-
- /* Multiple devices support */
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix
index dbbd94fe43..3631f7d495 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix
@@ -1,7 +1,7 @@
{ lib, swiftPackages, fetchFromGitHub }:
let
- inherit (swiftPackages) apple_sdk stdenv swift;
+ inherit (swiftPackages) stdenv swift;
arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
in
stdenv.mkDerivation rec {
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ swift ];
- buildInputs = with apple_sdk.frameworks; [ AppKit Foundation UniformTypeIdentifiers ];
-
makeFlags = [ "openwith_${arch}" ];
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ffado/fix-build.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ffado/fix-build.patch
deleted file mode 100644
index db4c47fa38..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ffado/fix-build.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b0f2b20b23780dd2e67a01c15462070dd86c4ac1 Mon Sep 17 00:00:00 2001
-From: Jan Tojnar
-Date: Sun, 3 Mar 2019 11:50:27 +0100
-Subject: [PATCH] build: Add datadir option for /usr/share
-
-Hardcoded /usr/share does not work for platforms that do not have global /usr like Nix.
-Let’s introduce a new DATADIR option, that allows overriding the directory and use it for metainfodir.
-
-While at it, let’s also use it for SHAREDIR and MANDIR for consistency,
-following the GNU directory convention:
-https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
----
- SConstruct | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 05755e4b..3fbdc1d8 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -49,9 +49,10 @@
- PathVariable( "BINDIR", "Overwrite the directory where apps are installed to.", "$PREFIX/bin", PathVariable.PathAccept ),
- PathVariable( "LIBDIR", "Overwrite the directory where libs are installed to.", "$PREFIX/lib", PathVariable.PathAccept ),
- PathVariable( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathVariable.PathAccept ),
-- PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathVariable.PathAccept ),
-+ PathVariable( "DATADIR", "Overwrite the directory where platform-independent files are installed to.", "$PREFIX/share", PathVariable.PathAccept ),
-+ PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$DATADIR/libffado", PathVariable.PathAccept ),
- PathVariable( "LIBDATADIR", "Location for architecture-dependent data.", "$LIBDIR/libffado", PathVariable.PathAccept ),
-- PathVariable( "MANDIR", "Overwrite the directory where manpages are installed", "$PREFIX/man", PathVariable.PathAccept ),
-+ PathVariable( "MANDIR", "Overwrite the directory where manpages are installed", "$DATADIR/man", PathVariable.PathAccept ),
- PathVariable( "PYPKGDIR", "The directory where the python modules get installed.",
- distutils.sysconfig.get_python_lib( prefix="$PREFIX" ), PathVariable.PathAccept ),
- PathVariable( "UDEVDIR", "Overwrite the directory where udev rules are installed to.", "/lib/udev/rules.d/", PathVariable.PathAccept ),
-@@ -523,6 +524,7 @@
- env['BINDIR'] = Template( env['BINDIR'] ).safe_substitute( env )
- env['LIBDIR'] = Template( env['LIBDIR'] ).safe_substitute( env )
- env['INCLUDEDIR'] = Template( env['INCLUDEDIR'] ).safe_substitute( env )
-+env['DATADIR'] = Template( env['DATADIR'] ).safe_substitute( env )
- env['SHAREDIR'] = Template( env['SHAREDIR'] ).safe_substitute( env )
- env['LIBDATADIR'] = Template( env['LIBDATADIR'] ).safe_substitute( env )
- env['UDEVDIR'] = Template( env['UDEVDIR'] ).safe_substitute( env )
-@@ -531,18 +533,21 @@
- env['bindir'] = Template( env.destdir + env['BINDIR'] ).safe_substitute( env )
- env['libdir'] = Template( env.destdir + env['LIBDIR'] ).safe_substitute( env )
- env['includedir'] = Template( env.destdir + env['INCLUDEDIR'] ).safe_substitute( env )
-+env['datadir'] = Template( env.destdir + env['DATADIR'] ).safe_substitute( env )
- env['sharedir'] = Template( env.destdir + env['SHAREDIR'] ).safe_substitute( env )
- env['libdatadir'] = Template( env.destdir + env['LIBDATADIR'] ).safe_substitute( env )
- env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env )
- env['pypkgdir'] = Template( env.destdir + env['PYPKGDIR'] ).safe_substitute( env )
- env['udevdir'] = Template( env.destdir + env['UDEVDIR'] ).safe_substitute( env )
- env['PYPKGDIR'] = Template( env['PYPKGDIR'] ).safe_substitute( env )
--env['metainfodir'] = Template( env.destdir + "/usr/share/metainfo" ).safe_substitute( env )
--
-+env['metainfodir'] = Template( env.destdir + env['DATADIR'] + "/metainfo" ).safe_substitute( env )
-+
-+env.Command( target=env['datadir'], source="", action=Mkdir( env['datadir'] ) )
- env.Command( target=env['sharedir'], source="", action=Mkdir( env['sharedir'] ) )
-
- env.Alias( "install", env['libdir'] )
- env.Alias( "install", env['includedir'] )
-+env.Alias( "install", env['datadir'] )
- env.Alias( "install", env['sharedir'] )
- env.Alias( "install", env['libdatadir'] )
- env.Alias( "install", env['bindir'] )
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
index a1e13be4fe..25ac706798 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
@@ -20,11 +20,11 @@ let
'';
in stdenvNoCC.mkDerivation rec {
pname = "linux-firmware";
- version = "20241017";
+ version = "20241110";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz";
- hash = "sha256-q4StJdoLCHQThFTzhxETDYlQP/ywmb3vwCr13xtrQzc=";
+ hash = "sha256-AsEJfAkr+E2Tnev/UkYLRXsf+PWCp7brvO99bMgLQ1A=";
};
postUnpack = ''
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
index 52cb45ad53..4e0e3feb67 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,61 +2,61 @@
"5.10": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-v5.10.228-hardened1.patch",
- "sha256": "1fzpiv9gn2krbx2v61j1dzzsdm0qlgps4rjdkzmi8a8fv9g1iq0p",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.228-hardened1/linux-hardened-v5.10.228-hardened1.patch"
+ "name": "linux-hardened-v5.10.229-hardened1.patch",
+ "sha256": "0bagy0x1kwm05x9mlgisjrlybk9yl91maxw6fai2si5m4xb3xv7n",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.229-hardened1/linux-hardened-v5.10.229-hardened1.patch"
},
- "sha256": "0wkvn49sdy9ykyz6cqdqd9yplqfhc6b255w6wc17ky182mzqvk3n",
- "version": "5.10.228"
+ "sha256": "1q6di05rk4bsy91r03zw6vz14zzcpvv25dv7gw0yz1gzpgkbb9h8",
+ "version": "5.10.229"
},
"5.15": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-v5.15.170-hardened1.patch",
- "sha256": "16b3dzfgx737hsr16n9j3v4lr1qrl5vgsjmmcri0szbcd5sm0620",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.170-hardened1/linux-hardened-v5.15.170-hardened1.patch"
+ "name": "linux-hardened-v5.15.171-hardened1.patch",
+ "sha256": "08fbvra05rj0xcj9a8hd6mhv4lis2mhp57v7x4mw7rxxz2vim4bz",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.171-hardened1/linux-hardened-v5.15.171-hardened1.patch"
},
- "sha256": "1ag7fvixhdcyxv6rqfsvq2wh02g64r4rx8izvfb33nfnld2nangx",
- "version": "5.15.170"
+ "sha256": "0fra5zwcixgl6fg9hgdzlfcqng6pg09h2j7xqhi4qg0jv1jf0lr9",
+ "version": "5.15.171"
},
"5.4": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-v5.4.284-hardened1.patch",
- "sha256": "1skqaq90bigrxg0w075nssqbdq868ii62r8asx0m6wcvd5cl50af",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.284-hardened1/linux-hardened-v5.4.284-hardened1.patch"
+ "name": "linux-hardened-v5.4.285-hardened1.patch",
+ "sha256": "1zm846mzvz1x88iskfw8513jkhlphxkd4v2qs86maxlgiz5zcxqp",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.285-hardened1/linux-hardened-v5.4.285-hardened1.patch"
},
- "sha256": "0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp",
- "version": "5.4.284"
+ "sha256": "1722sc365ajxmqyr4r49yp73mzdckay3rx5c2gx29xzny9zc6cmy",
+ "version": "5.4.285"
},
"6.1": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-v6.1.115-hardened1.patch",
- "sha256": "1vly83nqpridysywj8aby6pmzjgz7jlk6ni957s9v05gfkvf906l",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.115-hardened1/linux-hardened-v6.1.115-hardened1.patch"
+ "name": "linux-hardened-v6.1.116-hardened1.patch",
+ "sha256": "0q597vszhgj6bgq56j11nq01mjjxl0ws8kqcr839fzkcgn1h6xv9",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.116-hardened1/linux-hardened-v6.1.116-hardened1.patch"
},
- "sha256": "0vxs6zj4p0ihcp11h3svqy3wa1yph0f1vzc8dlvqh60zgs1bmn0g",
- "version": "6.1.115"
+ "sha256": "109vhc1hcfx6sacw4553xmwbj1gqx3zqjq5zg11z7a72dqrnisqp",
+ "version": "6.1.116"
},
"6.11": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-v6.11.6-hardened1.patch",
- "sha256": "0g5drxsknvhcd80s1mwmbbc9d3v3qpj4c7rha95ygzwxidvagr9f",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.6-hardened1/linux-hardened-v6.11.6-hardened1.patch"
+ "name": "linux-hardened-v6.11.7-hardened1.patch",
+ "sha256": "1rfvlhgl78ixsb75aah9173h8jp37c8i0hs7b4484vljmqv0khcy",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.7-hardened1/linux-hardened-v6.11.7-hardened1.patch"
},
- "sha256": "1kiky6viwrgm47slpv234lfq1wrwj29p5rx168gix3q0jw0zcm69",
- "version": "6.11.6"
+ "sha256": "1cpbycx79nl517rz573mja52bgzm249mhqzp424r5mqp91jfrx8b",
+ "version": "6.11.7"
},
"6.6": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-v6.6.59-hardened1.patch",
- "sha256": "1vdyryd0m9rr0z2pznq6jyxbdhy4w4x85c37gfl4sbbcs9549gnw",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.59-hardened1/linux-hardened-v6.6.59-hardened1.patch"
+ "name": "linux-hardened-v6.6.60-hardened1.patch",
+ "sha256": "090bs6nvc9by5higmxfwmzlqjrhbhqs21gsmpxvm18p9l3s08dq3",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.60-hardened1/linux-hardened-v6.6.60-hardened1.patch"
},
- "sha256": "0vd76ccd4li4wsg04gc4nai9f4y1nknz967qby0i53y0v046hq93",
- "version": "6.6.59"
+ "sha256": "1vsjb7ifmf6ic6zv16fbrxjvffqc1mkndza76hjr9aw2a0ny7yaj",
+ "version": "6.6.60"
}
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 3e97924166..1a8366f652 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,12 +14,12 @@ let
# kernel config in the xanmod version commit
variants = {
lts = {
- version = "6.6.59";
- hash = "sha256-VImhbdU+WAP0QRnYjHBNKYw5NlMDCBy8HJyP2NQBNHY=";
+ version = "6.6.60";
+ hash = "sha256-hbuMuLoXVaFb/HnkVlJm8BSwStxsWmz5e4y65kXBJto=";
};
main = {
- version = "6.11.6";
- hash = "sha256-t0kuKK2f8D1vxoX5dJnodTu3aBmzCc8F7tHwVAUHP1M=";
+ version = "6.11.7";
+ hash = "sha256-+gj6sR20v4+NHR4cqsVK5fVpqXs9zxcBh0kJUH5qpNE=";
};
};
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/msi-ec/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/msi-ec/default.nix
index 04f186af08..2720eb652e 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/msi-ec/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/msi-ec/default.nix
@@ -8,26 +8,18 @@
}:
stdenv.mkDerivation {
pname = "msi-ec-kmods";
- version = "0-unstable-2024-09-19";
+ version = "0-unstable-2024-11-04";
src = fetchFromGitHub {
owner = "BeardOverflow";
repo = "msi-ec";
- rev = "94c2a45c04a07096e10d7cb1240e1a201a025dc0";
- hash = "sha256-amJUoIf5Sl62BLyHLeam2fzN1s+APoWh2dH5QVfJhCs=";
+ rev = "be6f7156cd15f6ecf9d48dfcc30cbd1f693916b8";
+ hash = "sha256-gImiP4OaBt80n+qgVnbhd0aS/zW+05o3DzGCw0jq+0g=";
};
dontMakeSourcesWritable = false;
- postPatch =
- let
- targets = builtins.filter (v: v != "") [
- (lib.strings.optionalString (kernel.kernelOlder "6.2") "older-kernel-patch")
- (lib.strings.optionalString (kernel.kernelAtLeast "6.11") "6.11-kernel-patch")
- ];
- commands = builtins.map (target: "make ${target}") targets;
- in
- lib.concatStringsSep "\n" ([ "cp ${./patches/Makefile} ./Makefile" ] ++ commands);
+ patches = [ ./patches/makefile.patch ];
hardeningDisable = [ "pic" ];
@@ -48,6 +40,6 @@ stdenv.mkDerivation {
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.m1dugh ];
platforms = lib.platforms.linux;
- broken = kernel.kernelOlder "6.2";
+ broken = kernel.kernelOlder "5.5";
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/msi-ec/patches/Makefile b/third_party/nixpkgs/pkgs/os-specific/linux/msi-ec/patches/Makefile
deleted file mode 100644
index f88fa40220..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/linux/msi-ec/patches/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Out of the box, the build with this Makefile only works in FHS environments,
-# such as on Ubuntu or Debian. On NixOS, you either need to open an FHS
-# environment using a Nix shell or build this from a specially crafted Nix
-# derivation.
-#
-# This file follows the conventions written down here:
-# https://docs.kernel.org/kbuild/modules.html
-# Make it possible to override the kernel src tree location from Nix derivation.
-KERNEL ?= $(shell uname -r)
-KERNELDIR ?= /lib/modules/$(KERNEL)/build/
-ccflags-y := -std=gnu11 -Wno-declaration-after-statement
-.PHONY: default
-default: modules
-# -m: Build as module.
-obj-m = msi-ec.o
-.PHONY: modules
-modules:
- @#"M=": Module source. Special variable of the kernel's main Makefile.
- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
-.PHONY: modules_install
-modules_install:
- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
-6.11-kernel-patch:
- git apply 6.11-kernel.patch
-
-older-kernel-patch:
- git apply older-kernel.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/msi-ec/patches/makefile.patch b/third_party/nixpkgs/pkgs/os-specific/linux/msi-ec/patches/makefile.patch
new file mode 100644
index 0000000000..0ed29887b3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/msi-ec/patches/makefile.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile b/Makefile
+index bffcbd4..fd1d8a3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,7 @@
+ VERSION := 0.08
+ DKMS_ROOT_PATH := /usr/src/msi_ec-$(VERSION)
+ TARGET ?= $(shell uname -r)
++KERNELDIR ?= /lib/modules/$(TARGET)/build/
+
+ ccflags-y := -std=gnu11 -Wno-declaration-after-statement
+
+@@ -10,11 +11,14 @@ obj-m += msi-ec.o
+ all: modules
+
+ modules:
+- @$(MAKE) -C /lib/modules/$(TARGET)/build M=$(CURDIR) modules
++ @$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules
+
+ clean:
+ @$(MAKE) -C /lib/modules/$(TARGET)/build M=$(CURDIR) clean
+
++modules_install:
++ @$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules_install
++
+ load:
+ insmod msi-ec.ko
+
diff --git a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix
index 9a6a4e4713..609877ae1f 100644
--- a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix
@@ -178,7 +178,8 @@ in mkDerivation rec {
"-DENABLE_TESTS=OFF"
"-DCOMPILER_CACHE=disabled"
"-DENABLE_EMBEDDED_COMPILER=ON"
- ];
+ ] ++
+ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) "-DNO_ARMV81_OR_HIGHER=1";
env = {
NIX_CFLAGS_COMPILE =
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix
index 414449cabb..473f54e532 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix
@@ -2,18 +2,23 @@
buildHomeAssistantComponent,
fetchFromGitHub,
lib,
+ gitUpdater,
}:
buildHomeAssistantComponent rec {
owner = "KartoffelToby";
domain = "better_thermostat";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "KartoffelToby";
repo = "better_thermostat";
rev = "refs/tags/${version}";
- hash = "sha256-9iwrGKk3/m38ghDVGzKODWo9vzzZxJ91413/KWnULJU=";
+ hash = "sha256-zXO2UDLhSTOemzsO9G5ZUzr50Zg8kDW/aObn6Y3j70k=";
+ };
+
+ passthru.updateScript = gitUpdater {
+ ignoredVersions = "(Alpha|Beta|alpha|beta).*";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix
new file mode 100644
index 0000000000..4cc44ef19d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix
@@ -0,0 +1,33 @@
+{
+ lib,
+ fetchFromGitHub,
+ buildHomeAssistantComponent,
+ dirigera,
+}:
+
+buildHomeAssistantComponent rec {
+ owner = "sanjoyg";
+ domain = "dirigera_platform";
+ version = "2.6.4";
+
+ src = fetchFromGitHub {
+ owner = "sanjoyg";
+ repo = "dirigera_platform";
+ rev = version;
+ hash = "sha256-ftJUmJ5UWgm22YBfCIBAxRjG+niougw5ekrQNuSRgzI=";
+ };
+
+ postPatch = ''
+ substituteInPlace custom_components/dirigera_platform/manifest.json \
+ --replace-fail "0.0.1" "${version}"
+ '';
+
+ dependencies = [ dirigera ];
+
+ meta = with lib; {
+ description = "Home-assistant integration for IKEA Dirigera hub";
+ homepage = "https://github.com/sanjoyg/dirigera_platform";
+ maintainers = with maintainers; [ rhoriguchi ];
+ license = licenses.mit;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
index 15f79d1259..bc1c1837fe 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
@@ -1,19 +1,20 @@
-{ lib
-, fetchFromGitHub
-, buildHomeAssistantComponent
-, moonraker-api
+{
+ lib,
+ fetchFromGitHub,
+ buildHomeAssistantComponent,
+ moonraker-api,
}:
buildHomeAssistantComponent rec {
owner = "marcolivierarsenault";
domain = "moonraker";
- version = "1.3.7";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "marcolivierarsenault";
repo = "moonraker-home-assistant";
rev = "refs/tags/${version}";
- hash = "sha256-Mz78wCBP3U1CWbr3KajZ5RjQOIqhjFvmL9Walx+xxzQ=";
+ hash = "sha256-wdbomvpRvadWjxi8c6D9dhdXmWnSuVxmEPZCX8WmC5M=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
index 5c05354c37..f74cf52bdf 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
@@ -5,16 +5,16 @@
buildNpmPackage rec {
pname = "mushroom";
- version = "4.0.8";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "piitaya";
repo = "lovelace-mushroom";
rev = "v${version}";
- hash = "sha256-jwL/LrnQsjwv9Wt+jmJKE7jJ3YO8K7eBkxkvAvCbg7g=";
+ hash = "sha256-Mk1SkDUevaRugxZmMM73xEdiZXdB78rZ+FF/TeaxL8I=";
};
- npmDepsHash = "sha256-fzmVRmX1lBy+t7gRCUfw2ONYyKDUs6IkSnAstiYJ7qg=";
+ npmDepsHash = "sha256-Gzs660w9KG7/m4oB/TjEwSNogRPpnaaHsmQgmqHgfyU=";
installPhase = ''
runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/servers/invidious/use-etc-ssl-certs.patch b/third_party/nixpkgs/pkgs/servers/invidious/use-etc-ssl-certs.patch
deleted file mode 100644
index b60b0b1f1a..0000000000
--- a/third_party/nixpkgs/pkgs/servers/invidious/use-etc-ssl-certs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/crypto/x509/x509_def.c b/crypto/x509/x509_def.c
-index d2bc3e5c1..329580075 100644
---- a/crypto/x509/x509_def.c
-+++ b/crypto/x509/x509_def.c
-@@ -67,7 +67,7 @@
-
- #define X509_CERT_AREA OPENSSLDIR
- #define X509_CERT_DIR OPENSSLDIR "/certs"
--#define X509_CERT_FILE OPENSSLDIR "/cert.pem"
-+#define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt"
- #define X509_PRIVATE_DIR OPENSSLDIR "/private"
- #define X509_CERT_DIR_EVP "SSL_CERT_DIR"
- #define X509_CERT_FILE_EVP "SSL_CERT_FILE"
diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/cross_fix.diff b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/cross_fix.diff
deleted file mode 100644
index 6f4c769954..0000000000
--- a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/cross_fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c215f3bf..f5aa25d8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,7 +67,7 @@ AC_C_BIGENDIAN
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_LIBTOOL
--AC_PATH_PROG([AR], [ar])
-+AC_PATH_TOOL([AR], [ar])
- AC_PATH_PROG([CAT], [cat])
- AC_PATH_PROG([CHMOD], [chmod])
- AC_PATH_PROG([CHOWN], [chown])
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/Cargo.lock b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/Cargo.lock
deleted file mode 100644
index e03f69f58f..0000000000
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/Cargo.lock
+++ /dev/null
@@ -1,1016 +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"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "approx"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.51"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bytes"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
-
-[[package]]
-name = "bytes"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
-
-[[package]]
-name = "cc"
-version = "1.0.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "claim"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81099d6bb72e1df6d50bb2347224b666a670912bb7f06dbe867a4a070ab3ce8"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "clap"
-version = "2.33.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-
-[[package]]
-name = "domain"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb073186f6285f852b9e71b544111306ab08da4a6b40c25a73f4c9ee3e3df29"
-dependencies = [
- "rand",
-]
-
-[[package]]
-name = "dtoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futures-channel"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
-
-[[package]]
-name = "futures-sink"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
-
-[[package]]
-name = "futures-task"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
-
-[[package]]
-name = "futures-util"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
-dependencies = [
- "autocfg",
- "futures-core",
- "futures-task",
- "pin-project-lite 0.2.7",
- "pin-utils",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "h2"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
-dependencies = [
- "bytes 0.5.6",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
- "tracing-futures",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "http"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
-dependencies = [
- "bytes 1.1.0",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
-dependencies = [
- "bytes 0.5.6",
- "http",
-]
-
-[[package]]
-name = "httparse"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
-
-[[package]]
-name = "httpdate"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
-
-[[package]]
-name = "hyper"
-version = "0.13.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb"
-dependencies = [
- "bytes 0.5.6",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103"
-
-[[package]]
-name = "log"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "memchr"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
-
-[[package]]
-name = "mio"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio-uds"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
-dependencies = [
- "iovec",
- "libc",
- "mio",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.3"
-source = "git+https://github.com/Goirad/rust-native-tls.git?branch=pkcs8-squashed#255dd5493b446755a9e40be3a4638afedfe67b03"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
-
-[[package]]
-name = "openssl"
-version = "0.10.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
-
-[[package]]
-name = "openssl-src"
-version = "111.16.0+1.1.1l"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "openssl-src",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
-dependencies = [
- "lazy_static",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "security-framework"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
-dependencies = [
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
-dependencies = [
- "core-foundation-sys",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "simple_logger"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7de33c687404ec3045d4a0d437580455257c0436f858d702f244e7d652f9f07"
-dependencies = [
- "atty",
- "log",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
-
-[[package]]
-name = "socket2"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "structopt"
-version = "0.3.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa"
-dependencies = [
- "clap",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "rand",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "tokio"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
-dependencies = [
- "bytes 0.5.6",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
- "libc",
- "memchr",
- "mio",
- "mio-uds",
- "pin-project-lite 0.1.12",
- "signal-hook-registry",
- "slab",
- "tokio-macros",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
-dependencies = [
- "bytes 0.5.6",
- "futures-core",
- "futures-sink",
- "log",
- "pin-project-lite 0.1.12",
- "tokio",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
-
-[[package]]
-name = "tracing"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8"
-dependencies = [
- "cfg-if 1.0.0",
- "log",
- "pin-project-lite 0.2.7",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46125608c26121c81b0c6d693eab5a420e416da7e43c426d2e8f7df8da8a3acf"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "pin-project",
- "tracing",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "unbound-telemetry"
-version = "0.1.0"
-dependencies = [
- "approx",
- "async-trait",
- "claim",
- "domain",
- "dtoa",
- "hyper",
- "itoa",
- "libc",
- "log",
- "native-tls",
- "openssl",
- "simple_logger",
- "structopt",
- "tokio",
- "tokio-tls",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix
index dbd09f9516..e4427a4956 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mysql";
- version = "8.0.39";
+ version = "8.0.40";
src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
- hash = "sha256-jEpLHUnHFJINJo/jmNeZVZqzxc9ZoDaGGUs3yz020ws=";
+ hash = "sha256-At/ZQ/lnQvf5zXiFWzJwjqTfVIycFK+Sc4F/O72dIrI=";
};
nativeBuildInputs = [ bison cmake pkg-config ]
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/anonymizer.nix
index 4bb5aa5444..afb517c6b5 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/anonymizer.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/anonymizer.nix
@@ -1,9 +1,9 @@
-{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell, jitSupport, llvm }:
+{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell, jitSupport, llvm, nixosTests }:
stdenv.mkDerivation (finalAttrs: {
pname = "postgresql_anonymizer";
- inherit (pg-dump-anon) version src passthru;
+ inherit (pg-dump-anon) version src;
buildInputs = [ postgresql ];
nativeBuildInputs = [ postgresql ] ++ lib.optional jitSupport llvm;
@@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
EOF
'';
+ passthru.tests = nixosTests.postgresql.anonymizer.passthru.override postgresql;
+
meta = lib.getAttrs [ "homepage" "maintainers" "license" ] pg-dump-anon.meta // {
description = "Extension to mask or replace personally identifiable information (PII) or commercially sensitive data from a PostgreSQL database";
};
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
index af3df00fca..750551a9cb 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, postgresql, boost182, nixosTests }:
+{ stdenv, lib, fetchFromGitHub, postgresql, boost182, postgresqlTestExtension }:
let
version = "1.7.0";
@@ -20,7 +20,7 @@ let
};
in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "apache_datasketches";
inherit version;
@@ -61,7 +61,13 @@ stdenv.mkDerivation {
runHook postInstall
'';
- passthru.tests.apache_datasketches = nixosTests.apache_datasketches;
+ passthru.tests.extension = postgresqlTestExtension {
+ inherit (finalAttrs) finalPackage;
+ sql = ''
+ CREATE EXTENSION datasketches;
+ SELECT hll_sketch_to_string(hll_sketch_build(1));
+ '';
+ };
meta = {
description = "PostgreSQL extension providing approximate algorithms for distinct item counts, quantile estimation and frequent items detection";
@@ -75,4 +81,4 @@ stdenv.mkDerivation {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mmusnjak ];
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix
index a90502c35a..7bac053d92 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = unstableGitUpdater { };
- passthru.tests = {
- inherit (nixosTests) pgjwt;
+ passthru.tests = lib.recurseIntoAttrs {
+ pgjwt = nixosTests.postgresql.pgjwt.passthru.override postgresql;
extension = postgresqlTestExtension {
inherit (finalAttrs) finalPackage;
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix
index 117319e606..f25afda0ca 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix
@@ -86,9 +86,7 @@ in
passthru = {
updateScript = nix-update-script { };
- tests = {
- pgvecto-rs = nixosTests.pgvecto-rs;
- };
+ tests = nixosTests.postgresql.pgvecto-rs.passthru.override postgresql;
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
index aa62c778a3..afd24f8592 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -18,7 +18,7 @@
docbook5,
cunit,
pcre2,
- nixosTests,
+ postgresqlTestExtension,
jitSupport,
llvm,
}:
@@ -26,7 +26,7 @@
let
gdal = gdalMinimal;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "postgis";
version = "3.5.0";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
+ url = "https://download.osgeo.org/postgis/source/postgis-${finalAttrs.version}.tar.gz";
hash = "sha256-ymmKIswrKzRnrE4GO0OihBPzAE3dUFvczddMVqZH9RA=";
};
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
preConfigure = ''
sed -i 's@/usr/bin/file@${file}/bin/file@' configure
- configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev} --disable-extension-upgrades-install"
+ configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${finalAttrs.pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev} --disable-extension-upgrades-install"
- makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${pname}"
+ makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${finalAttrs.pname}"
'';
postConfigure = ''
sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ;
@@ -106,19 +106,39 @@ stdenv.mkDerivation rec {
rm $out/bin/postgres
for prog in $out/bin/*; do # */
- ln -s $prog $prog-${version}
+ ln -s $prog $prog-${finalAttrs.version}
done
mkdir -p $doc/share/doc/postgis
mv doc/* $doc/share/doc/postgis/
'';
- passthru.tests.postgis = nixosTests.postgis;
+ passthru.tests.extension = postgresqlTestExtension {
+ inherit (finalAttrs) finalPackage;
+ sql =
+ let
+ expectedVersion = "${lib.versions.major finalAttrs.version}.${lib.versions.minor finalAttrs.version} USE_GEOS=1 USE_PROJ=1 USE_STATS=1";
+ in
+ ''
+ CREATE EXTENSION postgis;
+ CREATE EXTENSION postgis_raster;
+ CREATE EXTENSION postgis_topology;
+ select postgis_version();
+ do $$
+ begin
+ if postgis_version() <> '${expectedVersion}' then
+ raise '"%" does not match "${expectedVersion}"', postgis_version();
+ end if;
+ end$$;
+ -- st_makepoint goes through c code
+ select st_makepoint(1, 1);
+ '';
+ };
meta = with lib; {
description = "Geographic Objects for PostgreSQL";
homepage = "https://postgis.net/";
- changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS";
+ changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${finalAttrs.version}/NEWS";
license = licenses.gpl2Plus;
maintainers =
with maintainers;
@@ -129,4 +149,4 @@ stdenv.mkDerivation rec {
];
inherit (postgresql.meta) platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/system_stats.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/system_stats.nix
index c1700fc038..03d3034079 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/system_stats.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/system_stats.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
hash = "sha256-/xXnui0S0ZjRw7P8kMAgttHVv8T41aOhM3pM8P0OTig=";
};
+ buildFlags = [ "PG_CFLAGS=-Wno-error=vla" ];
+
installPhase = ''
runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 60e14e9228..ab4736c5f7 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
done
'';
- passthru.tests = { inherit (nixosTests) timescaledb; };
+ passthru.tests = nixosTests.postgresql.timescaledb.passthru.override postgresql;
meta = with lib; {
description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space";
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
index ab414a400d..eec287ddcc 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
@@ -25,9 +25,7 @@
passthru = {
updateScript = nix-update-script { };
- tests = {
- timescaledb_toolkit = nixosTests.timescaledb;
- };
+ tests = nixosTests.postgresql.timescaledb.passthru.override postgresql;
};
# tests take really long
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsja.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsja.nix
index f0b9238f59..de19b047fe 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsja.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsja.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
mv dbinit_libtsja.txt $out/share/postgresql/extension/libtsja_dbinit.sql
'';
- passthru.tests.tsja = nixosTests.tsja;
+ passthru.tests = nixosTests.postgresql.tsja.passthru.override postgresql;
meta = with lib; {
description = "PostgreSQL extension implementing Japanese text search";
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix
index 4a1c9b18b1..f7d581f2c8 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix
@@ -4,6 +4,7 @@
callPackage,
fetchFromGitHub,
postgresql,
+ nixosTests,
}:
stdenv.mkDerivation rec {
@@ -26,12 +27,7 @@ stdenv.mkDerivation rec {
install -D -t $out/share/postgresql/extension sql/*.sql
'';
- passthru.tests.wal2json = lib.recurseIntoAttrs (
- callPackage ../../../../../nixos/tests/postgresql-wal2json.nix {
- inherit (stdenv) system;
- inherit postgresql;
- }
- );
+ passthru.tests = nixosTests.postgresql.wal2json.passthru.override postgresql;
meta = with lib; {
description = "PostgreSQL JSON output plugin for changeset extraction";
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix
index 0badde7a4d..7d59f6349d 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix
@@ -20,7 +20,7 @@ let
, version, hash, muslPatches ? {}
# for tests
- , testers
+ , testers, nixosTests
# JIT
, jitSupport
@@ -165,6 +165,12 @@ let
src = ./patches/locale-binary-path.patch;
locale = "${if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
})
+ ] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "17") [
+ # TODO: Remove this with the next set of minor releases
+ (fetchpatch ({
+ url = "https://github.com/postgres/postgres/commit/0a883a067bd78f0ff0607afb18c4f783ac764504.patch";
+ hash = "sha256-F3zCaar6w6bwQDno7Tkg7ZbPJ+rhgi8/2NSvFakzQek=";
+ }))
] ++ lib.optionals (olderThan "17") [
# TODO: Remove this with the next set of minor releases
(fetchpatch (
@@ -189,6 +195,12 @@ let
(if atLeast "13" then ./patches/socketdir-in-run-13+.patch else ./patches/socketdir-in-run.patch)
] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [
./patches/export-dynamic-darwin-15-.patch
+ ] ++ lib.optionals (atLeast "17") [
+ # Fix flaky test, https://www.postgresql.org/message-id/ba8e1bc0-8a99-45b7-8397-3f2e94415e03@suse.de
+ (fetchpatch {
+ url = "https://github.com/postgres/postgres/commit/a358019159de68d4f045cbb5d89c8c8c2e96e483.patch";
+ hash = "sha256-9joQZo93oUTp6CrcGnhj7o+Mrbj/KCWwwGUc9KAst+s=";
+ })
];
installTargets = [ "install-world" ];
@@ -300,18 +312,12 @@ let
};
tests = {
- postgresql-wal-receiver = import ../../../../nixos/tests/postgresql-wal-receiver.nix {
- inherit (stdenv) system;
- pkgs = self;
- package = this;
- };
+ postgresql = nixosTests.postgresql.postgresql.passthru.override finalAttrs.finalPackage;
+ postgresql-tls-client-cert = nixosTests.postgresql.postgresql-tls-client-cert.passthru.override finalAttrs.finalPackage;
+ postgresql-wal-receiver = nixosTests.postgresql.postgresql-wal-receiver.passthru.override finalAttrs.finalPackage;
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
} // lib.optionalAttrs jitSupport {
- postgresql-jit = import ../../../../nixos/tests/postgresql-jit.nix {
- inherit (stdenv) system;
- pkgs = self;
- package = this;
- };
+ postgresql-jit = nixosTests.postgresql.postgresql-jit.passthru.override finalAttrs.finalPackage;
};
};
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/bass.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/bass.nix
index 35b36e29d5..01fea3c8a0 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/bass.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/bass.nix
@@ -2,7 +2,7 @@
buildFishPlugin rec {
pname = "bass";
- version = "unstable-2021-02-18";
+ version = "1.0-unstable-2021-02-18";
src = fetchFromGitHub {
owner = "edc";
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefish.nix
index ea57eb5466..e4b7ead976 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefish.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefish.nix
@@ -5,7 +5,7 @@
}:
buildFishPlugin {
pname = "bobthefish";
- version = "unstable-2023-06-16";
+ version = "0-unstable-2023-06-16";
src = fetchFromGitHub {
owner = "oh-my-fish";
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefisher.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefisher.nix
index 20c79ffcdd..db114704c7 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefisher.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefisher.nix
@@ -5,7 +5,7 @@
}:
buildFishPlugin {
pname = "bobthefisher";
- version = "unstable-2023-10-25";
+ version = "0-unstable-2023-10-25";
src = fetchFromGitHub {
owner = "Scrumplex";
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/clownfish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/clownfish.nix
index cd5c997d31..90b1f0b86c 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/clownfish.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/clownfish.nix
@@ -2,7 +2,7 @@
buildFishPlugin {
pname = "clownfish";
- version = "unstable-2021-01-17";
+ version = "0-unstable-2021-01-17";
src = fetchFromGitHub {
owner = "IlanCosman";
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/colored-man-pages.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/colored-man-pages.nix
index 435ce6e5c4..07222395b6 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/colored-man-pages.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/colored-man-pages.nix
@@ -2,7 +2,7 @@
buildFishPlugin rec {
pname = "colored-man-pages";
- version = "unstable-2022-04-30";
+ version = "0-unstable-2022-04-30";
src = fetchFromGitHub {
owner = "patrickf1";
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/foreign-env/default.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/foreign-env/default.nix
index fd5c386829..4b317571b2 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/foreign-env/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/foreign-env/default.nix
@@ -2,7 +2,7 @@
buildFishPlugin {
pname = "foreign-env";
- version = "unstable-2020-02-09";
+ version = "0-unstable-2020-02-09";
src = fetchFromGitHub {
owner = "oh-my-fish";
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf.nix
index fa7e33da6a..66e1c562ec 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf.nix
@@ -5,7 +5,7 @@
}:
buildFishPlugin rec {
pname = "fzf";
- version = "unstable-2021-05-12";
+ version = "0.16.6-unstable-2021-05-12";
src = fetchFromGitHub {
owner = "jethrokuan";
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/grc.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/grc.nix
index 1149c082ca..9e74ae4408 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/grc.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/grc.nix
@@ -2,7 +2,7 @@
buildFishPlugin {
pname = "grc";
- version = "unstable-2022-05-24";
+ version = "0-unstable-2022-05-24";
src = fetchFromGitHub {
owner = "oh-my-fish";
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/humantime-fish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/humantime-fish.nix
index 8e1c960e59..417967b72c 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/humantime-fish.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/humantime-fish.nix
@@ -6,7 +6,7 @@
}:
buildFishPlugin rec {
pname = "humantime-fish";
- version = "unstable-2022-04-08";
+ version = "1.0.0-unstable-2022-04-08";
src = fetchFromGitHub {
owner = "jorgebucaran";
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/hydro.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/hydro.nix
index 38e866ef8b..7e3f86c347 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/hydro.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/hydro.nix
@@ -2,7 +2,7 @@
buildFishPlugin rec {
pname = "hydro";
- version = "unstable-2024-03-24";
+ version = "0-unstable-2024-03-24";
src = fetchFromGitHub {
owner = "jorgebucaran";
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/z.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/z.nix
index 207c68a43d..722cafa90d 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/z.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/z.nix
@@ -5,7 +5,7 @@
}:
buildFishPlugin rec {
pname = "z";
- version = "unstable-2022-04-08";
+ version = "0-unstable-2022-04-08";
src = fetchFromGitHub {
owner = "jethrokuan";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix
index b362c5f65b..828deed8ea 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,52 +1,52 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
- version = "3.137.0";
+ version = "3.138.0";
pulumiPkgs = {
x86_64-linux = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.137.0-linux-x64.tar.gz";
- sha256 = "0q2c00gm4vf8h1kl3mh4xkcchvhb1kh4dpn7z7q9lgvsc2yphl56";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.138.0-linux-x64.tar.gz";
+ sha256 = "1n3fzpm4anr0cim3dc4f1hg1gld4ka46rj9yydgy0pi8cgi5w900";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.26.1-linux-amd64.tar.gz";
- sha256 = "1a5m5khddsbipkqb4ijfj2l3hs591in6q7v2i0d2jwazbyfkqdh5";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.27.0-linux-amd64.tar.gz";
+ sha256 = "15vi8xlbyabh18krag5q6xqawr71miirbja9cpln6iyhw48wx954";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-linux-amd64.tar.gz";
sha256 = "0l5fy9gcmzb11q6sp7yqssfan2i804l2ck2rhfihb07kmdrgn4sh";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.1-linux-amd64.tar.gz";
- sha256 = "0yh44xnink15ajqgq5bckp23z476qfdxwj5r4slqkjj7sc5zaqzy";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.65.0-linux-amd64.tar.gz";
+ sha256 = "0zwkjckwlgq9iczf4ypxy7h33mn8bkbskqw3m4jvn5jhjqc5m5sd";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.0-linux-amd64.tar.gz";
- sha256 = "0d2mxvi1b801aviaj7i02c46xwh2wgzysd9yfd3s4rm1pg5j8kzk";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.4-linux-amd64.tar.gz";
+ sha256 = "1r11ms8b7ckgzl0kw6n9bpgw7mcj9fn3c18h08hwhlw5ypixsxvn";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.1-linux-amd64.tar.gz";
- sha256 = "14dgblnqwdvz7hhwmxymldfi06ka864g3h2812mbypmlp8wkqb0d";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.3-linux-amd64.tar.gz";
+ sha256 = "1xck3a9q5ayki3gs57z85hqwhr86apji91v843mxrrv5bxjir0v1";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.56.1-linux-amd64.tar.gz";
- sha256 = "0g82g9j5vqkf0alnj128a1m5yabjrj4gggq3g8p7yixnxkzxfazr";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.58.0-linux-amd64.tar.gz";
+ sha256 = "10grspac80kvn8wx4is72yfpgfv2aywcd60irs0jqnigb4pncm9q";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.8.0-linux-amd64.tar.gz";
+ sha256 = "0jifqlik321s67n77dr92ba9pmpj895z29b2klwi7iidgb3grn81";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-linux-amd64.tar.gz";
sha256 = "00r0ngvlqfmc2fydb9qc5r5s0rkws4r96i7wvrmmxsxhigc2g9w5";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.1-linux-amd64.tar.gz";
- sha256 = "0vg0fscvqgpiakfyhsazfyix679lhhwvixxqwr1q0c97whr0m51g";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.4.0-linux-amd64.tar.gz";
+ sha256 = "18v0fn2lcqbvqydz7lj6k1ybdkfrnjwycg7m41x4nymqy66b86rz";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.5.0-linux-amd64.tar.gz";
- sha256 = "05mxaq65a7p0va4268wq57shd87iv6bv00x288bsfp2ldz038ssy";
- }
- {
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.41.0-linux-amd64.tar.gz";
- sha256 = "1d0mn5kd86clwlwyizq04d1yf9a4ri63p5b0d1wsaprzdcdsdz1g";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.42.0-linux-amd64.tar.gz";
+ sha256 = "09lfkvc7hr8k09hv53qgizkrxpr7q9l4nwm6778pfbz5hmgarga8";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-linux-amd64.tar.gz";
@@ -57,8 +57,8 @@
sha256 = "0aazshisk8ap83zvj2jgjhxv6841zyf8v582f5gag4bag2fifywf";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.1-linux-amd64.tar.gz";
- sha256 = "1k56f68mld5rilwhn58zai8n9vp08qwmpg864gx08q4qfk0dzzfl";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.34.0-linux-amd64.tar.gz";
+ sha256 = "1vi1gh191w51w57ykivcfy2glnkc4mxk3azrp2bhrhc4qvz5x8nm";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-linux-amd64.tar.gz";
@@ -69,20 +69,20 @@
sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.1-linux-amd64.tar.gz";
- sha256 = "1ldwvyhx7fykny4knzzsnqz4vvj93xrjc576b2ssrs7d9c24zm2f";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.2-linux-amd64.tar.gz";
+ sha256 = "164mg37hjqc4jaiii4c0zlvrnflk4xk013wli1mvxpr2651iijqf";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.6.0-linux-amd64.tar.gz";
- sha256 = "1hqi96bxvbq5jrsrhv17slbfp8k2lphdk4lkz59aj6knfq9gp9hz";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.8.0-linux-amd64.tar.gz";
+ sha256 = "0yvlhng7sih84gnzw8gpz9x2rcxvxs9y00x551xw6n35ljxb9izl";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-linux-amd64.tar.gz";
sha256 = "0vrrbvr2n2f2jlmqb81snhf0xacz4r1ym7cqs5gnkx9swb427qgp";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.2-linux-amd64.tar.gz";
- sha256 = "1wyizcyj7wjhbqkbh5p5v01l535m6c3zgm47ym334y389amnng83";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.5.0-linux-amd64.tar.gz";
+ sha256 = "040yp3fjdnaxmqrkby519mjl858k4r9waf6czg0rf8bikbq648ij";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz";
@@ -93,12 +93,12 @@
sha256 = "1ippk47y3018rvl05bwhcjwhd942fmiam1w0s2ys3l3jky2n1pvs";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.2-linux-amd64.tar.gz";
- sha256 = "12lq2zpmyvp3amfv5q0ikh1000fdnmwlbg8qrvmaijb18zs1308a";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.3-linux-amd64.tar.gz";
+ sha256 = "0l1n44p3kc0j3my60h4iaz5qqynwynwr6asvls71y5dshbs6nh6q";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.2-linux-amd64.tar.gz";
- sha256 = "1q8vf0anvyhbq0fzkkmgrycay90izdfhyrragvn1ns9hpn4rxwd3";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.29.0-linux-amd64.tar.gz";
+ sha256 = "19vxhsms1q3591wyd3hlzffkkrg2bjqmxz5iyf35pgxb7yr22qhv";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-linux-amd64.tar.gz";
@@ -113,8 +113,8 @@
sha256 = "0jp5dbjr4f8r51y0nkv62r3rxl476lb6aqkkhr2n56gakfz1rbn7";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.2-linux-amd64.tar.gz";
- sha256 = "0ak0jvcw654153xqi8byaa6g928ca00mzn9v3a8a666rfrknr7pn";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.13.0-linux-amd64.tar.gz";
+ sha256 = "197ycb1z2rqnkqxa0fvslx86r02hcxwr43gpyprdvhi4vf0spm0n";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.7-linux-amd64.tar.gz";
@@ -125,36 +125,36 @@
sha256 = "088bfkpsq0zyazpzyxmji9brxyirxw12adc3pl9f5nc044p5c5zx";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.1-linux-amd64.tar.gz";
- sha256 = "0fmz1baas0p7nvk6yglpx2z155303j3f0l5f4zaq6091jk9ly9dp";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.98.0-linux-amd64.tar.gz";
+ sha256 = "07kfn511wl3n2q4w1rzfyk1vrpgmf14m0bqci0zq0pdpblsknb39";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.6-linux-amd64.tar.gz";
- sha256 = "1iz28rvprpdvx0fp4gdwp1g5g0hzl778lbb8fanyqrnvj39hjg77";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.7-linux-amd64.tar.gz";
+ sha256 = "15knw6fhdzhmws9ixzvbvgqwnzbryf91zbbkqrywi3yz1zc6mhg1";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.3-linux-amd64.tar.gz";
- sha256 = "0jxcq9h5jpmzwnbflzihgi6f9bi7z13064vsyjl1sl0swnfmgjpx";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.4-linux-amd64.tar.gz";
+ sha256 = "1qp0s4j5amjx1if1sz8f2hjim8g58i1wdd74nkdadya1qi6nyhw6";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.9-linux-amd64.tar.gz";
sha256 = "0k39k15k1rzcrw1k30683b8zhfp41r90zi6mlzivbbnszdjgnbml";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.1-linux-amd64.tar.gz";
- sha256 = "0aannlrhij2jmv9l6mxgy08vw7i16mg3jyl3wdb9mygg8irmllmy";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.2-linux-amd64.tar.gz";
+ sha256 = "0dijwdpr3ldqqarmrd8hnvgf1ifrk5krfh1a76mv8fcg16gqz2xn";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-linux-amd64.tar.gz";
sha256 = "1syqjpkn1nz05hlw3i09sjwrk81l42p61g09ml9afyc9pslkqhcl";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.0-linux-amd64.tar.gz";
- sha256 = "09swzcgkagv9ar6j6p026hywjwhhiqr9pbcgzdby0nzbvx2vigkb";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.1-linux-amd64.tar.gz";
+ sha256 = "06lfqaxgmgyi88f77qkv0114pn41wwwjc4z0z4zf3pp72kmvi3il";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.5-linux-amd64.tar.gz";
- sha256 = "0lkmhbs5g26x7y6d7lznp1c6cpwmyq2v2anajkfnmirgv8rccyji";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.6-linux-amd64.tar.gz";
+ sha256 = "1l2r5lbzm7wnx78im67rij8nlsm9ailxdl9m27ikmqsw6zfxjskc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz";
@@ -163,48 +163,48 @@
];
x86_64-darwin = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.137.0-darwin-x64.tar.gz";
- sha256 = "1dnzlms1bd7d9xmphgnx7q5vf8jagcrav8qlg4j8iac1ksfsjj2j";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.138.0-darwin-x64.tar.gz";
+ sha256 = "1zk5hs48dcn95z2ij1xg0lkyi8rka6xza1zj9aj2mhgyjx20xgkg";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.26.1-darwin-amd64.tar.gz";
- sha256 = "08p0kia600qpqfvwsyc0y5czf3wjz234s4al9hjpv340s32a9p4f";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.27.0-darwin-amd64.tar.gz";
+ sha256 = "067jp4s0cb9mih1a7dqwspj6lx2ylalnld0kcjf3b0cqka1fbvgf";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-darwin-amd64.tar.gz";
sha256 = "1ld0qnckwm6fkrr531vs5ay7krhpznhgk1193g231l0b0hb9lm3w";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.1-darwin-amd64.tar.gz";
- sha256 = "1xy1clkllxdgay9jpa1klq76kvn2yhb4zlsr9x6q2wga3519k0r0";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.65.0-darwin-amd64.tar.gz";
+ sha256 = "0rz2hyqbdfbsh1lfslmnd4vvnh3pm5s5ij093vaif02k0f84ckvj";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.0-darwin-amd64.tar.gz";
- sha256 = "159ikg6hzkksggsjna4pffg912vfiy6p6r4w0pwxxjg4bws63a5n";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.4-darwin-amd64.tar.gz";
+ sha256 = "1bp73yp7s7r9kgr1al4bi5z283slqplxzr086jb5mdnl1nhxrqz9";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.1-darwin-amd64.tar.gz";
- sha256 = "1ilqm6cjyhi7l7wdjzdzr5f8vsbn4s7lzfm5787yaks8wxzzr9d4";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.3-darwin-amd64.tar.gz";
+ sha256 = "1v65z6zifyx4lhzw34qbm5nsgkj0ca903gxiv6l2d2im411l65wn";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.56.1-darwin-amd64.tar.gz";
- sha256 = "16pvhcda0273v1j1whx7x3ix1npr4izb067d0j115c5cxygab2wl";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.58.0-darwin-amd64.tar.gz";
+ sha256 = "1vivk1j7rniv4kip4mkdd0849hxlkmclwp8kf2f3jv3nh2g344xz";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.8.0-darwin-amd64.tar.gz";
+ sha256 = "1py5sbh2lgh9qd4jzvygqgykhwr0r9y705qzflpy1jfdvidmxyir";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-darwin-amd64.tar.gz";
sha256 = "11gfaxk8vgk95crb45g43r8gyg43azq7qk3wzk7kn7vyvzdkq0l6";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.1-darwin-amd64.tar.gz";
- sha256 = "0vgfhlqmqxwdy1hf7zsdaid9ac1w84yc2fpgbvp2d3kqvp2alicr";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.4.0-darwin-amd64.tar.gz";
+ sha256 = "0kimrzah7zkvg3by7icmfpw7x3c06wnii6pqh94sfc2dbrv2vwgh";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.5.0-darwin-amd64.tar.gz";
- sha256 = "0m6ghahdr9z1z1493psr0ybi8xhbbk5wk2fdsa8cf4jvai3pzj2i";
- }
- {
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.41.0-darwin-amd64.tar.gz";
- sha256 = "066shndil11f4mj35v7h6ppdb2paaf9y6rgpvs024kh3bg66rgvi";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.42.0-darwin-amd64.tar.gz";
+ sha256 = "0yvaw55yqjgjwlys9x6k6p0i5sgjgx005lpdf3q7s2hj1afng4f7";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-darwin-amd64.tar.gz";
@@ -215,8 +215,8 @@
sha256 = "02130bdma9zhmc3jizgmdfnly5bddajxv5qcl0kxp7xs7r37vl3p";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.1-darwin-amd64.tar.gz";
- sha256 = "060fzxp4d2ll1sqrbd7840bbb7zim7qz8kcadg7h7i40nv0853s9";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.34.0-darwin-amd64.tar.gz";
+ sha256 = "143s973jb47ig91nnpqqivld5c51949dmqiw20hsj49as07v2sx3";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-darwin-amd64.tar.gz";
@@ -227,20 +227,20 @@
sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.1-darwin-amd64.tar.gz";
- sha256 = "18g2lbnjhfbbqmkmp23g7dgj2kfxcr577arss3ycx1dbalhabgyp";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.2-darwin-amd64.tar.gz";
+ sha256 = "0ndvsfd2dhrg18kvia8kj5xxr2cxsfxq9xnj30z6nx29jmxy5404";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.6.0-darwin-amd64.tar.gz";
- sha256 = "0laifnya9jbp3dw1ml5i66apxkn79j9c37isncmb6v58cgxkb20d";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.8.0-darwin-amd64.tar.gz";
+ sha256 = "1m8wzlqszs0nxxpxm9vk1sc0sp80grkv4xs72ypr7z415manny0y";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-darwin-amd64.tar.gz";
sha256 = "0pyjavhsblvfigaz80j5lh1dmlj3g42r4v6b92bjw45392dfh9v7";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.2-darwin-amd64.tar.gz";
- sha256 = "0wcndd5y60qqml980i0l7cckf66df2x3qb2s4sydnqw822fwhjy9";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.5.0-darwin-amd64.tar.gz";
+ sha256 = "0z7nay0808bb5apm3l72cpy47mzhr5zfh4h10wmm9sh0aqis39vq";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz";
@@ -251,12 +251,12 @@
sha256 = "0l1cndf2bcdc2492dm76sfad1m6xcbhqh4vkxahckflpy296pqmn";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.2-darwin-amd64.tar.gz";
- sha256 = "0d2w10acsann0wayh13930wm2cirnrzzrs9xfbp7vxf3i3v3qvwv";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.3-darwin-amd64.tar.gz";
+ sha256 = "0drbapilf6rafxjhrlzczzmgxs0ra1xirafx9qi8v7ghcsp8z98m";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.2-darwin-amd64.tar.gz";
- sha256 = "1iwnh05qrwr0xjl1q94sm0iv88klqnf24cv3fdqjz0s5wy69xpk8";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.29.0-darwin-amd64.tar.gz";
+ sha256 = "1xbcyy309rb6lf9xdq0nh9k0a8318kc8bc2wc45lvgnhqriqxj9x";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-darwin-amd64.tar.gz";
@@ -271,8 +271,8 @@
sha256 = "15057d3s3d7rwy3lwjlrr25ahrqhkpwla2pn58bkcwxfm6kkfrch";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.2-darwin-amd64.tar.gz";
- sha256 = "06qaskczdf8bbp0z6k1q015hd313g4bxl1x9fgc3aywjqafgw2br";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.13.0-darwin-amd64.tar.gz";
+ sha256 = "0hi24fbpxaqqmpx63f6yjvlm7cb2l8ic1hqi4r35yi8az8fgjf41";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.7-darwin-amd64.tar.gz";
@@ -283,36 +283,36 @@
sha256 = "0haii3k9b99qxd0apw9smks1zamq5y69vfiyzn7ylvcj42xnc2aq";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.1-darwin-amd64.tar.gz";
- sha256 = "0012plwfj18zqv4d55d1f47a7xnb88bgpshnj35izxrjzsagppvp";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.98.0-darwin-amd64.tar.gz";
+ sha256 = "01b1xp2i4sjp7mfxdwdvjdn86plc0q8ys771y7psjr7zhg16hcki";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.6-darwin-amd64.tar.gz";
- sha256 = "0m31jd9aln89jd6hz7fvxa8a9hnkkkliiiyayywvi4ab2p1fchcy";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.7-darwin-amd64.tar.gz";
+ sha256 = "0ydwz5gwlsm4jqi1994px58y2fkcylrvg4x8axj3774v5dw37s71";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.3-darwin-amd64.tar.gz";
- sha256 = "0sa7r49zdk4jy9qifw78qqvp4id6ycl96378p7333x8g7jlv5ich";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.4-darwin-amd64.tar.gz";
+ sha256 = "0rdzdji3dd1xipl37r09sa6dwmf14lsgkkkagn17nd6axhbqypg0";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.9-darwin-amd64.tar.gz";
sha256 = "1llbp6mda1ibd557d84mg9ck891y1jxdx11i33vav3ndnf2xnw8g";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.1-darwin-amd64.tar.gz";
- sha256 = "175zy697cvhsdm3b2vhd6rac3fz8p6ck8a2nw1wg9ahq2v7f8232";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.2-darwin-amd64.tar.gz";
+ sha256 = "1qxks12cca3h054ykr0v9wr4lx2a4bh3qwps5b7nwwxslq0zq93c";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-darwin-amd64.tar.gz";
sha256 = "04sl6rivgprh65c459b6xazpb1dbzimvczwj62jpra275qgbl0p8";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.0-darwin-amd64.tar.gz";
- sha256 = "0kfzqg8fidras6kf0f7dd9bfc2fyl15b9qch27fq32zy1baflvj5";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.1-darwin-amd64.tar.gz";
+ sha256 = "09jy2mibhs3rkas7shqdpx25sh6i9jv4laxm5hks3300dhvqsjmf";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.5-darwin-amd64.tar.gz";
- sha256 = "1hnqdbh1k17injwxrj2rd2rnx2zzm76fgjf0z20d2qlzv455pvad";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.6-darwin-amd64.tar.gz";
+ sha256 = "0fx83vhc2rjhi26v7nlngc3nmhnnxspbyz7m1031snh3wjaynicd";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz";
@@ -321,48 +321,48 @@
];
aarch64-linux = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.137.0-linux-arm64.tar.gz";
- sha256 = "13kmapsij72v0rfgrayz7zi9z9awzb0l9jqx7jkbvy1cvd6mnmy4";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.138.0-linux-arm64.tar.gz";
+ sha256 = "0v2nf32b4rpxrqvv2m9l3i37fpdlf7ac9dip2wv66jg31fw0clch";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.26.1-linux-arm64.tar.gz";
- sha256 = "02r2snp8vflp7b58yzvn3clq4im86h9mnk6m6xj0cgi92nr3lf29";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.27.0-linux-arm64.tar.gz";
+ sha256 = "0ya6x26yvg0jgnk3rvkkv8pipb2xqk54la7icsjn128689zn24hh";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-linux-arm64.tar.gz";
sha256 = "1h465gwiwrc7b7nq5s7x98gdhnrz08ng5ymzjsc0qam46dasgpwl";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.1-linux-arm64.tar.gz";
- sha256 = "12a6bcn40csxi134r5rmz8qshc5qr8gl15gr2mx7sq53d7sjkl98";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.65.0-linux-arm64.tar.gz";
+ sha256 = "0kz5m7f75xna9vmimssw0kv0fijy89m2qjw3j642l7c027kgp2rk";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.0-linux-arm64.tar.gz";
- sha256 = "0687dhw0i3a4asivff2izdm3l76qvxlgsav3h0q9zjqllgkaqzwp";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.4-linux-arm64.tar.gz";
+ sha256 = "11jlilbm61jsgphm33pcg1mk3xfilx18dvyahvnxpg08vmlm0rzj";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.1-linux-arm64.tar.gz";
- sha256 = "06i2zw9jblcmk6k2a1vqpqv1d9ndbs28vsdijfvkf9sdhgb7jv80";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.3-linux-arm64.tar.gz";
+ sha256 = "05cxa3xpdypkj64m9hv7c0yrgv20vn25dsbrn8j5wrn4fbfxpgay";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.56.1-linux-arm64.tar.gz";
- sha256 = "0wchfgrrfpwgbv9j9hn3rza59lfaggp6n76rfxlnnsg2n47f2iz1";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.58.0-linux-arm64.tar.gz";
+ sha256 = "1zgkacw0j2y1ri2i4vvb34kd6abkjkdid135hqncdgi1bvwhjy9i";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.8.0-linux-arm64.tar.gz";
+ sha256 = "1l83vpxcgi3jpbj5qc8yaxpf1yaiqhqcijhmhcqwinfwrzhnk67w";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-linux-arm64.tar.gz";
sha256 = "127jimzckvk4jd3k7fn9a7pi7i8z5069xnpa4dv02fchpw0hwpi6";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.1-linux-arm64.tar.gz";
- sha256 = "0h7pd02jbpmmdd4wnknf36z61cw5xf939nadia6djd345vnlbwc3";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.4.0-linux-arm64.tar.gz";
+ sha256 = "0vmnqjwlp649m8vv7cnch6rs4a5snd8c7ccn6vvi53n6j59w496g";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.5.0-linux-arm64.tar.gz";
- sha256 = "0i3nsz9liyp02ynghl2zgi16di6nrwjbd1pcp1bxnyrfbn05a3q6";
- }
- {
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.41.0-linux-arm64.tar.gz";
- sha256 = "1y8c8nkkxsq8866xr0pp3ahrbsqq00j26pi5d7fpaycacslazvxb";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.42.0-linux-arm64.tar.gz";
+ sha256 = "0v1cngb503pjcxrs71g170nsy86bp6b71nxdazphy0vnlczbdizx";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-linux-arm64.tar.gz";
@@ -373,8 +373,8 @@
sha256 = "0f2c1lp0pyc9wvnqqg633822m466vwiqfgf4swv46kad4gbsqyq9";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.1-linux-arm64.tar.gz";
- sha256 = "1d0abcsdji08mf08f3q6n4qhifny7rrb8mynhhikq1ahp2c9mdhb";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.34.0-linux-arm64.tar.gz";
+ sha256 = "0glsidkn34qxc763mvv1amhfx7bd9v2p1ic9if88sbj82apx70wb";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-linux-arm64.tar.gz";
@@ -385,20 +385,20 @@
sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.1-linux-arm64.tar.gz";
- sha256 = "16mr8zh7br7a005fa7r2w12r4g30rgs5f59z9d7xgmw54cg4cqb7";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.2-linux-arm64.tar.gz";
+ sha256 = "1p4nk58ac3hs98zgdfpn8gj7fdfzmkfr2hhbw2qrsk0c2j1p7i5c";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.6.0-linux-arm64.tar.gz";
- sha256 = "1g41hqnbw2fg1099hixh8icclgja6caq8x9qp87xm6lxaf0bljhg";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.8.0-linux-arm64.tar.gz";
+ sha256 = "1gbc8lscbm7vh1cq79lpjm2wj0dp8k0r1qdq41r9a23315cbc10h";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-linux-arm64.tar.gz";
sha256 = "0mv5hbi1lwp9z8bl1ygq7rkzcqxn0m12n6rfb0bkav8r64r0gp07";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.2-linux-arm64.tar.gz";
- sha256 = "17279g5ks9m74l2gskrd9x53azq2c82q19cs4ihkxcwv9pzhfrpm";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.5.0-linux-arm64.tar.gz";
+ sha256 = "12ds15ksk7acx2cs004vabz0hmydrql43nbg26yadzr4vzl1ih7y";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz";
@@ -409,12 +409,12 @@
sha256 = "02iqynwshdz4jnwna2y3nnba6lpiwckd1r56wdlf0ar3nhjimlv8";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.2-linux-arm64.tar.gz";
- sha256 = "1788ghs55asgc0pn2jdxpzwbpgwi3mby7g7ii0xi4vw7ddvn2vcp";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.3-linux-arm64.tar.gz";
+ sha256 = "0cmzvh8mlx1zaglhqv84zfnb21b2k59d44msqn05g5qjyjqqai3g";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.2-linux-arm64.tar.gz";
- sha256 = "07b347a55bif6b8w5ajg8da7z42k8sc2niid0w6s8j3llk404k7h";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.29.0-linux-arm64.tar.gz";
+ sha256 = "1vs4agfvkq29pl8gkqw99959l6hc4mr6fflc62r185c51s0b0kll";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-linux-arm64.tar.gz";
@@ -429,8 +429,8 @@
sha256 = "0sxhhzszpq2y7290ndlw3pj5h8rrdz556npmbly4v5q2yhcqfdw8";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.2-linux-arm64.tar.gz";
- sha256 = "142q0vc2d5kix8vxmg1fjj22wwrg5hlbfl5vzzm2689rghbchv1l";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.13.0-linux-arm64.tar.gz";
+ sha256 = "0qrgrb2ax7ix0ipmmgz1r3g0sh859h6l3vwzqsb9drddg1dm1bwf";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.7-linux-arm64.tar.gz";
@@ -441,36 +441,36 @@
sha256 = "0lgr2a1rvdn2qnzb889s039f5cw77syrhgnprc6c2z59r60spv3i";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.1-linux-arm64.tar.gz";
- sha256 = "0cjj4win1x4gmb729svwgfghfnl6yd95yxbdw13pdw2ppiq1vskr";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.98.0-linux-arm64.tar.gz";
+ sha256 = "1w1f570hkq2r7m0wxazc3jy7r5p0aj5kyp52y1qc2l0asd07yfp3";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.6-linux-arm64.tar.gz";
- sha256 = "12rz9jsn6zyycik5a85xf9yfqwap8jmhz1y25v47c4zsix5k7f41";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.7-linux-arm64.tar.gz";
+ sha256 = "0yxabd2yw754kapgf4llmrxai0l3knlw8ixal16aw66hqpv72b7c";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.3-linux-arm64.tar.gz";
- sha256 = "14qqswq79hgiajqvr8r9fg0hcmgwrarbm8dhrkxg0msn98wx6xkf";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.4-linux-arm64.tar.gz";
+ sha256 = "19fh2y6g5y2icdh8akjcji1r7pij05ykar0njg2q862iljw69z4p";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.9-linux-arm64.tar.gz";
sha256 = "0scga9q0vjc4xcl7yirxmv1ghzykrziacninmv6fl7zsf41f5rvs";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.1-linux-arm64.tar.gz";
- sha256 = "181rqzw2qfgmc5wb57rmar56pmhapxmaw6vs6bqrsdmh6xf7sm10";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.2-linux-arm64.tar.gz";
+ sha256 = "1brj3f8975hmgisalzs6byfxxklmj0hw446459zglv24f25ygwic";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-linux-arm64.tar.gz";
sha256 = "1rd21jdkc5q291b5gr6wlx6z5gcsk1b4fh1bqy5pc21pmg4a28bj";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.0-linux-arm64.tar.gz";
- sha256 = "18x89a5ibizj6q40g6las35inyb831f1c5gl6364ybx7qslk94yp";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.1-linux-arm64.tar.gz";
+ sha256 = "0zjq5rjs408j0xwqcp73avji21dbk0sgnaa3rpsfr83lmisjkbm9";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.5-linux-arm64.tar.gz";
- sha256 = "1qnw3hkdywrbzg7inpcrri7nvniq0lqfkgfj2qlbfq9iy4w3rm11";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.6-linux-arm64.tar.gz";
+ sha256 = "0hrq59isybs86i4lanf1fahsgc827raxnx30kqkdfclnzx1ln922";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz";
@@ -479,48 +479,48 @@
];
aarch64-darwin = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.137.0-darwin-arm64.tar.gz";
- sha256 = "0rcs5ybfzj99yv9k6zp38848ck3b8k7db426ckhcqxid1i5yp8bd";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.138.0-darwin-arm64.tar.gz";
+ sha256 = "1nlhg2f5abis1vfm0qv65hffmmw94nq2yjfhzisyr7ljwjzly7i6";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.26.1-darwin-arm64.tar.gz";
- sha256 = "047x4cb9km62bh5451w24jvphxx49n447kb30799z39sp3nvyb71";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.27.0-darwin-arm64.tar.gz";
+ sha256 = "0xbmbssvyj2wbqmyyaksvd50cqy3xkic4d3pf0mngskh0n8cni58";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-darwin-arm64.tar.gz";
sha256 = "0p5brsbvvjf3kw9wz829b6fxzprbiwzh0w7sx342zsj6xpia3d7b";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.63.1-darwin-arm64.tar.gz";
- sha256 = "1h9yrahnmn96y58xc8cw55x0dmddplg023cplrv4k1vqqjzig4y4";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.65.0-darwin-arm64.tar.gz";
+ sha256 = "12ydys1i139n5p86x7cfxx1y41128dcn00hfw7l762sc7v1hzn6a";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.0-darwin-arm64.tar.gz";
- sha256 = "12w3v61g7j3slzg59gkc8fwqzxpvwkfcdzdg0xrnnfr824xhr8b7";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.4-darwin-arm64.tar.gz";
+ sha256 = "1v1k1sj1a08g19dj68zs6jrsdwvxzwvbffsvd2isimbwp8dslgf0";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.1-darwin-arm64.tar.gz";
- sha256 = "041848mx22dqp4lkh4mxl6cjh3njl97qaf0aac5s34sw1xgj3lpw";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.3-darwin-arm64.tar.gz";
+ sha256 = "11xqpvvziw51wi41rrhwsc8x8lwl185dajlmrbmwd1z5xkp9q9sm";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.56.1-darwin-arm64.tar.gz";
- sha256 = "17xzjnpgj1h9mzgn1jb5p7qa0fzd1cjj448yh3injvv84v5zkvb6";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.58.0-darwin-arm64.tar.gz";
+ sha256 = "0qvjwafs1fidjhnq5qnl7fi3hhc3rmbwgxyav48632dyfqvb9g63";
+ }
+ {
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.8.0-darwin-arm64.tar.gz";
+ sha256 = "0cv3haz33qfc5dfi9wh5i1cd097xj22i23kwys74vawh4jv72mfz";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-darwin-arm64.tar.gz";
sha256 = "0fqkcnznp08ikx7acvjnzyv601qy2z9b4896mwswycayn3w6cnd3";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.1-darwin-arm64.tar.gz";
- sha256 = "1wmbzpd94hnl40i1iqwsh4nng1j3hrjc7vkpnahir2763qc2ybsz";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.4.0-darwin-arm64.tar.gz";
+ sha256 = "0a2frvzi2rv9jhsnmmyn81sc6gvf8kfr2hb84kppkk3v1277614y";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.5.0-darwin-arm64.tar.gz";
- sha256 = "0dgpl861qhhahglyvkpnlncd364fr3lwwnx0nm62zy42dxp0gzsc";
- }
- {
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.41.0-darwin-arm64.tar.gz";
- sha256 = "1arlc8xpxjsjl7pvvbl00j3w64w9p6rkarp00c064r2d6yk0bavb";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.42.0-darwin-arm64.tar.gz";
+ sha256 = "0azm53lv2g66ddcni14zykqwml50zynxmi16p282xwiwiksaxqpl";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-darwin-arm64.tar.gz";
@@ -531,8 +531,8 @@
sha256 = "1sffzffwp914977wpbs85r0a34fq3ww2b51pq7x0fbkp6gh86c2f";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.33.1-darwin-arm64.tar.gz";
- sha256 = "0aif1cm29m93awsac1amh14pm4vbgizp6qq96baidva3v4n7gl4g";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.34.0-darwin-arm64.tar.gz";
+ sha256 = "0h011iq2rfzbwhknk6id6j6dbyif191yqd3z09ai7r5b37g8dxh2";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-darwin-arm64.tar.gz";
@@ -543,20 +543,20 @@
sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.1-darwin-arm64.tar.gz";
- sha256 = "1zg3prszki0qxsinz4v5jqnng3z3s5f08hx3ji7v1mcd9mp97q9l";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.2-darwin-arm64.tar.gz";
+ sha256 = "1mqym6db5rz8s2p4zlzlmrrsjsid0dfwl3lwqwyakqnrqf8hmky8";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.6.0-darwin-arm64.tar.gz";
- sha256 = "10zmlalprlf1m56ig60cwwmpnibr547l3bhmaicvnp6apv308z93";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.8.0-darwin-arm64.tar.gz";
+ sha256 = "12p9jbyvs3cf0s8xidm58s4296sp50ai942xhm7gam3gs7licgv2";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-darwin-arm64.tar.gz";
sha256 = "06lnmwikkb2jzwbazqi9ca9mpyyxh2m85k3sy0cvfh8inyxy30yr";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.2-darwin-arm64.tar.gz";
- sha256 = "0xy6my4f0g2nf7gd1sxk6flp42l1639mldrrdr2npngrdynf0dp8";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.5.0-darwin-arm64.tar.gz";
+ sha256 = "1rkm44mcd5icw3f96fnkw2lyq772lx2n2yg56yf5a2a7l4ssmiy5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz";
@@ -567,12 +567,12 @@
sha256 = "0lzhv6x2fqdrwlvi6s2ryab40c8nvy83xwza7iwksagdx6jpp3nj";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.2-darwin-arm64.tar.gz";
- sha256 = "106al70xil9gyxaqpf4kdw1r0cj8gzrxnd1mhgbd27kgmyqi7m5z";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.3-darwin-arm64.tar.gz";
+ sha256 = "0hbs1v63z9mj4yxbbpd8m84hzraz5fqqqmkmx65bjf5kp355pmpn";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.28.2-darwin-arm64.tar.gz";
- sha256 = "0p1yj1ammwcx0nalnc8a0nf1q6fjs4f41nwr2mi5z65hl5gqc1r6";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.29.0-darwin-arm64.tar.gz";
+ sha256 = "02y0645k5zdx7ww9g1nsb6a79k9hzz79vb1dbfpjy2bn0mjaqxd3";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-darwin-arm64.tar.gz";
@@ -587,8 +587,8 @@
sha256 = "1rqcal6qnmic987hv8dag55ngixxmyrkrg9zf8fwlv21v5jybj8s";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.2-darwin-arm64.tar.gz";
- sha256 = "1lxjcd2xgn1b9qx410wa0z9v72zy6bl5pwg3ppb60y65lg551kad";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.13.0-darwin-arm64.tar.gz";
+ sha256 = "157idpir8w8jxayp6dhd0a9x1kmsrqi93zm45bbn9lggfxn6vnwx";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.7-darwin-arm64.tar.gz";
@@ -599,36 +599,36 @@
sha256 = "0z83d07daabjcizsj83zapc74ifi177n1fm98qw95mid9njficm1";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.97.1-darwin-arm64.tar.gz";
- sha256 = "0wghgnwc355aww0jqlps96axc7zc9823rg2d5pmqj6azk2ablzqr";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.98.0-darwin-arm64.tar.gz";
+ sha256 = "122052mcg8jwjmirbn1d8mg5f9imi32anwhzgrck4020g31m2zm7";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.6-darwin-arm64.tar.gz";
- sha256 = "14m8m0vn208p67g72gjib2dpjvsnkhw00986yq7h77bz8aqap93b";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.7-darwin-arm64.tar.gz";
+ sha256 = "109xy189w8m5s7i48fx9781494pygy46cz64sji7mml9a3i6gg30";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.3-darwin-arm64.tar.gz";
- sha256 = "0saaclj0a6dx84zdkyk03qmw6rgqmvfvs0q1dj4a9h5vcdgg44x6";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.4-darwin-arm64.tar.gz";
+ sha256 = "1fw3azy7z4k39q0mpwbq0p2yvyf7plr7hxgpi747j2zz3s1v7iwa";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.9-darwin-arm64.tar.gz";
sha256 = "019kvnzazk7aw5fcxf1219pgdn4kb0rp5xs42zi80bfvvc16ilin";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.1-darwin-arm64.tar.gz";
- sha256 = "1s7j9l9a9s9f14qm1i1ldiyzc583w8vz3kfsma90qr9rx1xrgsgy";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.2-darwin-arm64.tar.gz";
+ sha256 = "0j1b57p8hzs7l04h3im3sbkh2wc3x5av1vv37p9nypkaq0h0rwn9";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-darwin-arm64.tar.gz";
sha256 = "0v77jnip6d0vgbcf6qm23415kb8www6faj7bigdwhckk4i69lc4b";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.0-darwin-arm64.tar.gz";
- sha256 = "1rr98abkhmn8fg4zj8mdrfgkbwr45vkfkkz7xsjgmqy6awvjamh7";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.12.1-darwin-arm64.tar.gz";
+ sha256 = "15fwan0110mj72ggrzls0z6azhmmwvr6db1g0hjb5ysgnmrfx12w";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.5-darwin-arm64.tar.gz";
- sha256 = "1mszvsavgwvbim1av7dbczv66aiahbzk2b771ghp43vdmmghs72m";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.6-darwin-arm64.tar.gz";
+ sha256 = "1n387d84a3airf6w2lq62ija3ff86vpzgvm1qjzcdndbb9ymmr4c";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz";
diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix
index bf3c93ab51..b525d50d7d 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix
@@ -3,13 +3,13 @@
buildGoModule rec {
pname = "restic";
- version = "0.17.2";
+ version = "0.17.3";
src = fetchFromGitHub {
owner = "restic";
repo = "restic";
rev = "v${version}";
- hash = "sha256-CNQUqhFnuxoZpkVKyp/tDEfX91R8kjC2R41o2HA9eaM=";
+ hash = "sha256-PTy/YcojJGrYQhdp98e3rEMqHIWDMR5jiSC6BdzBT/M=";
};
patches = [
@@ -25,7 +25,9 @@ buildGoModule rec {
nativeCheckInputs = [ python3 ];
- passthru.tests.restic = nixosTests.restic;
+ passthru.tests = lib.optionalAttrs stdenv.isLinux {
+ restic = nixosTests.restic;
+ };
postPatch = ''
rm cmd/restic/cmd_mount_integration_test.go
diff --git a/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix b/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix
index 617f8f0e87..844d38ed00 100644
--- a/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix
@@ -1,13 +1,10 @@
{
lib,
+ bc,
buildDotnetModule,
fetchFromGitHub,
- glibc,
- zlib,
- gtk3,
copyDesktopItems,
icoutils,
- wrapGAppsHook3,
makeDesktopItem,
}:
@@ -34,19 +31,12 @@ buildDotnetModule rec {
'';
runtimeDeps = [
- glibc
- zlib
- gtk3
- ];
-
- buildInputs = [
- gtk3
+ bc
];
nativeBuildInputs = [
copyDesktopItems
icoutils
- wrapGAppsHook3
];
doCheck = true;
@@ -60,6 +50,8 @@ buildDotnetModule rec {
size=''${sizes[$i]}x''${sizes[$i]}
install -D omegamaggotprime_''$((i+1))_''${size}x32.png $out/share/icons/hicolor/$size/apps/scarab.png
done
+
+ wrapProgram "$out/bin/Scarab" --run '. ${./scaling-settings.bash}'
'';
desktopItems = [
diff --git a/third_party/nixpkgs/pkgs/tools/games/scarab/scaling-settings.bash b/third_party/nixpkgs/pkgs/tools/games/scarab/scaling-settings.bash
new file mode 100644
index 0000000000..f4bfdfd638
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/games/scarab/scaling-settings.bash
@@ -0,0 +1,24 @@
+# Keep existing value if it is already non-empty
+if [[ -z "${AVALONIA_GLOBAL_SCALE_FACTOR-}" ]] && command -v gsettings >/dev/null; then
+ echo 'Attempting to get GNOME desktop interface scaling factor' >&2
+ AVALONIA_GLOBAL_SCALE_FACTOR="$(gsettings get org.gnome.desktop.interface scaling-factor)"
+ AVALONIA_GLOBAL_SCALE_FACTOR="${AVALONIA_GLOBAL_SCALE_FACTOR##* }"
+fi
+
+if [[ "${AVALONIA_GLOBAL_SCALE_FACTOR-}" == "0" ]]; then
+ echo 'Unset invalid scaling value' >&2
+ unset AVALONIA_GLOBAL_SCALE_FACTOR
+fi
+
+if [[ -z "${AVALONIA_GLOBAL_SCALE_FACTOR-}" ]] && command -v xrdb >/dev/null; then
+ echo 'Attempting to get scaling factor from X FreeType DPI setting' >&2
+ dpi="$(xrdb -get Xft.dpi)"
+ if [[ -n "${dpi}" ]]; then
+ AVALONIA_GLOBAL_SCALE_FACTOR=$(echo "scale=2; ${dpi}/96" | bc)
+ fi
+fi
+
+if [[ -n "${AVALONIA_GLOBAL_SCALE_FACTOR-}" ]]; then
+ echo "Applying scale factor: ${AVALONIA_GLOBAL_SCALE_FACTOR}" >&2
+ export AVALONIA_GLOBAL_SCALE_FACTOR
+fi
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock b/third_party/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock
index 178b72975e..5bc148787e 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "ahash"
-version = "0.8.7"
+version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"once_cell",
@@ -22,18 +22,18 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
dependencies = [
"memchr",
]
[[package]]
name = "anstream"
-version = "0.6.11"
+version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -64,7 +64,7 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys",
]
[[package]]
@@ -74,7 +74,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
- "windows-sys 0.52.0",
+ "windows-sys",
]
[[package]]
@@ -85,9 +85,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
[[package]]
name = "bindgen"
@@ -117,18 +117,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bytemuck"
-version = "1.14.3"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
+checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
[[package]]
name = "cc"
-version = "1.0.83"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
[[package]]
name = "cexpr"
@@ -158,18 +155,18 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.0"
+version = "4.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
-version = "4.5.0"
+version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
dependencies = [
"anstream",
"anstyle",
@@ -191,18 +188,18 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
dependencies = [
"cfg-if",
]
[[package]]
name = "crossbeam-channel"
-version = "0.5.11"
+version = "0.5.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
dependencies = [
"crossbeam-utils",
]
@@ -240,9 +237,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
[[package]]
name = "either"
-version = "1.9.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
[[package]]
name = "fallible_collections"
@@ -298,9 +295,9 @@ dependencies = [
[[package]]
name = "gif-dispose"
-version = "5.0.0-beta.2"
+version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d20a3802e15ff705c260e39152ff1987145a1c5ae016bc3d510abceb45b9ed"
+checksum = "781005a5985b4c723fd3e6586df79d823151846ebcbcf2fcc7e3d3fba18c2d51"
dependencies = [
"gif",
"imgref",
@@ -309,7 +306,7 @@ dependencies = [
[[package]]
name = "gifski"
-version = "1.14.4"
+version = "1.32.0"
dependencies = [
"clap",
"crossbeam-channel",
@@ -330,6 +327,8 @@ dependencies = [
"resize",
"rgb",
"wild",
+ "y4m",
+ "yuv",
]
[[package]]
@@ -349,9 +348,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.3.5"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
[[package]]
name = "imagequant"
@@ -392,12 +391,12 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "libloading"
-version = "0.8.1"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
dependencies = [
"cfg-if",
- "windows-sys 0.48.0",
+ "windows-targets",
]
[[package]]
@@ -424,9 +423,9 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.7.1"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
[[package]]
name = "minimal-lexical"
@@ -512,15 +511,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
[[package]]
name = "pkg-config"
-version = "0.3.29"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]]
name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
dependencies = [
"unicode-ident",
]
@@ -533,18 +532,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quote"
-version = "1.0.35"
+version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rayon"
-version = "1.8.1"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
dependencies = [
"either",
"rayon-core",
@@ -562,9 +561,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.3"
+version = "1.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
dependencies = [
"aho-corasick",
"memchr",
@@ -574,9 +573,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
dependencies = [
"aho-corasick",
"memchr",
@@ -585,9 +584,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
[[package]]
name = "resize"
@@ -622,9 +621,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "strsim"
-version = "0.11.0"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "syn"
@@ -639,9 +638,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.48"
+version = "2.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
dependencies = [
"proc-macro2",
"quote",
@@ -650,9 +649,9 @@ dependencies = [
[[package]]
name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
dependencies = [
"cfg-if",
"once_cell",
@@ -719,137 +718,94 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
[[package]]
name = "windows-sys"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets",
]
[[package]]
name = "windows-targets"
-version = "0.48.5"
+version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
[[package]]
name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
[[package]]
-name = "windows_i686_gnu"
-version = "0.52.0"
+name = "windows_i686_gnullvm"
+version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
[[package]]
name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.0"
+name = "y4m"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448"
+
+[[package]]
+name = "yuv"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "157c9233496247738a5417ce7e8ecf953c3d4e1931374d16b0c6a95636572be4"
+dependencies = [
+ "num-traits",
+ "rgb",
+]
[[package]]
name = "zerocopy"
@@ -868,5 +824,5 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.58",
]
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix
index b95fc26e67..843916e743 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix
@@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec {
pname = "gifski";
- version = "1.14.4";
+ version = "1.32.0";
src = fetchFromGitHub {
owner = "ImageOptim";
repo = "gifski";
rev = version;
- hash = "sha256-Yhcz3pbEsSlpxQ1couFgQuaS8Eru7PLiGFNHcKmiFak=";
+ hash = "sha256-Sl8HRc5tfRcYxXsXmvZ3M+f7PU7+1jz+IKWPhWWQ/us=";
};
cargoLock = {
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix
index c43059c03a..0646718f4c 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix
@@ -49,7 +49,8 @@ in
(if withX then "--with-x" else "--without-x")
(if withQt then "--with-qt=qt5" else "--without-qt")
(if aquaterm then "--with-aquaterm" else "--without-aquaterm")
- ] ++ lib.optional withCaca "--with-caca";
+ ] ++ lib.optional withCaca "--with-caca"
+ ++ lib.optional withTeXLive "--with-texdir=${placeholder "out"}/share/texmf/tex/latex/gnuplot";
CXXFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin && withQt) "-std=c++11";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile.lock
deleted file mode 100644
index 656c96cbc4..0000000000
--- a/third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile.lock
+++ /dev/null
@@ -1,20 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- colsole (0.8.2)
- completely (0.5.2)
- colsole (~> 0.6)
- mister_bin (~> 0.7.2)
- docopt (0.6.1)
- mister_bin (0.7.3)
- colsole (~> 0.7)
- docopt (~> 0.6)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- completely
-
-BUNDLED WITH
- 2.4.5
diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix
index 3a80e8e0d5..2eea4ec131 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix
@@ -21,14 +21,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
- version = "2024.10.2";
+ version = "2024.10.3";
pyproject = true;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-WEsFgmwH6OGkAn1c0h/HBhBJr2329YHSKMZzjEDTKNg=";
+ hash = "sha256-13hNX9uaQbO/IKUkGaOITKh+REqUCHirbTPRgomzHBU=";
};
build-systems = with python.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix
index 07a1e906da..b1d49675db 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix
@@ -31,16 +31,16 @@ let
in
buildGoModule rec {
pname = "netbird";
- version = "0.30.2";
+ version = "0.31.0";
src = fetchFromGitHub {
owner = "netbirdio";
repo = "netbird";
rev = "v${version}";
- hash = "sha256-8PIReuWnD7iMesSWAo6E4J+mWNAa7lHKwBWsCsXUG+E=";
+ hash = "sha256-e3oiIVma4p3tAfDUwKC9zzgTWDjqXZSWsykR47eE+kE=";
};
- vendorHash = "sha256-KScynPcMZ90XZy/N5X3aQfKuVl/JOCJmd8luNxChkZk=";
+ vendorHash = "sha256-kEwGJ2+xe7ct9ckMAE4l+2cBYcUXpoDVM3DohtzHqeY=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/README.md b/third_party/nixpkgs/pkgs/tools/package-management/nix/README.md
index 968eae026f..0b87fdf108 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix/README.md
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/README.md
@@ -11,7 +11,7 @@ Alternatively, you can request access to the Nix community builder for all platf
To build all dependent packages, use:
```
-nix-review pr
+nixpkgs-review pr
```
And to build all important NixOS tests, run:
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/flaky-tests.patch b/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/flaky-tests.patch
deleted file mode 100644
index 3684b09f6f..0000000000
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/flaky-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/mk/run_test.sh b/mk/run_test.sh
-index 7e95df2ac..58420c317 100755
---- a/mk/run_test.sh
-+++ b/mk/run_test.sh
-@@ -27,7 +27,6 @@ run_test "$1"
- # appear randomly without anyone knowing why.
- # See https://github.com/NixOS/nix/issues/3605 for more info
- if [[ $status -ne 0 && $status -ne 99 && \
-- "$(uname)" == "Darwin" && \
- "$log" =~ "unexpected EOF reading a line" \
- ]]; then
- echo "$post_run_msg [${yellow}FAIL$normal] (possibly flaky, so will be retried)"
diff --git a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix
index 3e86fa2c18..bc7a23f0cb 100644
--- a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
- version = "11.28.1";
+ version = "11.29.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
- hash = "sha256-XbufLkszKqddqBrYrUHzQLUT+kzLaRo60f0D1mRmwRA=";
+ hash = "sha256-a8ihlnJ8fggJpr54GGlNLgWwM6veW5xz4ah5WkFHHh0=";
};
proxyVendor = true;
- vendorHash = "sha256-0XA3kDOY2PLczv9wlbeXzFe7UDNI5FQo4Q7bV1nsprA=";
+ vendorHash = "sha256-snnEqg41Vi82uoFzJzYg8/P45lp0Y4w1NQ0rG0CD+T0=";
subPackages = [ "apps/cnspec" ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix b/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix
index f550974f00..b05329f614 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ggshield";
- version = "1.32.2";
+ version = "1.33.0";
pyproject = true;
src = fetchFromGitHub {
owner = "GitGuardian";
repo = "ggshield";
rev = "refs/tags/v${version}";
- hash = "sha256-8Nrmfbu1ChuJU4lSbaqIxNagkTJoKTeooUWnMKtIVx0=";
+ hash = "sha256-qvvCBJ56wC56p6tOCb5hh+J7Y/Hec/YgDKNmDbbWNig=";
};
pythonRelaxDeps = true;
diff --git a/third_party/nixpkgs/pkgs/tools/security/gnupg/clang.patch b/third_party/nixpkgs/pkgs/tools/security/gnupg/clang.patch
deleted file mode 100644
index 842785e5c9..0000000000
--- a/third_party/nixpkgs/pkgs/tools/security/gnupg/clang.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gl/stdint_.h b/gl/stdint_.h
-index bc27595..303e81a 100644
---- a/gl/stdint_.h
-+++ b/gl/stdint_.h
-@@ -62,7 +62,7 @@
- int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
- also defines intptr_t and uintptr_t. */
- # define _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
--# include
-+// # include
- # undef _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
- #elif @HAVE_SYS_INTTYPES_H@
- /* Solaris 7 has the types except the *_fast*_t types, and
diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix
index 103066261a..b75dd1eb20 100644
--- a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
homepage = "https://www.keybase.io/";
description = "Keybase official command-line utility and service";
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ avaq np rvolosatovs Br1ght0ne shofius ];
+ maintainers = with maintainers; [ avaq np rvolosatovs Br1ght0ne shofius ryand56 ];
license = licenses.bsd3;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix
index 666425e4d3..3beeaac77b 100644
--- a/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix
@@ -4,16 +4,16 @@
, runtimeShell, gsettings-desktop-schemas }:
let
- versionSuffix = "20240101011938.ae7e4a1c15";
+ versionSuffix = "20240821175720.3212f60cc5";
in
stdenv.mkDerivation rec {
pname = "keybase-gui";
- version = "6.2.4"; # Find latest version and versionSuffix from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+ version = "6.4.0"; # Find latest version and versionSuffix from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
- hash = "sha256-XyGb9F83z8+OSjxOaO5k+h2qIY78ofS/ZfTXki54E5Q=";
+ hash = "sha256-OGuckMUXDzfHIMhQagYJZObV4W6LufqTeIiCg+c5MjM=";
};
nativeBuildInputs = [
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
checkFailed
fi
- exec $out/share/keybase/Keybase "\$@"
+ exec $out/share/keybase/Keybase \''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} "\$@"
EOF
chmod +x $out/bin/keybase-gui
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
description = "Keybase official GUI";
mainProgram = "keybase-gui";
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne shofius ];
+ maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne shofius ryand56 ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.bsd3;
};
diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix
index 571dfcc8d5..8cf055733d 100644
--- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix
@@ -9,16 +9,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "vaultwarden";
- version = "1.32.3";
+ version = "1.32.4";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = "vaultwarden";
rev = version;
- hash = "sha256-dtzC5T96fBrIvy5LFDnwLfx1wF9aVGv/FuAUDH56yto=";
+ hash = "sha256-fT1o+nR7k1fLFS4TeoP1Gm1P0uLTu6Dai6hMGraAKjE=";
};
- cargoHash = "sha256-a4OwL7yD2i4uJLnSzWpwfRZRSgFFammfUOE+PHA2iw0=";
+ cargoHash = "sha256-xidkmkRVIyQ3mutkmR3oObEwi1uRLCiRSyF5GpWVM9w=";
# used for "Server Installed" version in admin panel
env.VW_VERSION = version;
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
index d712b48b8c..c65aceae11 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -264,6 +264,11 @@ core-big = stdenv.mkDerivation {
utils/{tpic2pdftex,vlna,xindy,xml2pmx,xpdfopen}
mkdir WorkDir
cd WorkDir
+ ''
+ # force XeTeX to use fontconfig instead of Core Text, so that fonts can be made available via FONTCONFIG_FILE,
+ # by tricking configure into thinking that the relevant test result is already in the config cache
+ + lib.optionalString stdenv.isDarwin ''
+ export kpse_cv_have_ApplicationServices=no
'';
configureFlags = common.configureFlags
diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix
index cd0b0dffff..28319cd38a 100644
--- a/third_party/nixpkgs/pkgs/top-level/aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix
@@ -824,7 +824,6 @@ mapAliases {
neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
newlibCross = newlib; # Added 2024-09-06
newlib-nanoCross = newlib-nano; # Added 2024-09-06
- nitrokey-udev-rules = libnitrokey; # Added 2023-03-25
nix-direnv-flakes = nix-direnv;
nix-ld-rs = nix-ld; # Added 2024-08-17
nix-repl = throw (
@@ -1184,6 +1183,7 @@ mapAliases {
tclx = tclPackages.tclx; # Added 2024-10-02
tdesktop = telegram-desktop; # Added 2023-04-07
tdom = tclPackages.tdom; # Added 2024-10-02
+ teamspeak_client = teamspeak3; # Added 2024-11-07
teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index d66f3e3537..15d61c44a9 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -183,21 +183,15 @@ with pkgs;
autoconf = autoconf271;
};
- autorestic = callPackage ../tools/backup/autorestic { };
-
autoPatchelfHook = makeSetupHook {
name = "auto-patchelf-hook";
propagatedBuildInputs = [ auto-patchelf bintools ];
} ../build-support/setup-hooks/auto-patchelf.sh;
- appflowy = callPackage ../applications/office/appflowy { };
-
appimageTools = callPackage ../build-support/appimage { };
appimageupdate-qt = appimageupdate.override { withQtUI = true; };
- appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { };
-
bindle = callPackage ../servers/bindle {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -223,94 +217,20 @@ with pkgs;
# addDriverRunpath is the preferred package name, as this enables
# many more scenarios than just opengl now.
- addDriverRunpath = callPackage ../build-support/add-driver-runpath { };
-
- quickgui = callPackage ../applications/virtualization/quickgui { };
-
- alda = callPackage ../development/interpreters/alda { };
-
- align = callPackage ../tools/text/align { };
-
- alire = callPackage ../development/tools/build-managers/alire { };
-
- althttpd = callPackage ../servers/althttpd { };
-
- anders = callPackage ../applications/science/logic/anders { };
-
- ariang = callPackage ../servers/ariang { };
-
- ani-cli = callPackage ../applications/video/ani-cli { };
-
- dra-cla = callPackage ../applications/video/dra-cla { };
-
anime-downloader = callPackage ../applications/video/anime-downloader { };
aocd = with python3Packages; toPythonApplication aocd;
- aesfix = callPackage ../tools/security/aesfix { };
-
- aeskeyfind = callPackage ../tools/security/aeskeyfind { };
-
- alterx = callPackage ../tools/security/alterx { };
-
- altserver-linux = callPackage ../tools/misc/altserver-linux { };
-
archipelago-minecraft = callPackage ../by-name/ar/archipelago/package.nix { extraPackages = [jdk17]; };
- asciicam = callPackage ../applications/video/asciicam { };
-
asitop = pkgs.python3Packages.callPackage ../os-specific/darwin/asitop { };
- asnmap = callPackage ../tools/security/asnmap { };
-
- astrolog = callPackage ../applications/science/astronomy/astrolog { };
-
- astronomer = callPackage ../tools/misc/astronomer { };
-
- atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { };
-
- automatic-timezoned = callPackage ../tools/system/automatic-timezoned { };
-
cve = with python3Packages; toPythonApplication cvelib;
- db-rest = callPackage ../servers/db-rest { };
-
- fiche = callPackage ../servers/fiche { };
-
- fishnet = callPackage ../servers/fishnet { };
-
- fission = callPackage ../development/tools/fission { };
-
apko = callPackage ../development/tools/apko {
buildGoModule = buildGo123Module;
};
- melange = callPackage ../development/tools/melange { };
-
- activate-linux = callPackage ../applications/misc/activate-linux { };
-
- ansi = callPackage ../development/tools/ansi { };
-
- ares-rs = callPackage ../tools/security/ares-rs { };
-
- asn1c = callPackage ../development/compilers/asn1c { };
-
- authz0 = callPackage ../tools/security/authz0 { };
-
- auth0-cli = callPackage ../tools/admin/auth0-cli { };
-
- atomic-operator = callPackage ../tools/security/atomic-operator { };
-
- atomic-swap = callPackage ../applications/blockchains/atomic-swap { };
-
- bacnet-stack = callPackage ../tools/networking/bacnet-stack { };
-
- bada-bib = callPackage ../applications/science/misc/bada-bib { };
-
- badlion-client = callPackage ../games/badlion-client {};
-
- banana-accounting = callPackage ../applications/office/banana-accounting { };
-
basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {
tbb = tbb_2021_11;
cereal = cereal_1_3_2;
@@ -319,48 +239,12 @@ with pkgs;
beebeep = libsForQt5.callPackage ../applications/office/beebeep { };
- beeper = callPackage ../applications/networking/instant-messengers/beeper { };
-
- bearer = callPackage ../development/tools/bearer { };
-
- benthos = callPackage ../development/tools/benthos { };
-
- beyond-identity = callPackage ../tools/security/beyond-identity { };
-
- bibtex-tidy = callPackage ../tools/typesetting/bibtex-tidy { };
-
- bililiverecorder = callPackage ../servers/bililiverecorder { };
-
- binbloom = callPackage ../tools/security/binbloom { };
-
- bin2c = callPackage ../development/tools/bin2c { };
-
binserve = callPackage ../servers/binserve {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- blst = callPackage ../development/libraries/blst { };
-
bloodhound-py = with python3Packages; toPythonApplication bloodhound-py;
- bodyclose = callPackage ../development/tools/bodyclose { };
-
- bootstrap-studio = callPackage ../development/web/bootstrap-studio { };
-
- breakpad = callPackage ../development/misc/breakpad { };
-
- brev-cli = callPackage ../development/misc/brev-cli { };
-
- cbfmt = callPackage ../development/tools/cbfmt { };
-
- circumflex = callPackage ../applications/networking/circumflex { };
-
- citron = callPackage ../tools/misc/citron { };
-
- cxx-rs = callPackage ../development/libraries/cxx-rs { };
-
- elfcat = callPackage ../tools/misc/elfcat { };
-
# Zip file format only allows times after year 1980, which makes e.g. Python
# wheel building fail with:
# ValueError: ZIP does not support timestamps before 1980
@@ -386,74 +270,30 @@ with pkgs;
buildFHSEnvChroot = callPackage ../build-support/build-fhsenv-chroot { }; # Deprecated; use buildFHSEnv/buildFHSEnvBubblewrap
buildFHSEnvBubblewrap = callPackage ../build-support/build-fhsenv-bubblewrap { };
- c64-debugger = callPackage ../applications/emulators/c64-debugger { };
-
cameractrls-gtk4 = cameractrls.override { withGtk = 4; };
cameractrls-gtk3 = cameractrls.override { withGtk = 3; };
- camunda-modeler = callPackage ../applications/misc/camunda-modeler { };
-
checkpointBuildTools = callPackage ../build-support/checkpoint-build.nix {};
- caroline = callPackage ../development/libraries/caroline { };
-
- castget = callPackage ../applications/networking/feedreaders/castget { };
-
- catatonit = callPackage ../applications/virtualization/catatonit { };
-
- catppuccin-kde = callPackage ../data/themes/catppuccin-kde { };
-
- catppuccin-kvantum = callPackage ../data/themes/catppuccin-kvantum { };
-
- catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { };
-
- btdu = callPackage ../tools/misc/btdu { };
-
- ccal = callPackage ../tools/misc/ccal { };
-
celeste-classic-pm = pkgs.celeste-classic.override {
practiceMod = true;
};
cereal = cereal_1_3_0;
- cdecrypt = callPackage ../development/tools/cdecrypt { };
-
- certgraph = callPackage ../tools/security/certgraph { };
-
- certinfo = callPackage ../tools/security/certinfo { };
-
- certsync = callPackage ../tools/security/certsync { };
-
cewl = callPackage ../tools/security/cewl { };
- chatgpt-cli = callPackage ../tools/misc/chatgpt-cli { };
-
- chatgpt-retrieval-plugin = callPackage ../servers/chatgpt-retrieval-plugin { };
-
- mswatch = callPackage ../applications/networking/mailreaders/mswatch { };
-
chef-cli = callPackage ../tools/misc/chef-cli { };
checkov = callPackage ../development/tools/analysis/checkov {
python3 = python311;
};
- checkpwn = callPackage ../tools/misc/checkpwn { };
-
- banana-vera = callPackage ../development/tools/analysis/banana-vera { };
-
- ciel = callPackage ../tools/package-management/ciel { };
-
clang-uml = callPackage ../by-name/cl/clang-uml/package.nix {
stdenv = clangStdenv;
};
- classicube = callPackage ../games/classicube { };
-
- clj-kondo = callPackage ../development/tools/clj-kondo { };
-
cloak = callPackage ../applications/misc/cloak {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -467,76 +307,20 @@ with pkgs;
perlPackages = perl538Packages;
};
- cmark = callPackage ../development/libraries/cmark { };
-
- cmark-gfm = callPackage ../development/libraries/cmark-gfm { };
-
- cm256cc = callPackage ../development/libraries/cm256cc { };
-
- cnquery = callPackage ../tools/security/cnquery { };
-
cocogitto = callPackage ../development/tools/cocogitto {
inherit (darwin.apple_sdk.frameworks) Security;
};
- conftest = callPackage ../development/tools/conftest { };
-
coldsnap = callPackage ../tools/admin/coldsnap {
inherit (darwin.apple_sdk.frameworks) Security;
};
- colemak-dh = callPackage ../data/misc/colemak-dh { };
-
collision = callPackage ../applications/misc/collision { };
- colmena = callPackage ../tools/admin/colmena { };
-
- colorz = callPackage ../tools/misc/colorz { };
-
- colorpanes = callPackage ../tools/misc/colorpanes { };
-
- colorstorm = callPackage ../applications/misc/colorstorm { };
-
- comedilib = callPackage ../development/libraries/comedilib { };
-
- commix = callPackage ../tools/security/commix { };
-
- comodoro = callPackage ../applications/misc/comodoro { };
-
- compdb = callPackage ../tools/misc/compdb { };
-
- conserve = callPackage ../tools/backup/conserve { };
-
- conserver = callPackage ../tools/misc/conserver { };
-
coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { });
- confetty = callPackage ../applications/misc/confetty { };
-
- confy = callPackage ../applications/misc/confy { };
-
- coordgenlibs = callPackage ../development/libraries/coordgenlibs { };
-
- copilot-cli = callPackage ../tools/admin/copilot-cli { };
-
- cp210x-program = callPackage ../tools/misc/cp210x-program { };
-
- cp437 = callPackage ../tools/misc/cp437 { };
-
- cpm-cmake = callPackage ../development/tools/cpm-cmake { };
-
- crackle = callPackage ../tools/networking/crackle { };
-
- crackql = callPackage ../tools/security/crackql { };
-
- dae = callPackage ../tools/networking/dae { };
-
- darling = callPackage ../applications/emulators/darling { };
-
databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { };
- dcgm = callPackage ../os-specific/linux/dcgm { };
-
deck = callPackage ../by-name/de/deck/package.nix {
buildGoModule = buildGo123Module;
};
@@ -555,38 +339,14 @@ with pkgs;
djhtml = python3Packages.callPackage ../development/tools/djhtml { };
- deadnix = callPackage ../development/tools/deadnix { };
-
- dec-decode = callPackage ../development/tools/dec-decode { };
-
dnf-plugins-core = with python3Packages; toPythonApplication dnf-plugins-core;
dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { };
- dnf5 = callPackage ../tools/package-management/dnf5 { };
-
- documenso = callPackage ../applications/office/documenso { };
-
- domine = callPackage ../tools/misc/domine { };
-
- dsq = callPackage ../tools/misc/dsq { };
-
- dt = callPackage ../tools/text/dt { };
-
- dufs = callPackage ../servers/http/dufs { };
-
dynein = callPackage ../development/tools/database/dynein {
inherit (darwin.apple_sdk.frameworks) Security;
};
- ea = callPackage ../tools/misc/ea { };
-
- each = callPackage ../tools/text/each { };
-
- ebusd = callPackage ../servers/ebusd { };
-
- eclipse-mat = callPackage ../development/tools/eclipse-mat { };
-
ebpf-verifier = callPackage ../tools/networking/ebpf-verifier {
catch2 = catch2_3;
};
@@ -595,69 +355,14 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
- efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { };
-
eludris = callPackage ../tools/misc/eludris {
inherit (darwin.apple_sdk.frameworks) Security;
};
enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { };
- enumer = callPackage ../tools/misc/enumer { };
-
- evans = callPackage ../development/tools/evans { };
-
- evhz = callPackage ../tools/misc/evhz { };
-
- expand-response-params = callPackage ../build-support/expand-response-params { };
-
- expressvpn = callPackage ../applications/networking/expressvpn { };
-
- faq = callPackage ../development/tools/faq { };
-
- femtolisp = callPackage ../development/interpreters/femtolisp { };
-
- fh = callPackage ../tools/nix/fh { };
-
- firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
-
- frece = callPackage ../development/tools/frece { };
-
- frida-tools = callPackage ../tools/security/frida-tools { };
-
- frink = callPackage ../development/tools/frink { };
-
- frugal = callPackage ../development/tools/frugal { };
-
- frugally-deep = callPackage ../development/libraries/frugally-deep { };
-
- functiontrace-server = callPackage ../development/tools/functiontrace-server { };
-
- gendef = callPackage ../development/tools/gendef { };
-
- glade = callPackage ../development/tools/glade { };
-
- glamoroustoolkit = callPackage ../development/tools/glamoroustoolkit { };
-
- gobble = callPackage ../tools/X11/gobble { };
-
- gokrazy = callPackage ../development/misc/gokrazy { };
-
- govulncheck = callPackage ../tools/security/govulncheck { };
-
- gpick = callPackage ../tools/misc/gpick { };
-
- gradescope-submit = callPackage ../tools/misc/gradescope-submit { };
-
- gridlock = callPackage ../tools/nix/gridlock { };
inherit (gridlock) nyarr;
- hwatch = callPackage ../tools/misc/hwatch { };
-
- hobbes = callPackage ../development/tools/hobbes { };
-
- honeycomb-refinery = callPackage ../servers/tracing/honeycomb/refinery { };
-
html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
inspec = callPackage ../tools/misc/inspec { };
@@ -675,58 +380,16 @@ with pkgs;
mumps_par = callPackage ../by-name/mu/mumps/package.nix { mpiSupport = true; };
- mix2nix = callPackage ../development/tools/mix2nix { };
-
- n98-magerun = callPackage ../development/tools/misc/n98-magerun { };
-
prisma-engines = callPackage ../development/tools/database/prisma-engines {
inherit (darwin.apple_sdk.frameworks) Security;
};
- pridecat = callPackage ../tools/misc/pridecat { };
-
- pridefetch = callPackage ../tools/misc/pridefetch { };
-
- proto-contrib = callPackage ../development/tools/proto-contrib { };
-
protoc-gen-dart = callPackage ../development/tools/protoc-gen-dart { };
- protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { };
-
- protoc-gen-entgrpc = callPackage ../development/tools/protoc-gen-entgrpc { };
-
- protoc-gen-go = callPackage ../development/tools/protoc-gen-go { };
-
- protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { };
-
- protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { };
-
protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web {
protobuf = protobuf_21;
};
- protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { };
-
- protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { };
-
- protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { };
-
- protoc-gen-twirp_swagger = callPackage ../development/tools/protoc-gen-twirp_swagger { };
-
- protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { };
-
- protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { };
-
- protolint = callPackage ../development/tools/protolint { };
-
- ptags = callPackage ../development/tools/misc/ptags { };
-
- resolve-march-native = callPackage ../development/tools/resolve-march-native { };
-
- riot-redis = callPackage ../development/tools/riot-redis { };
-
- sea-orm-cli = callPackage ../development/tools/sea-orm-cli { };
-
vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
fmt = fmt_10;
@@ -734,22 +397,8 @@ with pkgs;
r3ctl = qt5.callPackage ../tools/misc/r3ctl { };
- ptouch-print = callPackage ../misc/ptouch-print { };
-
- demoit = callPackage ../servers/demoit { };
-
deviceTree = callPackage ../os-specific/linux/device-tree { };
- enum4linux = callPackage ../tools/security/enum4linux { };
-
- enum4linux-ng = callPackage ../tools/security/enum4linux-ng { };
-
- enumerepo = callPackage ../tools/security/enumerepo {};
-
- erosmb = callPackage ../tools/security/erosmb { };
-
- oauth2c = callPackage ../tools/security/oauth2c { };
-
octodns = python3Packages.callPackage ../tools/networking/octodns { };
octodns-providers = recurseIntoAttrs {
@@ -759,41 +408,23 @@ with pkgs;
powerdns = python3Packages.callPackage ../tools/networking/octodns/providers/powerdns { };
};
- octosuite = callPackage ../tools/security/octosuite { };
-
- onesixtyone = callPackage ../tools/security/onesixtyone { };
-
oletools = with python3.pkgs; toPythonApplication oletools;
ollama-rocm = callPackage ../by-name/ol/ollama/package.nix { acceleration = "rocm"; };
ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; };
- ots = callPackage ../tools/security/ots { };
-
- credential-detector = callPackage ../tools/security/credential-detector { };
-
- creds = callPackage ../tools/security/creds { };
-
- credslayer = callPackage ../tools/security/credslayer { };
-
device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { };
- devour = callPackage ../tools/X11/devour { };
-
didyoumean = callPackage ../tools/misc/didyoumean {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- didu = callPackage ../tools/misc/didu { };
-
diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
dieHook = makeSetupHook {
name = "die-hook";
} ../build-support/setup-hooks/die.sh;
- archiver = callPackage ../applications/misc/archiver { };
-
digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox {
autoreconfHook = buildPackages.autoreconfHook269;
};
@@ -802,38 +433,18 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Accelerate;
};
- grsync = callPackage ../applications/misc/grsync { };
-
devShellTools = callPackage ../build-support/dev-shell-tools { };
dockerTools = callPackage ../build-support/docker {
writePython3 = buildPackages.writers.writePython3;
};
- fakeNss = callPackage ../build-support/fake-nss { };
-
tarsum = callPackage ../build-support/docker/tarsum.nix { };
nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { };
- docker-ls = callPackage ../tools/misc/docker-ls { };
-
- docker-slim = callPackage ../applications/virtualization/docker-slim { };
-
- doc2go = callPackage ../development/tools/doc2go { };
-
docker-sync = callPackage ../tools/misc/docker-sync { };
- undocker = callPackage ../tools/misc/undocker { };
-
- dockle = callPackage ../development/tools/dockle { };
-
- docui = callPackage ../tools/misc/docui { };
-
- done = callPackage ../applications/misc/done { };
-
- dotfiles = callPackage ../applications/misc/dotfiles { };
-
# Dotnet
dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {});
@@ -854,13 +465,8 @@ with pkgs;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0;
- nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { };
inherit (dotnetCorePackages) buildDotnetModule buildDotnetGlobalTool mkNugetSource mkNugetDeps;
- fsautocomplete = callPackage ../development/tools/fsautocomplete { };
-
- pbm = callPackage ../tools/admin/pbm { };
-
fable = callPackage ../development/tools/fable { };
dotnetenv = callPackage ../build-support/dotnet/dotnetenv {
@@ -869,38 +475,12 @@ with pkgs;
buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { };
fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { };
- dotnetbuildhelpers = callPackage ../build-support/dotnet/dotnetbuildhelpers { };
-
- dumb-init = callPackage ../applications/virtualization/dumb-init { };
-
- umoci = callPackage ../applications/virtualization/umoci { };
-
- diswall = callPackage ../applications/networking/diswall { };
-
dupeguru = callPackage ../applications/misc/dupeguru {
python3Packages = python311Packages;
};
- dump1090 = callPackage ../applications/radio/dump1090 { };
-
- dwarf2json = callPackage ../tools/misc/dwarf2json { };
-
- ebook2cw = callPackage ../applications/radio/ebook2cw { };
-
qdmr = libsForQt5.callPackage ../applications/radio/qdmr { };
- edwin = callPackage ../data/fonts/edwin { };
-
- edwood = callPackage ../applications/editors/edwood { };
-
- etBook = callPackage ../data/fonts/et-book { };
-
- fntsample = callPackage ../tools/misc/fntsample { };
-
- fetchutils = callPackage ../tools/misc/fetchutils { };
-
- fet-sh = callPackage ../tools/misc/fet-sh { };
-
fetchbower = callPackage ../build-support/fetchbower { };
fetchbzr = callPackage ../build-support/fetchbzr { };
@@ -944,72 +524,22 @@ with pkgs;
yarnInstallHook
fetchYarnDeps;
- find-cursor = callPackage ../tools/X11/find-cursor { };
-
- flare-floss = callPackage ../tools/security/flare-floss { };
-
- flare-signal = callPackage ../applications/networking/instant-messengers/flare-signal { };
-
prefer-remote-fetch = import ../build-support/prefer-remote-fetch;
- global-platform-pro = callPackage ../development/tools/global-platform-pro { };
-
- gomi = callPackage ../tools/misc/gomi { };
-
- go-ios = callPackage ../tools/misc/go-ios { };
-
- graph-easy = callPackage ../tools/graphics/graph-easy { };
-
- mermaid-filter = callPackage ../tools/misc/mermaid-filter { };
-
- graphw00f = callPackage ../tools/security/graphw00f { };
-
- graphite-cursors = callPackage ../data/icons/graphite-cursors { };
-
opendrop = python3Packages.callPackage ../tools/networking/opendrop { };
- owl = callPackage ../tools/networking/owl { };
-
- mutmut = callPackage ../development/tools/mutmut { };
-
- packcc = callPackage ../development/tools/packcc { };
-
- packr = callPackage ../development/libraries/packr { };
-
- pacup = callPackage ../tools/package-management/pacup { };
-
- patcher9x = callPackage ../development/tools/patcher9x { };
-
perseus-cli = callPackage ../development/tools/perseus-cli {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- pet = callPackage ../development/tools/pet { };
-
pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { };
- pkger = callPackage ../development/libraries/pkger { };
-
- tapview = callPackage ../development/tools/tapview { };
-
- run = callPackage ../development/tools/run { };
-
- ruler = callPackage ../tools/security/ruler { };
-
magika = with python3Packages; toPythonApplication magika;
- mblock-mlink = callPackage ../development/tools/mblock-mlink { };
-
- mod = callPackage ../development/tools/mod { };
-
- mya = callPackage ../applications/misc/mya { };
-
mysql-shell = mysql-shell_8;
inherit ({
mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix {
- inherit (darwin) DarwinTools;
- inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10;
icu = icu73;
protobuf = protobuf_24;
@@ -1019,15 +549,11 @@ with pkgs;
;
mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {
- inherit (darwin) DarwinTools;
- inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10;
icu = icu73;
protobuf = protobuf_24;
};
- broadlink-cli = callPackage ../tools/misc/broadlink-cli { };
-
fetchpatch = callPackage ../build-support/fetchpatch {
# 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154
patchutils = __splicedPackages.patchutils_0_3_3;
@@ -1128,8 +654,6 @@ with pkgs;
fetchipfs = callPackage ../build-support/fetchipfs { };
- fetchit = callPackage ../applications/networking/cluster/fetchit { };
-
fetchzip = callPackage ../build-support/fetchzip { }
// {
tests = pkgs.tests.fetchzip;
@@ -1171,19 +695,9 @@ with pkgs;
inherit url;
};
- lazydocker = callPackage ../tools/misc/lazydocker { };
-
ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; }
../build-support/setup-hooks/ld-is-cc-hook.sh;
- libgflow = callPackage ../development/libraries/libgflow { };
- libgtkflow3 = callPackage ../development/libraries/libgtkflow3 { };
- libgtkflow4 = callPackage ../development/libraries/libgtkflow4 { };
-
- libredirect = callPackage ../build-support/libredirect { };
-
- madonctl = callPackage ../applications/misc/madonctl { };
-
copyDesktopItems = makeSetupHook {
name = "copy-desktop-items-hook";
} ../build-support/setup-hooks/copy-desktop-items.sh;
@@ -1221,8 +735,6 @@ with pkgs;
};
} ../build-support/setup-hooks/make-wrapper.sh;
- makeBinaryWrapper = callPackage ../build-support/setup-hooks/make-binary-wrapper { };
-
compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware.nix { type = "xz"; };
compressFirmwareZstd = callPackage ../build-support/kernel/compress-firmware.nix { type = "zstd"; };
@@ -1237,8 +749,6 @@ with pkgs;
mkShell = callPackage ../build-support/mkshell { };
mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; };
- mokutil = callPackage ../tools/security/mokutil { };
-
mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { };
nixBufferBuilders = import ../applications/editors/emacs/build-support/buffer.nix {
@@ -1248,8 +758,6 @@ with pkgs;
nix-gitignore = callPackage ../build-support/nix-gitignore { };
- numworks-epsilon = callPackage ../applications/science/math/numworks-epsilon { };
-
ociTools = callPackage ../build-support/oci-tools { };
inherit (
@@ -1263,8 +771,6 @@ with pkgs;
closureInfo = callPackage ../build-support/closure-info.nix { };
- sensible-utils = callPackage ../tools/misc/sensible-utils { };
-
serverspec = callPackage ../tools/misc/serverspec { };
setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { };
@@ -1277,14 +783,8 @@ with pkgs;
singularity-tools = callPackage ../build-support/singularity-tools { };
- sirula = callPackage ../tools/wayland/sirula { };
-
- sitelen-seli-kiwen = callPackage ../data/fonts/sitelen-seli-kiwen { };
-
srcOnly = callPackage ../build-support/src-only { };
- subnetcalc = callPackage ../tools/networking/subnetcalc { };
-
substitute = callPackage ../build-support/substitute/substitute.nix { };
substituteAll = callPackage ../build-support/substitute/substitute-all.nix { };
@@ -1395,14 +895,10 @@ with pkgs;
name = "use-old-cxx-abi-hook";
} ../build-support/setup-hooks/use-old-cxx-abi.sh;
- iconConvTools = callPackage ../build-support/icon-conv-tools { };
-
validatePkgConfig = makeSetupHook
{ name = "validate-pkg-config"; propagatedBuildInputs = [ findutils pkg-config ]; }
../build-support/setup-hooks/validate-pkg-config.sh;
- patchPpdFilesHook = callPackage ../build-support/setup-hooks/patch-ppd-files { };
-
#package writers
writers = callPackage ../build-support/writers { };
@@ -1420,59 +916,21 @@ with pkgs;
_3llo = callPackage ../tools/misc/3llo { };
- _3mux = callPackage ../tools/misc/3mux { };
-
_1password-gui = callPackage ../applications/misc/1password-gui { };
_1password-gui-beta = callPackage ../applications/misc/1password-gui { channel = "beta"; };
- _6tunnel = callPackage ../tools/networking/6tunnel { };
-
_7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { };
_7zz-rar = _7zz.override { enableUnfree = true; };
- _9pfs = callPackage ../tools/filesystems/9pfs { };
-
- _9ptls = callPackage ../os-specific/linux/9ptls { };
-
- aaa = callPackage ../tools/misc/aaa { };
-
- aardvark-dns = callPackage ../tools/networking/aardvark-dns { };
-
- a2ps = callPackage ../tools/text/a2ps { };
-
- abbreviate = callPackage ../tools/text/abbreviate { };
-
- abcm2ps = callPackage ../tools/audio/abcm2ps { };
-
- abduco = callPackage ../tools/misc/abduco { };
-
- acct = callPackage ../tools/system/acct { };
-
- accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { };
-
acme-dns = callPackage ../servers/dns/acme-dns/default.nix {
buildGoModule = buildGo122Module; # https://github.com/joohoi/acme-dns/issues/365
};
- acme-sh = callPackage ../tools/admin/acme-sh { };
-
- alsaequal = callPackage ../tools/audio/alsaequal { };
-
acquire = with python3Packages; toPythonApplication acquire;
actdiag = with python3.pkgs; toPythonApplication actdiag;
- actkbd = callPackage ../tools/system/actkbd { };
-
- adafruit-ampy = callPackage ../tools/misc/adafruit-ampy { };
-
- addic7ed-cli = callPackage ../tools/misc/addic7ed-cli { };
-
- addlicense = callPackage ../tools/misc/addlicense { };
-
- adenum = callPackage ../tools/security/adenum { };
-
adlplug = callPackage ../applications/audio/adlplug {
inherit (darwin.apple_sdk.frameworks) Foundation Cocoa Carbon CoreServices ApplicationServices CoreAudio CoreMIDI AudioToolbox Accelerate CoreImage IOKit AudioUnit QuartzCore WebKit DiscRecording CoreAudioKit;
jack = libjack2;
@@ -1481,10 +939,6 @@ with pkgs;
type = "OPN";
};
- arc_unpacker = callPackage ../tools/archivers/arc_unpacker { };
-
- adminer = callPackage ../servers/adminer { };
-
akkoma = callPackage ../servers/akkoma {
elixir = elixir_1_16;
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_16; });
@@ -1501,40 +955,16 @@ with pkgs;
blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { };
};
- advancecomp = callPackage ../tools/compression/advancecomp { };
-
- aefs = callPackage ../tools/filesystems/aefs { };
-
aegisub = callPackage ../by-name/ae/aegisub/package.nix ({
boost = boost179;
luajit = luajit.override { enable52Compat = true; };
wxGTK = wxGTK32;
} // (config.aegisub or {}));
- aerospike = callPackage ../servers/nosql/aerospike { };
-
- aespipe = callPackage ../tools/security/aespipe { };
-
- aescrypt = callPackage ../tools/misc/aescrypt { };
-
- aether-lv2 = callPackage ../applications/audio/aether-lv2 { };
-
acme-client = callPackage ../tools/networking/acme-client {
stdenv = gccStdenv;
};
- adrgen = callPackage ../tools/misc/adrgen { };
-
- adriconf = callPackage ../tools/graphics/adriconf { };
-
- amass = callPackage ../tools/networking/amass { };
-
- afew = callPackage ../applications/networking/mailreaders/afew { };
-
- afetch = callPackage ../tools/misc/afetch { };
-
- afio = callPackage ../tools/archivers/afio { };
-
honggfuzz = callPackage ../tools/security/honggfuzz {
clang = clang_16;
llvm = llvm_16;
@@ -1547,56 +977,14 @@ with pkgs;
wine = null;
};
- ledfx = callPackage ../applications/audio/ledfx { };
-
libdislocator = callPackage ../tools/security/aflplusplus/libdislocator.nix { };
- afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { };
-
afsctool = callPackage ../tools/filesystems/afsctool {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- agi = callPackage ../tools/graphics/agi { };
-
- agola = callPackage ../development/tools/continuous-integration/agola { };
-
- agrep = callPackage ../tools/text/agrep { };
-
- aha = callPackage ../tools/text/aha { };
-
- ahcpd = callPackage ../tools/networking/ahcpd { };
-
- aichat = callPackage ../tools/misc/aichat { };
-
- aide = callPackage ../tools/security/aide { };
-
- ain = callPackage ../tools/networking/ain { };
-
aioblescan = with python3Packages; toPythonApplication aioblescan;
- aiodnsbrute = callPackage ../tools/security/aiodnsbrute { };
-
- aircrack-ng = callPackage ../tools/networking/aircrack-ng { };
-
- airgeddon = callPackage ../tools/networking/airgeddon { };
-
- apache-airflow = callPackage ../servers/apache-airflow { };
-
- apachetomcatscanner = callPackage ../tools/security/apachetomcatscanner { };
-
- airsonic = callPackage ../servers/misc/airsonic { };
-
- airspy = callPackage ../applications/radio/airspy { };
-
- airspyhf = callPackage ../applications/radio/airspyhf { };
-
- airwindows-lv2 = callPackage ../applications/audio/airwindows-lv2 { };
-
- aixlog = callPackage ../development/libraries/aixlog { };
-
- aj-snapshot = callPackage ../applications/audio/aj-snapshot { };
-
ajour = callPackage ../tools/games/ajour {
inherit (plasma5Packages) kdialog;
};
@@ -1612,78 +1000,20 @@ with pkgs;
alice-tools-qt6 = qt6Packages.callPackage ../tools/games/alice-tools { };
- allure = callPackage ../development/tools/allure { };
-
- aquosctl = callPackage ../tools/misc/aquosctl { };
-
- arch-install-scripts = callPackage ../tools/misc/arch-install-scripts { };
-
- argocd-vault-plugin = callPackage ../tools/security/argocd-vault-plugin { };
-
- arubaotp-seed-extractor = callPackage ../tools/security/arubaotp-seed-extractor { };
-
auditwheel = with python3Packages; toPythonApplication auditwheel;
- amidst = callPackage ../tools/games/minecraft/amidst { };
-
- asar = callPackage ../tools/compression/asar { };
-
- askalono = callPackage ../tools/misc/askalono { };
-
awsbck = callPackage ../tools/backup/awsbck {
inherit (darwin.apple_sdk.frameworks) Security;
};
- balena-cli = callPackage ../tools/admin/balena-cli { };
-
- basez = callPackage ../tools/misc/basez { };
-
- btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { };
-
- carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { };
-
- cf-vault = callPackage ../tools/admin/cf-vault { };
-
- cfspeedtest = callPackage ../tools/networking/cfspeedtest { };
-
- cfonts = callPackage ../tools/misc/cfonts { };
-
bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { };
- cie-middleware-linux = callPackage ../tools/security/cie-middleware-linux { };
-
- cidrgrep = callPackage ../tools/text/cidrgrep { };
-
- clematis = callPackage ../tools/misc/clematis { };
-
- clubhouse-cli = callPackage ../tools/misc/clubhouse-cli { };
-
- colorless = callPackage ../tools/misc/colorless { };
-
- configurable-http-proxy = callPackage ../tools/networking/configurable-http-proxy { };
-
- crypto-tracker = callPackage ../tools/misc/crypto-tracker { };
-
- ejson2env = callPackage ../tools/admin/ejson2env { };
-
davinci-resolve = callPackage ../applications/video/davinci-resolve { };
davinci-resolve-studio = callPackage ../applications/video/davinci-resolve { studioVariant = true; };
dehinter = with python3Packages; toPythonApplication dehinter;
- dolbybcsoftwaredecode = callPackage ../applications/audio/dolbybcsoftwaredecode { };
-
- donkey = callPackage ../tools/security/donkey { };
-
- dwarfs = callPackage ../tools/filesystems/dwarfs { };
-
- dysk = callPackage ../tools/filesystems/dysk { };
-
- fscan = callPackage ../tools/security/fscan { };
-
- copier = callPackage ../tools/misc/copier { };
-
gamemode = callPackage ../tools/games/gamemode {
libgamemode32 = pkgsi686Linux.gamemode.lib;
};
@@ -1702,168 +1032,66 @@ with pkgs;
wlroots = wlroots_0_17;
};
- elkhound = callPackage ../development/tools/elkhound { };
-
- ethq = callPackage ../os-specific/linux/ethq { };
-
font-v = with python3Packages; toPythonApplication font-v;
fontbakery = with python3Packages; toPythonApplication fontbakery;
- weidu = callPackage ../tools/games/weidu { };
-
weylus = callPackage ../applications/graphics/weylus {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa VideoToolbox;
};
- gam = callPackage ../tools/admin/gam { };
-
- gen6dns = callPackage ../tools/networking/gen6dns { };
-
- github-copilot-cli = callPackage ../tools/misc/github-copilot-cli { };
-
# This is to workaround gfal2-python broken against Python 3.12 or later.
# TODO: Remove these lines after solving the breakage.
gfal2-util = callPackage ../by-name/gf/gfal2-util/package.nix (lib.optionalAttrs python3Packages.gfal2-python.meta.broken {
python3Packages = python311Packages;
});
- gfshare = callPackage ../tools/security/gfshare { };
-
gh-cal = callPackage ../tools/misc/gh-cal {
inherit (darwin.apple_sdk.frameworks) Security;
};
- ghostie = callPackage ../tools/misc/ghostie { };
-
- glooctl = callPackage ../applications/networking/cluster/glooctl { };
-
- gobgp = callPackage ../tools/networking/gobgp { };
-
- gof5 = callPackage ../tools/networking/gof5 { };
-
- goflow = callPackage ../tools/networking/goflow { };
-
- gofu = callPackage ../applications/misc/gofu { };
-
- godspeed = callPackage ../tools/networking/godspeed { };
-
- goodhosts = callPackage ../tools/networking/goodhosts { };
-
- goose = callPackage ../tools/misc/goose { };
-
gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { };
- grizzly = callPackage ../tools/misc/grizzly { };
-
- fabs = callPackage ../tools/backup/fabs { };
-
- fm = callPackage ../applications/file-managers/fm { };
-
fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { };
- hblock = callPackage ../tools/networking/hblock { };
-
- headsetcontrol = callPackage ../tools/audio/headsetcontrol { };
-
- headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { };
-
- hexdiff = callPackage ../tools/misc/hexdiff { };
-
- hexo-cli = callPackage ../development/tools/hexo-cli { };
-
- hostmux = callPackage ../tools/misc/hostmux { };
-
- hsd = callPackage ../tools/misc/hsd { };
-
- hyperpotamus = callPackage ../tools/misc/hyperpotamus { };
-
inherit (callPackages ../tools/networking/ivpn/default.nix { buildGoModule = buildGo122Module; }) ivpn ivpn-service;
- jobber = callPackage ../tools/system/jobber { };
-
- kanata = callPackage ../tools/system/kanata { };
-
kanata-with-cmd = kanata.override { withCmd = true; };
- kaufkauflist = callPackage ../applications/misc/kaufkauflist { };
-
kdocker = libsForQt5.callPackage ../tools/X11/kdocker { };
- kicli = callPackage ../tools/misc/kicli { };
-
- ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { };
-
ksnip = libsForQt5.callPackage ../tools/misc/ksnip { };
- kstart = callPackage ../tools/security/kstart { };
-
- kubevirt = callPackage ../tools/virtualization/kubevirt { };
-
- lektor = callPackage ../tools/misc/lektor { };
-
- licenseclassifier = callPackage ../development/tools/misc/licenseclassifier { };
-
- license-cli = callPackage ../tools/misc/license-cli { };
-
- linux-router = callPackage ../tools/networking/linux-router { };
-
linux-router-without-wifi = linux-router.override { useWifiDependencies = false; };
makehuman = libsForQt5.callPackage ../applications/misc/makehuman { };
- markdownlint-cli = callPackage ../tools/text/markdownlint-cli { };
-
- markdownlint-cli2 = callPackage ../tools/text/markdownlint-cli2 { };
-
- mbidled = callPackage ../tools/networking/mbidled { };
-
mcaselector = callPackage ../tools/games/minecraft/mcaselector {
jre = jre.override {
enableJavaFX = true;
};
};
- metapixel = callPackage ../tools/graphics/metapixel { };
-
memos = callPackage ../servers/memos { };
- midimonster = callPackage ../tools/audio/midimonster { };
-
- midi-trigger = callPackage ../applications/audio/midi-trigger { };
-
- mnc = callPackage ../tools/misc/mnc { };
-
- mgmt = callPackage ../applications/system/mgmt { };
-
mkosi = python3Packages.callPackage ../tools/virtualization/mkosi { inherit systemd; };
mkosi-full = mkosi.override { withQemu = true; };
- monica = callPackage ../servers/web-apps/monica { };
-
mpremote = python3Packages.callPackage ../tools/misc/mpremote { };
- mprocs = callPackage ../tools/misc/mprocs { };
-
mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { };
mymcplus = python3Packages.callPackage ../tools/games/mymcplus { };
- near-cli = callPackage ../tools/misc/near-cli { };
-
networkd-notify = python3Packages.callPackage ../tools/networking/networkd-notify {
systemd = pkgs.systemd;
};
- node-glob = callPackage ../tools/misc/node-glob { };
-
nominatim = callPackage ../servers/nominatim {
postgresql = postgresql_14;
};
- npm-check-updates = callPackage ../tools/package-management/npm-check-updates { };
-
ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };
openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { };
@@ -1875,114 +1103,46 @@ with pkgs;
osquery = callPackage ../tools/system/osquery { };
- paperview = callPackage ../tools/X11/paperview { };
-
- pferd = callPackage ../tools/misc/pferd { };
-
- polygon-cli = callPackage ../tools/networking/polygon-cli { };
-
pricehist = python3Packages.callPackage ../tools/misc/pricehist { };
- proycon-wayout = callPackage ../tools/wayland/proycon-wayout { };
-
q = callPackage ../tools/networking/q { };
qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { };
- quich = callPackage ../tools/misc/quich { } ;
-
- rabtap = callPackage ../tools/networking/rabtap { } ;
-
- redfang = callPackage ../tools/networking/redfang { };
-
ronin = callPackage ../tools/security/ronin { };
scarab = callPackage ../tools/games/scarab { };
inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2;
- sdlookup = callPackage ../tools/security/sdlookup { };
-
sdkmanager = with python3Packages; toPythonApplication sdkmanager;
- sgrep = callPackage ../tools/text/sgrep { };
-
shaperglot = with python3Packages; toPythonApplication shaperglot;
- shell-genie = callPackage ../applications/misc/shell-genie { };
-
- sloth = callPackage ../tools/misc/sloth { };
-
snagboot = python3.pkgs.callPackage ../applications/misc/snagboot { };
- simple-dlna-browser = callPackage ../tools/networking/simple-dlna-browser { };
-
- sitespeed-io = callPackage ../tools/networking/sitespeed-io { };
-
slipstream = callPackage ../tools/games/slipstream {
jdk = jdk8;
};
- sorted-grep = callPackage ../tools/text/sorted-grep { };
-
- smbmap = callPackage ../tools/security/smbmap { };
-
- smbscan = callPackage ../tools/security/smbscan { };
-
- spectre-cli = callPackage ../tools/security/spectre-cli { };
-
- speedtest-go = callPackage ../tools/networking/speedtest-go { };
-
- speedtest-rs = callPackage ../tools/networking/speedtest-rs { };
-
stargazer = callPackage ../servers/gemini/stargazer {
inherit (darwin.apple_sdk.frameworks) Security;
};
- steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch { };
-
- supercronic = callPackage ../tools/system/supercronic { };
-
supermin = callPackage ../tools/virtualization/supermin {
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
- sx-go = callPackage ../tools/security/sx-go { };
-
- systeroid = callPackage ../tools/system/systeroid { };
-
tailwindcss = callPackage ../development/tools/tailwindcss { };
- tauon = callPackage ../applications/audio/tauon { };
-
- tere = callPackage ../tools/misc/tere { };
-
termusic = darwin.apple_sdk_11_0.callPackage ../applications/audio/termusic {
inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
};
- tfk8s = callPackage ../tools/misc/tfk8s { };
-
- thumbs = callPackage ../tools/misc/thumbs { };
-
- tnat64 = callPackage ../tools/networking/tnat64 { };
-
- toast = callPackage ../development/tools/toast { };
-
- topicctl = callPackage ../tools/misc/topicctl { };
-
- transmission-rss = callPackage ../tools/networking/transmission-rss { };
-
trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; };
- ttchat = callPackage ../tools/misc/ttchat { };
-
ufolint = with python3Packages; toPythonApplication ufolint;
- ukmm = callPackage ../tools/games/ukmm { };
-
- unflac = callPackage ../tools/audio/unflac { };
-
valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };
veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
@@ -1994,31 +1154,17 @@ with pkgs;
withNtfs = true;
};
- vitess = callPackage ../development/tools/database/vitess { };
-
- vopono = callPackage ../tools/networking/vopono { };
-
vprof = with python3Packages; toPythonApplication vprof;
vrc-get = callPackage ../tools/misc/vrc-get {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- vrrtest = callPackage ../tools/video/vrrtest { };
-
winbox = winbox3;
winbox3 = callPackage ../tools/admin/winbox {
wine = wineWowPackages.stable;
};
- wwcd = callPackage ../tools/misc/wwcd { };
-
- writedisk = callPackage ../tools/misc/writedisk { };
-
- xcd = callPackage ../tools/misc/xcd { };
-
- xpaste = callPackage ../tools/text/xpaste { };
-
yabridge = callPackage ../tools/audio/yabridge {
wine = wineWowPackages.staging;
};
@@ -2033,8 +1179,6 @@ with pkgs;
yarn-lock-converter = callPackage ../tools/package-management/yarn-lock-converter { };
- zsh-history-to-fish = callPackage ../tools/misc/zsh-history-to-fish { };
-
archi = callPackage ../tools/misc/archi { };
breitbandmessung = callPackage ../applications/networking/breitbandmessung {
@@ -2043,8 +1187,6 @@ with pkgs;
### APPLICATIONS/VERSION-MANAGEMENT
- deepgit = callPackage ../applications/version-management/deepgit { };
-
git = callPackage ../applications/version-management/git {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
@@ -2082,10 +1224,6 @@ with pkgs;
withpcre2 = false;
};
- bfg-repo-cleaner = callPackage ../applications/version-management/bfg-repo-cleaner { };
-
- bit = callPackage ../applications/version-management/bit { };
-
bitbucket-server-cli = callPackage ../applications/version-management/bitbucket-server-cli { };
bump2version = with python3Packages; toPythonApplication bump2version;
@@ -2094,26 +1232,16 @@ with pkgs;
cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { };
- commit-formatter = callPackage ../applications/version-management/commit-formatter { };
-
commitlint = nodePackages."@commitlint/cli";
- conform = callPackage ../applications/version-management/conform { };
-
datalad = with python3Packages; toPythonApplication datalad;
datalad-gooey = with python3Packages; toPythonApplication datalad-gooey;
- degit = callPackage ../applications/version-management/degit { };
-
- delta = callPackage ../applications/version-management/delta { };
-
debase = callPackage ../by-name/de/debase/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
- diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };
-
forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { };
gfold = callPackage ../applications/version-management/gfold {
@@ -2126,23 +1254,11 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration;
};
- gg-scm = callPackage ../applications/version-management/gg { };
-
github-cli = gh;
- gh = callPackage ../applications/version-management/gh { };
-
- ghorg = callPackage ../applications/version-management/ghorg { };
-
- ghq = callPackage ../applications/version-management/ghq { };
-
- ghr = callPackage ../applications/version-management/ghr { };
-
git-absorb = callPackage ../applications/version-management/git-absorb {
inherit (darwin.apple_sdk.frameworks) Security;
};
- git-aggregator = callPackage ../applications/version-management/git-aggregator { };
-
git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui {
inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
};
@@ -2157,32 +1273,12 @@ with pkgs;
git-annex-remote-googledrive = python3Packages.callPackage ../applications/version-management/git-annex-remote-googledrive { };
- git-annex-remote-rclone = callPackage ../applications/version-management/git-annex-remote-rclone { };
-
- git-annex-utils = callPackage ../applications/version-management/git-annex-utils { };
-
- git-appraise = callPackage ../applications/version-management/git-appraise { };
-
git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { };
- git-backdate = callPackage ../applications/version-management/git-backdate { };
-
- git-big-picture = callPackage ../applications/version-management/git-big-picture { };
-
- git-bars = callPackage ../applications/version-management/git-bars { };
-
git-branchless = callPackage ../applications/version-management/git-branchless {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- git-bug = callPackage ../applications/version-management/git-bug { };
-
- git-bug-migration = callPackage ../applications/version-management/git-bug-migration { };
-
- git-cache = callPackage ../applications/version-management/git-cache { };
-
- git-chglog = callPackage ../applications/version-management/git-chglog { };
-
git-cinnabar = callPackage ../applications/version-management/git-cinnabar {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -2191,123 +1287,49 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- git-codereview = callPackage ../applications/version-management/git-codereview { };
-
- git-cola = callPackage ../applications/version-management/git-cola { };
-
- git-crecord = callPackage ../applications/version-management/git-crecord { };
-
git-credential-keepassxc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-credential-keepassxc {
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
};
git-credential-manager = callPackage ../applications/version-management/git-credential-manager { };
- git-credential-oauth = callPackage ../applications/version-management/git-credential-oauth { };
-
- git-crypt = callPackage ../applications/version-management/git-crypt { };
-
- git-delete-merged-branches = callPackage ../applications/version-management/git-delete-merged-branches { };
-
- git-dive = callPackage ../applications/version-management/git-dive { };
-
- git-extras = callPackage ../applications/version-management/git-extras { };
-
git-fame = callPackage ../applications/version-management/git-fame { };
- git-fire = callPackage ../applications/version-management/git-fire { };
-
- git-ftp = callPackage ../applications/version-management/git-ftp { };
-
git-gone = callPackage ../applications/version-management/git-gone {
inherit (darwin.apple_sdk.frameworks) Security;
};
- git-graph = callPackage ../applications/version-management/git-graph { };
-
- git-hound = callPackage ../applications/version-management/git-hound { };
-
- git-hub = callPackage ../applications/version-management/git-hub { };
-
- git-ignore = callPackage ../applications/version-management/git-ignore { };
-
git-imerge = python3Packages.callPackage ../applications/version-management/git-imerge { };
- git-interactive-rebase-tool = callPackage ../applications/version-management/git-interactive-rebase-tool { };
-
git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });
- git-mit = callPackage ../applications/version-management/git-mit { };
-
git-machete = python3Packages.callPackage ../applications/version-management/git-machete { };
- git-octopus = callPackage ../applications/version-management/git-octopus { };
-
- git-open = callPackage ../applications/version-management/git-open { };
-
- git-privacy = callPackage ../applications/version-management/git-privacy { };
-
git-ps-rs = callPackage ../development/tools/git-ps-rs {
inherit (darwin.apple_sdk.frameworks) Security;
};
git-publish = python3Packages.callPackage ../applications/version-management/git-publish { };
- git-quick-stats = callPackage ../applications/version-management/git-quick-stats { };
-
git-quickfix = callPackage ../applications/version-management/git-quickfix {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- git-radar = callPackage ../applications/version-management/git-radar { };
-
git-recent = callPackage ../applications/version-management/git-recent {
util-linux = if stdenv.hostPlatform.isLinux then util-linuxMinimal else util-linux;
};
- git-relevant-history = callPackage ../applications/version-management/git-relevant-history { };
-
git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-remote-codecommit { };
gitRepo = git-repo;
- git-repo = callPackage ../applications/version-management/git-repo { };
-
git-repo-updater = python3Packages.callPackage ../applications/version-management/git-repo-updater { };
git-review = python3Packages.callPackage ../applications/version-management/git-review { };
- git-remote-gcrypt = callPackage ../applications/version-management/git-remote-gcrypt { };
-
- git-remote-hg = callPackage ../applications/version-management/git-remote-hg { };
-
- git-reparent = callPackage ../applications/version-management/git-reparent { };
-
- git-secret = callPackage ../applications/version-management/git-secret { };
-
- git-secrets = callPackage ../applications/version-management/git-secrets { };
-
- git-series = callPackage ../applications/version-management/git-series { };
-
- git-sizer = callPackage ../applications/version-management/git-sizer { };
-
git-stack = callPackage ../applications/version-management/git-stack {
inherit (darwin.apple_sdk.frameworks) Security;
};
- git-stree = callPackage ../applications/version-management/git-stree { };
-
- git-subrepo = callPackage ../applications/version-management/git-subrepo { };
-
- git-subtrac = callPackage ../applications/version-management/git-subtrac { };
-
- git-sync = callPackage ../applications/version-management/git-sync { };
-
- git-team = callPackage ../applications/version-management/git-team { };
-
- git-test = callPackage ../applications/version-management/git-test { };
-
- git-town = callPackage ../applications/version-management/git-town { };
-
git-trim = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-trim {
inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Security;
};
@@ -2316,70 +1338,16 @@ with pkgs;
pythonPackages = python3Packages;
};
- git-vanity-hash = callPackage ../applications/version-management/git-vanity-hash { };
-
- git-vendor = callPackage ../applications/version-management/git-vendor { };
-
- git-when-merged = callPackage ../applications/version-management/git-when-merged { };
-
git-workspace = callPackage ../applications/version-management/git-workspace {
inherit (darwin.apple_sdk.frameworks) Security;
};
- git2cl = callPackage ../applications/version-management/git2cl { };
-
- gitbatch = callPackage ../applications/version-management/gitbatch { };
-
- gitflow = callPackage ../applications/version-management/gitflow { };
-
- gitfs = callPackage ../tools/filesystems/gitfs { };
-
- gitless = callPackage ../applications/version-management/gitless { };
-
gitlint = python3Packages.callPackage ../applications/version-management/gitlint { };
- gitls = callPackage ../applications/version-management/gitls { };
-
gitmux = callPackage ../applications/version-management/gitmux { buildGoModule = buildGo122Module; };
- gitnuro = callPackage ../applications/version-management/gitnuro { };
-
- gitnr = callPackage ../applications/version-management/gitnr { };
-
- gitsign = callPackage ../applications/version-management/gitsign { };
-
- gitstats = callPackage ../applications/version-management/gitstats { };
-
- gitstatus = callPackage ../applications/version-management/gitstatus { };
-
- gitty = callPackage ../applications/version-management/gitty { };
-
gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { };
- gitweb = callPackage ../applications/version-management/gitweb { };
-
- glitter = callPackage ../applications/version-management/glitter { };
-
- globalping-cli = callPackage ../tools/networking/globalping-cli { };
-
- gst = callPackage ../applications/version-management/gst { };
-
- guilt = callPackage ../applications/version-management/guilt { };
-
- gut = callPackage ../applications/version-management/gut { };
-
- hub = callPackage ../applications/version-management/hub { };
-
- hut = callPackage ../applications/version-management/hut { };
-
- josh = callPackage ../applications/version-management/josh { };
-
- lab = callPackage ../applications/version-management/lab { };
-
- legit = callPackage ../applications/version-management/legit { };
-
- legit-web = callPackage ../applications/version-management/legit-web { };
-
lucky-commit = callPackage ../applications/version-management/lucky-commit {
inherit (darwin.apple_sdk.frameworks) OpenCL;
};
@@ -2392,32 +1360,14 @@ with pkgs;
qgit = qt5.callPackage ../applications/version-management/qgit { };
- rs-git-fsmonitor = callPackage ../applications/version-management/rs-git-fsmonitor { };
-
- scmpuff = callPackage ../applications/version-management/scmpuff { };
-
silver-platter = python3Packages.callPackage ../applications/version-management/silver-platter { };
- stgit = callPackage ../applications/version-management/stgit { };
-
- subgit = callPackage ../applications/version-management/subgit { };
-
svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { };
svn2git = callPackage ../applications/version-management/svn2git {
git = gitSVN;
};
- thicket = callPackage ../applications/version-management/thicket { };
-
- tig = callPackage ../applications/version-management/tig { };
-
- top-git = callPackage ../applications/version-management/topgit { };
-
- transcrypt = callPackage ../applications/version-management/transcrypt { };
-
- ungit = callPackage ../applications/version-management/ungit { };
-
inherit (haskellPackages) git-annex;
inherit (haskellPackages) git-brunch;
@@ -2439,8 +1389,6 @@ with pkgs;
unfreeEnableDiscord = true;
};
- basiliskii = callPackage ../applications/emulators/basiliskii { };
-
box64 = callPackage ../applications/emulators/box64 {
hello-x86_64 = if stdenv.hostPlatform.isx86_64 then
hello
@@ -2466,26 +1414,12 @@ with pkgs;
else
throw "Don't know 32-bit platform for cross from: ${stdenv.hostPlatform.stdenv}";
- caprice32 = callPackage ../applications/emulators/caprice32 { };
-
- ccemux = callPackage ../applications/emulators/ccemux { };
-
cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { };
cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
- cen64 = callPackage ../applications/emulators/cen64 { };
-
- collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { };
-
coltrane = callPackage ../applications/misc/coltrane { };
- craftos-pc = callPackage ../applications/emulators/craftos-pc { };
-
- darcnes = callPackage ../applications/emulators/darcnes { };
-
- dlx = callPackage ../applications/emulators/dlx { };
-
dosbox = callPackage ../applications/emulators/dosbox {
inherit (darwin.apple_sdk.frameworks ) OpenGL;
SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat;
@@ -2500,22 +1434,8 @@ with pkgs;
firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };
- flycast = callPackage ../applications/emulators/flycast { };
-
- flix = callPackage ../development/compilers/flix { };
-
- fsrx = callPackage ../tools/misc/fsrx { };
-
- fuc = callPackage ../tools/misc/fuc { };
-
- fuse-emulator = callPackage ../applications/emulators/fuse-emulator { };
-
fusesoc = python3Packages.callPackage ../tools/package-management/fusesoc { };
- fw = callPackage ../tools/misc/fw { };
-
- g810-led = callPackage ../misc/g810-led { };
-
gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { };
@@ -2524,46 +1444,18 @@ with pkgs;
protobuf = protobuf_21;
};
- gopsuinfo = callPackage ../tools/system/gopsuinfo { };
-
- hatari = callPackage ../applications/emulators/hatari { };
-
- hostapd-mana = callPackage ../tools/networking/hostapd-mana { };
-
image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { };
kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { };
- lambda-delta = callPackage ../applications/emulators/lambda-delta { };
-
- libdsk = callPackage ../applications/emulators/libdsk { };
-
libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
- ludusavi = callPackage ../applications/backup/ludusavi { };
-
- maiko = callPackage ../applications/emulators/maiko { };
-
- mainsail = callPackage ../applications/misc/mainsail { };
-
mame = libsForQt5.callPackage ../applications/emulators/mame { };
mame-tools = lib.addMetaAttrs {
description = mame.meta.description + " (tools only)";
} (lib.getOutput "tools" mame);
- mupen64plus = callPackage ../applications/emulators/mupen64plus { };
-
- np2kai = callPackage ../applications/emulators/np2kai { };
-
- nuked-md = callPackage ../applications/emulators/nuked-md { };
-
- oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { };
-
- packwiz = callPackage ../tools/games/minecraft/packwiz { };
-
- pcem = callPackage ../applications/emulators/pcem { };
-
ppsspp-sdl = let
argset = {
enableQt = false;
@@ -2591,48 +1483,24 @@ with pkgs;
in
ppsspp.override argset;
- proton-caller = callPackage ../applications/emulators/proton-caller { };
-
punes = libsForQt5.callPackage ../applications/emulators/punes { };
punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { };
py65 = with python3.pkgs; toPythonApplication py65;
- retrofe = callPackage ../applications/emulators/retrofe { };
-
ripes = qt6Packages.callPackage ../applications/emulators/ripes { };
rmg-wayland = callPackage ../by-name/rm/rmg/package.nix {
withWayland = true;
};
- ruffle = callPackage ../applications/emulators/ruffle { };
-
- sameboy = callPackage ../applications/emulators/sameboy { };
-
- simplenes = callPackage ../applications/emulators/simplenes { };
-
snes9x-gtk = snes9x.override {
withGtk = true;
};
- tamatool = callPackage ../applications/emulators/tamatool { };
-
- termtekst = callPackage ../applications/emulators/termtekst { };
-
- tilem = callPackage ../applications/emulators/tilem { };
-
- uae = callPackage ../applications/emulators/uae { };
-
- vbam = callPackage ../applications/emulators/vbam { };
-
- vice = callPackage ../applications/emulators/vice { };
-
winetricks = callPackage ../applications/emulators/wine/winetricks.nix { };
- xcpc = callPackage ../applications/emulators/xcpc { };
-
zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { };
@@ -2642,8 +1510,6 @@ with pkgs;
bsnes-hd = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/bsnes-hd { };
- higan = callPackage ../applications/emulators/bsnes/higan { };
-
### APPLICATIONS/EMULATORS/DOLPHIN-EMU
dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu {
@@ -2651,9 +1517,8 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox;
};
- dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix {
+ dolphin-emu-primehack = qt6.callPackage ../applications/emulators/dolphin-emu/primehack.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
- fmt = fmt_8;
};
### APPLICATIONS/EMULATORS/RETROARCH
@@ -2708,22 +1573,12 @@ with pkgs;
### APPLICATIONS/FILE-MANAGERS
- browsr = callPackage ../applications/file-managers/browsr { };
-
- cfm = callPackage ../applications/file-managers/cfm { };
-
- clex = callPackage ../applications/file-managers/clex { };
-
- clifm = callPackage ../applications/file-managers/clifm { };
-
doublecmd = callPackage ../by-name/do/doublecmd/package.nix {
inherit (qt5) wrapQtAppsHook;
};
krusader = libsForQt5.callPackage ../applications/file-managers/krusader { };
- lesscpy = callPackage ../development/compilers/lesscpy { };
-
lf = callPackage ../applications/file-managers/lf { };
ctpv = callPackage ../applications/file-managers/lf/ctpv.nix { };
@@ -2736,47 +1591,21 @@ with pkgs;
boost = boost185;
};
- nnn = callPackage ../applications/file-managers/nnn { };
-
- noice = callPackage ../applications/file-managers/noice { };
-
- pcmanfm = callPackage ../applications/file-managers/pcmanfm { };
-
- portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { };
-
- potreeconverter = callPackage ../applications/graphics/potreeconverter { };
-
- ranger = callPackage ../applications/file-managers/ranger { };
-
- sfm = callPackage ../applications/file-managers/sfm { };
-
- spaceFM = callPackage ../applications/file-managers/spacefm { };
-
- vifm = callPackage ../applications/file-managers/vifm { };
-
vifm-full = vifm.override {
mediaSupport = true;
inherit lib udisks2 python3;
};
- walk = callPackage ../applications/file-managers/walk { };
-
xfe = callPackage ../applications/file-managers/xfe {
fox = fox_1_6;
};
- xplorer = callPackage ../applications/file-managers/xplorer { };
-
johnny-reborn-engine = callPackage ../applications/misc/johnny-reborn { };
johnny-reborn = callPackage ../applications/misc/johnny-reborn/with-data.nix { };
### APPLICATIONS/TERMINAL-EMULATORS
- alacritty = callPackage ../applications/terminal-emulators/alacritty { };
-
- blackbox-terminal = callPackage ../applications/terminal-emulators/blackbox-terminal { };
-
contour = qt6.callPackage ../applications/terminal-emulators/contour {
inherit (darwin.apple_sdk_11_0.libs) utmp;
inherit (darwin) sigtool;
@@ -2787,18 +1616,6 @@ with pkgs;
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
- darktile = callPackage ../applications/terminal-emulators/darktile { };
-
- dterm = callPackage ../applications/terminal-emulators/dterm { };
-
- foot = callPackage ../applications/terminal-emulators/foot { };
-
- guake = callPackage ../applications/terminal-emulators/guake { };
-
- hyper = callPackage ../applications/terminal-emulators/hyper { };
-
- iterm2 = callPackage ../applications/terminal-emulators/iterm2 { };
-
kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty {
harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; };
inherit (darwin.apple_sdk_11_0) Libsystem;
@@ -2812,17 +1629,11 @@ with pkgs;
kitty-themes = callPackage ../applications/terminal-emulators/kitty/themes.nix { };
- lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
-
- microcom = callPackage ../applications/terminal-emulators/microcom { };
-
mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { };
mlterm-wayland = mlterm.override {
enableX11 = false;
};
- mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };
-
rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { };
rxvt-unicode-emoji = rxvt-unicode.override {
@@ -2843,7 +1654,6 @@ with pkgs;
extraLibs = config.st.extraLibs or [];
};
xst = callPackage ../applications/terminal-emulators/st/xst.nix { };
- lukesmithxyz-st = callPackage ../applications/terminal-emulators/st/lukesmithxyz-st { };
mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { };
siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { };
@@ -2851,71 +1661,17 @@ with pkgs;
gtk = gtk3;
};
- terminator = callPackage ../applications/terminal-emulators/terminator { };
-
termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix {
termite = termite-unwrapped;
};
termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
- termonad = callPackage ../applications/terminal-emulators/termonad { };
-
- tym = callPackage ../applications/terminal-emulators/tym { };
-
- wayst = callPackage ../applications/terminal-emulators/wayst { };
-
wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm {
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications System;
};
- x3270 = callPackage ../applications/terminal-emulators/x3270 { };
-
- xterm = callPackage ../applications/terminal-emulators/xterm { };
-
- xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol { };
-
- yaft = callPackage ../applications/terminal-emulators/yaft { };
-
- iqueue = callPackage ../development/libraries/iqueue { };
-
- lifecycled = callPackage ../tools/misc/lifecycled { };
-
- lil-pwny = callPackage ../tools/security/lil-pwny { };
-
- lilo = callPackage ../tools/misc/lilo { };
-
- natls = callPackage ../tools/misc/natls { };
-
- notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { };
-
- pikchr = callPackage ../tools/graphics/pikchr { };
-
- poop = callPackage ../tools/misc/poop { };
-
- popl = callPackage ../development/libraries/popl { };
-
- popsicle = callPackage ../tools/misc/popsicle { };
-
- terminal-colors = callPackage ../applications/misc/terminal-colors { };
-
- termsyn = callPackage ../data/fonts/termsyn { };
-
- tvnamer = callPackage ../tools/misc/tvnamer { };
-
twine = with python3Packages; toPythonApplication twine;
- accelergy = callPackage ../applications/science/computer-architecture/accelergy { };
-
- aldo = callPackage ../applications/radio/aldo { };
-
- alglib = callPackage ../development/libraries/alglib { };
-
- almanah = callPackage ../applications/misc/almanah { };
-
- alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { };
-
- amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
-
amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -2933,20 +1689,8 @@ with pkgs;
ammonite_2_13;
ammonite = ammonite_2_13;
- ams = callPackage ../applications/audio/ams { };
-
- amtterm = callPackage ../tools/system/amtterm { };
-
- analog = callPackage ../tools/admin/analog { };
-
- android-backup-extractor = callPackage ../tools/backup/android-backup-extractor { };
-
android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools { });
- anew = callPackage ../tools/text/anew { };
-
- anewer = callPackage ../tools/text/anewer { };
-
angie = callPackage ../servers/http/angie {
zlib = zlib-ng.override { withZlibCompat = true; };
withPerl = false;
@@ -2968,26 +1712,10 @@ with pkgs;
angie-console-light = callPackage ../servers/http/angie/console-light.nix { };
- angle-grinder = callPackage ../tools/text/angle-grinder { };
-
- ansifilter = callPackage ../tools/text/ansifilter { };
-
- apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { };
-
apk-tools = callPackage ../tools/package-management/apk-tools {
lua = lua5_3;
};
- apkid = callPackage ../development/tools/apkid { };
-
- apkleaks = callPackage ../tools/security/apkleaks { };
-
- apksigcopier = callPackage ../development/tools/apksigcopier { };
-
- apksigner = callPackage ../development/tools/apksigner { };
-
- apktool = callPackage ../development/tools/apktool { };
-
appimage-run = callPackage ../tools/package-management/appimage-run { };
appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix {
appimage-run = appimage-run.override {
@@ -2995,96 +1723,34 @@ with pkgs;
};
};
- appimagekit = callPackage ../tools/package-management/appimagekit { };
-
- apt-cacher-ng = callPackage ../servers/http/apt-cacher-ng { };
-
- aptly = callPackage ../tools/misc/aptly { };
-
ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { };
- archivebox = callPackage ../applications/misc/archivebox { };
-
- archivy = callPackage ../applications/misc/archivy { };
-
- arandr = callPackage ../tools/X11/arandr { };
-
- arangodb = callPackage ../servers/nosql/arangodb { };
-
arduino = arduino-core.override { withGui = true; };
- arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { };
-
arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { };
arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { };
- arduino-language-server = callPackage ../development/embedded/arduino/arduino-language-server { };
-
- arduino-mk = callPackage ../development/embedded/arduino/arduino-mk { };
-
- arduinoOTA = callPackage ../development/embedded/arduino/arduinoOTA { };
-
apio = python3Packages.callPackage ../development/embedded/fpga/apio { };
apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { };
- arguments = callPackage ../development/libraries/arguments { };
-
- argus = callPackage ../tools/networking/argus { };
-
- argus-clients = callPackage ../tools/networking/argus-clients { };
-
- argyllcms = callPackage ../tools/graphics/argyllcms { };
-
arj = callPackage ../tools/archivers/arj {
stdenv = gccStdenv;
};
- arp-scan = callPackage ../tools/misc/arp-scan { };
-
inherit (callPackages ../data/fonts/arphic {})
arphic-ukai arphic-uming;
- artyFX = callPackage ../applications/audio/artyFX { };
-
- oggvideotools = callPackage ../tools/misc/oggvideotools { };
-
- owl-lisp = callPackage ../development/compilers/owl-lisp { };
-
- ascii = callPackage ../tools/text/ascii { };
-
- asciinema = callPackage ../tools/misc/asciinema { };
-
asciinema-agg = callPackage ../tools/misc/asciinema-agg {
inherit (darwin.apple_sdk.frameworks) Security;
};
- asciinema-scenario = callPackage ../tools/misc/asciinema-scenario { };
-
- asciiquarium = callPackage ../applications/misc/asciiquarium { };
-
- ashuffle = callPackage ../applications/audio/ashuffle { };
-
- ashpd-demo = callPackage ../development/tools/ashpd-demo { };
-
- astc-encoder = callPackage ../tools/graphics/astc-encoder { };
-
asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };
- async = callPackage ../development/tools/async { };
-
- atheme = callPackage ../servers/irc/atheme { };
-
- atinout = callPackage ../tools/networking/atinout { };
-
atomicparsley = callPackage ../tools/video/atomicparsley {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- audiowaveform = callPackage ../tools/audio/audiowaveform { };
-
- authenticator = callPackage ../applications/misc/authenticator { };
-
authelia = callPackage ../servers/authelia {
buildGoModule = buildGo123Module;
};
@@ -3093,62 +1759,18 @@ with pkgs;
autoflake = with python3.pkgs; toPythonApplication autoflake;
- autospotting = callPackage ../applications/misc/autospotting { };
-
- avfs = callPackage ../tools/filesystems/avfs { };
-
- aliyun-cli = callPackage ../tools/admin/aliyun-cli { };
-
- aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator { };
-
- awscli = callPackage ../tools/admin/awscli { };
-
- okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { };
-
- awslimitchecker = callPackage ../tools/admin/awslimitchecker { };
-
- awslogs = callPackage ../tools/admin/awslogs { };
-
awsume = python3Packages.callPackage ../tools/admin/awsume { };
- aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { };
-
aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { };
- aws-nuke = callPackage ../tools/admin/aws-nuke { };
-
- aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { };
-
- aws-sam-cli = callPackage ../development/tools/aws-sam-cli { };
-
- aws-sso-creds = callPackage ../tools/admin/aws-sso-creds { };
-
- iamy = callPackage ../tools/admin/iamy { };
-
- azeret-mono = callPackage ../data/fonts/azeret-mono { };
-
azure-cli-extensions = recurseIntoAttrs azure-cli.extensions;
- azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { };
-
azure-static-sites-client = callPackage ../development/tools/azure-static-sites-client { };
- azure-storage-azcopy = callPackage ../development/tools/azcopy { };
-
- bark = callPackage ../tools/audio/bark { };
-
- bashblog = callPackage ../tools/text/bashblog { };
-
- berglas = callPackage ../tools/admin/berglas { };
-
- betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { };
-
binocle = callPackage ../applications/misc/binocle {
inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreVideo Foundation Metal QuartzCore;
};
- bitwise = callPackage ../tools/misc/bitwise { };
-
blisp = darwin.apple_sdk_11_0.callPackage ../development/embedded/blisp {
inherit (darwin.apple_sdk_11_0.frameworks) IOKit;
};
@@ -3157,8 +1779,6 @@ with pkgs;
brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ;
- bootspec = callPackage ../tools/misc/bootspec { };
-
# Derivation's result is not used by nixpkgs. Useful for validation for
# regressions of bootstrapTools on hydra and on ofborg. Example:
# pkgsCross.aarch64-multiplatform.freshBootstrapTools.build
@@ -3174,44 +1794,14 @@ with pkgs;
callPackage ../stdenv/freebsd/make-bootstrap-tools.nix {}
else throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}";
- boxes = callPackage ../tools/text/boxes { };
-
- boxxy = callPackage ../tools/misc/boxxy { };
-
- chamber = callPackage ../tools/admin/chamber { };
-
- chaos = callPackage ../tools/networking/chaos { };
-
- charm = callPackage ../applications/misc/charm { };
-
chars = callPackage ../tools/text/chars {
inherit (darwin.apple_sdk.frameworks) Security;
};
- checkip = callPackage ../tools/networking/checkip { };
-
crystfel = callPackage ../applications/science/physics/crystfel { };
crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; };
- cyberchef = callPackage ../tools/misc/cyberchef { };
-
- cw = callPackage ../tools/admin/cw { };
-
- ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { };
-
- ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { };
-
- ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { };
-
- exoscale-cli = callPackage ../tools/admin/exoscale-cli { };
-
- altermime = callPackage ../tools/networking/altermime { };
-
- alttab = callPackage ../tools/X11/alttab { };
-
- amule = callPackage ../tools/networking/p2p/amule { };
-
amule-daemon = amule.override {
monolithic = false;
enableDaemon = true;
@@ -3227,68 +1817,24 @@ with pkgs;
httpServer = true;
};
- apg = callPackage ../tools/security/apg { };
-
apt-dater = callPackage ../tools/package-management/apt-dater {
autoreconfHook = buildPackages.autoreconfHook269;
};
- asusctl = callPackage ../applications/system/asusctl { };
-
- autorevision = callPackage ../tools/misc/autorevision { };
-
- automirror = callPackage ../tools/misc/automirror { };
-
- barman = callPackage ../tools/misc/barman { };
-
- bartib = callPackage ../tools/misc/bartib { };
-
- base16-universal-manager = callPackage ../applications/misc/base16-universal-manager { };
-
- base16384 = callPackage ../tools/text/base16384 { };
-
bashate = python3Packages.callPackage ../development/tools/bashate {
python3Packages = python311Packages;
};
- bash-my-aws = callPackage ../tools/admin/bash-my-aws { };
-
- bashcards = callPackage ../tools/misc/bashcards { };
-
- bazarr = callPackage ../servers/bazarr { };
-
bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { };
- bic = callPackage ../development/interpreters/bic { };
-
- biscuit-cli = callPackage ../tools/security/biscuit-cli { };
-
inherit (callPackages ../tools/security/bitwarden-directory-connector { }) bitwarden-directory-connector-cli bitwarden-directory-connector;
bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { };
- bklk = callPackage ../applications/misc/bklk { };
-
- bkt = callPackage ../tools/misc/bkt { };
-
- bkyml = callPackage ../tools/misc/bkyml { };
-
blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
- bolliedelayxt-lv2 = callPackage ../applications/audio/bolliedelayxt.lv2 { };
-
- bonnmotion = callPackage ../development/tools/misc/bonnmotion { };
-
- bonnie = callPackage ../tools/filesystems/bonnie { };
-
- boron = callPackage ../development/interpreters/boron { };
-
botamusique = callPackage ../tools/audio/botamusique { };
- boulder = callPackage ../tools/admin/boulder { };
-
- btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };
-
bucklespring = bucklespring-x11;
bucklespring-libinput = callPackage ../applications/audio/bucklespring { };
bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; };
@@ -3296,71 +1842,21 @@ with pkgs;
buildbotPackages = recurseIntoAttrs (python3.pkgs.callPackage ../development/tools/continuous-integration/buildbot { });
inherit (buildbotPackages) buildbot buildbot-ui buildbot-full buildbot-plugins buildbot-worker;
- bunyan-rs = callPackage ../development/tools/bunyan-rs { };
-
- calcure = callPackage ../applications/misc/calcure { };
-
- callaudiod = callPackage ../applications/audio/callaudiod { };
-
castopod = callPackage ../applications/audio/castopod { };
- calls = callPackage ../applications/networking/calls { };
-
- castnow = callPackage ../tools/networking/castnow { };
-
- castty = callPackage ../tools/misc/castty { };
-
- certigo = callPackage ../tools/admin/certigo { };
-
certipy = with python3Packages; toPythonApplication certipy-ad;
catcli = python3Packages.callPackage ../tools/filesystems/catcli { };
- changelogger = callPackage ../tools/misc/changelogger { };
-
chipsec = callPackage ../tools/security/chipsec {
kernel = null;
withDriver = false;
};
- chroma = callPackage ../tools/text/chroma { };
-
- clair = callPackage ../tools/admin/clair { };
-
- clairvoyance = callPackage ../tools/security/clairvoyance { };
-
- cloudfox = callPackage ../tools/security/cloudfox { };
-
- cloudhunter = callPackage ../tools/security/cloudhunter { };
-
- cloudsmith-cli = callPackage ../development/tools/cloudsmith-cli { };
-
- codeql = callPackage ../development/tools/analysis/codeql { };
-
fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { };
- cconv = callPackage ../tools/text/cconv { };
-
- go-check = callPackage ../development/tools/check { };
-
- go-cve-search = callPackage ../tools/security/go-cve-search { };
-
- go-dork = callPackage ../tools/security/go-dork { };
-
- chkcrontab = callPackage ../tools/admin/chkcrontab { };
-
- claws = callPackage ../tools/misc/claws { };
-
- cloud-custodian = callPackage ../tools/networking/cloud-custodian { };
-
coconut = with python3Packages; toPythonApplication coconut;
- cod = callPackage ../tools/misc/cod { };
-
- codespell = callPackage ../development/tools/codespell { };
-
- conjure = callPackage ../applications/graphics/conjure { };
-
coolreader = libsForQt5.callPackage ../applications/misc/coolreader { };
corsair = with python3Packages; toPythonApplication corsair-scan;
@@ -3369,162 +1865,54 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) PCSC;
};
- coze = callPackage ../tools/security/coze { } ;
-
- cozy = callPackage ../applications/audio/cozy { };
-
- cpptoml = callPackage ../development/libraries/cpptoml { };
-
- cpuid = callPackage ../os-specific/linux/cpuid { };
-
- ctre = callPackage ../development/libraries/ctre { };
-
- ctrtool = callPackage ../tools/archivers/ctrtool { };
-
- crowbar = callPackage ../tools/security/crowbar { };
-
- crumbs = callPackage ../applications/misc/crumbs { };
-
- crc32c = callPackage ../development/libraries/crc32c { };
-
- crcpp = callPackage ../development/libraries/crcpp { };
-
- cudd = callPackage ../development/libraries/cudd { };
-
inherit (cue) writeCueValidator;
- cuelsp = callPackage ../development/tools/cuelsp { };
-
- cyclonedds = callPackage ../development/libraries/cyclonedds { };
-
- cyclone-scheme = callPackage ../development/interpreters/cyclone { };
-
cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod {
buildGoModule = buildGo123Module;
};
- cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { };
-
dazel = python3Packages.callPackage ../development/tools/dazel { };
- dcap = callPackage ../tools/networking/dcap { };
-
- deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { };
-
- delayarchitect = callPackage ../applications/audio/delayarchitect { };
-
- dell-command-configure = callPackage ../tools/system/dell-command-configure { };
-
- deskew = callPackage ../applications/graphics/deskew { };
-
detect-secrets = with python3Packages; toPythonApplication detect-secrets;
- deterministic-uname = callPackage ../build-support/deterministic-uname { };
-
deterministic-host-uname = deterministic-uname.override {
forPlatform = stdenv.targetPlatform; # offset by 1 so it works in nativeBuildInputs
};
- dfmt = callPackage ../tools/text/dfmt { };
-
- diopser = callPackage ../applications/audio/diopser { };
-
- diskonaut = callPackage ../tools/misc/diskonaut { };
-
diskus = callPackage ../tools/misc/diskus {
inherit (darwin.apple_sdk.frameworks) Security;
};
- distrobox = callPackage ../applications/virtualization/distrobox { };
-
- djmount = callPackage ../tools/filesystems/djmount { };
-
dkimpy = with python3Packages; toPythonApplication dkimpy;
- dl-librescore = callPackage ../tools/audio/dl-librescore { };
-
- dontgo403 = callPackage ../tools/security/dontgo403 { };
-
- dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { };
-
- doona = callPackage ../tools/security/doona { };
-
- droidcam = callPackage ../applications/video/droidcam { };
-
- droidmote = callPackage ../tools/inputmethods/droidmote { };
-
- eartag = callPackage ../applications/audio/eartag { };
-
- ecdsautils = callPackage ../tools/security/ecdsautils { };
-
echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/security/echidna { });
- sedutil = callPackage ../tools/security/sedutil { };
-
- enchive = callPackage ../tools/security/enchive { };
-
- enjarify = callPackage ../tools/misc/enjarify { };
-
- enpass = callPackage ../tools/security/enpass { };
-
esbuild = callPackage ../development/tools/esbuild { };
esbuild_netlify = callPackage ../development/tools/esbuild/netlify.nix { };
- essentia-extractor = callPackage ../tools/audio/essentia-extractor { };
-
- esh = callPackage ../tools/text/esh { };
-
- ezstream = callPackage ../tools/audio/ezstream { };
-
libfx2 = with python3Packages; toPythonApplication fx2;
fastmod = callPackage ../tools/text/fastmod {
inherit (darwin.apple_sdk.frameworks) Security;
};
- fedifetcher = callPackage ../tools/misc/fedifetcher { };
-
- flavours = callPackage ../applications/misc/flavours { };
-
flirc = libsForQt5.callPackage ../applications/video/flirc {
readline = readline70;
};
- flood = callPackage ../applications/networking/p2p/flood { };
-
- flood-for-transmission = callPackage ../applications/networking/p2p/flood-for-transmission { };
-
- font-config-info = callPackage ../tools/misc/font-config-info { };
-
foxdot = with python3Packages; toPythonApplication foxdot;
- fspy = callPackage ../applications/misc/fspy { };
-
- fluffychat = callPackage ../applications/networking/instant-messengers/fluffychat { };
-
fluffychat-web = fluffychat.override { targetFlutterPlatform = "web"; };
- fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
-
gbl = callPackage ../tools/archivers/gbl {
inherit (darwin.apple_sdk.frameworks) Security;
};
- genann = callPackage ../development/libraries/genann { };
-
genpass = callPackage ../tools/security/genpass {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
- genymotion = callPackage ../development/mobile/genymotion { };
-
- galene = callPackage ../servers/web-apps/galene { };
-
- galaxy-buds-client = callPackage ../applications/audio/galaxy-buds-client { };
-
- gamecube-tools = callPackage ../development/tools/gamecube-tools { };
-
gammaray = qt6Packages.callPackage ../development/tools/gammaray { };
gams = callPackage ../tools/misc/gams (config.gams or {});
@@ -3533,59 +1921,21 @@ with pkgs;
callPackage ../by-name/ga/gancio/plugins.nix { inherit (gancio) nodejs; }
);
- gem = callPackage ../applications/audio/pd-plugins/gem { };
-
github-changelog-generator = callPackage ../development/tools/github-changelog-generator { };
- github-commenter = callPackage ../development/tools/github-commenter { };
-
- github-copilot-intellij-agent = callPackage ../development/tools/github-copilot-intellij-agent { };
-
github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite;
gistyc = with python3Packages; toPythonApplication gistyc;
- gjs = callPackage ../development/libraries/gjs { };
-
- gjo = callPackage ../tools/text/gjo { };
-
glances = python3Packages.callPackage ../applications/system/glances { };
- glasgow = callPackage ../tools/misc/glasgow { };
-
- glasstty-ttf = callPackage ../data/fonts/glasstty-ttf { };
-
glaxnimate = libsForQt5.callPackage ../applications/video/glaxnimate { };
- gluesql = callPackage ../servers/sql/gluesql { };
-
- gmni = callPackage ../applications/networking/browsers/gmni { };
-
- gmnisrv = callPackage ../servers/gemini/gmnisrv { };
-
- gmnitohtml = callPackage ../applications/misc/gmnitohtml { };
-
go2tv = darwin.apple_sdk_11_0.callPackage ../applications/video/go2tv {
inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa Kernel UserNotifications;
};
go2tv-lite = go2tv.override { withGui = false; };
- go2rtc = callPackage ../tools/video/go2rtc { };
-
- goimapnotify = callPackage ../tools/networking/goimapnotify { };
-
- gojsontoyaml = callPackage ../development/tools/gojsontoyaml { };
-
- gomatrix = callPackage ../applications/misc/gomatrix { };
-
- gomapenum = callPackage ../tools/security/gomapenum { };
-
- gopacked = callPackage ../applications/misc/gopacked { };
-
- goperf = callPackage ../development/tools/goperf { };
-
- gucci = callPackage ../tools/text/gucci { };
-
guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { };
grc = python3Packages.callPackage ../tools/misc/grc { };
@@ -3606,93 +1956,19 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- gcsfuse = callPackage ../tools/filesystems/gcsfuse { };
-
- glyr = callPackage ../tools/audio/glyr { };
-
- google-amber = callPackage ../tools/graphics/amber { };
-
- hakrawler = callPackage ../tools/security/hakrawler { };
-
- harsh = callPackage ../applications/misc/harsh { };
-
- headset = callPackage ../applications/audio/headset { };
-
- hilbish = callPackage ../shells/hilbish { };
-
- hime = callPackage ../tools/inputmethods/hime { };
-
- himitsu = callPackage ../tools/security/himitsu { };
-
- himitsu-firefox = callPackage ../tools/security/himitsu-firefox { };
-
hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit;
- hostctl = callPackage ../tools/system/hostctl { };
-
- hp2p = callPackage ../tools/networking/hp2p { };
-
- hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { };
-
- http2tcp = callPackage ../tools/networking/http2tcp { };
-
- httperf = callPackage ../tools/networking/httperf { };
-
hwi = with python3Packages; toPythonApplication hwi;
- ili2c = callPackage ../tools/misc/ili2c { };
-
- imagelol = callPackage ../tools/compression/imagelol { };
-
- imgpatchtools = callPackage ../development/mobile/imgpatchtools { };
-
- imgcrypt = callPackage ../applications/virtualization/imgcrypt { };
-
- ipgrep = callPackage ../tools/networking/ipgrep { };
-
- ipp-usb = callPackage ../os-specific/linux/ipp-usb { };
-
- itchiodl = callPackage ../games/itchiodl { };
-
- itd = callPackage ../applications/misc/itd { };
-
kavita = callPackage ../servers/web-apps/kavita { };
- keka = callPackage ../tools/compression/keka { };
-
- kord = callPackage ../applications/misc/kord { };
-
- lastpass-cli = callPackage ../tools/security/lastpass-cli { };
-
- leetcode-cli = callPackage ../applications/misc/leetcode-cli { };
-
- lesspass-cli = callPackage ../tools/security/lesspass-cli { };
-
livebook = callPackage ../servers/web-apps/livebook {
elixir = elixir_1_17;
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; });
};
- lsix = callPackage ../tools/graphics/lsix { };
-
- mdr = callPackage ../tools/misc/mdr { };
-
- mobilecoin-wallet = callPackage ../applications/misc/mobilecoin-wallet { };
-
- pacparser = callPackage ../tools/networking/pacparser { };
-
- pairdrop = callPackage ../applications/misc/pairdrop { };
-
- opencbm = callPackage ../tools/misc/opencbm { };
-
- parquet-tools = callPackage ../tools/misc/parquet-tools { };
-
pass = callPackage ../tools/security/pass { };
- passage = callPackage ../tools/security/passage { };
-
- passphrase2pgp = callPackage ../tools/security/passphrase2pgp { };
-
pass-nodmenu = callPackage ../tools/security/pass {
dmenuSupport = false;
pass = pass-nodmenu;
@@ -3705,16 +1981,10 @@ with pkgs;
passExtensions = recurseIntoAttrs pass.extensions;
- pbpctrl = callPackage ../applications/audio/pbpctrl { };
-
inherd-quake = callPackage ../applications/misc/inherd-quake {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
- xjadeo = callPackage ../tools/video/xjadeo { };
-
- go-audit = callPackage ../tools/system/go-audit { };
-
gopass = callPackage ../tools/security/gopass { };
gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { };
@@ -3725,24 +1995,6 @@ with pkgs;
gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { };
- gosh = callPackage ../tools/security/gosh { };
-
- gospider = callPackage ../tools/security/gospider { };
-
- browserpass = callPackage ../tools/security/browserpass { };
-
- passff-host = callPackage ../tools/security/passff-host { };
-
- oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
-
- goku = callPackage ../os-specific/darwin/goku { };
-
- grandperspective = callPackage ../os-specific/darwin/grandperspective { };
-
- hexfiend = callPackage ../os-specific/darwin/hexfiend { };
-
- grb = callPackage ../applications/misc/grb { };
-
kerf = kerf_1; /* kerf2 is WIP */
kerf_1 = callPackage ../development/interpreters/kerf {
stdenv = clangStdenv;
@@ -3751,10 +2003,6 @@ with pkgs;
;
};
- kwakd = callPackage ../servers/kwakd { };
-
- kwm = callPackage ../os-specific/darwin/kwm { };
-
khd = callPackage ../os-specific/darwin/khd {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
@@ -3763,74 +2011,27 @@ with pkgs;
lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { };
- luigi = callPackage ../applications/networking/cluster/luigi { };
-
- m-cli = callPackage ../os-specific/darwin/m-cli { };
-
- pebble = callPackage ../tools/admin/pebble { };
-
- play-with-mpv = callPackage ../tools/video/play-with-mpv { };
-
plausible = callPackage ../servers/web-apps/plausible {
elixir = elixir_1_14;
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
};
- pam-reattach = callPackage ../os-specific/darwin/pam-reattach { };
-
reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { };
qes = callPackage ../os-specific/darwin/qes {
inherit (darwin.apple_sdk.frameworks) Carbon;
};
- wgo = callPackage ../development/tools/wgo { };
-
- wiiload = callPackage ../development/tools/wiiload { };
-
- winhelpcgi = callPackage ../development/tools/winhelpcgi { };
-
- wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { };
-
- xc = callPackage ../development/tools/xc { };
-
xcodeenv = callPackage ../development/mobile/xcodeenv { };
- xcodes = swiftPackages.callPackage ../development/tools/xcodes {
- inherit (swiftPackages.apple_sdk.frameworks) CryptoKit LocalAuthentication;
- inherit (swiftPackages.apple_sdk) libcompression;
- };
-
gomobile = callPackage ../development/mobile/gomobile { };
- ssh-agents = callPackage ../tools/networking/ssh-agents { };
-
- ssh-key-confirmer = callPackage ../tools/networking/ssh-key-confirmer { };
-
- ssh-mitm = callPackage ../tools/security/ssh-mitm { };
-
- sshchecker = callPackage ../tools/security/sshchecker { };
-
- sshs = callPackage ../development/tools/sshs { };
-
- supergfxctl = callPackage ../applications/system/supergfxctl { };
-
- titanium = callPackage ../development/mobile/titanium { };
-
- titanium-alloy = callPackage ../development/mobile/titanium-alloy { };
-
titaniumenv = callPackage ../development/mobile/titaniumenv { };
- abootimg = callPackage ../development/mobile/abootimg { };
-
- adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { };
-
adb-sync = callPackage ../development/mobile/adb-sync {
inherit (androidenv.androidPkgs) platform-tools;
};
- amoco = callPackage ../tools/security/amoco { };
-
anbox = callPackage ../os-specific/linux/anbox {
protobuf = protobuf_21;
};
@@ -3863,24 +2064,12 @@ with pkgs;
apprise = with python3Packages; toPythonApplication apprise;
- aptdec = callPackage ../development/libraries/aptdec { };
-
aria2 = callPackage ../tools/networking/aria2 {
inherit (darwin.apple_sdk.frameworks) Security;
};
- as-tree = callPackage ../tools/misc/as-tree { };
-
- asmfmt = callPackage ../development/tools/asmfmt { };
-
asmrepl = callPackage ../development/interpreters/asmrepl { };
- aspcud = callPackage ../tools/misc/aspcud { };
-
- at = callPackage ../tools/system/at { };
-
- atftp = callPackage ../tools/networking/atftp { };
-
atlas = callPackage ../by-name/at/atlas/package.nix {
buildGoModule = buildGo123Module;
};
@@ -3889,92 +2078,34 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- autogen = callPackage ../development/tools/misc/autogen { };
-
- autojump = callPackage ../tools/misc/autojump { };
-
- automysqlbackup = callPackage ../tools/backup/automysqlbackup { };
-
- autorandr = callPackage ../tools/misc/autorandr { };
-
avahi = callPackage ../development/libraries/avahi { };
avahi-compat = callPackage ../development/libraries/avahi {
withLibdnssdCompat = true;
};
- avro-c = callPackage ../development/libraries/avro-c { };
-
- avro-cpp = callPackage ../development/libraries/avro-c++ { };
-
- aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { };
-
- awsls = callPackage ../tools/admin/awsls { };
-
- awsrm = callPackage ../tools/admin/awsrm { };
-
- awstats = callPackage ../tools/system/awstats { };
-
- awsweeper = callPackage ../tools/admin/awsweeper { };
-
axel = callPackage ../tools/networking/axel {
libssl = openssl;
};
- backblaze-b2 = callPackage ../development/tools/backblaze-b2 { };
-
bandwhich = callPackage ../tools/networking/bandwhich {
inherit (darwin.apple_sdk.frameworks) Security;
};
- badrobot = callPackage ../tools/security/badrobot { };
-
- bao = callPackage ../tools/security/bao { };
-
- bar = callPackage ../tools/system/bar { };
-
base16-builder = callPackage ../misc/base16-builder { };
- basex = callPackage ../tools/text/xml/basex { };
-
- bashplotlib = callPackage ../tools/misc/bashplotlib { };
-
- babeld = callPackage ../tools/networking/babeld { };
-
babelfish = callPackage ../shells/fish/babelfish.nix { };
- baboossh = callPackage ../tools/security/baboossh { };
-
badchars = python3Packages.callPackage ../tools/security/badchars { };
- badvpn = callPackage ../tools/networking/badvpn { };
-
- barcode = callPackage ../tools/graphics/barcode { };
-
- bashmount = callPackage ../tools/filesystems/bashmount { };
-
bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { });
- beats = callPackage ../tools/misc/beats { };
-
beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme {
inherit (plasma5Packages) breeze-icons;
};
beautysh = with python3.pkgs; toPythonApplication beautysh;
- bc = callPackage ../tools/misc/bc { };
-
- bdf2psf = callPackage ../tools/misc/bdf2psf { };
-
- bdf2sfd = callPackage ../tools/misc/bdf2sfd { };
-
- bdfresize = callPackage ../tools/misc/bdfresize { };
-
- bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
-
- bchunk = callPackage ../tools/cd-dvd/bchunk { };
-
inherit (callPackages ../misc/logging/beats/7.x.nix { })
auditbeat7
filebeat7
@@ -3988,44 +2119,12 @@ with pkgs;
metricbeat = metricbeat7;
packetbeat = packetbeat7;
- bfr = callPackage ../tools/misc/bfr { };
-
- bfscripts = callPackage ../tools/misc/bfscripts { };
-
- bibtool = callPackage ../tools/misc/bibtool { };
-
- bibutils = callPackage ../tools/misc/bibutils { };
-
- bibtex2html = callPackage ../tools/misc/bibtex2html { };
-
- bicon = callPackage ../applications/misc/bicon { };
-
biliass = with python3.pkgs; toPythonApplication biliass;
- bindfs = callPackage ../tools/filesystems/bindfs { };
-
binwalk = with python3Packages; toPythonApplication binwalk;
birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
- blitz = callPackage ../development/libraries/blitz { };
-
- blockbook = callPackage ../servers/blockbook { };
-
- blockhash = callPackage ../tools/graphics/blockhash { };
-
- bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
-
- bluewalker = callPackage ../tools/bluetooth/bluewalker { };
-
- blur-effect = callPackage ../tools/graphics/blur-effect { };
-
- bootiso = callPackage ../tools/cd-dvd/bootiso { };
-
- butane = callPackage ../development/tools/butane { };
-
- buttercup-desktop = callPackage ../tools/security/buttercup-desktop { };
-
charles = charles4;
inherit (callPackages ../applications/networking/charles {})
charles3
@@ -4042,120 +2141,38 @@ with pkgs;
libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { };
- tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { };
-
- tiny-cuda-nn = callPackage ../development/libraries/science/math/tiny-cuda-nn { };
-
- tezos-rust-libs = callPackage ../development/libraries/tezos-rust-libs { };
-
behave = with python3Packages; toPythonApplication behave;
- behdad-fonts = callPackage ../data/fonts/behdad-fonts { };
-
- bfetch = callPackage ../tools/misc/bfetch { };
-
blink = darwin.apple_sdk_11_0.callPackage ../applications/emulators/blink { };
- blink1-tool = callPackage ../tools/misc/blink1-tool { };
-
- blis = callPackage ../development/libraries/science/math/blis { };
-
- bliss = callPackage ../applications/science/math/bliss { };
-
- blobfuse = callPackage ../tools/filesystems/blobfuse { };
-
blockdiag = with python3Packages; toPythonApplication blockdiag;
- bmon = callPackage ../tools/misc/bmon { };
-
- boca = callPackage ../development/libraries/boca { };
-
- bubblewrap = callPackage ../tools/admin/bubblewrap { };
-
- borgbackup = callPackage ../tools/backup/borgbackup { };
-
- borgmatic = callPackage ../tools/backup/borgmatic { };
-
- borg-sans-mono = callPackage ../data/fonts/borg-sans-mono { };
-
- boringtun = callPackage ../tools/networking/boringtun { };
-
- book-summary = callPackage ../tools/text/book-summary { };
-
bookstack = callPackage ../servers/web-apps/bookstack { };
boomerang = libsForQt5.callPackage ../development/tools/boomerang { };
- boost-build = callPackage ../development/tools/boost-build { };
-
- boot = callPackage ../development/tools/build-managers/boot { };
-
- bowtie = callPackage ../applications/science/biology/bowtie { };
-
- bowtie2 = callPackage ../applications/science/biology/bowtie2 { };
-
- boxfs = callPackage ../tools/filesystems/boxfs { };
-
bozohttpd-minimal = bozohttpd.override { minimal = true; };
brasero-unwrapped = callPackage ../tools/cd-dvd/brasero { };
brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { };
- brigand = callPackage ../development/libraries/brigand { };
-
- brltty = callPackage ../tools/misc/brltty { };
-
- brook = callPackage ../tools/networking/brook { };
-
broot = callPackage ../tools/misc/broot {
inherit (darwin.apple_sdk.frameworks) Foundation Security;
};
- bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
-
- brutespray = callPackage ../tools/security/brutespray { };
-
- btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
-
- btrfs-snap = callPackage ../tools/filesystems/btrfs-snap { };
-
ssdfs-utils = callPackage ../tools/filesystems/ssdfs-utils { };
btlejack = python3Packages.callPackage ../applications/radio/btlejack { };
- btrbk = callPackage ../tools/backup/btrbk { };
-
- bonk = callPackage ../tools/misc/bonk { };
-
- bottom-rs = callPackage ../tools/misc/bottom-rs { };
-
- bsp-layout = callPackage ../tools/misc/bsp-layout { };
-
- buildtorrent = callPackage ../tools/misc/buildtorrent { };
-
- bwm_ng = callPackage ../tools/networking/bwm-ng { };
-
- bwbasic = callPackage ../development/interpreters/bwbasic { };
-
- bws = callPackage ../tools/security/bws { };
-
bsh = fetchurl {
url = "http://www.beanshell.org/bsh-2.0b5.jar";
hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw=";
};
- btfs = callPackage ../os-specific/linux/btfs { };
-
buildah = callPackage ../development/tools/buildah/wrapper.nix { };
buildah-unwrapped = callPackage ../development/tools/buildah { };
- buildkit = callPackage ../development/tools/buildkit { };
-
- bukubrow = callPackage ../tools/networking/bukubrow { };
-
- burpsuite = callPackage ../tools/networking/burpsuite { };
-
c3d = callPackage ../applications/graphics/c3d {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -4181,30 +2198,16 @@ with pkgs;
'';
});
- traefik = callPackage ../servers/traefik { };
-
- traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { };
-
- caffeine = callPackage ../tools/misc/caffeine { };
-
calamares = libsForQt5.callPackage ../tools/misc/calamares {
python = python3;
boost = boost.override { enablePython = true; python = python3; };
};
calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; });
- calamares-nixos-extensions = callPackage ../tools/misc/calamares-nixos-extensions { };
-
- calendar-cli = callPackage ../tools/networking/calendar-cli { };
-
- cameradar = callPackage ../tools/security/cameradar { };
-
candle = libsForQt5.callPackage ../applications/misc/candle { };
capstone = callPackage ../development/libraries/capstone { };
capstone_4 = callPackage ../development/libraries/capstone/4.nix { };
- keystone = callPackage ../development/libraries/keystone { };
-
casync = callPackage ../applications/networking/sync/casync {
sphinx = buildPackages.python3Packages.sphinx;
};
@@ -4212,74 +2215,26 @@ with pkgs;
cataract = callPackage ../applications/misc/cataract { };
cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { };
- catch = callPackage ../development/libraries/catch { };
-
catch2 = callPackage ../development/libraries/catch2 { };
catch2_3 = callPackage ../development/libraries/catch2/3.nix { };
- catdoc = callPackage ../tools/text/catdoc { };
-
- catdocx = callPackage ../tools/text/catdocx { };
-
- catclock = callPackage ../applications/misc/catclock { };
-
cardpeek = callPackage ../applications/misc/cardpeek { inherit (darwin.apple_sdk.frameworks) PCSC; };
- cde = callPackage ../tools/package-management/cde { };
-
- cdxgen = callPackage ../tools/security/cdxgen { };
-
ceres-solver = callPackage ../development/libraries/ceres-solver {
gflags = null; # only required for examples/tests
};
- cassowary = callPackage ../tools/networking/cassowary { };
-
- croc = callPackage ../tools/networking/croc { };
-
cedille = callPackage ../applications/science/logic/cedille
{ inherit (haskellPackages) alex happy Agda ghcWithPackages;
};
- cel-go = callPackage ../development/interpreters/cel-go { };
-
- cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { };
-
- cf-terraforming = callPackage ../tools/misc/cf-terraforming { };
-
- charliecloud = callPackage ../applications/virtualization/charliecloud { };
-
- chelf = callPackage ../tools/misc/chelf { };
-
- chisel = callPackage ../tools/networking/chisel { };
-
- cht-sh = callPackage ../tools/misc/cht.sh { };
-
- ckbcomp = callPackage ../tools/X11/ckbcomp { };
-
- clac = callPackage ../tools/misc/clac { };
-
- map-cmd = callPackage ../tools/misc/map { };
-
clevercsv = with python3Packages; toPythonApplication clevercsv;
- cli53 = callPackage ../tools/admin/cli53 { };
-
- cli-visualizer = callPackage ../applications/misc/cli-visualizer { };
-
- cliam = callPackage ../tools/security/cliam { };
-
- clickclack = callPackage ../tools/misc/clickclack { };
-
clickgen = with python3Packages; toPythonApplication clickgen;
- clog-cli = callPackage ../development/tools/clog-cli { };
-
cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; };
- cloudbrute = callPackage ../tools/security/cloudbrute { };
-
cloudflared = callPackage ../applications/networking/cloudflared {
# https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250
buildGoModule = buildGoModule.override {
@@ -4296,46 +2251,24 @@ with pkgs;
};
};
- cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { };
-
- cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { };
-
- clib = callPackage ../tools/package-management/clib { };
-
clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { };
clprover = callPackage ../applications/science/logic/clprover/clprover.nix { };
- clusterctl = callPackage ../applications/networking/cluster/clusterctl { };
-
coloredlogs = with python3Packages; toPythonApplication coloredlogs;
- colpack = callPackage ../applications/science/math/colpack { };
-
- cz-cli = callPackage ../applications/version-management/cz-cli { };
-
czkawka-full = czkawka.wrapper.override {
extraPackages = [ ffmpeg ];
};
- comma = callPackage ../tools/package-management/comma { };
-
commitizen = with python3Packages; toPythonApplication commitizen;
- common-licenses = callPackage ../data/misc/common-licenses { };
-
compactor = callPackage ../applications/networking/compactor {
protobuf = protobuf_21;
};
- consul-alerts = callPackage ../servers/monitoring/consul-alerts { };
-
- consul-template = callPackage ../tools/system/consul-template { };
-
- copyright-update = callPackage ../tools/text/copyright-update { };
-
inherit (callPackages ../tools/misc/coreboot-utils { })
msrtool
cbmem
@@ -4352,116 +2285,16 @@ with pkgs;
coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { };
- corosync = callPackage ../servers/corosync { };
-
- fw-ectool = callPackage ../os-specific/linux/fw-ectool { };
-
- chayang = callPackage ../tools/wayland/chayang { };
-
- cherrytree = callPackage ../applications/misc/cherrytree { };
-
- chntpw = callPackage ../tools/security/chntpw { };
-
- chopchop = callPackage ../tools/security/chopchop { };
-
- clapboard = callPackage ../tools/wayland/clapboard { };
-
- clipman = callPackage ../tools/wayland/clipman { };
-
- kabeljau = callPackage ../games/kabeljau { };
-
- kanshi = callPackage ../tools/wayland/kanshi { };
-
- shikane = callPackage ../tools/wayland/shikane { };
-
- shotman = callPackage ../tools/wayland/shotman { };
-
sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
wlroots = wlroots_0_18;
};
- swayr = callPackage ../tools/wayland/swayr { };
-
- swayrbar = callPackage ../tools/wayland/swayrbar { };
-
- swaysome = callPackage ../tools/wayland/swaysome { };
-
swaytools = python3Packages.callPackage ../tools/wayland/swaytools { };
- wayland-utils = callPackage ../tools/wayland/wayland-utils { };
-
- wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { };
-
- waylogout = callPackage ../tools/wayland/waylogout { };
-
- waynergy = callPackage ../tools/wayland/waynergy { };
-
- wayout = callPackage ../tools/wayland/wayout { };
-
- way-displays = callPackage ../tools/wayland/way-displays { };
-
- wev = callPackage ../tools/wayland/wev { };
-
- wdomirror = callPackage ../tools/wayland/wdomirror { };
-
- wdt = callPackage ../applications/networking/sync/wdt { };
-
- wl-clipboard = callPackage ../tools/wayland/wl-clipboard { };
-
- wl-clipboard-x11 = callPackage ../tools/wayland/wl-clipboard-x11 { };
-
- wl-color-picker = callPackage ../tools/wayland/wl-color-picker { };
-
- wl-mirror = callPackage ../tools/wayland/wl-mirror { };
-
- wl-screenrec = callPackage ../tools/wayland/wl-screenrec { };
-
- wleave = callPackage ../tools/wayland/wleave { };
-
- wlopm = callPackage ../tools/wayland/wlopm { };
-
- wlprop = callPackage ../tools/wayland/wlprop { };
-
- wlr-randr = callPackage ../tools/wayland/wlr-randr { };
-
- wlr-which-key = callPackage ../tools/wayland/wlr-which-key { };
-
- wlrctl = callPackage ../tools/wayland/wlrctl { };
-
- wlsunset = callPackage ../tools/wayland/wlsunset { };
-
- wl-gammactl = callPackage ../tools/wayland/wl-gammactl { };
-
- wluma = callPackage ../tools/wayland/wluma { };
-
- wob = callPackage ../tools/wayland/wob { };
-
- wshowkeys = callPackage ../tools/wayland/wshowkeys { };
-
- wtype = callPackage ../tools/wayland/wtype { };
-
- cambalache = callPackage ../development/tools/cambalache { };
-
cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };
- changedetection-io = callPackage ../servers/web-apps/changedetection-io { };
-
- clini = callPackage ../tools/misc/clini { };
-
- clipster = callPackage ../tools/misc/clipster { };
-
- clockify = callPackage ../applications/office/clockify { };
-
cplex = callPackage ../applications/science/math/cplex (config.cplex or {});
- cpulimit = callPackage ../tools/misc/cpulimit { };
-
- code-minimap = callPackage ../tools/misc/code-minimap { };
-
- codesearch = callPackage ../tools/text/codesearch { };
-
- codec2 = callPackage ../development/libraries/codec2 { };
-
contacts = callPackage ../tools/misc/contacts {
inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;
};
@@ -4472,138 +2305,30 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- compsize = callPackage ../os-specific/linux/compsize { };
-
- comrak = callPackage ../tools/text/comrak { };
-
cot = with python3Packages; toPythonApplication cot;
- coturn = callPackage ../servers/coturn { };
-
- coursier = callPackage ../development/tools/coursier { };
-
- cppclean = callPackage ../development/tools/cppclean { };
-
- credhub-cli = callPackage ../tools/admin/credhub-cli { };
-
- crex = callPackage ../tools/misc/crex { };
-
- cri-tools = callPackage ../tools/virtualization/cri-tools { };
-
- crip = callPackage ../applications/audio/crip { };
-
crosvm = callPackage ../applications/virtualization/crosvm { };
crossplane = with python3Packages; toPythonApplication crossplane;
- crowdsec = callPackage ../tools/security/crowdsec { };
-
- crunch = callPackage ../tools/security/crunch { };
-
- crudini = callPackage ../tools/misc/crudini { };
-
csv2md = with python3Packages; toPythonApplication csv2md;
- csv2odf = callPackage ../applications/office/csv2odf { };
-
- csv2parquet = callPackage ../tools/misc/csv2parquet { };
-
- csvdiff = callPackage ../tools/text/csvdiff { };
-
- csview = callPackage ../tools/text/csview { };
-
- csvquote = callPackage ../tools/text/csvquote { };
-
csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { };
- csv2latex = callPackage ../tools/misc/csv2latex { };
-
- csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { };
-
cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { };
- dab_lib = callPackage ../development/libraries/dab_lib { };
-
- dabet = callPackage ../tools/misc/dabet { };
-
- dabtools = callPackage ../applications/radio/dabtools { };
-
- daemontools = callPackage ../tools/admin/daemontools { };
-
- dale = callPackage ../development/compilers/dale { };
-
- damon = callPackage ../tools/admin/damon { };
-
- dancing-script = callPackage ../data/fonts/dancing-script { };
-
- dante = callPackage ../servers/dante { };
-
- dasel = callPackage ../applications/misc/dasel { };
-
- dasher = callPackage ../applications/accessibility/dasher { };
-
dataclass-wizard = with python3Packages; toPythonApplication dataclass-wizard;
- datafusion-cli = callPackage ../development/misc/datafusion { };
-
- datamash = callPackage ../tools/misc/datamash { };
-
datasette = with python3Packages; toPythonApplication datasette;
- howard-hinnant-date = callPackage ../development/libraries/howard-hinnant-date { };
-
- datefmt = callPackage ../tools/misc/datefmt { };
-
- datefudge = callPackage ../tools/system/datefudge { };
-
- dateutils = callPackage ../tools/misc/dateutils { };
-
datovka = libsForQt5.callPackage ../applications/networking/datovka { };
- dave = callPackage ../servers/http/dave { };
-
- dconf = callPackage ../development/libraries/dconf { };
-
- ddate = callPackage ../tools/misc/ddate { };
-
- ddosify = callPackage ../development/tools/ddosify { };
-
- dduper = callPackage ../tools/filesystems/dduper { };
-
- dedup = callPackage ../tools/backup/dedup { };
-
- deheader = callPackage ../development/tools/misc/deheader { };
-
- dehydrated = callPackage ../tools/admin/dehydrated { };
-
- deja-dup = callPackage ../applications/backup/deja-dup { };
-
- dejsonlz4 = callPackage ../tools/compression/dejsonlz4 { };
-
- desync = callPackage ../applications/networking/sync/desync { };
-
- devdocs-desktop = callPackage ../applications/misc/devdocs-desktop { };
-
- devmem2 = callPackage ../os-specific/linux/devmem2 { };
-
- dbus-broker = callPackage ../os-specific/linux/dbus-broker { };
-
- dblab = callPackage ../development/tools/database/dblab { };
-
- dbx = callPackage ../applications/misc/dbx { };
-
- ioport = callPackage ../os-specific/linux/ioport { };
-
diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
inherit (haskellPackages) ghcWithPackages diagrams-builder;
};
dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { };
- dieharder = callPackage ../tools/security/dieharder { };
-
- digitemp = callPackage ../tools/misc/digitemp { };
-
dijo = callPackage ../tools/misc/dijo {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -4613,92 +2338,34 @@ with pkgs;
aspellDicts_en = aspellDicts.en;
};
- dirb = callPackage ../tools/networking/dirb { };
-
- dirstalk = callPackage ../tools/security/dirstalk { };
-
h = callPackage ../tools/misc/h { };
- discount = callPackage ../tools/text/discount { };
-
discourse = callPackage ../servers/web-apps/discourse { };
discourseAllPlugins = discourse.override {
plugins = lib.filter (p: p ? pluginName) (builtins.attrValues discourse.plugins);
};
- discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { };
-
- discocss = callPackage ../tools/misc/discocss { };
-
- disfetch = callPackage ../tools/misc/disfetch { };
-
- disk-inventory-x = callPackage ../tools/filesystems/disk-inventory-x { };
-
- diskscan = callPackage ../tools/misc/diskscan { };
-
disorderfs = callPackage ../tools/filesystems/disorderfs {
asciidoc = asciidoc-full;
};
- dislocker = callPackage ../tools/filesystems/dislocker { };
-
- distgen = callPackage ../development/tools/distgen { };
-
- distrobuilder = callPackage ../tools/virtualization/distrobuilder { };
-
- ditaa = callPackage ../tools/graphics/ditaa { };
-
dino = callPackage ../applications/networking/instant-messengers/dino {
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-vaapi;
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
};
- djot-js = callPackage ../tools/text/djot-js { };
-
- djv = callPackage ../applications/graphics/djv { };
-
dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
- doitlive = callPackage ../tools/misc/doitlive { };
-
- dokuwiki = callPackage ../servers/web-apps/dokuwiki { };
-
- dolibarr = callPackage ../servers/web-apps/dolibarr { };
-
- dosage = callPackage ../applications/graphics/dosage { };
-
dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter {
inherit (darwin.apple_sdk.frameworks) Security;
};
- dotool = callPackage ../tools/dotool { };
-
inherit (ocamlPackages) dot-merlin-reader;
- dozenal = callPackage ../applications/misc/dozenal { };
-
- dpic = callPackage ../tools/graphics/dpic { };
-
- dsdcc = callPackage ../development/libraries/dsdcc { };
-
- dstp = callPackage ../development/tools/dstp { };
-
- dsvpn = callPackage ../applications/networking/dsvpn { };
-
- dwt1-shell-color-scripts = callPackage ../tools/misc/dwt1-shell-color-scripts { };
-
- dtrx = callPackage ../tools/compression/dtrx { };
-
- duf = callPackage ../tools/misc/duf { };
-
- dum = callPackage ../development/tools/dum { };
-
inherit (ocaml-ng.ocamlPackages_4_10) dune_1;
inherit (ocamlPackages) dune_2 dune_3 dune-release;
- duperemove = callPackage ../tools/filesystems/duperemove { };
-
dvc = with python3.pkgs; toPythonApplication dvc;
dvc-with-remotes = dvc.override {
@@ -4708,18 +2375,6 @@ with pkgs;
enableSSH = true;
};
- dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
-
- dynamic-wallpaper = callPackage ../tools/graphics/dynamic-wallpaper { };
-
- dyncall = callPackage ../development/libraries/dyncall { };
-
- dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
-
- earthly = callPackage ../development/tools/earthly { };
-
- earlybird = callPackage ../tools/security/earlybird { };
-
easyabc = callPackage ../applications/audio/easyabc { };
easyaudiosync = qt6Packages.callPackage ../applications/audio/easyaudiosync {};
@@ -4732,26 +2387,10 @@ with pkgs;
easyocr = with python3.pkgs; toPythonApplication easyocr;
- ecasound = callPackage ../applications/audio/ecasound { };
-
- edac-utils = callPackage ../os-specific/linux/edac-utils { };
-
eddy = libsForQt5.callPackage ../applications/graphics/eddy { };
- eggdrop = callPackage ../tools/networking/eggdrop { };
-
- egglog = callPackage ../applications/science/logic/egglog { };
-
- ego = callPackage ../tools/misc/ego { };
-
- ekam = callPackage ../development/tools/build-managers/ekam { };
-
electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { };
- electron-mail = callPackage ../applications/networking/mailreaders/electron-mail { };
-
- element = callPackage ../applications/science/chemistry/element { };
-
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_32;
@@ -4767,39 +2406,8 @@ with pkgs;
conf = config.element-web.conf or { };
};
- elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { };
-
- ell = callPackage ../os-specific/linux/ell { };
-
elm-github-install = callPackage ../tools/package-management/elm-github-install { };
- elogind = callPackage ../applications/misc/elogind { };
-
- elpa = callPackage ../development/libraries/elpa { };
-
- enca = callPackage ../tools/text/enca { };
-
- encpipe = callPackage ../tools/misc/encpipe { };
-
- ent = callPackage ../tools/misc/ent { };
-
- entwine = callPackage ../applications/graphics/entwine { };
-
- envconsul = callPackage ../tools/system/envconsul { };
-
- envsubst = callPackage ../tools/misc/envsubst { };
-
- envfs = callPackage ../tools/filesystems/envfs { };
-
- er-patcher = callPackage ../tools/games/er-patcher { };
-
- erdtree = callPackage ../tools/system/erdtree { };
-
- errcheck = callPackage ../development/tools/errcheck { };
-
- eschalot = callPackage ../tools/security/eschalot { };
-
- espanso = callPackage ../applications/office/espanso { };
espanso-wayland = espanso.override {
x11Support = false;
waylandSupport = true;
@@ -4808,138 +2416,44 @@ with pkgs;
esphome = callPackage ../tools/misc/esphome { };
- esptool = callPackage ../tools/misc/esptool { };
-
- esptool-ck = callPackage ../tools/misc/esptool-ck { };
-
- ephemeralpg = callPackage ../development/tools/database/ephemeralpg { };
-
- et = callPackage ../applications/misc/et { };
-
- ejson = callPackage ../development/tools/ejson { };
-
- eternal-terminal = callPackage ../tools/networking/eternal-terminal { };
-
- extism-cli = callPackage ../development/tools/extism-cli { };
-
- extrude = callPackage ../tools/security/extrude { };
-
fastly = callPackage ../misc/fastly {
# If buildGoModule is overridden, provide a matching version of the go attribute
};
- f2 = callPackage ../tools/misc/f2 { };
-
- f3 = callPackage ../tools/filesystems/f3 { };
-
f3d = callPackage ../applications/graphics/f3d {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
};
f3d_egl = f3d.override { vtk_9 = vtk_9_egl; };
- facedetect = callPackage ../tools/graphics/facedetect { };
-
- faketty = callPackage ../tools/misc/faketty { };
-
- fasd = callPackage ../tools/misc/fasd { };
-
- fastJson = callPackage ../development/libraries/fastjson { };
-
fast-cli = nodePackages.fast-cli;
- fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { };
-
fast-ssh = callPackage ../tools/networking/fast-ssh {
inherit (darwin.apple_sdk.frameworks) Security;
};
- faudio = callPackage ../development/libraries/faudio { };
-
- fblog = callPackage ../development/tools/fblog { };
-
- fd = callPackage ../tools/misc/fd { };
-
fdroidcl = pkgs.callPackage ../development/mobile/fdroidcl { };
fedimint = callPackage ../by-name/fe/fedimint/package.nix {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- fetch-scm = callPackage ../tools/misc/fetch-scm { };
-
- fiano = callPackage ../tools/misc/fiano { };
-
- filebench = callPackage ../tools/misc/filebench { };
-
- fileshare = callPackage ../servers/fileshare { };
-
- fileshelter = callPackage ../servers/web-apps/fileshelter { };
-
- fioctl = callPackage ../tools/admin/fioctl { };
-
- firectl = callPackage ../applications/virtualization/firectl { };
-
- firestarter = callPackage ../applications/misc/firestarter { };
-
- fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { };
-
- flitter = callPackage ../tools/misc/flitter { };
-
flowgger = callPackage ../tools/misc/flowgger {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- frangipanni = callPackage ../tools/text/frangipanni { };
-
- frawk = callPackage ../tools/text/frawk { };
-
- fre = callPackage ../tools/misc/fre { };
-
- frei = callPackage ../tools/misc/frei { };
-
- frogmouth = callPackage ../tools/text/frogmouth { };
-
- fselect = callPackage ../tools/misc/fselect { };
-
- fsmon = callPackage ../tools/misc/fsmon { };
-
- fst = callPackage ../tools/text/fst { };
-
- fsql = callPackage ../tools/misc/fsql { };
-
- kitty-img = callPackage ../tools/misc/kitty-img { };
-
### TOOLS/TYPESETTING/TEX
advi = callPackage ../tools/typesetting/tex/advi {
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
- auctex = callPackage ../tools/typesetting/tex/auctex { };
-
- blahtexml = callPackage ../tools/typesetting/tex/blahtexml { };
-
- catdvi = callPackage ../tools/typesetting/tex/catdvi { };
-
- dblatex = callPackage ../tools/typesetting/tex/dblatex { };
-
dblatexFull = dblatex.override { enableAllFeatures = true; };
- gladtex = callPackage ../tools/typesetting/tex/gladtex { };
-
latex2mathml = with python3Packages; toPythonApplication latex2mathml;
- latexrun = callPackage ../tools/typesetting/tex/latexrun { };
-
- lkproof = callPackage ../tools/typesetting/tex/lkproof { };
-
- mftrace = callPackage ../tools/typesetting/tex/mftrace { };
-
pgf = pgf2;
- pplatex = callPackage ../tools/typesetting/tex/pplatex { };
-
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
@@ -4949,63 +2463,22 @@ with pkgs;
inherit (texlive.schemes) texliveBasic texliveBookPub texliveConTeXt texliveFull texliveGUST texliveInfraOnly texliveMedium texliveMinimal texliveSmall texliveTeTeX;
texlivePackages = recurseIntoAttrs (lib.mapAttrs (_: v: v.build) texlive.pkgs);
- fop = callPackage ../tools/typesetting/fop { };
-
fondu = callPackage ../tools/misc/fondu {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- fpp = callPackage ../tools/misc/fpp { };
-
- fsmark = callPackage ../tools/misc/fsmark { };
-
futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark;
- fcft = callPackage ../development/libraries/fcft { };
-
- fuzzel = callPackage ../applications/misc/fuzzel { };
-
- fuzzylite = callPackage ../development/libraries/fuzzylite { };
-
- flashfocus = callPackage ../misc/flashfocus { };
-
qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { };
fwup = callPackage ../tools/misc/fwup {
inherit (darwin.apple_sdk.frameworks) DiskArbitration;
};
- fx-cast-bridge = callPackage ../tools/misc/fx-cast-bridge { };
-
- fzf-obc = callPackage ../shells/bash/fzf-obc { };
-
- fzf-zsh = callPackage ../shells/zsh/fzf-zsh { };
-
- fzy = callPackage ../tools/misc/fzy { };
-
g2o = libsForQt5.callPackage ../development/libraries/g2o { };
- gb-backup = callPackage ../tools/backup/gamerbackup { };
-
- gdrive = callPackage ../applications/networking/gdrive { };
-
- gdrive3 = callPackage ../applications/networking/gdrive3 { };
-
- gdu = callPackage ../tools/system/gdu { };
-
- gfxreconstruct = callPackage ../tools/graphics/gfxreconstruct { };
-
- go-containerregistry = callPackage ../development/tools/go-containerregistry { };
inherit (go-containerregistry) crane gcrane;
- go-rice = callPackage ../tools/misc/go.rice { };
-
- go-2fa = callPackage ../tools/security/2fa { };
-
- go-neb = callPackage ../applications/networking/instant-messengers/go-neb { };
-
- google-cursor = callPackage ../data/icons/google-cursor { };
-
geckodriver = callPackage ../development/tools/geckodriver {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -5015,16 +2488,6 @@ with pkgs;
geekbench_6 = callPackage ../tools/misc/geekbench/6.nix { };
geekbench = geekbench_6;
- gencfsm = callPackage ../tools/security/gencfsm { };
-
- genromfs = callPackage ../tools/filesystems/genromfs { };
-
- gh-ost = callPackage ../tools/misc/gh-ost { };
-
- ghauri = callPackage ../tools/security/ghauri { };
-
- ghdorker = callPackage ../tools/security/ghdorker { };
-
ghidra = darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix {
protobuf = protobuf_21;
};
@@ -5033,26 +2496,6 @@ with pkgs;
ghidra-bin = callPackage ../tools/security/ghidra { };
- gh2md = callPackage ../tools/backup/gh2md { };
-
- gif-for-cli = callPackage ../tools/misc/gif-for-cli { };
-
- giph = callPackage ../applications/video/giph { };
-
- gir-rs = callPackage ../development/tools/gir { };
-
- girsh = callPackage ../tools/networking/girsh { };
-
- gitjacker = callPackage ../tools/security/gitjacker { };
-
- gixy = callPackage ../tools/admin/gixy { };
-
- glpaper = callPackage ../development/tools/glpaper { };
-
- gllvm = callPackage ../development/tools/gllvm { };
-
- globalarrays = callPackage ../development/libraries/globalarrays { };
-
glslviewer = callPackage ../development/tools/glslviewer {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -5062,24 +2505,6 @@ with pkgs;
inherit (darwin) libobjc libresolv;
};
- goa = callPackage ../development/tools/goa { };
-
- goawk = callPackage ../tools/text/goawk { };
-
- gohai = callPackage ../tools/system/gohai { };
-
- gorilla-bin = callPackage ../tools/security/gorilla-bin { };
-
- gorilla-cli = callPackage ../tools/llm/gorilla-cli { };
-
- godu = callPackage ../tools/misc/godu { };
-
- gosu = callPackage ../tools/misc/gosu { };
-
- gotify-cli = callPackage ../tools/misc/gotify-cli { };
-
- gotify-desktop = callPackage ../tools/misc/gotify-desktop { };
-
gping = callPackage ../tools/networking/gping {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -5088,42 +2513,10 @@ with pkgs;
pythonPackages = python3Packages;
};
- grit = callPackage ../tools/misc/grit { };
-
- grobi = callPackage ../tools/X11/grobi { };
-
grype = callPackage ../by-name/gr/grype/package.nix {
buildGoModule = buildGo123Module;
};
- gsctl = callPackage ../applications/misc/gsctl { };
-
- gsocket = callPackage ../tools/networking/gsocket { };
-
- gthree = callPackage ../development/libraries/gthree { };
-
- gtg = callPackage ../applications/office/gtg { };
-
- gti = callPackage ../tools/misc/gti { };
-
- has = callPackage ../applications/misc/has { };
-
- hdate = callPackage ../applications/misc/hdate { };
-
- headache = callPackage ../development/tools/headache { };
-
- heatseeker = callPackage ../tools/misc/heatseeker { };
-
- hebcal = callPackage ../tools/misc/hebcal { };
-
- hexio = callPackage ../development/tools/hexio { };
-
- hid-listen = callPackage ../tools/misc/hid-listen { };
-
- hid-tools = callPackage ../tools/misc/hid-tools { };
-
- hidrd = callPackage ../tools/misc/hidrd { };
-
hiksink = callPackage ../tools/misc/hiksink {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -5134,16 +2527,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- hostsblock = callPackage ../tools/misc/hostsblock { };
-
hopper = qt5.callPackage ../development/tools/analysis/hopper { };
- hr = callPackage ../applications/misc/hr { };
-
- huniq = callPackage ../tools/text/huniq { };
-
- hunt = callPackage ../tools/misc/hunt { };
-
hypr = callPackage ../applications/window-managers/hyprwm/hypr {
cairo = cairo.override { xcbSupport = true; }; };
@@ -5151,16 +2536,6 @@ with pkgs;
stdenv = gcc14Stdenv;
};
- hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { };
-
- hyprland-per-window-layout = callPackage ../tools/wayland/hyprland-per-window-layout { };
-
- hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };
-
- hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
-
- hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { };
-
hyprpolkitagent = callPackage ../by-name/hy/hyprpolkitagent/package.nix {
stdenv = gcc14Stdenv;
};
@@ -5169,40 +2544,8 @@ with pkgs;
hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland-plugins { });
- hysteria = callPackage ../tools/networking/hysteria { };
-
- hyx = callPackage ../tools/text/hyx { };
-
- icdiff = callPackage ../tools/text/icdiff { };
-
- ictree = callPackage ../tools/misc/ictree { };
-
- inchi = callPackage ../development/libraries/inchi { };
-
- icon-slicer = callPackage ../tools/X11/icon-slicer { };
-
- ifm = callPackage ../tools/graphics/ifm { };
-
- ink = callPackage ../tools/misc/ink { };
-
- inklecate = callPackage ../development/compilers/inklecate { };
-
intensity-normalization = with python3Packages; toPythonApplication intensity-normalization;
- interactsh = callPackage ../tools/misc/interactsh { };
-
- interlock = callPackage ../servers/interlock { };
-
- invoice = callPackage ../tools/misc/invoice { };
-
- invoiceplane = callPackage ../servers/web-apps/invoiceplane { };
-
- iotas = callPackage ../applications/office/iotas { };
-
- jellycli = callPackage ../applications/audio/jellycli { };
-
- jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { };
-
jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
};
@@ -5211,40 +2554,18 @@ with pkgs;
jellyseerr = callPackage ../servers/jellyseerr { };
- jiten = callPackage ../applications/misc/jiten { };
-
- kanjidraw = callPackage ../applications/misc/kanjidraw { };
-
- jotta-cli = callPackage ../applications/misc/jotta-cli { };
-
- joycond = callPackage ../os-specific/linux/joycond { };
-
- joystickwake = callPackage ../tools/games/joystickwake { };
-
juce = callPackage ../development/misc/juce {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
- jumppad = callPackage ../tools/virtualization/jumppad { };
-
jwt-cli = callPackage ../tools/security/jwt-cli {
inherit (darwin.apple_sdk.frameworks) Security;
};
- jwt-hack = callPackage ../tools/security/jwt-hack { } ;
-
- jwx = callPackage ../tools/security/jwx { } ;
-
- karma = callPackage ../servers/monitoring/karma { };
-
kaldi = callPackage ../tools/audio/kaldi {
inherit (darwin.apple_sdk.frameworks) Accelerate;
};
- kalker = callPackage ../tools/misc/kalker { };
-
- kisslicer = callPackage ../tools/misc/kisslicer { };
-
klaus = with python3Packages; toPythonApplication klaus;
klipper = callPackage ../servers/klipper { };
@@ -5259,128 +2580,43 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- klipperscreen = callPackage ../applications/misc/klipperscreen { };
-
klog = qt5.callPackage ../applications/radio/klog { };
- komga = callPackage ../servers/komga { };
-
- komorebi = callPackage ../applications/graphics/komorebi { };
-
- konsave = callPackage ../applications/misc/konsave { };
-
- krapslog = callPackage ../tools/misc/krapslog { };
-
krill = callPackage ../servers/krill {
inherit (darwin.apple_sdk.frameworks) Security;
};
lapce = callPackage ../applications/editors/lapce {
inherit (darwin) libobjc;
- inherit (darwin.apple_sdk.frameworks) Security CoreServices ApplicationServices Carbon AppKit;
};
- lcdproc = callPackage ../servers/monitoring/lcdproc { };
-
- languagetool = callPackage ../tools/text/languagetool { };
-
languagetool-rust = callPackage ../tools/text/languagetool-rust {
inherit (darwin.apple_sdk.frameworks) Security;
};
- ldtk = callPackage ../applications/editors/ldtk { };
-
- lepton = callPackage ../tools/graphics/lepton { };
-
- lepton-eda = callPackage ../applications/science/electronics/lepton-eda { };
-
- lexend = callPackage ../data/fonts/lexend { };
-
lexicon = with python3Packages; toPythonApplication dns-lexicon;
- lenpaste = callPackage ../servers/lenpaste { };
-
lief = callPackage ../development/libraries/lief {
python = python3;
};
- libndtypes = callPackage ../development/libraries/libndtypes { };
-
- libnss-mysql = callPackage ../os-specific/linux/libnss-mysql { };
-
- libnvme = callPackage ../os-specific/linux/libnvme { };
-
- librenms = callPackage ../servers/monitoring/librenms { };
-
- libxnd = callPackage ../development/libraries/libxnd { };
-
- libzbc = callPackage ../os-specific/linux/libzbc { };
-
- libzbd = callPackage ../os-specific/linux/libzbd { };
-
- lifeograph = callPackage ../applications/editors/lifeograph { };
-
- limitcpu = callPackage ../tools/misc/limitcpu { };
-
- lineselect = callPackage ../tools/misc/lineselect { };
-
- link-grammar = callPackage ../tools/text/link-grammar { };
-
- linuxptp = callPackage ../os-specific/linux/linuxptp { };
-
- linuxdoc-tools = callPackage ../tools/text/sgml/linuxdoc-tools { };
-
- lisgd = callPackage ../tools/inputmethods/lisgd { };
-
- lite = callPackage ../applications/editors/lite { };
-
lite-xl = callPackage ../applications/editors/lite-xl {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- loadwatch = callPackage ../tools/system/loadwatch { };
-
- loccount = callPackage ../development/tools/misc/loccount { };
-
- long-shebang = callPackage ../misc/long-shebang { };
-
- lssecret = callPackage ../misc/lssecret {};
-
- lowdown = callPackage ../tools/typesetting/lowdown { };
-
# Less secure variant of lowdown for use inside Nix builds.
lowdown-unsandboxed = lowdown.override {
enableDarwinSandbox = false;
};
- numatop = callPackage ../os-specific/linux/numatop { };
-
- numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { };
-
- num-utils = callPackage ../tools/text/num-utils { };
-
- iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { };
-
- ipvsadm = callPackage ../os-specific/linux/ipvsadm { };
-
- ir-standard-fonts = callPackage ../data/fonts/ir-standard-fonts { };
-
kaggle = with python3Packages; toPythonApplication kaggle;
- lynis = callPackage ../tools/security/lynis { };
-
maigret = callPackage ../tools/security/maigret { };
maliit-framework = libsForQt5.callPackage ../applications/misc/maliit-framework { };
maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { };
- mandown = callPackage ../tools/misc/mandown { };
-
- mantra = callPackage ../tools/security/mantra { };
-
- mapcidr = callPackage ../tools/misc/mapcidr { };
-
maple-mono = (callPackage ../data/fonts/maple-font { }).Mono;
maple-mono-NF = (callPackage ../data/fonts/maple-font { }).NF;
maple-mono-SC-NF = (callPackage ../data/fonts/maple-font { }).SC-NF;
@@ -5388,32 +2624,12 @@ with pkgs;
maple-mono-woff2 = (callPackage ../data/fonts/maple-font { }).woff2;
maple-mono-autohint = (callPackage ../data/fonts/maple-font { }).autohint;
- marl = callPackage ../development/libraries/marl { };
-
- marlin-calc = callPackage ../tools/misc/marlin-calc { };
-
- marp-cli = callPackage ../tools/typesetting/marp { };
-
- masscan = callPackage ../tools/security/masscan { };
-
- massren = callPackage ../tools/misc/massren { };
-
mat2 = with python3.pkgs; toPythonApplication mat2;
materialx = with python3Packages; toPythonApplication materialx;
- maxcso = callPackage ../tools/archivers/maxcso { };
-
- medusa = callPackage ../tools/security/medusa { };
-
megasync = libsForQt5.callPackage ../applications/misc/megasync { };
- megacmd = callPackage ../applications/misc/megacmd { };
-
- merriweather = callPackage ../data/fonts/merriweather { };
-
- merriweather-sans = callPackage ../data/fonts/merriweather-sans { };
-
# while building documentation meson may want to run binaries for host
# which needs an emulator
# example of an error which this fixes
@@ -5437,8 +2653,6 @@ with pkgs;
else
throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression.");
- meson-tools = callPackage ../misc/meson-tools { };
-
metabase = callPackage ../servers/metabase {
jdk11 = jdk11_headless;
};
@@ -5447,96 +2661,24 @@ with pkgs;
electron = electron_27;
};
- midicsv = callPackage ../tools/audio/midicsv { };
-
- miniscript = callPackage ../applications/blockchains/miniscript { };
-
- miniserve = callPackage ../tools/misc/miniserve { };
-
mkspiffs = callPackage ../tools/filesystems/mkspiffs { };
mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { });
- mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { };
-
- mmctl = callPackage ../tools/misc/mmctl { };
-
- moar = callPackage ../tools/misc/moar { };
-
mobilizon = callPackage ../servers/mobilizon {
elixir = elixir_1_15;
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_15; });
mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { };
};
- molly-brown = callPackage ../servers/gemini/molly-brown { };
-
- monetdb = callPackage ../servers/sql/monetdb { };
-
monado = callPackage ../by-name/mo/monado/package.nix {
inherit (gst_all_1) gstreamer gst-plugins-base;
};
- mons = callPackage ../tools/misc/mons { };
-
- monsoon = callPackage ../tools/security/monsoon { };
-
- moodle-dl = callPackage ../tools/networking/moodle-dl { };
-
- moon-phases = callPackage ../tools/misc/moon-phases { };
-
- moonraker = callPackage ../servers/moonraker { };
-
- morsel = callPackage ../tools/text/morsel { };
-
- mousetweaks = callPackage ../applications/accessibility/mousetweaks { };
-
- mp3blaster = callPackage ../applications/audio/mp3blaster { };
-
- mp3cat = callPackage ../tools/audio/mp3cat { };
-
- mp3fs = callPackage ../tools/filesystems/mp3fs { };
-
- mpdas = callPackage ../tools/audio/mpdas { };
-
mpdcron = callPackage ../tools/audio/mpdcron { };
- mpdris2 = callPackage ../tools/audio/mpdris2 { };
-
- mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { };
-
- mpd-mpris = callPackage ../tools/audio/mpd-mpris { };
-
- mpd-notification = callPackage ../tools/audio/mpd-notification { };
-
mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { };
- mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { };
-
- mpd-touch-screen-gui = callPackage ../applications/audio/mpd-touch-screen-gui { };
-
- mq-cli = callPackage ../tools/system/mq-cli { };
-
- mrkd = callPackage ../tools/text/mrkd { };
-
- nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { };
-
- n2n = callPackage ../tools/networking/n2n { };
-
- nest-cli = callPackage ../development/tools/nest-cli { };
-
- nextdns = callPackage ../applications/networking/nextdns { };
-
- nexttrace = callPackage ../tools/networking/nexttrace { };
-
- ngadmin = callPackage ../applications/networking/ngadmin { };
-
- nfdump = callPackage ../tools/networking/nfdump { };
-
- nfstrace = callPackage ../tools/networking/nfstrace { };
-
- nixel = callPackage ../tools/nix/nixel { };
-
nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { };
nix-template = callPackage ../tools/package-management/nix-template {
@@ -5555,50 +2697,14 @@ with pkgs;
nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools;
- nostr-rs-relay = callPackage ../servers/nostr-rs-relay { };
-
- notemap = callPackage ../tools/networking/notemap { };
-
- noteshrink = callPackage ../tools/misc/noteshrink { };
-
noti = callPackage ../tools/misc/noti {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- notify = callPackage ../tools/misc/notify { };
-
- notifymuch = callPackage ../applications/misc/notifymuch { };
-
- nmh = callPackage ../tools/networking/nmh { };
-
- npins = callPackage ../tools/nix/npins { };
-
- nrsc5 = callPackage ../applications/misc/nrsc5 { };
-
- nsync = callPackage ../development/libraries/nsync { };
-
nsz = with python3.pkgs; toPythonApplication nsz;
- nx2elf = callPackage ../tools/compression/nx2elf { };
-
- nx-libs = callPackage ../tools/X11/nx-libs { };
-
- nyx = callPackage ../tools/networking/nyx { };
-
- oci-cli = callPackage ../tools/admin/oci-cli { };
-
- oci-seccomp-bpf-hook = callPackage ../os-specific/linux/oci-seccomp-bpf-hook { };
-
ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf;
- ocrfeeder = callPackage ../applications/graphics/ocrfeeder { };
-
- onboard = callPackage ../applications/misc/onboard { };
-
- oneshot = callPackage ../tools/networking/oneshot { };
-
- orjail = callPackage ../tools/security/orjail { };
-
online-judge-template-generator = python3Packages.callPackage ../tools/misc/online-judge-template-generator { };
online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools;
@@ -5607,37 +2713,12 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- xkbd = callPackage ../applications/misc/xkbd { };
-
- libpsm2 = callPackage ../os-specific/linux/libpsm2 { };
-
- optar = callPackage ../tools/graphics/optar { };
-
-
ockam = callPackage ../tools/networking/ockam {
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { };
- oil-buku = callPackage ../applications/misc/oil-buku { };
-
- ondir = callPackage ../tools/misc/ondir { };
-
- opam-publish = callPackage ../development/tools/ocaml/opam-publish { };
-
- osdlyrics = callPackage ../applications/audio/osdlyrics { };
-
- ossutil = callPackage ../tools/admin/ossutil { };
-
- ospd-openvas = callPackage ../tools/security/ospd-openvas { };
-
- osv-detector = callPackage ../tools/security/osv-detector { };
-
- osv-scanner = callPackage ../tools/security/osv-scanner { };
-
- otf2bdf = callPackage ../applications/misc/otf2bdf { };
-
pastel = callPackage ../applications/misc/pastel {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -5646,60 +2727,10 @@ with pkgs;
patool = with python3Packages; toPythonApplication patool;
- pbgopy = callPackage ../tools/text/pbgopy { };
-
- pbzx = callPackage ../tools/compression/pbzx { };
-
- pc = callPackage ../tools/misc/pc { };
-
- pcb2gcode = callPackage ../tools/misc/pcb2gcode { };
-
- pcp = callPackage ../tools/misc/pcp { };
-
- pev = callPackage ../development/tools/analysis/pev { };
-
- phd2 = callPackage ../applications/science/astronomy/phd2 { };
-
- phoronix-test-suite = callPackage ../tools/misc/phoronix-test-suite { };
-
- photon = callPackage ../tools/networking/photon { };
-
- photofield = callPackage ../servers/photofield { };
-
- photoprism = callPackage ../servers/photoprism { };
-
- piglit = callPackage ../tools/graphics/piglit { };
-
- pika = callPackage ../applications/graphics/pika { };
-
- pkg = callPackage ../tools/package-management/pkg { };
-
- playerctl = callPackage ../tools/audio/playerctl { };
-
- pn = callPackage ../tools/text/pn { };
-
pocket-casts = callPackage ../applications/audio/pocket-casts {
electron = electron_31;
};
- portal = callPackage ../tools/misc/portal { };
-
- pouf = callPackage ../tools/misc/pouf { };
-
- poweralertd = callPackage ../tools/misc/poweralertd { };
-
- pscale = callPackage ../development/tools/pscale { };
-
- pulsarctl = callPackage ../tools/admin/pulsarctl { };
-
- psstop = callPackage ../tools/system/psstop { };
-
- precice = callPackage ../development/libraries/precice { };
-
- precice-config-visualizer = callPackage ../tools/misc/precice-config-visualizer { };
-
- proxmox-backup-client = callPackage ../applications/backup/proxmox-backup-client { };
-
pueue = darwin.apple_sdk_11_0.callPackage ../applications/misc/pueue {
inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration;
@@ -5707,12 +2738,6 @@ with pkgs;
pixcat = with python3Packages; toPythonApplication pixcat;
- pixiecore = callPackage ../tools/networking/pixiecore { };
-
- waitron = callPackage ../tools/networking/waitron { };
-
- pyCA = callPackage ../applications/video/pyca { };
-
pyznap = python3Packages.callPackage ../tools/backup/pyznap { };
procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs {
@@ -5720,16 +2745,8 @@ with pkgs;
inherit (darwin.apple_sdk_11_0) Libsystem;
};
- procyon = callPackage ../tools/misc/procyon { };
-
- profetch = callPackage ../tools/misc/profetch { };
-
psrecord = python3Packages.callPackage ../tools/misc/psrecord { };
- pyenv = callPackage ../development/tools/pyenv { };
-
- r53-ddns = callPackage ../applications/networking/r53-ddns { };
-
rare = python3Packages.callPackage ../games/rare { };
rblake2sum = callPackage ../tools/security/rblake2sum {
@@ -5740,142 +2757,46 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- reg = callPackage ../tools/virtualization/reg { };
-
- rex = callPackage ../tools/system/rex { };
-
- rivercarro = callPackage ../applications/misc/rivercarro { };
-
- river-luatile = callPackage ../applications/misc/river-luatile{ };
-
- rmapi = callPackage ../applications/misc/remarkable/rmapi { };
-
- rmate-sh = callPackage ../tools/misc/rmate-sh { };
-
rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };
- rm-improved = callPackage ../applications/misc/rm-improved { };
-
remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
- restream = callPackage ../applications/misc/remarkable/restream { };
-
ropgadget = with python3Packages; toPythonApplication ropgadget;
scour = with python3Packages; toPythonApplication scour;
- see = callPackage ../tools/misc/see { };
-
- s2png = callPackage ../tools/graphics/s2png { };
-
- sfz = callPackage ../tools/misc/sfz { };
-
- sgp4 = callPackage ../development/libraries/sgp4 { };
-
sheldon = callPackage ../tools/misc/sheldon {
inherit (darwin.apple_sdk.frameworks) Security;
};
- shell-hist = callPackage ../tools/misc/shell-hist { };
-
- shellhub-agent = callPackage ../applications/networking/shellhub-agent { };
-
- shellclear = callPackage ../tools/security/shellclear { };
-
- shellnoob = callPackage ../tools/security/shellnoob { };
-
sheesy-cli = callPackage ../tools/security/sheesy-cli {
inherit (darwin.apple_sdk.frameworks) Security;
};
- simdjson = callPackage ../development/libraries/simdjson { };
-
- shisho = callPackage ../tools/security/shisho { };
-
- sigslot = callPackage ../development/libraries/sigslot { };
-
- siglo = callPackage ../applications/misc/siglo { };
-
- simg2img = callPackage ../tools/filesystems/simg2img { };
-
- snazy = callPackage ../development/tools/snazy { };
-
- snippetpixie = callPackage ../tools/text/snippetpixie { };
-
- snowcat = callPackage ../tools/security/snowcat { };
-
- socklog = callPackage ../tools/system/socklog { };
-
- spacevim = callPackage ../applications/editors/spacevim { };
-
- ssmsh = callPackage ../tools/admin/ssmsh { };
-
- stacs = callPackage ../tools/security/stacs { };
-
- stagit = callPackage ../development/tools/stagit { };
-
- starboard = callPackage ../applications/networking/cluster/starboard { };
-
- statserial = callPackage ../tools/misc/statserial { };
-
steampipePackages = recurseIntoAttrs (
callPackage ../tools/misc/steampipe-packages { }
);
- step-kms-plugin = callPackage ../tools/security/step-kms-plugin { };
-
- string-machine = callPackage ../applications/audio/string-machine { };
-
- stripe-cli = callPackage ../tools/admin/stripe-cli { };
-
- bash-supergenpass = callPackage ../tools/security/bash-supergenpass { };
-
swappy = callPackage ../applications/misc/swappy { gtk = gtk3; };
- swapspace = callPackage ../tools/admin/swapspace { };
-
- swego = callPackage ../servers/swego { };
-
- sydbox = callPackage ../os-specific/linux/sydbox { };
-
synth = callPackage ../tools/misc/synth {
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
- syscall_limiter = callPackage ../os-specific/linux/syscall_limiter { };
-
- svt-av1 = callPackage ../tools/video/svt-av1 { };
-
inherit (callPackages ../servers/rainloop { })
rainloop-community
rainloop-standard;
- raven-reader = callPackage ../applications/networking/newsreaders/raven-reader { };
-
razergenie = libsForQt5.callPackage ../applications/misc/razergenie { };
- tsduck = callPackage ../tools/video/tsduck { };
-
- turso-cli = callPackage ../development/tools/turso-cli {};
-
ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
- ripe-atlas-tools = callPackage ../tools/networking/ripe-atlas-tools { };
-
roundcube = callPackage ../servers/roundcube { };
roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
- routersploit = callPackage ../tools/security/routersploit { };
-
- rsbep = callPackage ../tools/backup/rsbep { };
-
- rsbkb = callPackage ../tools/text/rsbkb { };
-
- rsign2 = callPackage ../tools/security/rsign2 { };
-
rsyslog = callPackage ../tools/system/rsyslog {
withHadoop = false; # Currently Broken
withKsi = false; # Currently Broken
@@ -5912,62 +2833,16 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- xlogo = callPackage ../tools/X11/xlogo { };
-
- xmlbeans = callPackage ../tools/misc/xmlbeans { };
-
xmlsort = perlPackages.XMLFilterSort;
- xmousepasteblock = callPackage ../tools/X11/xmousepasteblock { };
-
- mcrypt = callPackage ../tools/misc/mcrypt { };
-
- mongoaudit = callPackage ../tools/security/mongoaudit { };
-
- mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
-
- moosefs = callPackage ../tools/filesystems/moosefs { };
-
- mountain-duck = callPackage ../tools/filesystems/mountain-duck { };
-
- mox = callPackage ../servers/mail/mox { };
-
- mozlz4a = callPackage ../tools/compression/mozlz4a { };
-
- msr-tools = callPackage ../os-specific/linux/msr-tools { };
-
- mstflint = callPackage ../tools/misc/mstflint { };
-
- msldapdump = callPackage ../tools/security/msldapdump { };
-
- mslink = callPackage ../tools/misc/mslink { };
-
- mceinject = callPackage ../os-specific/linux/mceinject { };
-
mcelog = callPackage ../os-specific/linux/mcelog {
util-linux = util-linuxMinimal;
};
- sqldef = callPackage ../development/tools/sqldef { };
-
sqlint = callPackage ../development/tools/sqlint { };
- squawk = callPackage ../development/tools/squawk { };
-
- antibody = callPackage ../shells/zsh/antibody { };
-
- antidote = callPackage ../shells/zsh/antidote { };
-
- antigen = callPackage ../shells/zsh/antigen { };
-
- apparix = callPackage ../tools/misc/apparix { };
-
apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { };
- arping = callPackage ../tools/networking/arping { };
-
- arpoison = callPackage ../tools/networking/arpoison { };
-
asciidoc = callPackage ../tools/typesetting/asciidoc {
inherit (python3.pkgs) pygments matplotlib numpy aafigure recursive-pth-loader;
w3m = w3m-batch;
@@ -5987,14 +2862,6 @@ with pkgs;
asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };
- asciidoctorj = callPackage ../tools/typesetting/asciidoctorj { };
-
- asunder = callPackage ../applications/audio/asunder { };
-
- autossh = callPackage ../tools/networking/autossh { };
-
- assh = callPackage ../tools/networking/assh { };
-
b2sum = callPackage ../tools/security/b2sum {
inherit (llvmPackages) openmp;
};
@@ -6003,14 +2870,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit Kerberos;
};
- bats = callPackage ../development/interpreters/bats { };
-
- bbe = callPackage ../tools/misc/bbe { };
-
- bkcrack = callPackage ../tools/security/bkcrack { };
-
- bdsync = callPackage ../tools/backup/bdsync { };
-
beamerpresenter = beamerpresenter-mupdf;
beamerpresenter-mupdf = qt6Packages.callPackage ../applications/office/beamerpresenter {
@@ -6026,75 +2885,19 @@ with pkgs;
beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { });
inherit (beetsPackages) beets beets-unstable;
- bento4 = callPackage ../tools/video/bento4 { };
-
- bepasty = callPackage ../tools/misc/bepasty { };
-
- bettercap = callPackage ../tools/security/bettercap { };
-
- bfs = callPackage ../tools/system/bfs { };
-
- bgs = callPackage ../tools/X11/bgs { };
-
- bibclean = callPackage ../tools/typesetting/bibclean { };
-
- biber = callPackage ../tools/typesetting/biber { };
-
biber-for-tectonic = callPackage ../tools/typesetting/tectonic/biber.nix { };
- biber-ms = callPackage ../tools/typesetting/biber-ms { };
-
- biblatex-check = callPackage ../tools/typesetting/biblatex-check { };
-
binlore = callPackage ../development/tools/analysis/binlore { };
birdfont = callPackage ../tools/misc/birdfont { };
xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; };
- blueberry = callPackage ../tools/bluetooth/blueberry { };
-
- blueman = callPackage ../tools/bluetooth/blueman { };
-
bmrsa = callPackage ../tools/security/bmrsa/11.nix { };
- bogofilter = callPackage ../tools/misc/bogofilter { };
-
- bom = callPackage ../tools/admin/bom { };
-
- bomber-go = callPackage ../development/tools/bomber-go { };
-
- bomutils = callPackage ../tools/archivers/bomutils { };
-
- boofuzz= callPackage ../tools/security/boofuzz { };
-
- briar-desktop = callPackage ../applications/networking/instant-messengers/briar-desktop { };
-
- bsdbuild = callPackage ../development/tools/misc/bsdbuild { };
-
- bsdiff = callPackage ../tools/compression/bsdiff { };
-
- btar = callPackage ../tools/backup/btar { };
-
- bumpver = callPackage ../applications/version-management/bumpver { };
-
bupstash = darwin.apple_sdk_11_0.callPackage ../tools/backup/bupstash { };
- burp = callPackage ../tools/backup/burp { };
-
- buku = callPackage ../applications/misc/buku { };
-
- byzanz = callPackage ../applications/video/byzanz { };
-
- anydesk = callPackage ../applications/networking/remote/anydesk { };
-
anystyle-cli = callPackage ../tools/misc/anystyle-cli { };
- atool = callPackage ../tools/archivers/atool { };
-
- bash_unit = callPackage ../tools/misc/bash_unit { };
-
- boltbrowser = callPackage ../tools/misc/boltbrowser { };
-
bzip2 = callPackage ../tools/compression/bzip2 { };
bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { };
@@ -6103,44 +2906,18 @@ with pkgs;
stdenv = clangStdenv;
};
- cabextract = callPackage ../tools/archivers/cabextract { };
-
- cadaver = callPackage ../tools/networking/cadaver { };
-
davix = callPackage ../tools/networking/davix {
inherit (darwin.apple_sdk.frameworks) Security;
};
davix-copy = davix.override { enableThirdPartyCopy = true; };
- cantoolz = callPackage ../tools/networking/cantoolz { };
-
- can-utils = callPackage ../os-specific/linux/can-utils { };
-
- cannelloni = callPackage ../os-specific/linux/cannelloni { };
-
- caudec = callPackage ../applications/audio/caudec { };
-
- ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { };
-
- ccrypt = callPackage ../tools/security/ccrypt { };
-
- ccze = callPackage ../tools/misc/ccze { };
-
- cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { };
-
cdist = python3Packages.callPackage ../tools/admin/cdist { };
- cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { };
-
- cdpr = callPackage ../tools/networking/cdpr { };
-
cdrdao = callPackage ../tools/cd-dvd/cdrdao {
inherit (darwin.apple_sdk.frameworks) CoreServices IOKit;
};
- cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
-
cdrtools = callPackage ../tools/cd-dvd/cdrtools {
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_14.stdenv else stdenv;
inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
@@ -6148,18 +2925,6 @@ with pkgs;
cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };
- cider = callPackage ../applications/audio/cider { };
-
- iat = callPackage ../tools/cd-dvd/iat { };
-
- isolyzer = callPackage ../tools/cd-dvd/isolyzer { };
-
- isomd5sum = callPackage ../tools/cd-dvd/isomd5sum { };
-
- mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { };
-
- nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { };
-
libceph = ceph.lib;
inherit (callPackages ../tools/filesystems/ceph {
lua = lua5_4; # Ceph currently requires >= 5.3
@@ -6175,39 +2940,6 @@ with pkgs;
ceph-client;
ceph-dev = ceph;
- cfdg = callPackage ../tools/graphics/cfdg { };
-
- cglm = callPackage ../development/libraries/cglm { };
-
- chain-bench = callPackage ../tools/security/chain-bench { };
-
- chainsaw = callPackage ../tools/security/chainsaw { };
-
- checkinstall = callPackage ../tools/package-management/checkinstall { };
-
- checkmake = callPackage ../development/tools/checkmake { };
-
- cherrybomb = callPackage ../tools/security/cherrybomb { };
-
- chit = callPackage ../development/tools/chit { };
-
- chkrootkit = callPackage ../tools/security/chkrootkit { };
-
- chunkfs = callPackage ../tools/filesystems/chunkfs { };
-
- chunksync = callPackage ../tools/backup/chunksync { };
-
- cicero-tui = callPackage ../tools/misc/cicero-tui { };
-
- cilium-cli = callPackage ../applications/networking/cluster/cilium { };
-
- cjdns = callPackage ../tools/networking/cjdns { };
- cjdns-tools = callPackage ../tools/admin/cjdns-tools { };
-
- cjson = callPackage ../development/libraries/cjson { };
-
- cksfv = callPackage ../tools/networking/cksfv { };
-
clementine = libsForQt5.callPackage ../applications/audio/clementine {
gst_plugins =
with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ];
@@ -6216,14 +2948,8 @@ with pkgs;
mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
- ciopfs = callPackage ../tools/filesystems/ciopfs { };
-
- circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
-
circus = with python310Packages; toPythonApplication circus;
- cirrusgo = callPackage ../tools/security/cirrusgo { };
-
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_23_09_0
citrix_workspace_23_11_0
@@ -6232,34 +2958,10 @@ with pkgs;
;
citrix_workspace = citrix_workspace_24_05_0;
- clima = callPackage ../tools/text/clima { };
-
- cmigemo = callPackage ../tools/text/cmigemo { };
-
- cmospwd = callPackage ../tools/security/cmospwd { };
-
cmst = libsForQt5.callPackage ../tools/networking/cmst { };
- cmt = callPackage ../applications/audio/cmt { };
-
- crlfsuite = callPackage ../tools/security/crlfsuite { };
-
- crlfuzz = callPackage ../tools/security/crlfuzz { };
-
- hedgedoc = callPackage ../servers/web-apps/hedgedoc { };
-
- colord = callPackage ../tools/misc/colord { };
-
- colord-gtk = callPackage ../tools/misc/colord-gtk { };
-
colord-gtk4 = colord-gtk.override { withGtk4 = true; };
- colordiff = callPackage ../tools/text/colordiff { };
-
- connect = callPackage ../tools/networking/connect { };
-
- conspy = callPackage ../os-specific/linux/conspy { };
-
connmanFull = connman.override {
# TODO: Why is this in `connmanFull` and not the default build? See TODO in
# nixos/modules/services/networking/connman.nix (near the assertions)
@@ -6293,85 +2995,31 @@ with pkgs;
enableWispr = false;
};
- convertlit = callPackage ../tools/text/convertlit { };
-
collectd = callPackage ../tools/system/collectd {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
collectd-data = callPackage ../tools/system/collectd/data.nix { };
- colormake = callPackage ../development/tools/build-managers/colormake { };
-
- cpuminer = callPackage ../tools/misc/cpuminer { };
-
- crabz = callPackage ../tools/compression/crabz { };
-
- ethash = callPackage ../development/libraries/ethash { };
-
- cuetools = callPackage ../tools/cd-dvd/cuetools { };
-
- u3-tool = callPackage ../tools/filesystems/u3-tool { };
-
- unifdef = callPackage ../development/tools/misc/unifdef { };
-
unify = with python3Packages; toPythonApplication unify;
- unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { };
-
- unparam = callPackage ../tools/misc/unparam { };
-
inherit (nodePackages) uppy-companion;
usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { };
- usbsdmux = callPackage ../development/tools/misc/usbsdmux { };
-
- usbview = callPackage ../tools/misc/usbview { };
-
- usbimager = callPackage ../tools/misc/usbimager { };
-
- uwuify = callPackage ../tools/misc/uwuify { };
-
- anthy = callPackage ../tools/inputmethods/anthy { };
-
- evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { };
-
- evsieve = callPackage ../tools/inputmethods/evsieve { };
-
- eyedropper = callPackage ../applications/graphics/eyedropper { };
-
persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { };
- evscript = callPackage ../tools/inputmethods/evscript { };
-
- keyd = callPackage ../tools/inputmethods/keyd { };
-
- keymapper = callPackage ../tools/inputmethods/keymapper { };
-
twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui {
inherit (darwin.apple_sdk_11_0.frameworks) Security CoreServices SystemConfiguration;
};
- gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { };
-
- kime = callPackage ../tools/inputmethods/kime { };
-
- libpinyin = callPackage ../development/libraries/libpinyin { };
-
inherit (import ../development/libraries/libsbsms pkgs)
libsbsms
libsbsms_2_0_2
libsbsms_2_3_0
;
- libskk = callPackage ../development/libraries/libskk { };
-
- m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { };
-
- m17n_db = callPackage ../tools/inputmethods/m17n-db { };
-
m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { };
@@ -6385,17 +3033,8 @@ with pkgs;
ui = true;
};
- netevent = callPackage ../tools/inputmethods/netevent { };
-
- netplan = callPackage ../tools/admin/netplan { };
-
- skktools = callPackage ../tools/inputmethods/skk/skktools { };
skkDictionaries = callPackages ../tools/inputmethods/skk/skk-dicts { };
- libkkc-data = callPackage ../data/misc/libkkc-data { };
-
- libkkc = callPackage ../tools/inputmethods/libkkc { };
-
ibus = callPackage ../tools/inputmethods/ibus { };
ibus-engines = recurseIntoAttrs {
@@ -6444,26 +3083,16 @@ with pkgs;
ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { };
- ibus-theme-tools = callPackage ../tools/misc/ibus-theme-tools { };
-
interception-tools = callPackage ../tools/inputmethods/interception-tools { };
interception-tools-plugins = recurseIntoAttrs {
caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { };
dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { };
};
- age = callPackage ../tools/security/age { };
-
age-plugin-ledger = callPackage ../tools/security/age-plugin-ledger {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- age-plugin-tpm = callPackage ../tools/security/age-plugin-tpm { };
-
- artim-dark = callPackage ../data/themes/artim-dark { };
-
- bbin = callPackage ../development/tools/bbin { };
-
blacken-docs = with python3Packages; toPythonApplication blacken-docs;
bore = callPackage ../tools/networking/bore {
@@ -6471,20 +3100,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
- brotli = callPackage ../tools/compression/brotli { };
-
- biodiff = callPackage ../development/tools/biodiff { };
-
- biosdevname = callPackage ../tools/networking/biosdevname { };
-
bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { };
- boa = callPackage ../development/web/boa { };
-
- bombardier = callPackage ../tools/networking/bombardier { };
-
- caeml = callPackage ../applications/networking/mailreaders/caeml { };
-
calyx-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn {
provider = "calyx";
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
@@ -6492,36 +3109,16 @@ with pkgs;
cask-server = libsForQt5.callPackage ../applications/misc/cask-server { };
- cc2538-bsl = callPackage ../tools/misc/cc2538-bsl { };
-
code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; };
code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; };
code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; };
- certstrap = callPackage ../tools/security/certstrap { };
-
cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert;
- cfssl = callPackage ../tools/security/cfssl { };
-
- cfs-zen-tweaks = callPackage ../os-specific/linux/cfs-zen-tweaks { };
-
chafa = callPackage ../tools/misc/chafa {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- changetower = callPackage ../tools/networking/changetower { };
-
- chatblade = callPackage ../applications/misc/chatblade { };
-
- checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
-
- checkmate = callPackage ../development/tools/checkmate { };
-
- circup = callPackage ../development/tools/circup { };
-
- civetweb = callPackage ../development/libraries/civetweb { };
-
ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };
clamav = callPackage ../tools/security/clamav {
@@ -6529,16 +3126,6 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) Foundation;
};
- client-ip-echo = callPackage ../servers/misc/client-ip-echo { };
-
- cloc = callPackage ../tools/misc/cloc { };
-
- clolcat = callPackage ../tools/misc/clolcat { };
-
- cloud-utils = callPackage ../tools/misc/cloud-utils { };
-
- cloudlist = callPackage ../tools/security/cloudlist { };
-
cmdpack = callPackages ../tools/misc/cmdpack { };
cobalt = callPackage ../applications/misc/cobalt {
@@ -6557,34 +3144,12 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- codeberg-pages = callPackage ../development/tools/continuous-integration/codeberg-pages { };
-
- codebraid = callPackage ../tools/misc/codebraid { };
-
- codemov = callPackage ../tools/misc/codemov { };
-
- codevis = callPackage ../tools/misc/codevis { };
-
compass = callPackage ../development/tools/compass { };
cone = callPackage ../development/compilers/cone {
llvmPackages = llvmPackages_13;
};
- conda = callPackage ../tools/package-management/conda { };
-
- conduktor = callPackage ../applications/misc/conduktor { };
-
- console-bridge = callPackage ../development/libraries/console-bridge { };
-
- convbin = callPackage ../tools/misc/convbin { };
-
- convimg = callPackage ../tools/misc/convimg { };
-
- convfont = callPackage ../tools/misc/convfont { };
-
- cpcfs = callPackage ../tools/filesystems/cpcfs { };
-
coreutils = callPackage ../tools/misc/coreutils { };
# The coreutils above are built with dependencies from
@@ -6593,32 +3158,10 @@ with pkgs;
coreutils-full = callPackage ../tools/misc/coreutils { minimal = false; };
coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; };
- corkscrew = callPackage ../tools/networking/corkscrew { };
-
- cowpatty = callPackage ../tools/security/cowpatty { };
-
- cpio = callPackage ../tools/archivers/cpio { };
-
- cpufetch = callPackage ../tools/misc/cpufetch { };
-
- crackxls = callPackage ../tools/security/crackxls { };
-
- crd2pulumi = callPackage ../development/tools/crd2pulumi { };
-
create-cycle-app = nodePackages.create-cycle-app;
- createrepo_c = callPackage ../tools/package-management/createrepo_c { };
-
- cromfs = callPackage ../tools/archivers/cromfs { };
-
cron = isc-cron;
- ctlptl = callPackage ../development/tools/ctlptl { };
-
- dumpnar = callPackage ../tools/archivers/dumpnar { };
-
- snooze = callPackage ../tools/system/snooze { };
-
cudaPackages_10_0 = callPackage ./cuda-packages.nix { cudaVersion = "10.0"; };
cudaPackages_10_1 = callPackage ./cuda-packages.nix { cudaVersion = "10.1"; };
cudaPackages_10_2 = callPackage ./cuda-packages.nix { cudaVersion = "10.2"; };
@@ -6648,8 +3191,6 @@ with pkgs;
cudatoolkit = cudaPackages.cudatoolkit;
cudatoolkit_11 = cudaPackages_11.cudatoolkit;
- curie = callPackage ../data/fonts/curie { };
-
curlFull = curl.override {
ldapSupport = true;
gsaslSupport = true;
@@ -6671,109 +3212,28 @@ with pkgs;
brotliSupport = true;
});
- curlMinimal = callPackage ../tools/networking/curl { };
-
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { };
curl-impersonate-ff = curl-impersonate.curl-impersonate-ff;
curl-impersonate-chrome = curl-impersonate.curl-impersonate-chrome;
- curlie = callPackage ../tools/networking/curlie { };
-
- trurl = callPackage ../tools/networking/trurl { };
-
- curv = callPackage ../applications/graphics/curv { };
-
- cunit = callPackage ../tools/misc/cunit { };
- bcunit = callPackage ../tools/misc/bcunit { };
-
- curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
-
- tcp-cutter = callPackage ../tools/networking/tcp-cutter { };
-
- cwebbin = callPackage ../development/tools/misc/cwebbin { };
-
cve-bin-tool = python3Packages.callPackage ../tools/security/cve-bin-tool { };
- cvs-fast-export = callPackage ../applications/version-management/cvs-fast-export { };
-
- dadadodo = callPackage ../tools/text/dadadodo { };
-
- daemon = callPackage ../tools/system/daemon { };
-
- daemonize = callPackage ../tools/system/daemonize { };
-
danger-gitlab = callPackage ../applications/version-management/danger-gitlab { };
- daq = callPackage ../applications/networking/ids/daq { };
-
dar = callPackage ../tools/backup/dar {
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
- darkhttpd = callPackage ../servers/http/darkhttpd { };
-
- darkstat = callPackage ../tools/networking/darkstat { };
-
- dav1d = callPackage ../development/libraries/dav1d { };
-
- davfs2 = callPackage ../tools/filesystems/davfs2 { };
-
- dbench = callPackage ../development/tools/misc/dbench { };
-
- dclxvi = callPackage ../development/libraries/dclxvi { };
-
dconf2nix = callPackage ../development/tools/haskell/dconf2nix { };
- dcraw = callPackage ../tools/graphics/dcraw { };
-
- dcs = callPackage ../tools/text/dcs { };
-
- dcfldd = callPackage ../tools/system/dcfldd { };
-
- debian-devscripts = callPackage ../tools/misc/debian-devscripts { };
-
- debian-goodies = callPackage ../applications/misc/debian-goodies { };
-
- debootstrap = callPackage ../tools/misc/debootstrap { };
-
- debugedit = callPackage ../development/tools/misc/debugedit { };
-
- decode-spam-headers = callPackage ../tools/networking/decode-spam-headers { };
-
- deer = callPackage ../shells/zsh/zsh-deer { };
-
- deqp-runner = callPackage ../tools/graphics/deqp-runner { };
-
- detox = callPackage ../tools/misc/detox { };
-
devilspie2 = callPackage ../applications/misc/devilspie2 {
gtk = gtk3;
};
- dex = callPackage ../tools/X11/dex { };
-
- ddccontrol = callPackage ../tools/misc/ddccontrol { };
-
- ddccontrol-db = callPackage ../data/misc/ddccontrol-db { };
-
ddcui = libsForQt5.callPackage ../applications/misc/ddcui { };
- ddcutil = callPackage ../tools/misc/ddcutil { };
-
- ddclient = callPackage ../tools/networking/ddclient { };
-
- dd_rescue = callPackage ../tools/system/dd_rescue { };
-
- ddh = callPackage ../tools/system/ddh { };
-
- ddrescue = callPackage ../tools/system/ddrescue { };
-
- ddrescueview = callPackage ../tools/system/ddrescueview { };
-
- ddrutility = callPackage ../tools/system/ddrutility { };
-
inherit (callPackages ../applications/networking/p2p/deluge { })
deluge-gtk
deluged
@@ -6781,58 +3241,8 @@ with pkgs;
deluge-2_x = deluge;
- der-ascii = callPackage ../tools/security/der-ascii { };
-
- desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { };
-
- dfc = callPackage ../tools/system/dfc { };
-
- dfrs = callPackage ../tools/system/dfrs { };
-
- diskrsync = callPackage ../tools/backup/diskrsync { };
-
- djbdns = callPackage ../tools/networking/djbdns { };
-
- dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { };
-
- dnscontrol = callPackage ../applications/networking/dnscontrol { };
-
- dnsenum = callPackage ../tools/security/dnsenum { };
-
- dnsmasq = callPackage ../tools/networking/dnsmasq { };
-
- dnsmon-go = callPackage ../tools/networking/dnsmon-go { };
-
- dnsmonster = callPackage ../tools/networking/dnsmonster { };
-
- dnspeep = callPackage ../tools/security/dnspeep { };
-
- dnsproxy = callPackage ../tools/networking/dnsproxy { };
-
- dnsperf = callPackage ../tools/networking/dnsperf { };
-
- dnsrecon = callPackage ../tools/security/dnsrecon { };
-
- dnstop = callPackage ../tools/networking/dnstop { };
-
dnsviz = python3Packages.callPackage ../tools/networking/dnsviz { };
- dnsx = callPackage ../tools/security/dnsx { };
-
- dhcpdump = callPackage ../tools/networking/dhcpdump { };
-
- dhcpcd = callPackage ../tools/networking/dhcpcd { };
-
- dhcping = callPackage ../tools/networking/dhcping { };
-
- dotacat = callPackage ../tools/misc/dotacat { };
-
- di = callPackage ../tools/system/di { };
-
- diction = callPackage ../tools/text/diction { };
-
- diffoci = callPackage ../tools/misc/diffoci { };
-
diffoscope = callPackage ../tools/misc/diffoscope {
jdk = jdk8;
};
@@ -6845,38 +3255,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- diffsitter = callPackage ../tools/text/diffsitter { };
-
- diffstat = callPackage ../tools/text/diffstat { };
-
- difftastic = callPackage ../tools/text/difftastic { };
-
diffutils = callPackage ../tools/text/diffutils { };
- dirdiff = callPackage ../tools/text/dirdiff { };
-
- dwdiff = callPackage ../applications/misc/dwdiff { };
-
- picoscope = callPackage ../applications/science/electronics/picoscope { };
-
- picotts = callPackage ../tools/audio/picotts { };
-
- wgetpaste = callPackage ../tools/text/wgetpaste { };
-
- dismap = callPackage ../tools/security/dismap { };
-
- dismember = callPackage ../tools/security/dismember { };
-
- dirvish = callPackage ../tools/backup/dirvish { };
-
- dleyna-connector-dbus = callPackage ../development/libraries/dleyna-connector-dbus { };
-
- dleyna-core = callPackage ../development/libraries/dleyna-core { };
-
- dleyna-renderer = callPackage ../development/libraries/dleyna-renderer { };
-
- dleyna-server = callPackage ../development/libraries/dleyna-server { };
-
dmd = callPackage ../by-name/dm/dmd/package.nix ({
inherit (darwin.apple_sdk.frameworks) Foundation;
} // lib.optionalAttrs stdenv.hostPlatform.isLinux {
@@ -6884,46 +3264,16 @@ with pkgs;
stdenv = gcc11Stdenv;
});
- dmg2img = callPackage ../tools/misc/dmg2img { };
-
- docbook2odf = callPackage ../tools/typesetting/docbook2odf { };
-
- doas = callPackage ../tools/security/doas { };
-
- doas-sudo-shim = callPackage ../tools/security/doas-sudo-shim { };
-
- docbook2x = callPackage ../tools/typesetting/docbook2x { };
-
- docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };
-
- dockbarx = callPackage ../applications/misc/dockbarx { };
-
- dog = callPackage ../tools/system/dog { };
-
dogdns = callPackage ../tools/networking/dogdns {
inherit (darwin.apple_sdk.frameworks) Security;
};
- dool = callPackage ../tools/system/dool { };
-
- dosfstools = callPackage ../tools/filesystems/dosfstools { };
-
dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
- domoticz = callPackage ../servers/domoticz { };
-
- dorkscout = callPackage ../tools/security/dorkscout { };
-
sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { };
- drive = callPackage ../applications/networking/drive { };
-
- driftnet = callPackage ../tools/networking/driftnet { };
-
- driftctl = callPackage ../applications/networking/cluster/driftctl { };
-
drill = callPackage ../tools/networking/drill {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -6933,29 +3283,11 @@ with pkgs;
enableUnfree = false;
};
- drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { };
-
- drone-runner-exec = callPackage ../development/tools/continuous-integration/drone-runner-exec { };
-
- drone-runner-docker = callPackage ../development/tools/continuous-integration/drone-runner-docker { };
-
- drone-runner-ssh = callPackage ../development/tools/continuous-integration/drone-runner-ssh { };
-
- dropbear = callPackage ../tools/networking/dropbear { };
-
dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };
- dtach = callPackage ../tools/misc/dtach { };
-
- dtc = callPackage ../development/compilers/dtc { };
-
- dt-schema = callPackage ../development/tools/dt-schema { };
-
inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; })
buildDubPackage dub-to-nix;
- duc = callPackage ../tools/misc/duc { };
-
duff = callPackage ../tools/filesystems/duff {
autoreconfHook = buildPackages.autoreconfHook269;
};
@@ -6964,26 +3296,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- dumpasn1 = callPackage ../tools/security/dumpasn1 { };
-
- dumptorrent = callPackage ../tools/misc/dumptorrent { };
-
- duo-unix = callPackage ../tools/security/duo-unix { };
-
- dupe-krill = callPackage ../tools/filesystems/dupe-krill { };
-
- duplicity = callPackage ../tools/backup/duplicity { };
-
- duply = callPackage ../tools/backup/duply { };
-
- dvd-vr = callPackage ../tools/cd-dvd/dvd-vr { };
-
- dvdisaster = callPackage ../tools/cd-dvd/dvdisaster { };
-
- dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { };
-
- dvgrab = callPackage ../tools/video/dvgrab { };
-
dvtm = callPackage ../tools/misc/dvtm {
# if you prefer a custom config, write the config.h in dvtm.config.h
# and enable
@@ -6992,64 +3304,22 @@ with pkgs;
dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { };
- erofs-utils = callPackage ../tools/filesystems/erofs-utils { };
-
- e2tools = callPackage ../tools/filesystems/e2tools { };
-
- e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
-
- easyrsa = callPackage ../tools/networking/easyrsa { };
-
- easysnap = callPackage ../tools/backup/easysnap { };
-
- ebook_tools = callPackage ../tools/text/ebook-tools { };
-
ecryptfs = callPackage ../tools/security/ecryptfs { };
ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { };
- edgetpu-compiler = callPackage ../development/libraries/science/robotics/edgetpu-compiler { };
-
- edid-decode = callPackage ../tools/misc/edid-decode { };
-
- edid-generator = callPackage ../tools/misc/edid-generator { };
-
- edir = callPackage ../tools/misc/edir { };
-
- editres = callPackage ../tools/graphics/editres { };
-
- edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { };
-
- edl = callPackage ../development/embedded/edl { };
-
- edlib = callPackage ../development/libraries/science/biology/edlib { };
-
- eff = callPackage ../development/interpreters/eff { };
-
eid-mw = callPackage ../tools/security/eid-mw {
autoreconfHook = buildPackages.autoreconfHook269;
};
engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { };
- epub2txt2 = callPackage ../tools/text/epub2txt2 { };
-
- epubcheck = callPackage ../tools/text/epubcheck { };
-
- evil-winrm = callPackage ../tools/security/evil-winrm { };
-
- evtx = callPackage ../tools/security/evtx { };
-
- kics = callPackage ../tools/admin/kics { };
-
kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { };
lychee = callPackage ../tools/networking/lychee {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- mcrcon = callPackage ../tools/networking/mcrcon { };
-
mozwire = callPackage ../tools/networking/mozwire {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
@@ -7058,30 +3328,16 @@ with pkgs;
inherit (pkgs.darwin.apple_sdk.libs) utmp;
};
- rar2fs = callPackage ../tools/filesystems/rar2fs { };
-
rocmPackages = rocmPackages_6;
rocmPackages_5 = recurseIntoAttrs (callPackage ../development/rocm-modules/5 { });
rocmPackages_6 = recurseIntoAttrs (callPackage ../development/rocm-modules/6 { });
- rune = callPackage ../development/interpreters/rune { };
-
- s9fes = callPackage ../development/interpreters/s9fes { };
-
- s-tar = callPackage ../tools/archivers/s-tar { };
-
solo2-cli = callPackage ../tools/security/solo2-cli {
inherit (darwin.apple_sdk.frameworks) PCSC IOKit CoreFoundation AppKit;
};
- sonota = callPackage ../tools/misc/sonota { };
-
sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { };
- stratisd = callPackage ../tools/filesystems/stratisd { };
-
- stratis-cli = callPackage ../tools/filesystems/stratis-cli { };
-
strawberry-qt5 = libsForQt5.callPackage ../applications/audio/strawberry { };
strawberry-qt6 = qt6Packages.callPackage ../applications/audio/strawberry { };
@@ -7098,22 +3354,10 @@ with pkgs;
teamocil = callPackage ../tools/misc/teamocil { };
- the-way = callPackage ../development/tools/the-way { };
-
- timeline = callPackage ../applications/office/timeline { };
-
tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };
tracy-x11 = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; };
- trivy = callPackage ../tools/admin/trivy { };
-
- trompeloeil = callPackage ../development/libraries/trompeloeil { };
-
- updog = callPackage ../tools/networking/updog { };
-
- uudeview = callPackage ../tools/misc/uudeview { };
-
uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi;
uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {
@@ -7123,18 +3367,8 @@ with pkgs;
uutils-coreutils-noprefix = uutils-coreutils.override { prefix = null; };
- volctl = callPackage ../tools/audio/volctl { };
-
vorta = qt6Packages.callPackage ../applications/backup/vorta { };
- vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };
-
- vt-cli = callPackage ../tools/security/vt-cli { };
-
- wakeonlan = callPackage ../tools/networking/wakeonlan { };
-
- wayback = callPackage ../tools/misc/wayback { };
-
worker-build = callPackage ../development/tools/worker-build {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -7143,54 +3377,20 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
};
- snowflake = callPackage ../tools/networking/snowflake { };
-
- wsl-open = callPackage ../tools/misc/wsl-open { };
-
- wsl-vpnkit = callPackage ../tools/networking/wsl-vpnkit { };
-
xkcdpass = with python3Packages; toPythonApplication xkcdpass;
- xjobs = callPackage ../tools/misc/xjobs { };
-
- xob = callPackage ../tools/X11/xob { };
-
- z-lua = callPackage ../tools/misc/z-lua { };
-
- zabbixctl = callPackage ../tools/misc/zabbixctl { };
-
zee = callPackage ../applications/editors/zee {
inherit (darwin.apple_sdk.frameworks) Security;
};
zeek = darwin.apple_sdk_11_0.callPackage ../applications/networking/ids/zeek { };
- zeekscript = callPackage ../tools/security/zeekscript { };
-
zonemaster-cli = perlPackages.ZonemasterCLI;
- zotero-translation-server = callPackage ../tools/misc/zotero-translation-server { };
-
- zoxide = callPackage ../tools/misc/zoxide { };
-
- zzuf = callPackage ../tools/security/zzuf { };
-
### DEVELOPMENT / EMSCRIPTEN
buildEmscriptenPackage = callPackage ../development/em-modules/generic { };
- carp = callPackage ../development/compilers/carp { };
-
- cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { };
-
- choose = callPackage ../tools/text/choose { };
-
- d2 = callPackage ../tools/text/d2 { };
-
- ddev = callPackage ../applications/virtualization/ddev { };
-
- easeprobe = callPackage ../tools/misc/easeprobe { };
-
emscripten = callPackage ../development/compilers/emscripten {
llvmPackages = llvmPackages_19;
};
@@ -7199,12 +3399,6 @@ with pkgs;
emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; };
- efivar = callPackage ../tools/system/efivar { };
-
- eget = callPackage ../tools/misc/eget { };
-
- evemu = callPackage ../tools/system/evemu { };
-
# The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
# When updating make sure to update all plugins or they will break!
elk7Version = "7.17.16";
@@ -7224,116 +3418,28 @@ with pkgs;
emborg = python3Packages.callPackage ../development/python-modules/emborg { };
- emblem = callPackage ../applications/graphics/emblem { };
-
- emem = callPackage ../applications/misc/emem { };
-
- empty = callPackage ../tools/misc/empty { };
-
emulsion = callPackage ../applications/graphics/emulsion {
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices Foundation OpenGL;
};
- emulsion-palette = callPackage ../applications/graphics/emulsion-palette { };
-
- emv = callPackage ../tools/misc/emv { };
-
- enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { };
-
- enc = callPackage ../tools/security/enc { };
-
- endlessh = callPackage ../servers/endlessh { };
-
- ericw-tools = callPackage ../applications/misc/ericw-tools { };
-
- cryfs = callPackage ../tools/filesystems/cryfs { };
-
encfs = callPackage ../tools/filesystems/encfs {
tinyxml2 = tinyxml-2;
};
- enscript = callPackage ../tools/text/enscript { };
-
- ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { };
-
- entr = callPackage ../tools/misc/entr { };
-
envchain = callPackage ../tools/misc/envchain { inherit (darwin.apple_sdk.frameworks) Security; };
- eot_utilities = callPackage ../tools/misc/eot-utilities { };
-
- eplot = callPackage ../tools/graphics/eplot { };
-
- epstool = callPackage ../tools/graphics/epstool { };
-
- escrotum = callPackage ../tools/graphics/escrotum { };
-
- esshader = callPackage ../tools/graphics/esshader { };
-
ethercalc = callPackage ../servers/web-apps/ethercalc { };
- ethtool = callPackage ../tools/misc/ethtool { };
-
- ets = callPackage ../tools/misc/ets { };
-
- ettercap = callPackage ../applications/networking/sniffers/ettercap { };
-
- evcc = callPackage ../servers/home-automation/evcc { };
-
- eventstat = callPackage ../os-specific/linux/eventstat { };
-
- evtest = callPackage ../applications/misc/evtest { };
-
evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { };
- eva = callPackage ../tools/misc/eva { };
-
- exactaudiocopy = callPackage ../applications/audio/exact-audio-copy { };
-
- exempi = callPackage ../development/libraries/exempi { };
-
executor = with python3Packages; toPythonApplication executor;
- exif = callPackage ../tools/graphics/exif { };
-
- exifprobe = callPackage ../tools/graphics/exifprobe { };
-
- exiftags = callPackage ../tools/graphics/exiftags { };
-
exiftool = perlPackages.ImageExifTool;
- ext4magic = callPackage ../tools/filesystems/ext4magic { };
-
- extract_url = callPackage ../applications/misc/extract_url { };
-
- extundelete = callPackage ../tools/filesystems/extundelete { };
-
expect = tclPackages.expect;
- expected-lite = callPackage ../development/libraries/expected-lite { };
-
- exportarr = callPackage ../servers/monitoring/prometheus/exportarr { };
-
- expliot = callPackage ../tools/security/expliot { };
-
Fabric = with python3Packages; toPythonApplication fabric;
- fakeroot = callPackage ../tools/system/fakeroot { };
-
- fakeroute = callPackage ../tools/networking/fakeroute { };
-
- fakechroot = callPackage ../tools/system/fakechroot { };
-
- fancy-motd = callPackage ../tools/system/fancy-motd { };
-
- fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { };
-
- fanficfare = callPackage ../tools/text/fanficfare { };
-
- fastd = callPackage ../tools/networking/fastd { };
-
- fatsort = callPackage ../tools/filesystems/fatsort { };
-
chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { };
fcitx5 = callPackage ../tools/inputmethods/fcitx5 { };
@@ -7362,22 +3468,8 @@ with pkgs;
fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { };
- fcppt = callPackage ../development/libraries/fcppt { };
-
- fcrackzip = callPackage ../tools/security/fcrackzip { };
-
- fcron = callPackage ../tools/system/fcron { };
-
- fdm = callPackage ../tools/networking/fdm { };
-
- fdtools = callPackage ../tools/misc/fdtools { };
-
featherpad = qt5.callPackage ../applications/editors/featherpad { };
- fend = callPackage ../tools/misc/fend { };
-
- ferm = callPackage ../tools/networking/ferm { };
-
feroxbuster = callPackage ../tools/security/feroxbuster {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
@@ -7386,13 +3478,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security AppKit;
};
- fgallery = callPackage ../tools/graphics/fgallery { };
-
flannel = callPackage ../tools/networking/flannel { };
cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix { };
- flashbench = callPackage ../os-specific/linux/flashbench { };
-
flatpak-builder = callPackage ../development/tools/flatpak-builder {
binutils = binutils-unwrapped;
};
@@ -7401,32 +3489,12 @@ with pkgs;
icu = icu63;
};
- fluent-reader = callPackage ../applications/networking/feedreaders/fluent-reader { };
-
- flux = callPackage ../development/compilers/flux { };
-
- fierce = callPackage ../tools/security/fierce { };
-
- figlet = callPackage ../tools/misc/figlet { };
-
file = callPackage ../tools/misc/file {
inherit (windows) libgnurx;
};
- filegive = callPackage ../tools/networking/filegive { };
-
- filet = callPackage ../applications/misc/filet { };
-
- findex = callPackage ../applications/misc/findex { };
-
- findomain = callPackage ../tools/networking/findomain { };
-
findutils = callPackage ../tools/misc/findutils { };
- findup = callPackage ../tools/misc/findup { };
-
- fingerprintx = callPackage ../tools/security/fingerprintx { };
-
bsd-fingerd = bsd-finger.override {
buildProduct = "daemon";
};
@@ -7435,30 +3503,12 @@ with pkgs;
firehol = callPackage ../applications/networking/firehol { };
- fio = callPackage ../tools/system/fio { };
-
- flamerobin = callPackage ../applications/misc/flamerobin { };
-
- flashrom = callPackage ../tools/misc/flashrom { };
-
- flexoptix-app = callPackage ../tools/misc/flexoptix-app { };
-
- flpsed = callPackage ../applications/editors/flpsed { };
-
fluentd = callPackage ../tools/misc/fluentd { };
- flvstreamer = callPackage ../tools/networking/flvstreamer { };
-
- frr = callPackage ../servers/frr { };
-
gemstash = callPackage ../development/tools/gemstash { };
hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { };
- libbsd = callPackage ../development/libraries/libbsd { };
-
- libbladeRF = callPackage ../development/libraries/libbladeRF { };
-
libbtbb = callPackage ../development/libraries/libbtbb {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -7469,46 +3519,8 @@ with pkgs;
inherit (darwin) autoSignDarwinBinariesHook;
};
- fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { };
-
- faraday-agent-dispatcher = callPackage ../tools/security/faraday-agent-dispatcher { };
-
- faraday-cli = callPackage ../tools/security/faraday-cli { };
-
fastlane = callPackage ../tools/admin/fastlane { };
- fatresize = callPackage ../tools/filesystems/fatresize { };
-
- fdk_aac = callPackage ../development/libraries/fdk-aac { };
-
- fdk-aac-encoder = callPackage ../applications/audio/fdkaac { };
-
- fead = callPackage ../applications/misc/fead { };
-
- feedgnuplot = callPackage ../tools/graphics/feedgnuplot { };
-
- fermyon-spin = callPackage ../development/tools/fermyon-spin { };
-
- fbcat = callPackage ../tools/misc/fbcat { };
-
- fbjni = callPackage ../development/libraries/fbjni { };
-
- fbv = callPackage ../tools/graphics/fbv { };
-
- fbvnc = callPackage ../tools/admin/fbvnc { };
-
- fim = callPackage ../tools/graphics/fim { };
-
- flamegraph = callPackage ../development/tools/flamegraph { };
-
- flawfinder = callPackage ../development/tools/flawfinder { };
-
- flintlock = callPackage ../applications/virtualization/flintlock { };
-
- flips = callPackage ../tools/compression/flips { };
-
- flowblade = callPackage ../applications/video/flowblade { };
-
fontforge = lowPrio (callPackage ../tools/misc/fontforge {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
python = python3;
@@ -7524,78 +3536,34 @@ with pkgs;
fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { };
- foremost = callPackage ../tools/system/foremost { };
-
- forktty = callPackage ../os-specific/linux/forktty { };
-
- fortran-fpm = callPackage ../tools/package-management/fortran-fpm { };
-
- fortune = callPackage ../tools/misc/fortune { };
-
fox = callPackage ../development/libraries/fox {};
fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- fpart = callPackage ../tools/misc/fpart { };
-
- fpattern = callPackage ../development/libraries/fpattern { };
-
- fping = callPackage ../tools/networking/fping { };
-
fpm = callPackage ../tools/package-management/fpm { };
ferdium = callPackage ../applications/networking/instant-messengers/ferdium {
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
};
- fq = callPackage ../development/tools/fq { };
-
franz = callPackage ../applications/networking/instant-messengers/franz {
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
};
- freac = callPackage ../applications/audio/freac { };
-
- freebind = callPackage ../tools/networking/freebind { };
-
- freeipmi = callPackage ../tools/system/freeipmi { };
-
- freetalk = callPackage ../applications/networking/instant-messengers/freetalk { };
-
- freetds = callPackage ../development/libraries/freetds { };
-
- freetube = callPackage ../applications/video/freetube { };
-
- freeze = callPackage ../tools/security/freeze { };
-
freqtweak = callPackage ../applications/audio/freqtweak {
wxGTK = wxGTK32;
};
- frescobaldi = callPackage ../misc/frescobaldi { };
-
freshfetch = callPackage ../tools/misc/freshfetch {
inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation DiskArbitration Foundation IOKit;
};
- frigate = callPackage ../applications/video/frigate { };
-
frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { };
- ftop = callPackage ../os-specific/linux/ftop { };
-
- ftxui = callPackage ../development/libraries/ftxui { };
-
- fsarchiver = callPackage ../tools/archivers/fsarchiver { };
-
fstl = qt5.callPackage ../applications/graphics/fstl { };
- fswebcam = callPackage ../os-specific/linux/fswebcam { };
-
- fuseiso = callPackage ../tools/filesystems/fuseiso { };
-
fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { });
inherit (fdbPackages)
@@ -7604,48 +3572,18 @@ with pkgs;
foundationdb = foundationdb71;
- fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
-
- fuse-archive = callPackage ../tools/filesystems/fuse-archive { };
-
fuse-ext2 = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/fuse-ext2 { };
- fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs { };
-
- fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { };
-
- fusee-launcher = callPackage ../development/tools/fusee-launcher { };
-
- fusee-nano = callPackage ../development/tools/fusee-nano { };
-
- fverb = callPackage ../applications/audio/fverb { };
-
fwknop = callPackage ../tools/security/fwknop {
texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8.
};
- elastic = callPackage ../applications/misc/elastic { };
-
- exfat = callPackage ../tools/filesystems/exfat { };
-
- exfatprogs = callPackage ../tools/filesystems/exfatprogs { };
-
- dos2unix = callPackage ../tools/text/dos2unix { };
-
- uni2ascii = callPackage ../tools/text/uni2ascii { };
-
uniscribe = callPackage ../tools/text/uniscribe { };
- fornalder = callPackage ../applications/version-management/fornalder { };
-
- galen = callPackage ../development/tools/galen { };
-
gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { };
gandi-cli = python3Packages.callPackage ../tools/networking/gandi-cli { };
- gandom-fonts = callPackage ../data/fonts/gandom-fonts { };
-
gaphor = python3Packages.callPackage ../tools/misc/gaphor { };
inherit (callPackages ../tools/filesystems/garage {
@@ -7656,10 +3594,6 @@ with pkgs;
garage_0_8_7 garage_0_9_4
garage_1_0_1 garage_1_x;
- garmintools = callPackage ../development/libraries/garmintools { };
-
- gau = callPackage ../tools/security/gau { };
-
gauge-unwrapped = callPackage ../development/tools/gauge { };
gauge = callPackage ../development/tools/gauge/wrapper.nix { };
gaugePlugins = recurseIntoAttrs (callPackage ../development/tools/gauge/plugins {});
@@ -7677,152 +3611,48 @@ with pkgs;
gawkInteractive = gawk.override { interactive = true; };
- gatk = callPackage ../applications/science/biology/gatk {} ;
-
gbdfed = callPackage ../tools/misc/gbdfed {
gtk = gtk2-x11;
};
- gcfflasher = callPackage ../applications/misc/gcfflasher { };
-
- gdmap = callPackage ../tools/system/gdmap { };
-
- gef = callPackage ../development/tools/misc/gef { };
-
- gelasio = callPackage ../data/fonts/gelasio { };
-
- gemget = callPackage ../tools/networking/gemget { };
-
- gen-oath-safe = callPackage ../tools/security/gen-oath-safe { };
-
- genext2fs = callPackage ../tools/filesystems/genext2fs { };
-
- gengetopt = callPackage ../development/tools/misc/gengetopt { };
-
- genimage = callPackage ../tools/filesystems/genimage { };
-
- genmap = callPackage ../applications/science/biology/genmap { };
-
- geonkick = callPackage ../applications/audio/geonkick { };
-
- geteltorito = callPackage ../tools/misc/geteltorito { };
-
- getopt = callPackage ../tools/misc/getopt { };
-
- getoptions = callPackage ../tools/misc/getoptions { };
-
- gexiv2 = callPackage ../development/libraries/gexiv2 { };
-
gftp = callPackage ../applications/networking/ftp/gftp {
gtk = gtk2;
};
- gfs2-utils = callPackage ../tools/filesystems/gfs2-utils { };
-
- gfbgraph = callPackage ../development/libraries/gfbgraph { };
-
- ggobi = callPackage ../tools/graphics/ggobi { };
-
ggshield = callPackage ../tools/security/ggshield {
python3 = python311;
};
- ghost = callPackage ../tools/security/ghost { };
-
- ghostunnel = callPackage ../tools/networking/ghostunnel { };
-
- ghz = callPackage ../tools/networking/ghz { };
-
- gi-crystal = callPackage ../development/tools/gi-crystal { };
-
gibberish-detector = with python3Packages; toPythonApplication gibberish-detector;
- gibo = callPackage ../tools/misc/gibo { };
-
gifski = callPackage ../tools/graphics/gifski {
ffmpeg = ffmpeg_6;
};
- github-backup = callPackage ../tools/misc/github-backup { };
-
- gitkraken = callPackage ../applications/version-management/gitkraken { };
-
gitlab = callPackage ../applications/version-management/gitlab { };
gitlab-ee = callPackage ../applications/version-management/gitlab {
gitlabEnterprise = true;
};
- gitlab-clippy = callPackage ../development/tools/rust/gitlab-clippy { };
-
- gitlab-container-registry = callPackage ../applications/version-management/gitlab/gitlab-container-registry { };
-
- gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { };
-
- gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
-
gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };
gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };
- gitlab-elasticsearch-indexer = callPackage ../applications/version-management/gitlab/gitlab-elasticsearch-indexer { };
-
- gitleaks = callPackage ../tools/security/gitleaks { };
-
- gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
-
gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };
- git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
-
- gokart = callPackage ../development/tools/gokart { };
-
- gl2ps = callPackage ../development/libraries/gl2ps { };
-
- glusterfs = callPackage ../tools/filesystems/glusterfs { };
-
- glmark2 = callPackage ../tools/graphics/glmark2 { };
-
glogg = libsForQt5.callPackage ../tools/text/glogg { };
gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect {
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
};
- gnirehtet = callPackage ../tools/networking/gnirehtet { };
-
- gnome-builder = callPackage ../applications/editors/gnome-builder { };
-
- gnome-desktop = callPackage ../development/libraries/gnome-desktop { };
-
gnome-decoder = callPackage ../applications/graphics/gnome-decoder {
inherit (gst_all_1) gstreamer gst-plugins-base;
gst-plugins-bad = gst_all_1.gst-plugins-bad.override { enableZbar = true; };
};
- gnome-epub-thumbnailer = callPackage ../applications/misc/gnome-epub-thumbnailer { };
-
- gnome-extension-manager = callPackage ../applications/misc/gnome-extension-manager { };
-
- gnome-frog = callPackage ../applications/misc/gnome-frog { };
-
- gnome-keysign = callPackage ../tools/security/gnome-keysign { };
-
- gnome-secrets = callPackage ../applications/misc/gnome-secrets { };
-
- gnome-solanum = callPackage ../applications/misc/gnome-solanum { };
-
gnome-panel-with-modules = callPackage ../by-name/gn/gnome-panel/wrapper.nix { };
- gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };
-
- gnome-photos = callPackage ../applications/graphics/gnome-photos { };
-
- gnome-randr = callPackage ../tools/wayland/gnome-randr { };
-
- gnuapl = callPackage ../development/interpreters/gnu-apl { };
-
- gnu-shepherd = callPackage ../misc/gnu-shepherd { };
-
dapl = callPackage ../development/interpreters/dzaima-apl {
buildNativeImage = false;
stdenv = stdenvNoCC;
@@ -7835,18 +3665,12 @@ with pkgs;
gnucap-full = gnucap.withPlugins(p: [ p.verilog ]);
- gnu-cim = callPackage ../development/compilers/gnu-cim { };
-
- gnuclad = callPackage ../applications/graphics/gnuclad { };
-
gnufdisk = callPackage ../tools/system/fdisk {
guile = guile_1_8;
};
gnugrep = callPackage ../tools/text/gnugrep { };
- gnulib = callPackage ../development/tools/gnulib { };
-
gnupatch = callPackage ../tools/text/gnupatch { };
gnupg1orig = callPackage ../tools/security/gnupg/1.nix { };
@@ -7863,8 +3687,6 @@ with pkgs;
};
gnupg = gnupg24;
- gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { };
-
gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -7874,16 +3696,10 @@ with pkgs;
# must have AquaTerm installed separately
gnuplot_aquaterm = gnuplot.override { aquaterm = true; };
- gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { };
-
gnused = callPackage ../tools/text/gnused { };
gnutar = callPackage ../tools/archivers/gnutar { };
- goaccess = callPackage ../tools/misc/goaccess { };
-
- gocryptfs = callPackage ../tools/filesystems/gocryptfs { };
-
godot3 = callPackage ../development/tools/godot/3 { };
godot3-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { };
@@ -7904,24 +3720,12 @@ with pkgs;
godot3-mono-server = callPackage ../development/tools/godot/3/mono/server.nix { };
- goeland = callPackage ../applications/networking/feedreaders/goeland { };
-
- go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
-
- goofys = callPackage ../tools/filesystems/goofys { };
-
- go-sct = callPackage ../tools/X11/go-sct { };
-
goattracker = callPackage ../applications/audio/goattracker { };
goattracker-stereo = callPackage ../applications/audio/goattracker {
isStereo = true;
};
- google-app-engine-go-sdk = callPackage ../development/tools/google-app-engine-go-sdk { };
-
- google-authenticator = callPackage ../os-specific/linux/google-authenticator { };
-
google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk {
python = python3;
};
@@ -7930,47 +3734,15 @@ with pkgs;
with-gce = true;
};
- google-cloud-bigtable-tool = callPackage ../tools/misc/google-cloud-bigtable-tool { };
-
- google-cloud-sql-proxy = callPackage ../tools/misc/google-cloud-sql-proxy { };
-
- google-fonts = callPackage ../data/fonts/google-fonts { };
-
- google-clasp = callPackage ../development/tools/google-clasp { };
-
google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine;
- google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { };
-
- google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { };
-
- google-java-format = callPackage ../development/tools/google-java-format { };
-
- google-guest-agent = callPackage ../tools/virtualization/google-guest-agent { };
-
- google-guest-configs = callPackage ../tools/virtualization/google-guest-configs { };
-
gdown = with python3Packages; toPythonApplication gdown;
- gopro = callPackage ../tools/video/gopro { };
-
- goreplay = callPackage ../tools/networking/goreplay { };
-
- gost = callPackage ../tools/networking/gost { };
-
- gource = callPackage ../applications/version-management/gource { };
-
- govc = callPackage ../tools/virtualization/govc { };
-
goverlay = callPackage ../tools/graphics/goverlay {
inherit (qt5) wrapQtAppsHook;
inherit (plasma5Packages) breeze-qt5;
};
- gpart = callPackage ../tools/filesystems/gpart { };
-
- gparted = callPackage ../tools/misc/gparted { };
-
gpt4all-cuda = gpt4all.override {
cudaSupport = true;
};
@@ -7981,30 +3753,12 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- gptman = callPackage ../tools/system/gptman { };
-
- ldmtool = callPackage ../tools/misc/ldmtool { };
-
- gphotos-sync = callPackage ../tools/backup/gphotos-sync { };
-
- gpodder = callPackage ../applications/audio/gpodder { };
-
- gpp = callPackage ../development/tools/gpp { };
-
gpredict = callPackage ../applications/science/astronomy/gpredict {
hamlib = hamlib_4;
};
gprof2dot = with python3Packages; toPythonApplication gprof2dot;
- gprojector = callPackage ../applications/science/astronomy/gprojector { };
-
- gptfdisk = callPackage ../tools/system/gptfdisk { };
-
- gql = callPackage ../applications/version-management/gql { };
-
- gradience = callPackage ../applications/misc/gradience { };
-
grails = callPackage ../development/web/grails { jdk = null; };
graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { };
@@ -8026,50 +3780,14 @@ with pkgs;
withXorg = false;
};
- grass-sass = callPackage ../tools/misc/grass-sass { };
-
- gridtracker = callPackage ../applications/radio/gridtracker { };
-
- grig = callPackage ../applications/radio/grig { };
-
- grin = callPackage ../tools/text/grin { };
-
- gyb = callPackage ../tools/backup/gyb { };
-
- halftone = callPackage ../applications/graphics/halftone { };
-
- harminv = callPackage ../development/libraries/science/chemistry/harminv { };
-
igrep = callPackage ../tools/text/igrep {
inherit (darwin.apple_sdk.frameworks) Security;
};
- ripgrep = callPackage ../tools/text/ripgrep { };
-
ripgrep-all = callPackage ../tools/text/ripgrep-all {
inherit (darwin.apple_sdk.frameworks) Security;
};
- grive2 = callPackage ../tools/filesystems/grive2 { };
-
- groff = callPackage ../tools/text/groff { };
-
- gron = callPackage ../development/tools/gron { };
-
- groonga = callPackage ../servers/search/groonga { };
-
- grpcurl = callPackage ../tools/networking/grpcurl { };
-
- grpc_cli = callPackage ../tools/networking/grpc_cli { };
-
- grpc-gateway = callPackage ../development/tools/grpc-gateway { };
-
- grpcui = callPackage ../tools/networking/grpcui { };
-
- grpc-tools = callPackage ../development/tools/misc/grpc-tools { };
-
- grpc-client-cli = callPackage ../development/tools/misc/grpc-client-cli { };
-
grub2 = callPackage ../tools/misc/grub/default.nix { };
grub2_efi = grub2.override {
@@ -8084,8 +3802,6 @@ with pkgs;
xenSupport = true;
};
- grub2_pvgrub_image = callPackage ../tools/misc/grub/pvgrub_image { };
-
grub4dos = callPackage ../tools/misc/grub4dos {
stdenv = stdenv_32bit;
};
@@ -8095,14 +3811,6 @@ with pkgs;
gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa;
gx = callPackage ../tools/package-management/gx { };
- gx-go = callPackage ../tools/package-management/gx/go { };
-
- efitools = callPackage ../tools/security/efitools { };
-
- sbsigntool = callPackage ../tools/security/sbsigntool { };
-
- gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
-
gsmlib = callPackage ../development/libraries/gsmlib
{ autoreconfHook = buildPackages.autoreconfHook269; };
@@ -8112,142 +3820,44 @@ with pkgs;
gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { };
- gt5 = callPackage ../tools/system/gt5 { };
-
- gtest = callPackage ../development/libraries/gtest { };
-
- gbenchmark = callPackage ../development/libraries/gbenchmark { };
-
- gkraken = callPackage ../tools/system/gkraken { };
-
- gtkdatabox = callPackage ../development/libraries/gtkdatabox { };
-
- gtdialog = callPackage ../development/libraries/gtdialog { };
-
gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; };
- gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
-
- gtkradiant = callPackage ../applications/misc/gtkradiant { };
-
- gtk-frdp = callPackage ../development/libraries/gtk-frdp { };
-
- gtk-vnc = callPackage ../tools/admin/gtk-vnc { };
-
gup = callPackage ../development/tools/build-managers/gup { };
gupnp = callPackage ../development/libraries/gupnp { };
gupnp_1_6 = callPackage ../development/libraries/gupnp/1.6.nix { };
- gupnp-av = callPackage ../development/libraries/gupnp-av { };
-
- gupnp-dlna = callPackage ../development/libraries/gupnp-dlna { };
-
- gupnp-igd = callPackage ../development/libraries/gupnp-igd { };
-
- gupnp-tools = callPackage ../tools/networking/gupnp-tools { };
-
gvm-tools = with python3.pkgs; toPythonApplication gvm-tools;
- gvpe = callPackage ../tools/networking/gvpe { };
-
- gvolicon = callPackage ../tools/audio/gvolicon { };
-
- gvproxy = callPackage ../tools/networking/gvproxy { };
-
gyroflow = qt6Packages.callPackage ../applications/video/gyroflow { };
gzip = callPackage ../tools/compression/gzip { };
- gzrt = callPackage ../tools/compression/gzrt { };
-
- httplab = callPackage ../tools/networking/httplab { };
-
- lucky-cli = callPackage ../development/web/lucky-cli { };
-
- mac-fdisk = callPackage ../tools/system/mac-fdisk { };
-
- partclone = callPackage ../tools/backup/partclone { };
-
- partimage = callPackage ../tools/backup/partimage { };
-
pdisk = callPackage ../tools/system/pdisk {
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
};
- pgf_graphics = callPackage ../tools/graphics/pgf { };
-
- pgbackrest = callPackage ../tools/backup/pgbackrest { };
-
- pgformatter = callPackage ../development/tools/pgformatter { };
-
- pgloader = callPackage ../development/tools/pgloader { };
-
- pgtop = callPackage ../development/tools/pgtop { };
-
- pigz = callPackage ../tools/compression/pigz { };
-
- pixz = callPackage ../tools/compression/pixz { };
-
- plog = callPackage ../development/libraries/plog {};
-
plplot = callPackage ../development/libraries/plplot {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- pxattr = callPackage ../tools/archivers/pxattr { };
-
- pxz = callPackage ../tools/compression/pxz { };
-
haguichi = callPackage ../tools/networking/haguichi { };
- hans = callPackage ../tools/networking/hans { };
-
- haproxy = callPackage ../tools/networking/haproxy { };
-
- hackertyper = callPackage ../tools/misc/hackertyper { };
-
- hackneyed = callPackage ../data/icons/hackneyed { };
-
- haveged = callPackage ../tools/security/haveged { };
-
- habitat = callPackage ../applications/networking/cluster/habitat { };
-
- hashcash = callPackage ../tools/security/hashcash { };
-
hashcat = callPackage ../tools/security/hashcat {
inherit (darwin.apple_sdk.frameworks) Foundation IOKit Metal OpenCL;
};
- hashcat-utils = callPackage ../tools/security/hashcat-utils { };
-
- hashrat = callPackage ../tools/security/hashrat { };
-
- hash_extender = callPackage ../tools/security/hash_extender { };
-
- hash-identifier = callPackage ../tools/security/hash-identifier { };
-
- hash-slinger = callPackage ../tools/security/hash-slinger { };
-
haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { };
hassil = with python3Packages; toPythonApplication hassil;
- hasmail = callPackage ../applications/networking/mailreaders/hasmail { };
-
haste-client = callPackage ../tools/misc/haste-client { };
- haste-server = callPackage ../servers/haste-server { };
-
hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
- half = callPackage ../development/libraries/half { };
-
- halibut = callPackage ../tools/typesetting/halibut { };
-
halide = callPackage ../development/compilers/halide {
llvmPackages = llvmPackages_18;
};
@@ -8256,30 +3866,6 @@ with pkgs;
ham = pkgs.perlPackages.ham;
- hamsket = callPackage ../applications/networking/instant-messengers/hamsket { };
-
- hardinfo = callPackage ../tools/system/hardinfo { };
-
- hayagriva = callPackage ../tools/typesetting/hayagriva { };
-
- hcl2json = callPackage ../applications/misc/hcl2json { };
-
- hcledit = callPackage ../tools/text/hcledit { };
-
- hcxtools = callPackage ../tools/security/hcxtools { };
-
- hcxdumptool = callPackage ../tools/security/hcxdumptool { };
-
- hdapsd = callPackage ../os-specific/linux/hdapsd { };
-
- hdaps-gl = callPackage ../tools/misc/hdaps-gl { };
-
- hddfancontrol = callPackage ../tools/system/hddfancontrol { };
-
- hddtemp = callPackage ../tools/misc/hddtemp { };
-
- hdf4 = callPackage ../tools/misc/hdf4 { };
-
hdf5 = callPackage ../tools/misc/hdf5 {
fortranSupport = false;
fortran = gfortran;
@@ -8298,16 +3884,8 @@ with pkgs;
hdf5-threadsafe = hdf5.override { threadsafe = true; };
- hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { };
-
- hdfview = callPackage ../tools/misc/hdfview { };
-
- hecate = callPackage ../applications/editors/hecate { };
-
heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack { };
- heatshrink = callPackage ../tools/compression/heatshrink { };
-
heimdall = libsForQt5.callPackage ../tools/misc/heimdall { };
heimdall-gui = heimdall.override { enableGUI = true; };
@@ -8316,37 +3894,10 @@ with pkgs;
buildGoModule = buildGo123Module;
};
- health = callPackage ../applications/misc/health { };
-
- healthchecks = callPackage ../servers/web-apps/healthchecks { };
-
- heisenbridge = callPackage ../servers/heisenbridge { };
-
- helio-workstation = callPackage ../applications/audio/helio-workstation { };
-
- hevea = callPackage ../tools/typesetting/hevea { };
-
- hex = callPackage ../tools/misc/hex { };
-
- hexd = callPackage ../tools/misc/hexd { };
- pixd = callPackage ../tools/misc/pixd { };
-
- hexgui = callPackage ../games/hexgui { };
-
- hey = callPackage ../tools/networking/hey { };
-
- heygpt = callPackage ../tools/llm/heygpt { };
-
- hhpc = callPackage ../tools/misc/hhpc { };
-
hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
- hivemind = callPackage ../applications/misc/hivemind { };
-
hobbits = libsForQt5.callPackage ../tools/graphics/hobbits { };
- hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
-
highlight = callPackage ../tools/text/highlight {
lua = lua5;
};
@@ -8355,30 +3906,16 @@ with pkgs;
hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { };
- holochain-launcher = callPackage ../applications/misc/holochain-launcher { };
-
homesick = callPackage ../tools/misc/homesick { };
- honcho = callPackage ../tools/system/honcho { };
-
- horst = callPackage ../tools/networking/horst { };
-
host = bind.host;
- hostess = callPackage ../development/tools/hostess { };
-
- hostname-debian = callPackage ../tools/networking/hostname-debian { };
-
hotdoc = python3Packages.callPackage ../development/tools/hotdoc { };
- hotpatch = callPackage ../development/libraries/hotpatch { };
-
hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { };
hpccm = with python3Packages; toPythonApplication hpccm;
- hping = callPackage ../tools/networking/hping { };
-
hqplayer-desktop = libsForQt5.callPackage ../applications/audio/hqplayer-desktop { };
html-proofer = callPackage ../tools/misc/html-proofer { };
@@ -8387,92 +3924,34 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- htpdate = callPackage ../tools/networking/htpdate { };
-
http-prompt = callPackage ../tools/networking/http-prompt { };
- httpdump = callPackage ../tools/security/httpdump { };
-
httpie = with python3Packages; toPythonApplication httpie;
- httplz = callPackage ../tools/networking/httplz { };
-
- httpfs2 = callPackage ../tools/filesystems/httpfs { };
-
- httprobe = callPackage ../tools/networking/httprobe { };
-
- httpstat = callPackage ../tools/networking/httpstat { };
-
- httptunnel = callPackage ../tools/networking/httptunnel { };
-
- httpx = callPackage ../tools/security/httpx { };
-
hue-plus = libsForQt5.callPackage ../applications/misc/hue-plus { };
- hubicfuse = callPackage ../tools/filesystems/hubicfuse { };
-
humanfriendly = with python3Packages; toPythonApplication humanfriendly;
hw-probe = perlPackages.callPackage ../tools/system/hw-probe { };
- hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { };
-
hyphen = callPackage ../development/libraries/hyphen { };
hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix {});
- i2c-tools = callPackage ../os-specific/linux/i2c-tools { };
-
- i2pd = callPackage ../tools/networking/i2pd { };
-
iannix = libsForQt5.callPackage ../applications/audio/iannix { };
iaito = libsForQt5.callPackage ../tools/security/iaito { };
jamulus = libsForQt5.callPackage ../applications/audio/jamulus { };
- ultrablue-server = callPackage ../os-specific/linux/ultrablue-server { };
-
- ibm-sw-tpm2 = callPackage ../tools/security/ibm-sw-tpm2 { };
-
- ibniz = callPackage ../tools/graphics/ibniz { };
-
- icebreaker = callPackage ../servers/icebreaker { };
-
- icecast = callPackage ../servers/icecast { };
-
icemon = libsForQt5.callPackage ../applications/networking/icemon { };
icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak;
- iceshelf = callPackage ../tools/backup/iceshelf { };
-
- darkice = callPackage ../tools/audio/darkice { };
-
- bc-decaf = callPackage ../development/libraries/bc-decaf { };
-
- deckmaster = callPackage ../applications/misc/deckmaster { };
-
- deco = callPackage ../applications/misc/deco { };
-
- decoder = callPackage ../tools/security/decoder { };
-
- icoutils = callPackage ../tools/graphics/icoutils { };
-
- idutils = callPackage ../tools/misc/idutils { };
-
- idle3tools = callPackage ../tools/system/idle3tools { };
-
- iftop = callPackage ../tools/networking/iftop { };
-
ifwifi = callPackage ../tools/networking/ifwifi {
inherit (darwin.apple_sdk.frameworks) Security;
};
- ifuse = callPackage ../tools/filesystems/ifuse { };
- ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { };
- idevicerestore = callPackage ../tools/misc/idevicerestore { };
-
inherit (callPackages ../tools/filesystems/irods rec {
stdenv = llvmPackages_13.libcxxStdenv;
libcxx = llvmPackages_13.libcxx;
@@ -8485,8 +3964,6 @@ with pkgs;
irods
irods-icommands;
- igmpproxy = callPackage ../tools/networking/igmpproxy { };
-
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
inherit (haskellPackages) ghcWithPackages;
@@ -8497,302 +3974,99 @@ with pkgs;
iruby = callPackage ../applications/editors/jupyter-kernels/iruby { };
- ike-scan = callPackage ../tools/security/ike-scan { };
-
ilspycmd = callPackage ../development/tools/ilspycmd {
inherit (darwin) autoSignDarwinBinariesHook;
};
- imapsync = callPackage ../tools/networking/imapsync { };
-
- imgur-screenshot = callPackage ../tools/graphics/imgur-screenshot { };
-
- imgurbash2 = callPackage ../tools/graphics/imgurbash2 { };
-
in-formant = qt6Packages.callPackage ../applications/audio/in-formant { };
- inadyn = callPackage ../tools/networking/inadyn { };
-
incus-lts = callPackage ../by-name/in/incus/lts.nix { };
- incron = callPackage ../tools/system/incron { };
-
indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2;
- industrializer = callPackage ../applications/audio/industrializer { };
-
- inetutils = callPackage ../tools/networking/inetutils { };
-
- inferno = callPackage ../development/tools/inferno { };
-
infisical = callPackage ../development/tools/infisical { };
inform6 = darwin.apple_sdk_11_0.callPackage ../development/compilers/inform6 { };
- inform7 = callPackage ../development/compilers/inform7 { };
-
- infamousPlugins = callPackage ../applications/audio/infamousPlugins { };
-
innernet = callPackage ../tools/networking/innernet {
inherit (darwin.apple_sdk.frameworks) Security;
};
- innoextract = callPackage ../tools/archivers/innoextract { };
-
input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { };
- inql = callPackage ../tools/security/inql { };
-
- intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { };
-
- intermodal = callPackage ../tools/misc/intermodal { };
-
internetarchive = with python3Packages; toPythonApplication internetarchive;
invidious = callPackage ../servers/invidious { };
- invoice2data = callPackage ../tools/text/invoice2data { };
-
- inxi = callPackage ../tools/system/inxi { };
-
- iodine = callPackage ../tools/networking/iodine { };
-
- ioc-scan = callPackage ../tools/security/ioc-scan { };
-
- ioccheck = callPackage ../tools/security/ioccheck { };
-
iocextract = with python3Packages; toPythonApplication iocextract;
iocsearcher = with python3Packages; toPythonApplication iocsearcher;
- ioping = callPackage ../tools/system/ioping { };
-
- ior = callPackage ../tools/system/ior { };
-
- ioztat = callPackage ../tools/filesystems/ioztat { };
-
- ip2location = callPackage ../tools/networking/ip2location { };
-
- ip2unix = callPackage ../tools/networking/ip2unix { };
-
- ipad_charge = callPackage ../tools/misc/ipad_charge { };
-
iperf2 = callPackage ../tools/networking/iperf/2.nix { };
iperf3 = callPackage ../tools/networking/iperf/3.nix { };
iperf = iperf3;
- iperf3d = callPackage ../tools/networking/iperf3d { };
-
- ipfetch = callPackage ../tools/networking/ipfetch { };
-
- ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
-
- ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { };
-
- ipget = callPackage ../applications/networking/ipget { };
-
i-pi = with python3Packages; toPythonApplication i-pi;
- iptsd = callPackage ../applications/misc/iptsd { };
-
- ipmitool = callPackage ../tools/system/ipmitool { };
-
- ipmiutil = callPackage ../tools/system/ipmiutil { };
-
- ipatool = callPackage ../applications/misc/ipatool { };
-
- ipmicfg = callPackage ../applications/misc/ipmicfg { };
-
- ipmiview = callPackage ../applications/misc/ipmiview { };
-
- ipcalc = callPackage ../tools/networking/ipcalc { };
-
- netmask = callPackage ../tools/networking/netmask { };
-
- netifd = callPackage ../tools/networking/netifd { };
-
- ipinfo = callPackage ../tools/networking/ipinfo { };
-
- ipscan = callPackage ../tools/security/ipscan { };
# ipscan is commonly known under the name angryipscanner
angryipscanner = ipscan;
- ipv6calc = callPackage ../tools/networking/ipv6calc { };
-
- irker = callPackage ../servers/irker { };
-
- iroh = callPackage ../applications/networking/iroh { };
-
- ised = callPackage ../tools/misc/ised { };
-
isl = isl_0_20;
isl_0_17 = callPackage ../development/libraries/isl/0.17.1.nix { };
isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { };
- ispike = callPackage ../development/libraries/science/robotics/ispike { };
-
- isrcsubmit = callPackage ../tools/audio/isrcsubmit { };
-
isync = callPackage ../tools/networking/isync {
inherit (darwin.apple_sdk.frameworks) Security;
};
- itm-tools = callPackage ../development/tools/misc/itm-tools { };
-
- ite-backlight = callPackage ../misc/ite-backlight { };
-
- iwgtk = callPackage ../tools/networking/iwgtk { };
-
- ix = callPackage ../tools/misc/ix { };
-
- jaaa = callPackage ../applications/audio/jaaa { };
-
jackett = callPackage ../servers/jackett { };
- jade = callPackage ../tools/text/sgml/jade { };
-
- jadx = callPackage ../tools/security/jadx { };
-
jamesdsp = qt6Packages.callPackage ../applications/audio/jamesdsp { };
jamesdsp-pulse = qt6Packages.callPackage ../applications/audio/jamesdsp {
usePipewire = false;
usePulseaudio = true;
};
- jaq = callPackage ../development/tools/jaq { };
-
- jasmin-compiler = callPackage ../development/compilers/jasmin-compiler { };
-
jazzy = callPackage ../development/tools/jazzy { };
jc = with python3Packages; toPythonApplication jc;
- jd-diff-patch = callPackage ../development/tools/jd-diff-patch { };
-
- jdiskreport = callPackage ../tools/misc/jdiskreport { };
-
jekyll = callPackage ../applications/misc/jekyll { };
jello = with python3Packages; toPythonApplication jello;
- jen = callPackage ../tools/text/jen { };
-
- jet = callPackage ../development/tools/jet { };
-
- jf = callPackage ../development/tools/jf { };
-
- jfmt = callPackage ../development/tools/jfmt { };
-
- jfsutils = callPackage ../tools/filesystems/jfsutils { };
-
- jhead = callPackage ../tools/graphics/jhead { };
-
- jid = callPackage ../development/tools/jid { };
-
jing = res.jing-trang;
jing-trang = callPackage ../tools/text/xml/jing-trang {
jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
- jirafeau = callPackage ../servers/web-apps/jirafeau { };
-
- jitterentropy = callPackage ../development/libraries/jitterentropy { };
-
jl = haskellPackages.jl;
jless = callPackage ../development/tools/jless {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- jmespath = callPackage ../development/tools/jmespath { };
-
juicefs = callPackage ../tools/filesystems/juicefs {
buildGoModule = buildGo122Module;
};
- juicity = callPackage ../tools/networking/juicity { };
-
- jmtpfs = callPackage ../tools/filesystems/jmtpfs { };
-
- jnettop = callPackage ../tools/networking/jnettop { };
-
- jsvc = callPackage ../tools/system/jsvc { };
-
- junkie = callPackage ../tools/networking/junkie { };
-
- go-jira = callPackage ../applications/misc/go-jira { };
-
jogl = callPackage ../by-name/jo/jogl/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv;
};
- john = callPackage ../tools/security/john { };
-
- joomscan = callPackage ../tools/security/joomscan { };
-
joplin = nodePackages.joplin;
- joplin-desktop = callPackage ../applications/misc/joplin-desktop { };
-
- jot = callPackage ../applications/misc/jot { };
-
- jotdown = callPackage ../tools/text/jotdown { };
-
- journaldriver = callPackage ../tools/misc/journaldriver { };
-
- jp = callPackage ../development/tools/jp { };
-
- jp2a = callPackage ../applications/misc/jp2a { };
-
- jpeg-archive = callPackage ../applications/graphics/jpeg-archive { };
-
- jpegexiforient = callPackage ../tools/graphics/jpegexiforient { };
-
- jpeginfo = callPackage ../applications/graphics/jpeginfo { };
-
- jpegoptim = callPackage ../applications/graphics/jpegoptim { };
-
- jpegrescan = callPackage ../applications/graphics/jpegrescan { };
-
jpylyzer = with python3Packages; toPythonApplication jpylyzer;
- jiq = callPackage ../development/tools/misc/jiq { };
-
- jql = callPackage ../development/tools/jql { };
-
- jqp = callPackage ../development/tools/jqp { };
-
- jo = callPackage ../development/tools/jo { };
-
- jrnl = callPackage ../applications/misc/jrnl { };
-
jsbeautifier = with python3Packages; toPythonApplication jsbeautifier;
- jscoverage = callPackage ../development/tools/misc/jscoverage { };
-
- jsduck = callPackage ../development/tools/jsduck { };
-
- jsluice = callPackage ../tools/security/jsluice { };
-
json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans;
- jsonfmt = callPackage ../development/tools/misc/jsonfmt { };
-
jsonwatch = callPackage ../tools/misc/jsonwatch {
inherit (darwin.apple_sdk.frameworks) Security;
};
- jsubfinder = callPackage ../tools/security/jsubfinder { };
-
- jtag-remote-server = callPackage ../development/embedded/jtag-remote-server { };
-
- jtc = callPackage ../development/tools/jtc { };
-
- jumpapp = callPackage ../tools/X11/jumpapp { };
-
- jugglinglab = callPackage ../tools/misc/jugglinglab { };
-
jupyter = callPackage ../applications/editors/jupyter { };
jupyter-all = jupyter.override {
@@ -8807,18 +4081,6 @@ with pkgs;
jupyter-kernel = callPackage ../applications/editors/jupyter/kernel.nix { };
- justify = callPackage ../tools/text/justify { };
-
- jwhois = callPackage ../tools/networking/jwhois { };
-
- k2pdfopt = callPackage ../applications/misc/k2pdfopt { };
-
- kazam = callPackage ../applications/video/kazam { };
-
- kalibrate-rtl = callPackage ../applications/radio/kalibrate-rtl { };
-
- kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { };
-
wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; });
kakounePlugins = recurseIntoAttrs (callPackage ../applications/editors/kakoune/plugins { });
@@ -8836,12 +4098,6 @@ with pkgs;
kakoune-cr = callPackage ../tools/misc/kakoune-cr { crystal = crystal_1_2; };
- kaniko = callPackage ../applications/networking/cluster/kaniko { };
-
- katana = callPackage ../tools/security/katana { };
-
- kbdd = callPackage ../applications/window-managers/kbdd { };
-
kbs2 = callPackage ../tools/security/kbs2 {
inherit (darwin.apple_sdk.frameworks) AppKit SystemConfiguration;
};
@@ -8850,26 +4106,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- kdoctor = callPackage ../development/tools/kdoctor { };
-
- kdigger = callPackage ../tools/security/kdigger { };
-
kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { };
- keepalived = callPackage ../tools/networking/keepalived { };
-
- keepwn = callPackage ../tools/security/keepwn { };
-
- kestrel = callPackage ../tools/security/kestrel { };
-
- kexec-tools = callPackage ../os-specific/linux/kexec-tools { };
-
keepkey-agent = with python3Packages; toPythonApplication keepkey-agent;
- keepmenu = callPackage ../applications/misc/keepmenu { };
-
- kent = callPackage ../applications/science/biology/kent { };
-
keybase = darwin.apple_sdk_11_0.callPackage ../tools/security/keybase {
# Reasoning for the inherited apple_sdk.frameworks:
# 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox
@@ -8883,10 +4123,6 @@ with pkgs;
keybase-gui = callPackage ../tools/security/keybase/gui.nix { };
- keychain = callPackage ../tools/misc/keychain { };
-
- keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
-
keyscope = callPackage ../tools/security/keyscope {
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security;
};
@@ -8895,36 +4131,10 @@ with pkgs;
jdk = jdk11;
};
- kibi = callPackage ../applications/editors/kibi { };
-
kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { };
- kismet = callPackage ../applications/networking/sniffers/kismet { };
-
- kiterunner = callPackage ../tools/security/kiterunner { };
-
- klick = callPackage ../applications/audio/klick { };
-
- klystrack = callPackage ../applications/audio/klystrack { };
-
- knit = callPackage ../development/tools/build-managers/knit { };
-
- knockpy = callPackage ../tools/security/knockpy { };
-
- knowsmore = callPackage ../tools/security/knowsmore { };
-
- kool = callPackage ../development/tools/misc/kool { };
-
- kore = callPackage ../development/web/kore { };
-
- krakenx = callPackage ../tools/system/krakenx { };
-
- kpcli = callPackage ../tools/security/kpcli { };
-
kphotoalbum = libsForQt5.callPackage ../applications/graphics/kphotoalbum { };
- kratos = callPackage ../applications/misc/kratos { };
-
krename = libsForQt5.callPackage ../applications/misc/krename { };
krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { };
@@ -8937,20 +4147,8 @@ with pkgs;
kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
- krop = callPackage ../applications/graphics/krop { };
-
kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
- kube-router = callPackage ../applications/networking/cluster/kube-router { };
-
- kubedock = callPackage ../development/tools/kubedock { };
-
- kubepug = callPackage ../development/tools/kubepug { };
-
- kubeshark = callPackage ../applications/networking/cluster/kubeshark { };
-
- kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { };
-
kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { };
kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { };
kubo-migrator = callPackage ../applications/networking/kubo-migrator { };
@@ -8963,20 +4161,6 @@ with pkgs;
kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { };
- kytea = callPackage ../tools/text/kytea { };
-
- kyverno = callPackage ../applications/networking/cluster/kyverno { };
-
- k6 = callPackage ../development/tools/k6 { };
-
- l2md = callPackage ../tools/text/l2md { };
-
- lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { };
-
- lalrpop = callPackage ../development/tools/lalrpop { };
-
- last-resort = callPackage ../data/fonts/last-resort { };
-
ligo =
let ocaml_p = ocaml-ng.ocamlPackages_4_14.overrideScope (self: super: {
zarith = super.zarith.override { version = "1.13"; };
@@ -8988,22 +4172,8 @@ with pkgs;
ocamlPackages = ocaml_p;
};
- lego = callPackage ../tools/admin/lego { };
-
leocad = libsForQt5.callPackage ../applications/graphics/leocad { };
- lha = callPackage ../tools/archivers/lha { };
-
- lhasa = callPackage ../tools/compression/lhasa { };
-
- libcsptr = callPackage ../development/libraries/libcsptr { };
-
- libgovirt = callPackage ../applications/virtualization/libgovirt { };
-
- libscrypt = callPackage ../development/libraries/libscrypt { };
-
- libcloudproviders = callPackage ../development/libraries/libcloudproviders { };
-
libcoap = callPackage ../applications/networking/libcoap {
autoconf = buildPackages.autoconf269;
};
@@ -9013,49 +4183,21 @@ with pkgs;
gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3;
};
- libshumate = callPackage ../development/libraries/libshumate { };
-
- libsmartcols = callPackage ../development/libraries/libsmartcols { };
-
- libsmi = callPackage ../development/libraries/libsmi { };
-
- libgen-cli = callPackage ../tools/misc/libgen-cli { };
-
- libpff = callPackage ../tools/misc/libpff {};
-
- licensor = callPackage ../tools/misc/licensor { };
-
- lesspipe = callPackage ../tools/misc/lesspipe { };
-
liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
ffmpeg = ffmpeg_6-full;
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
- linuxwave = callPackage ../tools/audio/linuxwave { };
-
- lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };
-
lldpd = callPackage ../tools/networking/lldpd {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
llm = with python3Packages; toPythonApplication llm;
- lnav = callPackage ../tools/misc/lnav { };
-
- lnch = callPackage ../tools/misc/lnch { };
-
lnx = callPackage ../servers/search/lnx {
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
};
- loadlibrary = callPackage ../tools/misc/loadlibrary { };
-
- loc = callPackage ../development/misc/loc { };
-
- lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
-
loganalyzer = libsForQt5.callPackage ../development/tools/loganalyzer { };
logstash7 = callPackage ../tools/misc/logstash/7.x.nix {
@@ -9073,26 +4215,12 @@ with pkgs;
lolcat = callPackage ../tools/misc/lolcat { };
- lottieconverter = callPackage ../tools/misc/lottieconverter { };
-
loudgain = callPackage ../tools/audio/loudgain/default.nix { };
- lpcnetfreedv = callPackage ../development/libraries/lpcnetfreedv { };
-
- lsdvd = callPackage ../tools/cd-dvd/lsdvd { };
-
lsyncd = callPackage ../applications/networking/sync/lsyncd {
lua = lua5_2_compat;
};
- lttoolbox = callPackage ../applications/misc/lttoolbox { };
-
- ltwheelconf = callPackage ../applications/misc/ltwheelconf { };
-
- lvmsync = callPackage ../tools/backup/lvmsync { };
-
- kapp = callPackage ../tools/networking/kapp { };
-
kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { };
kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { };
@@ -9106,29 +4234,13 @@ with pkgs;
mailcatcher = callPackage ../development/web/mailcatcher { };
- makebootfat = callPackage ../tools/misc/makebootfat { };
-
- mani = callPackage ../development/tools/mani { };
-
- manifest-tool = callPackage ../development/tools/manifest-tool { };
-
- mask = callPackage ../development/tools/mask { };
-
maskromtool = qt6Packages.callPackage ../tools/graphics/maskromtool { };
- mastotool = callPackage ../tools/misc/mastotool { };
-
- mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { };
-
- matrix-conduit = callPackage ../servers/matrix-conduit { };
-
matrix-synapse = callPackage ../servers/matrix-synapse/wrapper.nix { };
matrix-synapse-unwrapped = callPackage ../servers/matrix-synapse/default.nix { };
matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins;
matrix-synapse-tools = recurseIntoAttrs matrix-synapse-unwrapped.tools;
- matrix-appservice-irc = callPackage ../servers/matrix-synapse/matrix-appservice-irc { };
-
matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {
matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3;
nodejs = nodejs_18;
@@ -9136,60 +4248,34 @@ with pkgs;
matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { };
- matrix-corporal = callPackage ../servers/matrix-corporal { };
-
- matrix-hookshot = callPackage ../servers/matrix-synapse/matrix-hookshot { };
-
maubot = with python3Packages; toPythonApplication maubot;
- mautrix-discord = callPackage ../servers/mautrix-discord { };
-
- mautrix-facebook = callPackage ../servers/mautrix-facebook { };
-
- mautrix-googlechat = callPackage ../servers/mautrix-googlechat { };
-
mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { });
mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
- mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };
-
m2r = with python3Packages; toPythonApplication m2r;
md2gemini = with python3.pkgs; toPythonApplication md2gemini;
md2pdf = with python3Packages; toPythonApplication md2pdf;
- mdbook-emojicodes = callPackage ../tools/text/mdbook-emojicodes { };
-
mdbook-epub = callPackage ../tools/text/mdbook-epub {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { };
-
- mdbook-pagetoc = callPackage ../tools/text/mdbook-pagetoc { };
-
mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- mdbook-i18n-helpers = callPackage ../tools/text/mdbook-i18n-helpers { };
-
mdbook-katex = callPackage ../tools/text/mdbook-katex {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- mdbook-kroki-preprocessor = callPackage ../tools/text/mdbook-kroki-preprocessor { };
-
mdbook-linkcheck = callPackage ../tools/text/mdbook-linkcheck {
inherit (darwin.apple_sdk.frameworks) Security;
};
- mdbook-open-on-gh = callPackage ../tools/text/mdbook-open-on-gh { };
-
- mdbook-man = callPackage ../tools/text/mdbook-man { };
-
mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -9227,90 +4313,26 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration;
};
- memtester = callPackage ../tools/system/memtester { };
-
- mesa-demos = callPackage ../tools/graphics/mesa-demos { };
-
mhonarc = perlPackages.MHonArc;
- minica = callPackage ../tools/security/minica { };
-
- minidlna = callPackage ../tools/networking/minidlna { };
-
- miniplayer = callPackage ../applications/audio/miniplayer { };
-
- minipro = callPackage ../tools/misc/minipro { };
-
- minisign = callPackage ../tools/security/minisign { };
-
- ministat = callPackage ../tools/misc/ministat { };
-
- minizign = callPackage ../tools/security/minizign { };
-
- mitm6 = callPackage ../tools/security/mitm6 { };
-
- mjolnir = callPackage ../servers/mjolnir { };
-
- mmutils = callPackage ../tools/X11/mmutils { };
-
- mmv = callPackage ../tools/misc/mmv { };
-
- mmv-go = callPackage ../tools/misc/mmv-go { };
-
- mob = callPackage ../applications/misc/mob { };
-
- most = callPackage ../tools/misc/most { };
-
- motion = callPackage ../applications/video/motion { };
-
- mozphab = callPackage ../applications/misc/mozphab { };
-
- mtail = callPackage ../servers/monitoring/mtail { };
-
mujmap = callPackage ../applications/networking/mujmap {
inherit (darwin.apple_sdk.frameworks) Security;
};
- multitail = callPackage ../tools/misc/multitail { };
-
- mvebu64boot = callPackage ../tools/misc/mvebu64boot { };
-
mx-puppet-discord = callPackage ../servers/mx-puppet-discord { };
- mx-takeover = callPackage ../tools/security/mx-takeover { };
-
- mxt-app = callPackage ../misc/mxt-app { };
-
- naabu = callPackage ../tools/security/naabu { };
-
nagstamon = callPackage ../tools/misc/nagstamon {
pythonPackages = python3Packages;
};
nanoemoji = with python3Packages; toPythonApplication nanoemoji;
- nagelfar = callPackage ../development/tools/nagelfar { };
-
- nats-top = callPackage ../tools/system/nats-top { };
-
- natscli = callPackage ../tools/system/natscli { };
-
- nsc = callPackage ../tools/system/nsc { };
-
- nbench = callPackage ../tools/misc/nbench { };
-
nbtscanner = callPackage ../tools/security/nbtscanner {
inherit (darwin.apple_sdk.frameworks) Security;
};
- nbutools = callPackage ../tools/security/nbutools { };
-
- ncrack = callPackage ../tools/security/ncrack { };
-
netexec = python3Packages.callPackage ../tools/security/netexec { };
- nerdctl = callPackage ../applications/networking/cluster/nerdctl { };
-
netdata = callPackage ../tools/system/netdata {
protobuf = protobuf_21;
};
@@ -9322,16 +4344,6 @@ with pkgs;
netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { });
netsurf-browser = netsurf.browser;
- netperf = callPackage ../applications/networking/netperf { };
-
- netsniff-ng = callPackage ../tools/networking/netsniff-ng { };
-
- networkminer = callPackage ../tools/security/networkminer { };
-
- nixpacks = callPackage ../applications/virtualization/nixpacks { };
-
- nkeys = callPackage ../tools/system/nkeys { };
-
nyxt = callPackage ../applications/networking/browsers/nyxt {
sbcl = sbcl_2_4_6;
inherit (gst_all_1)
@@ -9343,16 +4355,8 @@ with pkgs;
gst-plugins-ugly;
};
- nfpm = callPackage ../tools/package-management/nfpm { };
-
- nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { };
-
- ninka = callPackage ../development/tools/misc/ninka { };
-
nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
- nodenv = callPackage ../development/tools/nodenv { };
-
nodejs = hiPrio nodejs_20;
nodejs-slim = nodejs-slim_20;
corepack = hiPrio corepack_20;
@@ -9393,125 +4397,27 @@ with pkgs;
node2nix = nodePackages.node2nix;
- notesnook = callPackage ../applications/misc/notesnook { };
-
- oddjob = callPackage ../os-specific/linux/oddjob { };
-
- openipmi = callPackage ../tools/system/openipmi { };
-
- ox = callPackage ../applications/editors/ox { };
-
oxigraph = callPackage ../servers/oxigraph {
inherit (darwin.apple_sdk.frameworks) IOKit Security;
};
- file-rename = callPackage ../tools/filesystems/file-rename { };
-
kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd { };
- kea = callPackage ../tools/networking/kea { };
-
- keama = callPackage ../tools/networking/keama { };
-
ktailctl = kdePackages.callPackage ../applications/networking/ktailctl {};
- ispell = callPackage ../tools/text/ispell { };
-
- iodash = callPackage ../development/libraries/iodash { };
-
- jbofihe = callPackage ../tools/text/jbofihe { };
-
- jbrowse = callPackage ../applications/science/biology/jbrowse { };
-
- jumanpp = callPackage ../tools/text/jumanpp { };
-
- jump = callPackage ../tools/system/jump { };
-
- latex2html = callPackage ../tools/misc/latex2html { };
-
- lazycli = callPackage ../tools/misc/lazycli { };
-
- lavat = callPackage ../tools/misc/lavat { };
-
- lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { };
-
- lcsync = callPackage ../applications/networking/sync/lcsync { };
-
ldapdomaindump = with python3Packages; toPythonApplication ldapdomaindump;
- ldapmonitor = callPackage ../tools/security/ldapmonitor { };
-
- ldapnomnom = callPackage ../tools/security/ldapnomnom { };
-
- ldapvi = callPackage ../tools/misc/ldapvi { };
-
- ldeep = callPackage ../tools/security/ldeep { };
-
- ldns = callPackage ../development/libraries/ldns { };
-
leanblueprint = with python3Packages; toPythonApplication leanblueprint;
- leanify = callPackage ../tools/misc/leanify { };
-
- leatherman = callPackage ../development/libraries/leatherman { };
-
- lact = callPackage ../tools/system/lact { };
-
- ledit = callPackage ../tools/misc/ledit { };
-
- ledmon = callPackage ../tools/system/ledmon { };
-
- leela = callPackage ../tools/graphics/leela { };
-
- lemmeknow = callPackage ../tools/misc/lemmeknow { };
-
- lemmy-help = callPackage ../tools/misc/lemmy-help { };
-
- lerpn = callPackage ../tools/misc/lerpn { };
-
lethe = callPackage ../tools/security/lethe {
inherit (darwin.apple_sdk.frameworks) Security;
};
- lftp = callPackage ../tools/networking/lftp { };
-
- libck = callPackage ../development/libraries/libck { };
-
- libcork = callPackage ../development/libraries/libcork { };
-
- libcmis = callPackage ../development/libraries/libcmis { };
-
- libee = callPackage ../development/libraries/libee { };
-
- libepc = callPackage ../development/libraries/libepc { };
-
- liberfa = callPackage ../development/libraries/liberfa { };
-
- libestr = callPackage ../development/libraries/libestr { };
-
- libevdev = callPackage ../development/libraries/libevdev { };
-
- liberio = callPackage ../development/libraries/liberio { };
-
- libevdevplus = callPackage ../development/libraries/libevdevplus { };
-
- libfann = callPackage ../development/libraries/libfann { };
-
- libfsm = callPackage ../development/libraries/libfsm { };
-
- libgaminggear = callPackage ../development/libraries/libgaminggear { };
-
libhandy = callPackage ../development/libraries/libhandy { };
# Needed for apps that still depend on the unstable verison of the library (not libhandy-1)
libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { };
- libgmpris = callPackage ../development/libraries/libgmpris { };
-
- libgumath = callPackage ../development/libraries/libgumath { };
-
- libinsane = callPackage ../development/libraries/libinsane { };
-
libint = callPackage ../development/libraries/libint { };
libintPsi4 = callPackage ../development/libraries/libint {
enableFortran = false;
@@ -9536,117 +4442,23 @@ with pkgs;
eri3PureSh = false;
};
- libipfix = callPackage ../development/libraries/libipfix { };
-
libirc = libsForQt5.callPackage ../development/libraries/libirc { };
- libircclient = callPackage ../development/libraries/libircclient { };
-
- libiscsi = callPackage ../development/libraries/libiscsi { };
-
- libisds = callPackage ../development/libraries/libisds { };
-
- libite = callPackage ../development/libraries/libite { };
-
- liblangtag = callPackage ../development/libraries/liblangtag { };
-
- liblouis = callPackage ../development/libraries/liblouis { };
-
- liboauth = callPackage ../development/libraries/liboauth { };
-
- libr3 = callPackage ../development/libraries/libr3 { };
-
- libraspberrypi = callPackage ../development/libraries/libraspberrypi { };
-
- libsidplayfp = callPackage ../development/libraries/libsidplayfp { };
-
- libspf2 = callPackage ../development/libraries/libspf2 { };
-
- libsrs2 = callPackage ../development/libraries/libsrs2 { };
-
- libtermkey = callPackage ../development/libraries/libtermkey { };
-
- libtelnet = callPackage ../development/libraries/libtelnet { };
-
- libtirpc = callPackage ../development/libraries/ti-rpc { };
-
- libtickit = callPackage ../development/libraries/libtickit { };
-
- libtins = callPackage ../development/libraries/libtins { };
-
- libtree = callPackage ../development/tools/misc/libtree { };
-
- libshout = callPackage ../development/libraries/libshout { };
-
- libqb = callPackage ../development/libraries/libqb { };
-
- libqmi = callPackage ../development/libraries/libqmi { };
-
- libqrtr-glib = callPackage ../development/libraries/libqrtr-glib { };
-
- libmbim = callPackage ../development/libraries/libmbim { };
-
libmongocrypt = darwin.apple_sdk_11_0.callPackage ../development/libraries/libmongocrypt { };
- libmesode = callPackage ../development/libraries/libmesode { };
-
- libmsym = callPackage ../development/libraries/science/chemistry/libmsym { };
-
- libnabo = callPackage ../development/libraries/libnabo { };
-
- libngspice = callPackage ../development/libraries/libngspice { };
-
- libnixxml = callPackage ../development/libraries/libnixxml { };
-
- libplctag = callPackage ../development/libraries/libplctag { };
-
- libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
-
- libportal = callPackage ../development/libraries/libportal { };
libportal-gtk3 = libportal.override { variant = "gtk3"; };
libportal-gtk4 = libportal.override { variant = "gtk4"; };
libportal-qt5 = libportal.override { variant = "qt5"; };
libportal-qt6 = libportal.override { variant = "qt6"; };
- libmicrodns = callPackage ../development/libraries/libmicrodns { };
-
- libnids = callPackage ../tools/networking/libnids { };
-
jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent {
libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { };
};
- libmpack = callPackage ../development/libraries/libmpack { };
-
- libiberty = callPackage ../development/libraries/libiberty { };
-
- libucl = callPackage ../development/libraries/libucl { };
-
- libxc = callPackage ../development/libraries/libxc { };
-
- libxcomp = callPackage ../development/libraries/libxcomp { };
-
- libxl = callPackage ../development/libraries/libxl { };
-
- libx86emu = callPackage ../development/libraries/libx86emu { };
-
- libzim = callPackage ../development/libraries/libzim { };
-
-
- libzmf = callPackage ../development/libraries/libzmf { };
-
- librespeed-cli = callPackage ../tools/misc/librespeed-cli { };
-
- libreswan = callPackage ../tools/networking/libreswan { };
-
librest = callPackage ../development/libraries/librest { };
librest_1_0 = callPackage ../development/libraries/librest/1.0.nix { };
- libwebsockets = callPackage ../development/libraries/libwebsockets { };
-
- libyafaray = callPackage ../tools/graphics/libyafaray { };
-
licensee = callPackage ../tools/package-management/licensee { };
lidarr = callPackage ../servers/lidarr { };
@@ -9662,106 +4474,18 @@ with pkgs;
limesuite
limesuiteWithGui;
- limesurvey = callPackage ../servers/limesurvey { };
-
- linux-exploit-suggester = callPackage ../tools/security/linux-exploit-suggester { };
-
linux-gpib = callPackage ../applications/science/electronics/linux-gpib/user.nix { };
- linuxquota = callPackage ../tools/misc/linuxquota { };
-
- lipl = callPackage ../tools/misc/lipl { };
-
liquidctl = with python3Packages; toPythonApplication liquidctl;
- lmp = callPackage ../tools/security/lmp { };
-
- localproxy = callPackage ../applications/networking/localproxy { };
-
localstack = with python3Packages; toPythonApplication localstack;
- localtime = callPackage ../tools/system/localtime { };
-
- log4j-detect = callPackage ../tools/security/log4j-detect { };
-
- log4j-scan = callPackage ../tools/security/log4j-scan { };
-
- log4j-sniffer = callPackage ../tools/security/log4j-sniffer { };
-
- log4j-vuln-scanner = callPackage ../tools/security/log4j-vuln-scanner { };
-
- log4jcheck = callPackage ../tools/security/log4jcheck { };
-
- log4shell-detector = callPackage ../tools/security/log4shell-detector { };
-
- logcheck = callPackage ../tools/system/logcheck { };
-
- logmap = callPackage ../tools/security/logmap { };
-
- logmein-hamachi = callPackage ../tools/networking/logmein-hamachi { };
-
- logkeys = callPackage ../tools/security/logkeys { };
-
- logrotate = callPackage ../tools/system/logrotate { };
-
- logstalgia = callPackage ../tools/graphics/logstalgia { };
-
- lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { };
-
- loki = callPackage ../development/libraries/loki { };
-
- longview = callPackage ../servers/monitoring/longview { };
-
- lorien = callPackage ../applications/graphics/lorien { };
-
- lout = callPackage ../tools/typesetting/lout { };
-
- lr = callPackage ../tools/system/lr { };
-
- lrzip = callPackage ../tools/compression/lrzip { };
-
- lsb-release = callPackage ../os-specific/linux/lsb-release { };
-
- lunatic = callPackage ../development/interpreters/lunatic { };
-
- lux = callPackage ../tools/video/lux { };
-
- lv = callPackage ../tools/text/lv { };
-
- lwc = callPackage ../tools/misc/lwc { };
-
- lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { };
-
- lzfse = callPackage ../tools/compression/lzfse { };
-
- lzham = callPackage ../tools/compression/lzham { };
-
- lzip = callPackage ../tools/compression/lzip { };
-
- lziprecover = callPackage ../tools/compression/lziprecover { };
-
xz = callPackage ../tools/compression/xz { };
- lz4 = callPackage ../tools/compression/lz4 { };
-
- lzbench = callPackage ../tools/compression/lzbench { };
-
- lzop = callPackage ../tools/compression/lzop { };
-
lzwolf = callPackage ../games/lzwolf { SDL2_mixer = SDL2_mixer_2_0; };
- macchanger = callPackage ../os-specific/linux/macchanger { };
-
- macchina = callPackage ../tools/misc/macchina { };
-
madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang;
- maeparser = callPackage ../development/libraries/maeparser { };
-
- mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { };
-
- maildrop = callPackage ../tools/networking/maildrop { };
-
mailnag = callPackage ../applications/networking/mailreaders/mailnag {
availablePlugins = {
# More are listed here: https://github.com/pulb/mailnag/#desktop-integration
@@ -9772,14 +4496,10 @@ with pkgs;
mailnagWithPlugins = mailnag.withPlugins(
builtins.attrValues mailnag.availablePlugins
);
- bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { };
-
mailpit = callPackage ../servers/mail/mailpit {
libtool = if stdenv.hostPlatform.isDarwin then cctools else libtool;
};
- mailsend = callPackage ../tools/networking/mailsend { };
-
mailutils = callPackage ../tools/networking/mailutils {
sasl = gsasl;
};
@@ -9787,24 +4507,10 @@ with pkgs;
matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { };
matrix-sdk-crypto-nodejs-0_1_0-beta_3 = callPackage ../development/libraries/matrix-sdk-crypto-nodejs/beta3.nix { };
- email = callPackage ../tools/networking/email { };
-
- maim = callPackage ../tools/graphics/maim { };
-
- mairix = callPackage ../tools/text/mairix { };
-
makemkv = libsForQt5.callPackage ../applications/video/makemkv { };
- makerpm = callPackage ../development/tools/makerpm { };
-
- makefile2graph = callPackage ../development/tools/analysis/makefile2graph { };
-
man = man-db;
- man-db = callPackage ../tools/misc/man-db { };
-
- mandoc = callPackage ../tools/misc/mandoc { };
-
mangohud = callPackage ../tools/graphics/mangohud {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
mangohud32 = pkgsi686Linux.mangohud;
@@ -9813,12 +4519,6 @@ with pkgs;
marimo = with python3Packages; toPythonApplication marimo;
- marktext = callPackage ../applications/misc/marktext { };
-
- mars-mips = callPackage ../development/tools/mars-mips { };
-
- mb2md = callPackage ../tools/text/mb2md { };
-
mecab =
let
mecab-nodic = callPackage ../tools/text/mecab/nodic.nix { };
@@ -9829,138 +4529,32 @@ with pkgs;
};
};
- mediawiki = callPackage ../servers/web-apps/mediawiki { };
-
- mediawriter = callPackage ../tools/system/mediawriter { };
-
- memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { };
-
- memtest86-efi = callPackage ../tools/misc/memtest86-efi { };
-
- memtest86plus = callPackage ../tools/misc/memtest86+ { };
-
mbutil = python310Packages.callPackage ../applications/misc/mbutil { };
- mcabber = callPackage ../applications/networking/instant-messengers/mcabber { };
-
- mcron = callPackage ../tools/system/mcron { };
-
mcstatus = with python3Packages; toPythonApplication mcstatus;
- mdbtools = callPackage ../tools/misc/mdbtools { };
-
- mdk = callPackage ../development/tools/mdk { };
-
- mdk4 = callPackage ../tools/networking/mdk4 { };
-
- mdp = callPackage ../applications/misc/mdp { };
-
- megacli = callPackage ../tools/misc/megacli { };
-
- memo = callPackage ../applications/misc/memo { };
-
- mencal = callPackage ../applications/misc/mencal { } ;
-
- metamorphose2 = callPackage ../applications/misc/metamorphose2 { };
-
- metar = callPackage ../applications/misc/metar { };
-
- mfcuk = callPackage ../tools/security/mfcuk { };
-
- mfoc = callPackage ../tools/security/mfoc { };
-
- microbin = callPackage ../servers/microbin { };
-
- microplane = callPackage ../tools/misc/microplane { };
-
- microserver = callPackage ../servers/microserver { };
-
- midisheetmusic = callPackage ../applications/audio/midisheetmusic { };
-
- mimeo = callPackage ../tools/misc/mimeo { };
-
- mimetic = callPackage ../development/libraries/mimetic { };
-
- minio-client = callPackage ../tools/networking/minio-client { };
-
- minio-certgen = callPackage ../tools/security/minio-certgen { };
-
- minissdpd = callPackage ../tools/networking/minissdpd { };
-
- miniupnpc = callPackage ../tools/networking/miniupnpc { };
-
miniupnpd = callPackage ../tools/networking/miniupnpd { };
miniupnpd-nftables = callPackage ../tools/networking/miniupnpd { firewall = "nftables"; };
- miniball = callPackage ../development/libraries/miniball { };
-
minijail = callPackage ../tools/system/minijail { };
minijail-tools = python3.pkgs.callPackage ../tools/system/minijail/tools.nix { };
- minilibx = callPackage ../development/libraries/minilibx { };
-
- minixml = callPackage ../development/libraries/minixml { };
-
mir-qualia = callPackage ../tools/text/mir-qualia {
pythonPackages = python3Packages;
};
- mirakurun = callPackage ../applications/video/mirakurun { };
-
- miredo = callPackage ../tools/networking/miredo { };
-
- mirrorbits = callPackage ../servers/mirrorbits { };
-
mitmproxy = with python3Packages; toPythonApplication mitmproxy;
- mitmproxy2swagger = callPackage ../tools/security/mitmproxy2swagger { };
-
- mjpegtools = callPackage ../tools/video/mjpegtools { };
-
mjpegtoolsFull = mjpegtools.override {
withMinimal = false;
};
- mkclean = callPackage ../applications/video/mkclean { };
-
- mkcue = callPackage ../tools/cd-dvd/mkcue { };
-
- mkp224o = callPackage ../tools/security/mkp224o { };
-
mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { });
- mkrand = callPackage ../tools/security/mkrand { };
-
- mktemp = callPackage ../tools/security/mktemp { };
-
- mktorrent = callPackage ../tools/misc/mktorrent { };
-
- mloader = callPackage ../tools/misc/mloader { };
-
- mmake = callPackage ../tools/misc/mmake { };
-
- mmixware = callPackage ../development/tools/mmixware { };
-
- modemmanager = callPackage ../tools/networking/modemmanager { };
-
- modem-manager-gui = callPackage ../applications/networking/modem-manager-gui { };
-
- modsecurity_standalone = callPackage ../tools/security/modsecurity { };
-
- modsecurity-crs = callPackage ../tools/security/modsecurity-crs { };
-
molecule = with python3Packages; toPythonApplication molecule;
- molly-guard = callPackage ../os-specific/linux/molly-guard { };
-
- molotov = callPackage ../applications/video/molotov { };
-
- monit = callPackage ../tools/system/monit { };
-
- monocraft = callPackage ../data/fonts/monocraft { };
-
monolith = callPackage ../tools/backup/monolith {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
@@ -9969,70 +4563,24 @@ with pkgs;
docbook-xsl = docbook_xsl;
};
- mole = callPackage ../tools/networking/mole { };
-
morgen = callPackage ../applications/office/morgen {
electron = electron_32;
};
- mosh = callPackage ../tools/networking/mosh { };
-
- motrix = callPackage ../tools/networking/motrix { };
-
- mount-zip = callPackage ../tools/filesystems/mount-zip { };
-
- mpage = callPackage ../tools/text/mpage { };
-
- mprime = callPackage ../tools/misc/mprime { };
-
- mpw = callPackage ../tools/security/mpw { };
-
- mqtt_cpp = callPackage ../development/libraries/mqtt_cpp { };
-
- mr = callPackage ../applications/version-management/mr { };
-
- mrsh = callPackage ../shells/mrsh { };
-
- mrtg = callPackage ../tools/misc/mrtg { };
-
- mscgen = callPackage ../tools/graphics/mscgen { };
-
- msfpc = callPackage ../tools/security/msfpc { };
-
- melt = callPackage ../tools/security/melt { };
-
- metabigor = callPackage ../tools/security/metabigor { };
-
metasploit = callPackage ../tools/security/metasploit { };
mhost = callPackage ../applications/networking/mhost {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- ms-sys = callPackage ../tools/misc/ms-sys { };
-
mtools = callPackage ../tools/filesystems/mtools { };
mtr = callPackage ../tools/networking/mtr { };
- mtr-exporter = callPackage ../tools/networking/mtr-exporter { };
-
mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; };
- mtx = callPackage ../tools/backup/mtx { };
-
- mt-st = callPackage ../tools/backup/mt-st { };
-
- mubeng = callPackage ../tools/networking/mubeng { };
-
- muffet = callPackage ../tools/networking/muffet { };
-
multipass = qt6Packages.callPackage ../tools/virtualization/multipass { };
- multitime = callPackage ../tools/misc/multitime { };
-
- sta = callPackage ../tools/misc/sta { };
-
multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in {
multitrandata = callPackage ../tools/text/multitran/data { };
@@ -10047,160 +4595,43 @@ with pkgs;
mtutils = callPackage ../tools/text/multitran/mtutils { };
});
- munge = callPackage ../tools/security/munge { };
-
- mutagen = callPackage ../tools/misc/mutagen { };
-
- mutagen-compose = callPackage ../tools/misc/mutagen-compose { };
-
- mycli = callPackage ../tools/admin/mycli { };
-
- mycrypto = callPackage ../applications/blockchains/mycrypto { };
-
- mydumper = callPackage ../tools/backup/mydumper { };
-
- mylvmbackup = callPackage ../tools/backup/mylvmbackup { };
-
- mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { };
-
- mysqltuner = callPackage ../tools/misc/mysqltuner { };
-
mytetra = libsForQt5.callPackage ../applications/office/mytetra { };
- nabi = callPackage ../tools/inputmethods/nabi { };
-
- nahid-fonts = callPackage ../data/fonts/nahid-fonts { };
-
- namazu = callPackage ../tools/text/namazu { };
-
- nasty = callPackage ../tools/security/nasty { };
-
- nat-traverse = callPackage ../tools/networking/nat-traverse { };
-
- navi = callPackage ../applications/misc/navi { };
-
navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; };
- nbd = callPackage ../tools/networking/nbd { };
- xnbd = callPackage ../tools/networking/xnbd { };
-
- ndjbdns = callPackage ../tools/networking/ndjbdns { };
-
- ndppd = callPackage ../applications/networking/ndppd { };
-
- nearcore = callPackage ../applications/blockchains/nearcore { };
-
- nebula = callPackage ../tools/networking/nebula { };
-
- nemiver = callPackage ../development/tools/nemiver { };
-
- neo-cowsay = callPackage ../tools/misc/neo-cowsay { };
-
- neofetch = callPackage ../tools/misc/neofetch { };
-
- nerdfix = callPackage ../tools/text/nerdfix { };
-
nerdfonts = callPackage ../data/fonts/nerdfonts { };
- netatalk = callPackage ../tools/filesystems/netatalk { };
-
- netavark = callPackage ../tools/networking/netavark { };
-
- netcdf = callPackage ../development/libraries/netcdf { };
-
netcdf-mpi = netcdf.override {
hdf5 = hdf5-mpi.override { usev110Api = true; };
};
- netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };
-
netcdffortran = callPackage ../development/libraries/netcdf-fortran {
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration;
};
- networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { };
-
- nco = callPackage ../development/libraries/nco { };
-
- ncftp = callPackage ../tools/networking/ncftp { };
-
- ncgopher = callPackage ../applications/networking/ncgopher { };
-
- ncompress = callPackage ../tools/compression/ncompress { };
-
- ndisc6 = callPackage ../tools/networking/ndisc6 { };
-
- netassert = callPackage ../tools/networking/netassert { };
-
- netboot = callPackage ../tools/networking/netboot { };
-
- netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { };
-
inherit (callPackage ../servers/web-apps/netbox { }) netbox_3_7;
# Not in aliases because it wouldn't get picked up by callPackage
netbox = netbox_4_1;
- netbox2netshot = callPackage ../tools/admin/netbox2netshot { };
-
netcat = libressl.nc.overrideAttrs (old: {
meta = old.meta // {
mainProgram = "nc";
};
});
- netcat-gnu = callPackage ../tools/networking/netcat { };
-
- netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
-
- netdiscover = callPackage ../tools/networking/netdiscover { };
-
- nethogs = callPackage ../tools/networking/nethogs { };
-
- nethoscope = callPackage ../tools/networking/nethoscope { };
-
- netkittftp = callPackage ../tools/networking/netkit/tftp { };
-
netlify-cli = callPackage ../development/web/netlify-cli { };
- netlistsvg = callPackage ../applications/science/logic/netlistsvg { };
-
netpbm = callPackage ../tools/graphics/netpbm { };
- netrw = callPackage ../tools/networking/netrw { };
-
- netselect = callPackage ../tools/networking/netselect { };
-
networkmanager = callPackage ../tools/networking/networkmanager { };
- networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };
-
- networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };
-
- networkmanager-l2tp = callPackage ../tools/networking/networkmanager/l2tp { };
-
- networkmanager-vpnc = callPackage ../tools/networking/networkmanager/vpnc { };
-
- networkmanager-openconnect = callPackage ../tools/networking/networkmanager/openconnect { };
-
- networkmanager-fortisslvpn = callPackage ../tools/networking/networkmanager/fortisslvpn { };
-
- networkmanager_strongswan = callPackage ../tools/networking/networkmanager/strongswan { };
-
- networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };
-
- networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { };
-
libnma = callPackage ../tools/networking/networkmanager/libnma { };
libnma-gtk4 = libnma.override { withGtk4 = true; };
- networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu { };
-
nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { };
- grocy = callPackage ../servers/grocy { };
-
inherit (callPackages ../servers/nextcloud {})
nextcloud28 nextcloud29 nextcloud30;
@@ -10221,18 +4652,6 @@ with pkgs;
nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { };
- ndstool = callPackage ../tools/archivers/ndstool { };
-
- nfs-ganesha = callPackage ../servers/nfs-ganesha { };
-
- nflz = callPackage ../misc/nflz { };
-
- ngrep = callPackage ../tools/networking/ngrep { };
-
- nifi = callPackage ../servers/web-apps/nifi { };
-
- noip = callPackage ../tools/networking/noip { };
-
inherit (callPackages ../applications/networking/cluster/nomad { })
nomad
nomad_1_4
@@ -10243,28 +4662,8 @@ with pkgs;
nomad_1_9
;
- nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { };
-
- nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { };
-
- nova = callPackage ../applications/networking/cluster/nova { };
-
- nomino = callPackage ../tools/misc/nomino { };
-
- nb = callPackage ../tools/misc/nb { };
-
- kb = callPackage ../tools/misc/kb { };
-
- notable = callPackage ../applications/misc/notable { };
-
- npm-check = callPackage ../development/tools/npm-check { };
-
nth = with python3Packages; toPythonApplication name-that-hash;
- ntlmrecon = callPackage ../tools/security/ntlmrecon { };
-
- numberstation = callPackage ../applications/misc/numberstation { };
-
nvchecker = with python3Packages; toPythonApplication (
nvchecker.overridePythonAttrs (oldAttrs: {
propagatedBuildInputs = oldAttrs.propagatedBuildInputs
@@ -10275,16 +4674,10 @@ with pkgs;
nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
- miller = callPackage ../tools/text/miller { };
-
- milu = callPackage ../applications/misc/milu { };
-
mkgmap = callPackage ../applications/misc/mkgmap { };
mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { };
- mtm = callPackage ../tools/misc/mtm { };
-
op-geth = callPackage ../applications/blockchains/optimism/geth.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) IOKit;
@@ -10292,8 +4685,6 @@ with pkgs;
optimism = callPackage ../applications/blockchains/optimism { };
- pa_applet = callPackage ../tools/audio/pa-applet { };
-
pandoc-acro = python3Packages.callPackage ../tools/misc/pandoc-acro { };
pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { };
@@ -10302,8 +4693,6 @@ with pkgs;
pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { };
- pandoc-katex = callPackage ../tools/misc/pandoc-katex { };
-
pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { };
# pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality
@@ -10312,90 +4701,22 @@ with pkgs;
pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { };
pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { };
- panicparse = callPackage ../tools/misc/panicparse {};
-
- panoply = callPackage ../tools/misc/panoply { };
-
- patray = callPackage ../tools/audio/patray { };
-
- pathvector = callPackage ../tools/networking/pathvector { };
-
- pasystray = callPackage ../tools/audio/pasystray { };
-
- pcmsolver = callPackage ../development/libraries/pcmsolver { };
-
pegasus-frontend = libsForQt5.callPackage ../games/pegasus-frontend {};
pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };
- pffft = callPackage ../development/libraries/pffft { };
-
- phash = callPackage ../development/libraries/phash { };
-
- pnmixer = callPackage ../tools/audio/pnmixer { };
-
- present-cli = callPackage ../tools/misc/present-cli { };
-
- pulsemixer = callPackage ../tools/audio/pulsemixer { };
-
- pwsafe = callPackage ../applications/misc/pwsafe { };
-
- pw-viz = callPackage ../applications/misc/pw-viz { };
-
- napi-rs-cli = callPackage ../development/tools/napi-rs-cli { };
-
- neil = callPackage ../development/tools/neil { };
-
- niff = callPackage ../tools/package-management/niff { };
-
nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { };
- nilfs-utils = callPackage ../tools/filesystems/nilfs-utils { };
-
- nitrogen = callPackage ../tools/X11/nitrogen { };
-
- smart-wallpaper = callPackage ../tools/X11/smart-wallpaper { };
-
- nms = callPackage ../tools/misc/nms { };
-
- nomachine-client = callPackage ../tools/admin/nomachine-client { };
-
- notify-desktop = callPackage ../tools/misc/notify-desktop { };
-
- nkf = callPackage ../tools/text/nkf { };
-
nlopt = callPackage ../development/libraries/nlopt { octave = null; };
- npapi_sdk = callPackage ../development/libraries/npapi-sdk { };
-
- npth = callPackage ../development/libraries/npth { };
-
- nmap-formatter = callPackage ../tools/security/nmap-formatter { };
-
- noise-repellent = callPackage ../applications/audio/noise-repellent { };
-
- noisetorch = callPackage ../applications/audio/noisetorch { };
-
notation = callPackage ../by-name/no/notation/package.nix {
buildGoModule = buildGo123Module;
};
- notify-osd = callPackage ../applications/misc/notify-osd { };
-
- notes-up = callPackage ../applications/office/notes-up { };
-
- notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { };
-
- nox = callPackage ../tools/package-management/nox { };
-
- nq = callPackage ../tools/system/nq { };
-
nsjail = callPackage ../tools/security/nsjail {
protobuf = protobuf_21;
};
- nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd { };
-
ntfs3g = callPackage ../tools/filesystems/ntfs-3g {
inherit (darwin.apple_sdk.frameworks) DiskArbitration;
};
@@ -10407,100 +4728,28 @@ with pkgs;
ntfy-sh = callPackage ../tools/misc/ntfy-sh { };
- ntirpc = callPackage ../development/libraries/ntirpc { };
-
- ntopng = callPackage ../tools/networking/ntopng { };
-
- ntp = callPackage ../tools/networking/ntp { };
-
- numdiff = callPackage ../tools/text/numdiff { };
-
- numlockx = callPackage ../tools/X11/numlockx { };
-
- nurl = callPackage ../tools/misc/nurl { };
-
- nttcp = callPackage ../tools/networking/nttcp { };
-
- ntttcp = callPackage ../tools/networking/ntttcp { };
-
- nuttcp = callPackage ../tools/networking/nuttcp { };
-
- nssmdns = callPackage ../tools/networking/nss-mdns { };
-
nvfancontrol = callPackage ../tools/misc/nvfancontrol {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
};
- nvimpager = callPackage ../tools/misc/nvimpager { };
-
nwdiag = with python3Packages; toPythonApplication nwdiag;
nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { };
- nxpmicro-mfgtools = callPackage ../development/tools/misc/nxpmicro-mfgtools { };
-
- nyancat = callPackage ../tools/misc/nyancat { };
-
- nylon = callPackage ../tools/networking/nylon { };
-
- oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
-
- oatpp = callPackage ../development/libraries/oatpp { };
-
- obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };
-
- obexd = callPackage ../tools/bluetooth/obexd { };
-
- obfs4 = callPackage ../tools/networking/obfs4 { };
-
- ocproxy = callPackage ../tools/networking/ocproxy { };
-
- ocserv = callPackage ../tools/networking/ocserv { };
-
octofetch = callPackage ../tools/misc/octofetch {
inherit (darwin.apple_sdk.frameworks) Security;
};
- oha = callPackage ../tools/networking/oha { };
-
onetun = callPackage ../tools/networking/onetun {
inherit (darwin.apple_sdk.frameworks) Security;
};
- opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
-
- openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { };
-
- openfortivpn = callPackage ../tools/networking/openfortivpn { };
-
openobserve = darwin.apple_sdk_11_0.callPackage ../servers/monitoring/openobserve {
apple_sdk = darwin.apple_sdk_11_0;
};
- obexfs = callPackage ../tools/bluetooth/obexfs { };
-
- obexftp = callPackage ../tools/bluetooth/obexftp { };
-
- objconv = callPackage ../development/tools/misc/objconv { };
-
- odpic = callPackage ../development/libraries/odpic { };
-
- odt2txt = callPackage ../tools/text/odt2txt { };
-
- odyssey = callPackage ../tools/misc/odyssey { };
-
- offensive-azure = callPackage ../tools/security/offensive-azure { };
-
- offlineimap = callPackage ../tools/networking/offlineimap { };
-
- offzip = callPackage ../tools/compression/offzip { };
-
ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { };
- ogdf = callPackage ../development/libraries/ogdf { };
-
- oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
-
ola = callPackage ../applications/misc/ola {
protobuf = protobuf_21;
};
@@ -10513,55 +4762,29 @@ with pkgs;
ome_zarr = with python3Packages; toPythonApplication ome-zarr;
- omping = callPackage ../applications/networking/omping { };
-
onefetch = callPackage ../tools/misc/onefetch {
inherit (darwin) libresolv;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
- onioncircuits = callPackage ../tools/security/onioncircuits { };
-
- onlykey-agent = callPackage ../tools/security/onlykey-agent { };
-
- onlykey-cli = callPackage ../tools/security/onlykey-cli { };
-
onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; };
- ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { };
-
openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; };
openboard = libsForQt5.callPackage ../applications/graphics/openboard { };
- opencc = callPackage ../tools/text/opencc { };
-
- opencryptoki = callPackage ../tools/security/opencryptoki { };
-
- opendbx = callPackage ../development/libraries/opendbx { };
-
opendht = callPackage ../development/libraries/opendht {
inherit (darwin.apple_sdk.frameworks) Security;
};
- opendkim = callPackage ../development/libraries/opendkim { };
-
- openfec = callPackage ../development/libraries/openfec { };
-
ophcrack-cli = ophcrack.override { enableGui = false; };
ophis = python3Packages.callPackage ../development/compilers/ophis { };
- open-ecard = callPackage ../tools/security/open-ecard { };
-
open-interpreter = with python3Packages; toPythonApplication open-interpreter;
- openjade = callPackage ../tools/text/sgml/openjade { };
-
openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { };
- openimagedenoise = callPackage ../development/libraries/openimagedenoise { };
-
openmvg = callPackage ../applications/science/misc/openmvg {
inherit (llvmPackages) openmp;
};
@@ -10570,17 +4793,11 @@ with pkgs;
inherit (llvmPackages) openmp;
};
- openntpd = callPackage ../tools/networking/openntpd { };
-
openntpd_nixos = openntpd.override {
privsepUser = "ntp";
privsepPath = "/var/empty";
};
- openobex = callPackage ../tools/bluetooth/openobex { };
-
- openresolv = callPackage ../tools/networking/openresolv { };
-
openrefine = callPackage ../applications/science/misc/openrefine { jdk = jdk17; };
openrgb = libsForQt5.callPackage ../applications/misc/openrgb { };
@@ -10594,24 +4811,12 @@ with pkgs;
openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { };
- opensbi = callPackage ../misc/opensbi { };
-
opensc = callPackage ../tools/security/opensc {
inherit (darwin.apple_sdk.frameworks) Carbon PCSC;
};
- openseachest = callPackage ../tools/system/openseachest { };
-
- opensm = callPackage ../tools/networking/opensm { };
-
- tinyssh = callPackage ../tools/networking/tinyssh { };
-
- tinystatus = callPackage ../tools/networking/tinystatus { };
-
toastify = darwin.apple_sdk_11_0.callPackage ../tools/misc/toastify {};
- tuc = callPackage ../tools/text/tuc { };
-
opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {});
openssh = opensshPackages.openssh.override {
@@ -10641,18 +4846,8 @@ with pkgs;
sshd-openpgp-auth = callPackage ../by-name/ss/ssh-openpgp-auth/daemon.nix { };
- opensp = callPackage ../tools/text/sgml/opensp { };
-
- opentofu = callPackage ../applications/networking/cluster/opentofu { };
-
opentrack = libsForQt5.callPackage ../applications/misc/opentrack { };
- opentracker = callPackage ../applications/networking/p2p/opentracker { };
-
- alttpr-opentracker = callPackage ../tools/games/opentracker { };
-
- opentsdb = callPackage ../tools/misc/opentsdb { };
-
openvpn = callPackage ../tools/networking/openvpn {};
openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
@@ -10663,22 +4858,6 @@ with pkgs;
namespaced-openvpn = python3Packages.callPackage ../tools/networking/namespaced-openvpn { };
- oq = callPackage ../development/tools/oq { };
-
- out-of-tree = callPackage ../development/tools/out-of-tree { };
-
- oppai-ng = callPackage ../tools/misc/oppai-ng { };
-
- operator-sdk = callPackage ../development/tools/operator-sdk { };
-
- oscclip = callPackage ../tools/misc/oscclip { };
-
- oui = callPackage ../tools/networking/oui { };
-
- owncast = callPackage ../servers/owncast { };
-
- owntracks-recorder = callPackage ../servers/owntracks-recorder { };
-
update-dotdee = with python3Packages; toPythonApplication update-dotdee;
update-nix-fetchgit = haskell.lib.compose.justStaticExecutables haskellPackages.update-nix-fetchgit;
@@ -10687,10 +4866,6 @@ with pkgs;
update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { };
- opae = callPackage ../development/libraries/opae { };
-
- open-pdf-sign = callPackage ../tools/misc/open-pdf-sign { };
-
opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { };
opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { };
@@ -10700,12 +4875,6 @@ with pkgs;
optifine = optifinePackages.optifine-latest;
- optipng = callPackage ../tools/graphics/optipng { };
-
- olsrd = callPackage ../tools/networking/olsrd { };
-
- oonf-olsrd2 = callPackage ../tools/networking/oonf-olsrd2 { };
-
opl3bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor { };
opn2bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { };
@@ -10713,14 +4882,6 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
};
- org-stats = callPackage ../tools/misc/org-stats { };
-
- orz = callPackage ../tools/compression/orz { };
-
- os-prober = callPackage ../tools/misc/os-prober { };
-
- oshka = callPackage ../development/tools/oshka { };
-
osl = libsForQt5.callPackage ../development/compilers/osl {
boost = boost179;
libclang = llvmPackages_15.libclang;
@@ -10729,48 +4890,16 @@ with pkgs;
openexr = openexr_3;
};
- osqp = callPackage ../development/libraries/science/math/osqp { };
-
ossec-agent = callPackage ../tools/security/ossec/agent.nix { };
ossec-server = callPackage ../tools/security/ossec/server.nix { };
- osslsigncode = callPackage ../development/tools/osslsigncode { };
-
- ostree = callPackage ../tools/misc/ostree { };
-
- ostree-rs-ext = callPackage ../tools/misc/ostree-rs-ext { };
-
- otel-cli = callPackage ../tools/misc/otel-cli { };
-
- otfcc = callPackage ../tools/misc/otfcc { };
-
- otpclient = callPackage ../applications/misc/otpclient { };
-
- otpw = callPackage ../os-specific/linux/otpw { };
-
- ovftool = callPackage ../tools/virtualization/ovftool { };
-
- overmind = callPackage ../applications/misc/overmind { };
-
- oxker = callPackage ../applications/misc/oxker { };
-
- oxlint = callPackage ../development/tools/oxlint { };
-
ovito = qt6Packages.callPackage ../applications/graphics/ovito {
inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration;
};
- oxefmsynth = callPackage ../applications/audio/oxefmsynth { };
-
oxidized = callPackage ../tools/admin/oxidized { };
- oxipng = callPackage ../tools/graphics/oxipng { };
-
- payload_dumper = callPackage ../tools/archivers/payload_dumper { };
-
- payload-dumper-go = callPackage ../tools/archivers/payload-dumper-go { };
-
p4c = callPackage ../development/compilers/p4c {
protobuf = protobuf_21;
};
@@ -10780,56 +4909,22 @@ with pkgs;
packagekit = callPackage ../tools/package-management/packagekit { };
- packetdrill = callPackage ../tools/networking/packetdrill { };
-
- pacman = callPackage ../tools/package-management/pacman { };
-
- paco = callPackage ../development/compilers/paco { };
-
padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
- padbuster = callPackage ../tools/security/padbuster { };
-
- page = callPackage ../tools/misc/page { };
-
pageedit = libsForQt5.callPackage ../applications/office/PageEdit {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
- paging-calculator = callPackage ../development/tools/paging-calculator { };
-
- pagmo2 = callPackage ../development/libraries/pagmo2 { };
-
- paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { };
-
pakcs = callPackage ../development/compilers/pakcs { };
- pal = callPackage ../tools/misc/pal { };
-
- pandoc = callPackage ../development/tools/pandoc { };
-
- pandoc-lua-filters = callPackage ../tools/misc/pandoc-lua-filters { };
-
- pamtester = callPackage ../tools/security/pamtester { };
-
- paperless-ngx = callPackage ../applications/office/paperless-ngx { };
-
paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };
- papeer = callPackage ../tools/text/papeer { };
-
- papertrail = callPackage ../tools/text/papertrail { };
-
- par2cmdline = callPackage ../tools/networking/par2cmdline { };
-
parallel = callPackage ../tools/misc/parallel { };
parallel-full = callPackage ../tools/misc/parallel/wrapper.nix { };
- parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { };
-
parcellite = callPackage ../tools/misc/parcellite {
autoreconfHook = buildPackages.autoreconfHook269;
};
@@ -10844,71 +4939,25 @@ with pkgs;
patchutils_0_4_2 = callPackage ../tools/text/patchutils/0.4.2.nix { };
- parted = callPackage ../tools/misc/parted { };
-
- passh = callPackage ../tools/networking/passh { };
-
- paulstretch = callPackage ../applications/audio/paulstretch { };
-
- pazi = callPackage ../tools/misc/pazi { };
-
- peep = callPackage ../tools/misc/peep { };
-
- pell = callPackage ../applications/misc/pell { };
-
- perccli = callPackage ../tools/misc/perccli { };
-
- perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
-
inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_4 percona-server;
inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_4 percona-xtrabackup;
- pick = callPackage ../tools/misc/pick { };
-
- pipe-rename = callPackage ../tools/misc/pipe-rename { };
-
pipecontrol = libsForQt5.callPackage ../applications/audio/pipecontrol { };
- pipectl = callPackage ../tools/misc/pipectl { };
-
- pitivi = callPackage ../applications/video/pitivi { };
-
- prism = callPackage ../applications/video/prism { };
-
- pulumi = callPackage ../tools/admin/pulumi { };
-
pulumiPackages = recurseIntoAttrs (
callPackage ../tools/admin/pulumi-packages { }
);
pulumi-bin = callPackage ../tools/admin/pulumi-bin { };
- p0f = callPackage ../tools/security/p0f { };
-
- pngloss = callPackage ../tools/graphics/pngloss { };
-
- pngout = callPackage ../tools/graphics/pngout { };
-
patch = gnupatch;
- patchage = callPackage ../applications/audio/patchage { };
-
patchance = python3Packages.callPackage ../applications/audio/patchance { };
- patatt = callPackage ../development/tools/patatt { };
-
- pcapfix = callPackage ../tools/networking/pcapfix { };
-
- pbzip2 = callPackage ../tools/compression/pbzip2 { };
-
- pcimem = callPackage ../os-specific/linux/pcimem { };
-
pciutils = callPackage ../tools/system/pciutils {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- otpauth = callPackage ../tools/security/otpauth { };
-
pcsclite = callPackage ../tools/security/pcsclite {
inherit (darwin.apple_sdk.frameworks) Foundation IOKit;
};
@@ -10918,66 +4967,16 @@ with pkgs;
polkitSupport = true;
};
- pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { };
-
- pcsc-safenet = callPackage ../tools/security/pcsc-safenet { };
-
- pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { };
-
pcsc-tools = callPackage ../tools/security/pcsc-tools {
inherit (pkgs.darwin.apple_sdk.frameworks) PCSC;
};
- ifdnfc = callPackage ../tools/security/ifdnfc { };
-
pdd = python3Packages.callPackage ../tools/misc/pdd { };
- pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { };
-
- pdfcrack = callPackage ../tools/security/pdfcrack { };
-
pdfposter = callPackage ../applications/misc/pdfposter { };
- pdfsandwich = callPackage ../tools/typesetting/pdfsandwich { };
-
- pdftag = callPackage ../tools/graphics/pdftag { };
-
- pdf2svg = callPackage ../tools/graphics/pdf2svg { };
-
- pdftoipe = callPackage ../tools/graphics/pdftoipe { };
-
pdfminer = with python3Packages; toPythonApplication pdfminer-six;
- pdf-quench = callPackage ../applications/misc/pdf-quench { };
-
- briss = callPackage ../tools/graphics/briss { };
-
- brickd = callPackage ../servers/brickd { };
-
- bully = callPackage ../tools/networking/bully { };
-
- pcapc = callPackage ../tools/networking/pcapc { };
-
- pdm = callPackage ../tools/package-management/pdm { };
-
- pdnsd = callPackage ../tools/networking/pdnsd { };
-
- peco = callPackage ../tools/text/peco { };
-
- percollate = callPackage ../tools/text/percollate { };
-
- pg_activity = callPackage ../development/tools/database/pg_activity { };
-
- pg_checksums = callPackage ../development/tools/database/pg_checksums { };
-
- pg_flame = callPackage ../tools/misc/pg_flame { };
-
- pg_top = callPackage ../tools/misc/pg_top { };
-
- pgcenter = callPackage ../tools/misc/pgcenter { };
-
- pgmetrics = callPackage ../tools/misc/pgmetrics { };
-
pgsync = callPackage ../development/tools/database/pgsync { };
pdsh = callPackage ../tools/networking/pdsh {
@@ -10985,25 +4984,12 @@ with pkgs;
ssh = openssh;
};
- pfetch = callPackage ../tools/misc/pfetch { };
-
- pfetch-rs = callPackage ../tools/misc/pfetch-rs { };
-
pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { };
phoc = callPackage ../applications/misc/phoc {
wlroots = wlroots_0_17;
};
- phockup = callPackage ../applications/misc/phockup { };
-
- phodav = callPackage ../tools/networking/phodav { };
-
- photon-rss = callPackage ../applications/networking/feedreaders/photon { };
-
- pim6sd = callPackage ../servers/pim6sd { };
-
- piper-phonemize = callPackage ../development/libraries/piper-phonemize { };
piper-train = callPackage ../tools/audio/piper/train.nix { };
piper-tts = callPackage ../tools/audio/piper { };
@@ -11011,8 +4997,6 @@ with pkgs;
phosh-mobile-settings = callPackage ../applications/window-managers/phosh/phosh-mobile-settings.nix { };
- piknik = callPackage ../tools/networking/piknik { };
-
inherit (callPackages ../tools/security/pinentry { })
pinentry-curses
pinentry-emacs
@@ -11026,40 +5010,20 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { };
-
- pinentry-rofi = callPackage ../tools/security/pinentry-rofi { };
-
- pingtcp = callPackage ../tools/networking/pingtcp { };
-
pingu = callPackage ../tools/networking/pingu {
buildGoModule = buildGo122Module;
};
pinnwand = callPackage ../servers/pinnwand { };
- pinsel = callPackage ../tools/misc/pinsel { };
-
piping-server-rust = callPackage ../servers/piping-server-rust {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
- pirate-get = callPackage ../tools/networking/pirate-get { };
-
- pipr = callPackage ../applications/misc/pipr { };
-
- pipreqs = callPackage ../tools/misc/pipreqs { };
-
- pius = callPackage ../tools/security/pius { };
-
- pixiewps = callPackage ../tools/networking/pixiewps { };
-
pinyin-tool = callPackage ../tools/text/pinyin-tool {
inherit (darwin.apple_sdk.frameworks) Security;
};
- pk2cmd = callPackage ../tools/misc/pk2cmd { };
-
plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port {
inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit Metal QuartzCore;
inherit (darwin) DarwinTools;
@@ -11069,19 +5033,11 @@ with pkgs;
platformio = if stdenv.hostPlatform.isLinux then platformioPackages.platformio-chrootenv else platformioPackages.platformio-core;
platformio-core = platformioPackages.platformio-core;
- platinum-searcher = callPackage ../tools/text/platinum-searcher { };
-
playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { };
playwright-driver = (callPackage ../development/web/playwright/driver.nix { }).playwright-core;
playwright-test = (callPackage ../development/web/playwright/driver.nix { }).playwright-test;
- please = callPackage ../tools/security/please { };
-
- plecost = callPackage ../tools/security/plecost { };
-
- plujain-ramp = callPackage ../applications/audio/plujain-ramp { };
-
inherit (callPackage ../servers/plik { })
plik plikd;
@@ -11089,10 +5045,6 @@ with pkgs;
plexRaw = callPackage ../servers/plex/raw.nix { };
- psitransfer = callPackage ../servers/psitransfer { };
-
- tab = callPackage ../tools/text/tab { };
-
tabview = with python3Packages; toPythonApplication tabview;
tautulli = python3Packages.callPackage ../servers/tautulli { };
@@ -11106,38 +5058,10 @@ with pkgs;
python = null;
};
- ploticus = callPackage ../tools/graphics/ploticus { };
-
- plotinus = callPackage ../tools/misc/plotinus { };
-
- plots = callPackage ../applications/misc/plots { };
-
- plotutils = callPackage ../tools/graphics/plotutils { };
-
- plowshare = callPackage ../tools/misc/plowshare { };
-
- pmenu = callPackage ../tools/X11/pmenu { };
-
- pngcheck = callPackage ../tools/graphics/pngcheck { };
-
- pngcrush = callPackage ../tools/graphics/pngcrush { };
-
- pngnq = callPackage ../tools/graphics/pngnq { };
-
- pngoptimizer = callPackage ../tools/graphics/pngoptimizer { };
-
- pngtoico = callPackage ../tools/graphics/pngtoico { };
-
pngpaste = callPackage ../os-specific/darwin/pngpaste {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
- pngtools = callPackage ../tools/graphics/pngtools { };
-
- pngpp = callPackage ../development/libraries/png++ { };
-
- pngquant = callPackage ../tools/graphics/pngquant { };
-
inherit (callPackage ../development/tools/pnpm { })
pnpm_8 pnpm_9;
pnpm = pnpm_9;
@@ -11148,22 +5072,12 @@ with pkgs;
inherit (llvmPackages_14) stdenv;
};
- podiff = callPackage ../tools/text/podiff { };
-
- pocketbase = callPackage ../servers/pocketbase { };
-
- podman = callPackage ../applications/virtualization/podman { };
-
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose { };
podman-desktop = callPackage ../applications/virtualization/podman-desktop {
inherit (darwin) autoSignDarwinBinariesHook;
};
- pods = callPackage ../applications/virtualization/pods { };
-
- pod2mdoc = callPackage ../tools/misc/pod2mdoc { };
-
poedit = callPackage ../tools/text/poedit {
wxGTK32 = wxGTK32.override { withWebKit = true; };
};
@@ -11172,60 +5086,12 @@ with pkgs;
polaris-web = callPackage ../servers/polaris/web.nix { };
- polipo = callPackage ../servers/polipo { };
-
- poly2tri-c = callPackage ../development/libraries/poly2tri-c { };
-
- polypane = callPackage ../applications/networking/browsers/polypane { };
-
- pomsky = callPackage ../tools/text/pomsky { };
-
- ponysay = callPackage ../tools/misc/ponysay { };
-
- popfile = callPackage ../tools/text/popfile { };
-
- porsmo = callPackage ../applications/misc/porsmo { };
-
- pantum-driver = callPackage ../misc/drivers/pantum-driver { };
-
- posteid-seed-extractor = callPackage ../tools/security/posteid-seed-extractor { };
-
- postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { };
-
povray = callPackage ../tools/graphics/povray {
# https://github.com/POV-Ray/povray/issues/460
# https://github.com/NixOS/nixpkgs/issues/311017
stdenv = gcc12Stdenv;
};
- ppl = callPackage ../development/libraries/ppl { };
-
- pplite = callPackage ../development/libraries/pplite { };
-
- ppp = callPackage ../tools/networking/ppp { };
-
- pptp = callPackage ../tools/networking/pptp { };
-
- pptpd = callPackage ../tools/networking/pptpd { };
-
- pre-commit = callPackage ../tools/misc/pre-commit { };
-
- pre-commit-hook-ensure-sops = callPackage ../tools/misc/pre-commit-hook-ensure-sops { };
-
- pretender = callPackage ../tools/security/pretender { };
-
- pretty-simple = callPackage ../development/tools/pretty-simple { };
-
- prettyping = callPackage ../tools/networking/prettyping { };
-
- pritunl-ssh = callPackage ../tools/networking/pritunl-ssh { };
-
- profile-cleaner = callPackage ../tools/misc/profile-cleaner { };
-
- profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { };
-
- projectable = callPackage ../applications/file-managers/projectable { };
-
projectlibre = callPackage ../applications/misc/projectlibre {
jre = jre8;
jdk = jdk8;
@@ -11233,103 +5099,27 @@ with pkgs;
projectm = libsForQt5.callPackage ../applications/audio/projectm { };
- proot = callPackage ../tools/system/proot { };
-
- prototypejs = callPackage ../development/libraries/prototypejs { };
-
proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
- proxychains = callPackage ../tools/networking/proxychains { };
-
- proxychains-ng = callPackage ../tools/networking/proxychains-ng { };
-
- proxify = callPackage ../tools/networking/proxify { };
-
- proxysql = callPackage ../servers/sql/proxysql { };
-
- prs = callPackage ../tools/security/prs { };
-
- psw = callPackage ../tools/misc/psw { };
-
pws = callPackage ../tools/misc/pws { };
- cntlm = callPackage ../tools/networking/cntlm { };
-
- cnping = callPackage ../tools/networking/cnping { };
-
- past-time = callPackage ../tools/misc/past-time { };
-
- pastebinit = callPackage ../tools/misc/pastebinit { };
-
- pmacct = callPackage ../tools/networking/pmacct { };
-
- pmix = callPackage ../development/libraries/pmix { };
-
- polygraph = callPackage ../tools/networking/polygraph { };
-
- pr-tracker = callPackage ../servers/pr-tracker { };
-
- progress = callPackage ../tools/misc/progress { };
-
- ps3-disc-dumper = callPackage ../tools/games/ps3-disc-dumper { };
-
- ps3iso-utils = callPackage ../tools/games/ps3iso-utils { };
-
- ps3netsrv = callPackage ../servers/ps3netsrv { };
-
- pscircle = callPackage ../os-specific/linux/pscircle { };
-
- psitop = callPackage ../applications/system/psitop { };
-
- psmisc = callPackage ../os-specific/linux/psmisc { };
-
- pssh = callPackage ../tools/networking/pssh { };
-
- pspg = callPackage ../tools/misc/pspg { };
-
- pstoedit = callPackage ../tools/graphics/pstoedit { };
-
- psutils = callPackage ../tools/typesetting/psutils { };
-
- psudohash = callPackage ../tools/security/psudohash { };
-
- pubs = callPackage ../tools/misc/pubs { };
-
- pulldown-cmark = callPackage ../tools/typesetting/pulldown-cmark { };
-
- pulumictl = callPackage ../development/tools/pulumictl { };
-
- pure-prompt = callPackage ../shells/zsh/pure-prompt { };
-
- pwgen = callPackage ../tools/security/pwgen { };
-
- pwgen-secure = callPackage ../tools/security/pwgen-secure { };
-
- pwnat = callPackage ../tools/networking/pwnat { };
-
pwninit = callPackage ../development/tools/misc/pwninit {
inherit (darwin.apple_sdk.frameworks) Security;
};
pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;
- pydf = callPackage ../applications/misc/pydf { };
-
pyinfra = with python3Packages; toPythonApplication pyinfra;
pylint = with python3Packages; toPythonApplication pylint;
- pympress = callPackage ../applications/office/pympress { };
-
pyocd = with python3Packages; toPythonApplication pyocd;
pypass = with python3Packages; toPythonApplication pypass;
- ticktick = callPackage ../applications/office/ticktick { };
-
py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy {
# https://github.com/benfred/py-spy/issues/633
python3 = python311;
@@ -11337,37 +5127,17 @@ with pkgs;
pydeps = with python3Packages; toPythonApplication pydeps;
- pysentation = callPackage ../applications/misc/pysentation { };
-
- python-launcher = callPackage ../development/tools/misc/python-launcher { };
-
- pytrainer = callPackage ../applications/misc/pytrainer { };
-
pywal = with python3Packages; toPythonApplication pywal;
- pystring = callPackage ../development/libraries/pystring { };
-
raysession = python3Packages.callPackage ../applications/audio/raysession {};
- rbw = callPackage ../tools/security/rbw { };
-
remarshal = with python3Packages; toPythonApplication remarshal;
- rehex = callPackage ../applications/editors/rehex { };
-
- rio = callPackage ../applications/terminal-emulators/rio { };
-
- rig = callPackage ../tools/misc/rig { };
-
- ripdrag = callPackage ../tools/misc/ripdrag { };
-
riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn {
provider = "riseup";
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
- rnm = callPackage ../tools/filesystems/rnm { };
-
rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix {
@@ -11384,17 +5154,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreMIDI CoreAudio CoreServices;
};
- openmpi = callPackage ../development/libraries/openmpi { };
-
- ouch = callPackage ../tools/compression/ouch { };
-
mpi = openmpi; # this attribute should used to build MPI applications
- mpiCheckPhaseHook = callPackage ../build-support/setup-hooks/mpi-check-hook { };
-
- ucc = callPackage ../development/libraries/ucc { };
-
- ucx = callPackage ../development/libraries/ucx { };
-
openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {});
prowlarr = callPackage ../servers/prowlarr { };
@@ -11411,62 +5171,34 @@ with pkgs;
quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { };
- q-text-as-data = callPackage ../tools/misc/q-text-as-data { };
-
- qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { };
-
qalculate-qt = qt6Packages.callPackage ../applications/science/math/qalculate-qt { };
qastools = libsForQt5.callPackage ../tools/audio/qastools { };
qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ;
- qhull = callPackage ../development/libraries/qhull { };
-
qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { };
qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { };
- qmk = callPackage ../tools/misc/qmk { };
-
- qmk_hid = callPackage ../tools/misc/qmk_hid { };
-
qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };
qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { };
- qovery-cli = callPackage ../tools/admin/qovery-cli { };
-
qownnotes = qt6Packages.callPackage ../applications/office/qownnotes {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
- qpdf = callPackage ../development/libraries/qpdf { };
-
- qprint = callPackage ../tools/text/qprint { };
-
- qrscan = callPackage ../tools/misc/qrscan { };
-
qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { };
- quadrafuzz = callPackage ../applications/audio/quadrafuzz { };
-
- quickfix = callPackage ../development/libraries/quickfix { };
-
- quickserve = callPackage ../tools/networking/quickserve { };
-
quictls = callPackage ../development/libraries/quictls { };
- quicktun = callPackage ../tools/networking/quicktun { };
-
quickwit = callPackage ../servers/search/quickwit {
inherit (darwin.apple_sdk.frameworks) Security;
};
- quilt = callPackage ../development/tools/quilt { };
-
quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota;
qvge = libsForQt5.callPackage ../applications/graphics/qvge { };
@@ -11475,322 +5207,98 @@ with pkgs;
wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { };
- wiggle = callPackage ../development/tools/wiggle { };
-
- radamsa = callPackage ../tools/security/radamsa { };
-
radarr = callPackage ../servers/radarr { };
radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { };
- radsecproxy = callPackage ../tools/networking/radsecproxy { };
-
- radvd = callPackage ../tools/networking/radvd { };
-
- rain = callPackage ../development/tools/rain { };
-
rainbowstream = with python3.pkgs; toPythonApplication rainbowstream;
- rambox = callPackage ../applications/networking/instant-messengers/rambox { };
-
- ramfetch = callPackage ../tools/misc/ramfetch { };
-
rapidgzip = with python3Packages; toPythonApplication rapidgzip;
rar = callPackage ../tools/archivers/rar { };
- rarcrack = callPackage ../tools/security/rarcrack { };
-
- rare-regex = callPackage ../tools/text/rare-regex { };
-
- ratman = callPackage ../tools/networking/ratman { };
-
ratarmount = with python3Packages; toPythonApplication ratarmount;
- ratools = callPackage ../tools/networking/ratools { };
-
- ratt = callPackage ../applications/misc/ratt { };
-
- rc-9front = callPackage ../shells/rc-9front { };
-
- rcon = callPackage ../tools/networking/rcon { };
-
- rconc = callPackage ../tools/networking/rconc { };
-
- rdap = callPackage ../tools/networking/rdap { };
-
rdbtools = callPackage ../development/tools/rdbtools { python = python3; };
- rdma-core = callPackage ../os-specific/linux/rdma-core { };
-
- rdrview = callPackage ../tools/networking/rdrview { };
-
- real_time_config_quick_scan = callPackage ../applications/audio/real_time_config_quick_scan { };
-
- realesrgan-ncnn-vulkan = callPackage ../tools/graphics/realesrgan-ncnn-vulkan { };
-
- react-native-debugger = callPackage ../development/tools/react-native-debugger { };
-
- read-edid = callPackage ../os-specific/linux/read-edid { };
-
- readstat = callPackage ../applications/science/math/readstat { };
-
- redir = callPackage ../tools/networking/redir { };
-
- redpanda-client = callPackage ../servers/redpanda { };
-
- redsocks = callPackage ../tools/networking/redsocks { };
-
- rep = callPackage ../development/tools/rep { };
-
- repseek = callPackage ../applications/science/biology/repseek { };
-
- reredirect = callPackage ../tools/misc/reredirect { };
-
retext = qt6Packages.callPackage ../applications/editors/retext { };
- rewrk = callPackage ../tools/networking/rewrk { };
-
inherit (callPackage ../tools/security/rekor { })
rekor-cli
rekor-server;
- rhai-doc = callPackage ../development/tools/misc/rhai-doc { };
-
- rich-cli = callPackage ../misc/rich-cli { };
-
- richgo = callPackage ../development/tools/richgo { };
-
- risor = callPackage ../development/interpreters/risor { };
-
- rlci = callPackage ../development/interpreters/rlci { };
-
rst2pdf = with python3Packages; toPythonApplication rst2pdf;
rstcheck = with python3Packages; toPythonApplication rstcheck;
- rstfmt = callPackage ../development/tools/rstfmt { };
-
- rt = callPackage ../servers/rt { };
-
- rtmpdump = callPackage ../tools/video/rtmpdump { };
rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
- rtptools = callPackage ../tools/networking/rtptools { };
-
- rtss = callPackage ../development/tools/misc/rtss { };
-
- re-isearch = callPackage ../applications/search/re-isearch { };
-
- reason-shell = callPackage ../applications/science/misc/reason-shell { };
-
- reaverwps = callPackage ../tools/networking/reaver-wps { };
-
- reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x { };
-
- rx = callPackage ../applications/graphics/rx { };
-
qt-box-editor = libsForQt5.callPackage ../applications/misc/qt-box-editor { };
- readability-cli = callPackage ../tools/text/readability-cli { };
-
recoll = libsForQt5.callPackage ../applications/search/recoll { };
recoll-nox = recoll.override { withGui = false; };
- redoc-cli = callPackage ../development/tools/redoc-cli { };
-
- reflex = callPackage ../development/tools/reflex { };
-
- reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
-
- reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
-
- relic = callPackage ../development/tools/relic { };
-
remmina = darwin.apple_sdk_11_0.callPackage ../applications/networking/remote/remmina { };
- rename = callPackage ../tools/misc/rename { };
-
- renameutils = callPackage ../tools/misc/renameutils { };
-
- repgrep = callPackage ../tools/text/repgrep { };
-
- replace = callPackage ../tools/text/replace { };
-
- resvg = callPackage ../tools/graphics/resvg { };
-
reckon = callPackage ../tools/text/reckon { };
- recoverjpeg = callPackage ../tools/misc/recoverjpeg { };
-
- reftools = callPackage ../development/tools/reftools { };
-
- redwax-tool = callPackage ../tools/security/redwax-tool { };
-
- regpg = callPackage ../tools/security/regpg { };
-
- remote-touchpad = callPackage ../tools/inputmethods/remote-touchpad { };
-
remote-exec = python3Packages.callPackage ../tools/misc/remote-exec { };
- reposurgeon = callPackage ../applications/version-management/reposurgeon { };
-
reptor = with python3.pkgs; toPythonApplication reptor;
- reptyr = callPackage ../os-specific/linux/reptyr { };
-
rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { };
inherit (callPackage ../development/misc/resholve { })
resholve;
- restool = callPackage ../os-specific/linux/restool { };
-
reuse = with python3.pkgs; toPythonApplication reuse;
- reveal-md = callPackage ../tools/text/reveal-md { };
-
- rewritefs = callPackage ../os-specific/linux/rewritefs { };
-
- rdiff-backup = callPackage ../tools/backup/rdiff-backup { };
-
- rdfind = callPackage ../tools/filesystems/rdfind { };
-
- rhash = callPackage ../tools/security/rhash { };
-
- rhoas = callPackage ../tools/admin/rhoas { };
-
- riemann_c_client = callPackage ../tools/misc/riemann-c-client { };
riemann-tools = callPackage ../tools/misc/riemann-tools { };
- ripmime = callPackage ../tools/networking/ripmime { };
-
- rkflashtool = callPackage ../tools/misc/rkflashtool { };
-
- rkvm = callPackage ../tools/misc/rkvm { };
-
- rkrlv2 = callPackage ../applications/audio/rkrlv2 { };
-
rmlint = callPackage ../tools/misc/rmlint {
inherit (python3Packages) sphinx;
};
- rmw = callPackage ../tools/misc/rmw { };
-
- rng-tools = callPackage ../tools/security/rng-tools { };
-
- rnnoise = callPackage ../development/libraries/rnnoise { };
-
# Use `apple_sdk_11_0` because `apple_sdk.libs` does not provide `simd`
rnnoise-plugin = darwin.apple_sdk_11_0.callPackage ../development/libraries/rnnoise-plugin {
inherit (darwin.apple_sdk_11_0.frameworks) WebKit MetalKit CoreAudioKit;
inherit (darwin.apple_sdk_11_0.libs) simd;
};
- rnp = callPackage ../tools/security/rnp { };
-
- rnr = callPackage ../tools/text/rnr { };
-
- rnv = callPackage ../tools/text/xml/rnv { };
-
- roam-research = callPackage ../applications/office/roam-research { };
-
- rosie = callPackage ../tools/text/rosie { };
-
- rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { };
-
- roundup = callPackage ../tools/misc/roundup { };
-
- routino = callPackage ../tools/misc/routino { };
-
- rq = callPackage ../development/tools/rq { };
-
- rsnapshot = callPackage ../tools/backup/rsnapshot { };
-
- rlwrap = callPackage ../tools/misc/rlwrap { };
-
- rmtrash = callPackage ../tools/misc/rmtrash { };
-
- roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { };
-
rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { };
rosenpass = callPackage ../tools/networking/rosenpass { };
rosenpass-tools = callPackage ../tools/networking/rosenpass/tools.nix { };
- rot8 = callPackage ../tools/misc/rot8 { };
-
- rowhammer-test = callPackage ../tools/system/rowhammer-test { };
-
- rpPPPoE = callPackage ../tools/networking/rp-pppoe { };
-
rpm = callPackage ../tools/package-management/rpm {
python = python3;
lua = lua5_4;
};
- rpm-ostree = callPackage ../tools/misc/rpm-ostree { };
-
- rpm2targz = callPackage ../tools/archivers/rpm2targz { };
-
- rpmextract = callPackage ../tools/archivers/rpmextract { };
-
- rscw = callPackage ../applications/radio/rscw { };
-
- rset = callPackage ../tools/admin/rset { };
-
- rshijack = callPackage ../tools/networking/rshijack { };
-
- rshim-user-space = callPackage ../tools/misc/rshim-user-space { };
-
rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { };
- rslint = callPackage ../development/tools/rslint { };
-
- rss-bridge-cli = callPackage ../applications/misc/rss-bridge-cli { };
-
rss2email = callPackage ../applications/networking/feedreaders/rss2email {
pythonPackages = python3Packages;
};
- feed2imap-go = callPackage ../applications/networking/feedreaders/feed2imap-go { };
-
- rsstail = callPackage ../applications/networking/feedreaders/rsstail { };
-
- rtz = callPackage ../tools/misc/rtz { };
-
- rubber = callPackage ../tools/typesetting/rubber { };
-
rubocop = rubyPackages.rubocop;
ruby-lsp = rubyPackages.ruby-lsp;
- runningx = callPackage ../tools/X11/runningx { };
-
- rund = callPackage ../development/tools/rund { };
-
- runzip = callPackage ../tools/archivers/runzip { };
-
ruplacer = callPackage ../tools/text/ruplacer {
inherit (darwin.apple_sdk.frameworks) Security;
};
- rust-code-analysis = callPackage ../development/tools/rust-code-analysis { };
-
rust-motd = callPackage ../tools/misc/rust-motd {
inherit (darwin.apple_sdk.frameworks) Security;
};
- rust-petname = callPackage ../tools/text/rust-petname { };
-
rustcat = callPackage ../tools/networking/rustcat {
inherit (darwin.apple_sdk.frameworks) Security;
};
- rustfilt = callPackage ../development/tools/rust/rustfilt { };
-
rustscan = callPackage ../tools/security/rustscan {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -11799,28 +5307,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- rustypaste = callPackage ../servers/rustypaste { };
-
- rustypaste-cli = callPackage ../tools/misc/rustypaste-cli { };
-
- rustywind = callPackage ../development/tools/misc/rustywind { };
-
- rw = callPackage ../tools/misc/rw { };
-
- rwc = callPackage ../tools/system/rwc { };
-
- rwedid = callPackage ../tools/video/rwedid { };
-
- rxp = callPackage ../tools/text/xml/rxp { };
-
- rzip = callPackage ../tools/compression/rzip { };
-
- s-tui = callPackage ../tools/system/s-tui { };
-
- s3backer = callPackage ../tools/filesystems/s3backer { };
-
- s3bro = callPackage ../tools/admin/s3bro { };
-
s3fs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/s3fs { };
s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { };
@@ -11831,319 +5317,72 @@ with pkgs;
s3-credentials = with python3Packages; toPythonApplication s3-credentials;
- s4cmd = callPackage ../tools/networking/s4cmd { };
-
- s5 = callPackage ../tools/security/s5 { };
-
- s5cmd = callPackage ../tools/networking/s5cmd { };
-
- sacad = callPackage ../tools/misc/sacad { };
-
- sad = callPackage ../tools/text/sad { };
-
- safecopy = callPackage ../tools/system/safecopy { };
-
- sacd = callPackage ../tools/cd-dvd/sacd { };
-
- safe = callPackage ../tools/security/safe { };
-
safety-cli = with python3.pkgs; toPythonApplication safety;
- safe-rm = callPackage ../tools/system/safe-rm { };
-
- safecloset = callPackage ../applications/misc/safecloset { };
-
- safeeyes = callPackage ../applications/misc/safeeyes { };
-
- sagoin = callPackage ../tools/misc/sagoin { };
-
- sahel-fonts = callPackage ../data/fonts/sahel-fonts { };
-
- saldl = callPackage ../tools/networking/saldl { };
-
- salt = callPackage ../tools/admin/salt { };
-
- samim-fonts = callPackage ../data/fonts/samim-fonts { };
-
saml2aws = callPackage ../tools/security/saml2aws {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- sammler = callPackage ../tools/security/sammler { };
-
- samplicator = callPackage ../tools/networking/samplicator { };
-
- sanctity = callPackage ../tools/misc/sanctity { };
-
sasview = libsForQt5.callPackage ../applications/science/misc/sasview { };
- sbs = callPackage ../tools/X11/sbs { };
-
- schemes = callPackage ../applications/misc/schemes { };
-
- scanbd = callPackage ../tools/graphics/scanbd { };
-
- scdl = callPackage ../tools/misc/scdl { };
-
- scorecard = callPackage ../tools/security/scorecard { };
-
- scream = callPackage ../applications/audio/scream { };
-
screen = callPackage ../tools/misc/screen {
inherit (darwin.apple_sdk.libs) utmp;
};
- screen-message = callPackage ../tools/X11/screen-message { };
-
- screenkey = callPackage ../applications/video/screenkey { };
-
- scrub = callPackage ../tools/misc/scrub { };
-
scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { };
- scraper = callPackage ../tools/text/scraper { };
-
- scriptaculous = callPackage ../development/libraries/scriptaculous { };
-
- script-directory = callPackage ../tools/misc/script-directory { };
-
- scrot = callPackage ../tools/graphics/scrot { };
-
- scrypt = callPackage ../tools/security/scrypt { };
-
sd = callPackage ../tools/text/sd {
inherit (darwin.apple_sdk.frameworks) Security;
};
- sd-switch = callPackage ../os-specific/linux/sd-switch { };
-
- sdate = callPackage ../tools/misc/sdate { };
-
- sdat2img = callPackage ../tools/filesystems/sdat2img { };
-
- sdcv = callPackage ../applications/misc/sdcv { };
-
- sdl-jstest = callPackage ../tools/misc/sdl-jstest { };
-
- senpai = callPackage ../applications/networking/irc/senpai { };
-
- skim = callPackage ../tools/misc/skim { };
-
- seashells = callPackage ../applications/misc/seashells { };
-
- seaweedfs = callPackage ../applications/networking/seaweedfs { };
-
- sec = callPackage ../tools/admin/sec { };
-
- seccure = callPackage ../tools/security/seccure { };
-
- secp256k1 = callPackage ../tools/security/secp256k1 { };
-
securefs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/securefs { };
- seehecht = callPackage ../tools/text/seehecht { };
-
segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; };
selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { };
- semantic-release = callPackage ../development/tools/semantic-release { };
-
semgrep = python3.pkgs.toPythonApplication python3.pkgs.semgrep;
inherit (semgrep.passthru) semgrep-core;
- setroot = callPackage ../tools/X11/setroot { };
-
- setserial = callPackage ../tools/system/setserial { };
-
seqdiag = with python3Packages; toPythonApplication seqdiag;
- sequoia-sqv = callPackage ../tools/security/sequoia-sqv { };
-
- sequoia-sqop = callPackage ../tools/security/sequoia-sqop { };
-
- sequoia-chameleon-gnupg = callPackage ../tools/security/sequoia-chameleon-gnupg { };
-
- sewer = callPackage ../tools/admin/sewer { };
-
- sexpp = callPackage ../development/libraries/sexpp { };
-
- sfeed = callPackage ../tools/misc/sfeed { };
-
- sftpman = callPackage ../tools/filesystems/sftpman { };
-
- sftpgo = callPackage ../servers/sftpgo { };
-
- screenfetch = callPackage ../tools/misc/screenfetch { };
-
- sg3_utils = callPackage ../tools/system/sg3_utils { };
-
- sha1collisiondetection = callPackage ../tools/security/sha1collisiondetection { };
-
- shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { };
-
- shadered = callPackage ../development/tools/shadered { };
-
- go-shadowsocks2 = callPackage ../tools/networking/go-shadowsocks2 { };
-
- shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { };
-
shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust {
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};
- shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { };
-
- sharutils = callPackage ../tools/archivers/sharutils { };
-
- shell2http = callPackage ../servers/misc/shell2http { };
-
- shelldap = callPackage ../tools/misc/shelldap { };
-
shellify = haskellPackages.shellify.bin;
- shellspec = callPackage ../tools/misc/shellspec { };
-
- schema2ldif = callPackage ../tools/text/schema2ldif { };
-
- schemacrawler = callPackage ../development/tools/schemacrawler { };
-
sharedown = callPackage ../tools/misc/sharedown { };
- shen-sbcl = callPackage ../development/interpreters/shen-sbcl { };
-
- shen-sources = callPackage ../development/interpreters/shen-sources { };
-
shiv = with python3Packages; toPythonApplication shiv;
- shim-unsigned = callPackage ../tools/misc/shim { };
-
- shocco = callPackage ../tools/text/shocco { };
-
- shopify-themekit = callPackage ../development/web/shopify-themekit { };
-
- shorewall = callPackage ../tools/networking/shorewall { };
-
- shotwell = callPackage ../applications/graphics/shotwell { };
-
- shrikhand = callPackage ../data/fonts/shrikhand { };
-
- shunit2 = callPackage ../tools/misc/shunit2 { };
-
- sic = callPackage ../applications/networking/irc/sic { };
-
- siege = callPackage ../tools/networking/siege { };
-
- sieve-connect = callPackage ../applications/networking/sieve-connect { };
-
- sigal = callPackage ../applications/misc/sigal { };
-
sigil = libsForQt5.callPackage ../applications/editors/sigil { };
- signald = callPackage ../applications/networking/instant-messengers/signald { };
-
- signaldctl = callPackage ../applications/networking/instant-messengers/signaldctl { };
-
- signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { };
-
inherit (callPackage ../applications/networking/instant-messengers/signal-desktop {}) signal-desktop signal-desktop-beta;
slither-analyzer = with python3Packages; toPythonApplication slither-analyzer;
- sigma-cli = callPackage ../tools/security/sigma-cli { };
-
- signify = callPackage ../tools/security/signify { };
-
# aka., pgp-tools
- signing-party = callPackage ../tools/security/signing-party { };
-
- sigtop = callPackage ../tools/backup/sigtop { };
-
- silc_client = callPackage ../applications/networking/instant-messengers/silc-client { };
-
- silc_server = callPackage ../servers/silc-server { };
-
- silenthound = callPackage ../tools/security/silenthound { };
-
- silice = callPackage ../development/compilers/silice { };
-
- silver-searcher = callPackage ../tools/text/silver-searcher { };
-
- simple-mtpfs = callPackage ../tools/filesystems/simple-mtpfs { };
-
- simpleproxy = callPackage ../tools/networking/simpleproxy { };
-
simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { };
- sipexer = callPackage ../tools/networking/sipexer { };
-
- sipsak = callPackage ../tools/networking/sipsak { };
-
- sipvicious = callPackage ../tools/security/sipvicious { };
-
- siril = callPackage ../applications/science/astronomy/siril { };
-
sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { };
- sixpair = callPackage ../tools/misc/sixpair { };
-
- skippy-xd = callPackage ../tools/X11/skippy-xd { };
-
sks = callPackage ../servers/sks {
ocamlPackages = ocaml-ng.ocamlPackages_4_12;
};
- skydns = callPackage ../servers/skydns { };
-
- sing-box = callPackage ../tools/networking/sing-box { };
-
- sing-geosite = callPackage ../data/misc/sing-geosite { };
-
- sing-geoip = callPackage ../data/misc/sing-geoip { };
-
- sipcalc = callPackage ../tools/networking/sipcalc { };
-
- skytemple = callPackage ../applications/misc/skytemple { };
-
- sleuthkit = callPackage ../tools/system/sleuthkit { };
-
- slides = callPackage ../applications/misc/slides { };
-
- slippy = callPackage ../applications/misc/slippy { };
-
- slirp4netns = callPackage ../tools/networking/slirp4netns { };
-
slowlorust = callPackage ../tools/networking/slowlorust {
inherit (darwin.apple_sdk.frameworks) Security;
};
- slsa-verifier = callPackage ../tools/security/slsa-verifier { };
-
- slsnif = callPackage ../tools/misc/slsnif { };
-
slstatus = callPackage ../applications/misc/slstatus {
conf = config.slstatus.conf or null;
};
- smartdns = callPackage ../tools/networking/smartdns { };
-
smartmontools = callPackage ../tools/system/smartmontools {
inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices;
};
- smarty3 = callPackage ../development/libraries/smarty3 { };
- smarty3-i18n = callPackage ../development/libraries/smarty3-i18n { };
-
- smbnetfs = callPackage ../tools/filesystems/smbnetfs { };
-
- smenu = callPackage ../tools/misc/smenu { };
-
- boost-sml = callPackage ../development/libraries/boost-ext/boost-sml { };
-
- smu = callPackage ../tools/text/smu { };
-
- smug = callPackage ../tools/misc/smug { };
-
smpq = callPackage ../by-name/sm/smpq/package.nix {
stormlib = stormlib.overrideAttrs (old: {
version = "9.22";
@@ -12156,88 +5395,39 @@ with pkgs;
});
};
- snabb = callPackage ../tools/networking/snabb { };
-
- snallygaster = callPackage ../tools/security/snallygaster { };
-
snapcast = darwin.apple_sdk_11_0.callPackage ../applications/audio/snapcast {
inherit (darwin.apple_sdk_11_0.frameworks) IOKit AudioToolbox;
pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux;
};
- snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { };
-
- snet = callPackage ../tools/networking/snet { };
-
- snmpcheck = callPackage ../tools/networking/snmpcheck { };
-
- snobol4 = callPackage ../development/interpreters/snobol4 { };
-
- snort = callPackage ../applications/networking/ids/snort { };
-
soapui = callPackage ../applications/networking/soapui {
jdk = jdk11;
};
- sockdump = callPackage ../tools/networking/sockdump { };
-
specup = haskellPackages.specup.bin;
spglib = callPackage ../development/libraries/spglib {
inherit (llvmPackages) openmp;
};
- spicy = callPackage ../development/tools/spicy { };
-
- spire = callPackage ../tools/security/spire { };
# to match naming of other package repositories
spire-agent = spire.agent;
spire-server = spire.server;
spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { };
- sqlboiler = callPackage ../development/tools/sqlboiler { };
-
- sshed = callPackage ../tools/networking/sshed { };
-
- sshguard = callPackage ../tools/security/sshguard { };
-
- sshping = callPackage ../tools/networking/sshping { };
-
- ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { };
-
- ssh-to-age = callPackage ../tools/security/ssh-to-age { };
-
- ssh-to-pgp = callPackage ../tools/security/ssh-to-pgp { };
-
suricata = callPackage ../applications/networking/ids/suricata {
python = python3;
libbpf = libbpf_0;
};
- sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { };
-
softhsm = callPackage ../tools/security/softhsm {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Security;
};
- snapshot = callPackage ../applications/graphics/snapshot { };
-
- solvespace = callPackage ../applications/graphics/solvespace { };
-
- sonata = callPackage ../applications/audio/sonata { };
-
- sony-headphones-client = callPackage ../applications/audio/sony-headphones-client { };
-
- soundconverter = callPackage ../applications/audio/soundconverter { };
-
soundkonverter = libsForQt5.soundkonverter;
- sozu = callPackage ../servers/sozu { };
-
- spacer = callPackage ../tools/misc/spacer { };
-
sparrow-unwrapped = callPackage ../applications/blockchains/sparrow {
openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix {};
openjdk = jdk23.override { enableJavaFX = true; };
@@ -12245,255 +5435,70 @@ with pkgs;
sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix { };
- sparsehash = callPackage ../development/libraries/sparsehash { };
-
- spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { };
-
- spiped = callPackage ../tools/networking/spiped { };
-
- sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { };
-
- sqls = callPackage ../applications/misc/sqls { };
-
- stdman = callPackage ../data/documentation/stdman { };
-
- stderred = callPackage ../tools/misc/stderred { };
-
steck = callPackage ../servers/pinnwand/steck.nix { };
- stenc = callPackage ../tools/backup/stenc { };
-
stm32loader = with python3Packages; toPythonApplication stm32loader;
stremio = qt5.callPackage ../applications/video/stremio { };
- sunwait = callPackage ../applications/misc/sunwait { };
-
- surface-control = callPackage ../applications/misc/surface-control { };
-
- syntex = callPackage ../tools/graphics/syntex { };
-
- synapse-admin = callPackage ../tools/admin/synapse-admin { };
-
- sl = callPackage ../tools/misc/sl { };
-
- socat = callPackage ../tools/networking/socat { };
-
- sockperf = callPackage ../tools/networking/sockperf { };
-
- softnet = callPackage ../tools/networking/softnet { };
-
- solaar = callPackage ../applications/misc/solaar { };
-
solanum = callPackage ../servers/irc/solanum {
autoreconfHook = buildPackages.autoreconfHook269;
};
solc-select = with python3Packages; toPythonApplication solc-select;
- sourceHighlight = callPackage ../tools/text/source-highlight { };
-
- somebar = callPackage ../applications/misc/somebar { };
-
- speech-denoiser = callPackage ../applications/audio/speech-denoiser { };
-
splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot;
- spotdl = callPackage ../tools/audio/spotdl { };
-
- squashfsTools = callPackage ../tools/filesystems/squashfs { };
-
squashfs-tools-ng = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/squashfs-tools-ng { };
- squashfuse = callPackage ../tools/filesystems/squashfuse { };
-
- srt-live-server = callPackage ../applications/video/srt-live-server { };
-
- srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { };
-
- srtrelay = callPackage ../applications/video/srtrelay { };
-
- srsran = callPackage ../applications/radio/srsran { };
-
sourcehut = callPackage ../applications/version-management/sourcehut { };
- sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { };
sshfs = sshfs-fuse; # added 2017-08-14
- sshlatex = callPackage ../tools/typesetting/sshlatex { };
-
- sshuttle = callPackage ../tools/security/sshuttle { };
-
inherit (callPackages ../tools/misc/sshx { })
sshx
sshx-server;
- ssldump = callPackage ../tools/networking/ssldump { };
-
- sslsplit = callPackage ../tools/networking/sslsplit { };
-
- sstp = callPackage ../tools/networking/sstp { };
-
strip-nondeterminism = perlPackages.strip-nondeterminism;
- subberthehut = callPackage ../tools/misc/subberthehut { };
-
- subedit = callPackage ../tools/text/subedit { };
-
subsurface = libsForQt5.callPackage ../applications/misc/subsurface { };
- sudo = callPackage ../tools/security/sudo { };
-
- sudo-rs = callPackage ../tools/security/sudo-rs { };
-
- suidChroot = callPackage ../tools/system/suid-chroot { };
-
- sundtek = callPackage ../misc/drivers/sundtek { };
-
- sunxi-tools = callPackage ../development/tools/sunxi-tools { };
-
sumorobot-manager = python3Packages.callPackage ../applications/science/robotics/sumorobot-manager { };
- supertag = callPackage ../tools/filesystems/supertag { };
-
- svgbob = callPackage ../tools/graphics/svgbob { };
-
- svgcleaner = callPackage ../tools/graphics/svgcleaner { };
-
- svu = callPackage ../tools/misc/svu { };
-
- ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { };
-
- ssdeep = callPackage ../tools/security/ssdeep { };
-
- ssh-ident = callPackage ../tools/networking/ssh-ident { };
-
- sshpass = callPackage ../tools/networking/sshpass { };
-
sslscan = callPackage ../tools/security/sslscan {
openssl = openssl.override { withZlib = true; };
};
- sslmate = callPackage ../development/tools/sslmate { };
-
- sslmate-agent = callPackage ../development/tools/sslmate-agent { };
-
- sshocker = callPackage ../tools/security/sshocker { };
-
- sshoogr = callPackage ../tools/networking/sshoogr { };
-
- ssocr = callPackage ../applications/misc/ssocr { };
-
- sss-cli = callPackage ../tools/security/sss-cli { };
-
- ssss = callPackage ../tools/security/ssss { };
-
- stabber = callPackage ../misc/stabber { };
-
stacer = libsForQt5.callPackage ../tools/system/stacer { };
- starcharts = callPackage ../servers/misc/starcharts { };
-
staticjinja = with python3.pkgs; toPythonApplication staticjinja;
- stress = callPackage ../tools/system/stress { };
-
- stress-ng = callPackage ../tools/system/stress-ng { };
-
- stressapptest = callPackage ../tools/system/stressapptest { };
-
stoken = callPackage ../tools/security/stoken (config.stoken or {});
- storeBackup = callPackage ../tools/backup/store-backup { };
-
- stow = callPackage ../tools/misc/stow { };
- xstow = callPackage ../tools/misc/xstow { };
-
- stun = callPackage ../tools/networking/stun { };
-
- stunnel = callPackage ../tools/networking/stunnel { };
-
- stuntman = callPackage ../tools/networking/stuntman { };
-
stutter = haskell.lib.compose.justStaticExecutables haskellPackages.stutter;
- strongswan = callPackage ../tools/networking/strongswan { };
strongswanTNC = strongswan.override { enableTNC = true; };
strongswanNM = strongswan.override { enableNetworkManager = true; };
- stylish = callPackage ../applications/misc/stylish { };
-
stylish-haskell = haskell.lib.compose.justStaticExecutables haskellPackages.stylish-haskell;
su = shadow.su;
- subjs = callPackage ../tools/security/subjs { };
-
- subsonic = callPackage ../servers/misc/subsonic { };
-
- subfinder = callPackage ../tools/networking/subfinder { };
-
subzerod = with python3Packages; toPythonApplication subzerod;
suckit = callPackage ../tools/networking/suckit {
inherit (darwin.apple_sdk.frameworks) Security;
};
- surfraw = callPackage ../tools/networking/surfraw { };
-
- swagger-cli = callPackage ../tools/networking/swagger-cli { };
-
- swagger-codegen = callPackage ../tools/networking/swagger-codegen { };
-
- swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { };
-
- swaggerhole = callPackage ../tools/security/swaggerhole { };
-
- swapview = callPackage ../os-specific/linux/swapview { };
-
- swc = callPackage ../development/tools/swc { };
-
- swtpm = callPackage ../tools/security/swtpm { };
-
- svnfs = callPackage ../tools/filesystems/svnfs { };
-
- svtplay-dl = callPackage ../tools/misc/svtplay-dl { };
-
- sycl-info = callPackage ../development/libraries/sycl-info { };
-
- symengine = callPackage ../development/libraries/symengine { };
-
- synaesthesia = callPackage ../applications/audio/synaesthesia { };
-
- sysbench = callPackage ../development/tools/misc/sysbench { };
-
- systemc = callPackage ../applications/science/electronics/systemc { };
-
system-config-printer = callPackage ../tools/misc/system-config-printer {
autoreconfHook = buildPackages.autoreconfHook269;
libxml2 = libxml2Python;
};
- systembus-notify = callPackage ../applications/misc/systembus-notify { };
-
- stricat = callPackage ../tools/security/stricat { };
-
- stone-phaser = callPackage ../applications/audio/stone-phaser { };
-
- systrayhelper = callPackage ../tools/misc/systrayhelper { };
-
privoxy = callPackage ../tools/networking/privoxy {
w3m = w3m-batch;
};
- swaks = callPackage ../tools/networking/swaks { };
-
- swiftbar = callPackage ../os-specific/darwin/swiftbar { };
-
- swiften = callPackage ../development/libraries/swiften { };
-
- squeekboard = callPackage ../applications/accessibility/squeekboard { };
-
systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { };
t = callPackage ../tools/misc/t { };
@@ -12504,78 +5509,20 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- tagtime = callPackage ../applications/misc/tagtime { };
-
- tailer = callPackage ../tools/misc/tailer { };
-
tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { };
- tango = callPackage ../applications/misc/tango { };
-
- tangram = callPackage ../applications/networking/instant-messengers/tangram { };
-
- t1utils = callPackage ../tools/misc/t1utils { };
-
- talkfilters = callPackage ../misc/talkfilters { };
-
- znapzend = callPackage ../tools/backup/znapzend { };
-
- tar2ext4 = callPackage ../tools/filesystems/tar2ext4 { };
-
- targetcli = callPackage ../os-specific/linux/targetcli { };
-
- target-isns = callPackage ../os-specific/linux/target-isns { };
-
- tarsnap = callPackage ../tools/backup/tarsnap { };
-
- tarsnapper = callPackage ../tools/backup/tarsnapper { };
-
- tarantool = callPackage ../servers/tarantool { };
-
- tarssh = callPackage ../servers/tarssh { };
-
tartube = callPackage ../applications/video/tartube { };
tartube-yt-dlp = callPackage ../applications/video/tartube {
youtube-dl = yt-dlp;
};
- tayga = callPackage ../tools/networking/tayga { };
-
- tcb = callPackage ../tools/security/tcb { };
-
- tcpcrypt = callPackage ../tools/security/tcpcrypt { };
-
- tcptraceroute = callPackage ../tools/networking/tcptraceroute { };
-
- tboot = callPackage ../tools/security/tboot { };
-
- tagutil = callPackage ../applications/audio/tagutil { };
-
- tcpdump = callPackage ../tools/networking/tcpdump { };
-
- tcpflow = callPackage ../tools/networking/tcpflow { };
-
- tcpkali = callPackage ../applications/networking/tcpkali { };
-
tcpreplay = callPackage ../tools/networking/tcpreplay {
inherit (darwin.apple_sdk.frameworks) Carbon CoreServices;
};
- tdns-cli = callPackage ../tools/networking/tdns-cli { };
-
- tea = callPackage ../tools/misc/tea { };
-
- teavpn2 = callPackage ../tools/networking/teavpn2 { };
-
- ted = callPackage ../tools/typesetting/ted { };
-
teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
- teehee = callPackage ../applications/editors/teehee { };
-
- teip = callPackage ../tools/text/teip { };
-
inherit (callPackages ../servers/teleport {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
buildGoModule = buildGo122Module;
@@ -12585,24 +5532,10 @@ with pkgs;
pythonPackages = python3Packages;
};
- telepresence2 = callPackage ../tools/networking/telepresence2 { };
-
- teler = callPackage ../tools/security/teler { };
-
- termcolor = callPackage ../development/libraries/termcolor { };
-
termscp = callPackage ../tools/networking/termscp {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation Security;
};
- termius = callPackage ../applications/networking/termius { };
-
- termplay = callPackage ../tools/misc/termplay { };
-
- tetrd = callPackage ../applications/networking/tetrd { };
-
- tewisay = callPackage ../tools/misc/tewisay { };
-
texmacs = libsForQt5.callPackage ../applications/editors/texmacs {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
extraFonts = true;
@@ -12616,18 +5549,6 @@ with pkgs;
texworks = qt6Packages.callPackage ../applications/editors/texworks { };
- tf2pulumi = callPackage ../development/tools/tf2pulumi { };
-
- thc-hydra = callPackage ../tools/security/thc-hydra { };
-
- thc-ipv6 = callPackage ../tools/security/thc-ipv6 { };
-
- thedesk = callPackage ../applications/misc/thedesk { };
-
- theharvester = callPackage ../tools/security/theharvester { };
-
- thelounge = callPackage ../applications/networking/irc/thelounge { };
-
theLoungePlugins = let
pkgs = lib.filterAttrs (name: _: lib.hasPrefix "thelounge-" name) nodePackages;
getPackagesWithPrefix = prefix: lib.mapAttrs' (name: pkg: lib.nameValuePair (lib.removePrefix ("thelounge-" + prefix + "-") name) pkg)
@@ -12638,148 +5559,40 @@ with pkgs;
themes = lib.recurseIntoAttrs (getPackagesWithPrefix "theme");
};
- theme-sh = callPackage ../tools/misc/theme-sh { };
-
- thiefmd = callPackage ../applications/editors/thiefmd { };
-
- thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { };
-
thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { };
- threatest = callPackage ../tools/security/threatest { };
-
- threema-desktop = callPackage ../applications/networking/instant-messengers/threema-desktop { };
-
- tidy-viewer = callPackage ../tools/text/tidy-viewer { };
-
tiled = libsForQt5.callPackage ../applications/editors/tiled { };
- tiledb = callPackage ../development/libraries/tiledb { };
-
- timemachine = callPackage ../applications/audio/timemachine { };
-
- timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { };
-
- timelens = callPackage ../applications/video/timelens { };
-
timetrap = callPackage ../applications/office/timetrap { };
- timetagger = callPackage ../servers/timetagger { };
-
- timetagger_cli = callPackage ../tools/misc/timetagger_cli { };
-
- timezonemap = callPackage ../development/libraries/timezonemap { };
-
- tzupdate = callPackage ../applications/misc/tzupdate { };
-
tinc = callPackage ../tools/networking/tinc { };
- tie = callPackage ../development/tools/misc/tie { };
-
- tidb = callPackage ../servers/tidb { };
-
tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };
tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
- tinycbor = callPackage ../development/libraries/tinycbor { };
-
- tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { };
-
- tinyobjloader = callPackage ../development/libraries/tinyobjloader { };
-
- tinyprog = callPackage ../development/embedded/fpga/tinyprog { };
-
- tinyproxy = callPackage ../tools/networking/tinyproxy { };
-
- time-decode = callPackage ../tools/misc/time-decode { };
-
- timer = callPackage ../tools/misc/timer { };
-
- tiv = callPackage ../applications/misc/tiv { };
-
- tkman = callPackage ../tools/misc/tkman { };
-
- tldr = callPackage ../tools/misc/tldr { };
-
tldr-hs = haskellPackages.tldr;
- tlsclient = callPackage ../tools/admin/tlsclient { };
-
- tlsx = callPackage ../tools/security/tlsx { };
-
- tmate = callPackage ../tools/misc/tmate { };
-
- tmate-ssh-server = callPackage ../servers/tmate-ssh-server { };
-
- tml = callPackage ../tools/text/tml { };
-
- tmpwatch = callPackage ../tools/misc/tmpwatch { };
-
- tmpmail = callPackage ../applications/networking/tmpmail { };
-
- tmux = callPackage ../tools/misc/tmux { };
-
- tmuxp = callPackage ../tools/misc/tmuxp { };
-
- tmuxinator = callPackage ../tools/misc/tmuxinator { };
-
- tmux-mem-cpu-load = callPackage ../tools/misc/tmux-mem-cpu-load { };
-
tmux-sessionizer = callPackage ../tools/misc/tmux-sessionizer {
inherit (darwin.apple_sdk.frameworks) Security;
};
- tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { };
-
tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins {
pkgs = pkgs.__splicedPackages;
});
- tncattach = callPackage ../applications/radio/tncattach { };
-
- to-html = callPackage ../tools/text/to-html { };
-
- toilet = callPackage ../tools/misc/toilet { };
-
tokei = callPackage ../development/tools/misc/tokei {
inherit (darwin.apple_sdk.frameworks) Security;
};
- tokio-console = callPackage ../development/tools/tokio-console { };
-
- toml2json = callPackage ../development/tools/toml2json { };
-
- toml2nix = callPackage ../development/tools/toml2nix { };
-
- topfew = callPackage ../tools/text/topfew { };
-
- topfew-rs = callPackage ../tools/text/topfew-rs { };
-
topgrade = callPackage ../tools/misc/topgrade {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
};
- topiary = callPackage ../development/tools/misc/topiary { };
-
- todo = callPackage ../tools/misc/todo { };
-
- toolbox = callPackage ../applications/virtualization/toolbox { };
-
tor = callPackage ../tools/security/tor { };
- touchegg = callPackage ../tools/inputmethods/touchegg { };
-
- torrent7z = callPackage ../tools/archivers/torrent7z { };
-
torsocks = callPackage ../tools/security/tor/torsocks.nix { };
- toss = callPackage ../tools/networking/toss { };
-
- tox-node = callPackage ../tools/networking/tox-node { };
-
- toxvpn = callPackage ../tools/networking/toxvpn { };
-
toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox { };
trackma = callPackage ../tools/misc/trackma { };
@@ -12790,24 +5603,8 @@ with pkgs;
trackma-qt = trackma.override { withQT = true; };
- tran = callPackage ../tools/networking/tran { };
-
tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
- tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };
-
- tpm-tools = callPackage ../tools/security/tpm-tools { };
-
- tpm-luks = callPackage ../tools/security/tpm-luks { };
-
- tpm2-abrmd = callPackage ../tools/security/tpm2-abrmd { };
-
- tpm2-pkcs11 = callPackage ../misc/tpm2-pkcs11 { };
-
- tpm2-tools = callPackage ../tools/security/tpm2-tools { };
-
- trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules { };
-
trezorctl = with python3Packages; toPythonApplication trezor;
trezord = callPackage ../servers/trezord {
@@ -12816,110 +5613,38 @@ with pkgs;
trezor-agent = with python3Packages; toPythonApplication trezor-agent;
- trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
-
trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
};
- tthsum = callPackage ../applications/misc/tthsum { };
-
- ttdl = callPackage ../applications/misc/ttdl { };
-
ttp = with python3.pkgs; toPythonApplication ttp;
trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
kernelshark = qt6Packages.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { };
- traceroute = callPackage ../tools/networking/traceroute { };
-
- tracebox = callPackage ../tools/networking/tracebox { };
-
tracee = callPackage ../tools/security/tracee {
clang = clang_14;
};
- tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { };
-
- tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { };
-
- transifex-cli = callPackage ../applications/misc/transifex-cli { };
-
- translatelocally = callPackage ../applications/misc/translatelocally { };
-
translatelocally-models = recurseIntoAttrs (callPackages ../misc/translatelocally-models { });
- translate-shell = callPackage ../applications/misc/translate-shell { };
-
translatepy = with python3.pkgs; toPythonApplication translatepy;
- trash-cli = callPackage ../tools/misc/trash-cli { };
-
- trashy = callPackage ../tools/misc/trashy { };
-
- trdl-client = callPackage ../tools/misc/trdl-client { };
-
trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { };
- trickle = callPackage ../tools/networking/trickle { };
-
- node-manta = callPackage ../tools/admin/manta { };
-
- triton = callPackage ../tools/admin/triton { };
-
- triggerhappy = callPackage ../tools/inputmethods/triggerhappy { };
-
inherit (callPackage ../applications/office/trilium {})
trilium-desktop
trilium-server
;
- trippy = callPackage ../tools/networking/trippy { };
-
- trousers = callPackage ../tools/security/trousers { };
-
- trueseeing = callPackage ../tools/security/trueseeing { };
-
- trx = callPackage ../tools/audio/trx { };
-
- tryton = callPackage ../applications/office/tryton { };
-
trytond = with python3Packages; toPythonApplication trytond;
- tun2socks = callPackage ../tools/networking/tun2socks { };
-
- tuntox = callPackage ../tools/networking/tuntox { };
-
- tunwg = callPackage ../tools/networking/tunwg { };
-
- ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
-
ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint {
autoreconfHook = buildPackages.autoreconfHook269;
};
ttfautohint-nox = ttfautohint.override { enableGUI = false; };
- tty-clock = callPackage ../tools/misc/tty-clock { };
-
- tty-share = callPackage ../applications/misc/tty-share { };
-
- ttyplot = callPackage ../tools/misc/ttyplot { };
-
- ttygif = callPackage ../tools/misc/ttygif { };
-
- ttylog = callPackage ../tools/misc/ttylog { };
-
- ipbt = callPackage ../tools/misc/ipbt { };
-
- tuckr = callPackage ../applications/misc/tuckr { };
-
- tuhi = callPackage ../applications/misc/tuhi { };
-
- tui-journal = callPackage ../applications/misc/tui-journal { };
-
- tuir = callPackage ../applications/misc/tuir { };
-
tuifeed = callPackage ../applications/networking/feedreaders/tuifeed {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -12928,243 +5653,45 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- tuptime = callPackage ../tools/system/tuptime { };
-
- turses = callPackage ../applications/networking/instant-messengers/turses { };
-
- tutanota-desktop = callPackage ../applications/networking/mailreaders/tutanota-desktop { };
-
- tv = callPackage ../tools/text/tv { };
-
- tvm = callPackage ../development/compilers/tvm { };
-
- ttfb = callPackage ../development/tools/ttfb { };
-
twilight = callPackage ../tools/graphics/twilight {
libX11 = xorg.libX11;
};
twitch-chat-downloader = python3Packages.callPackage ../applications/misc/twitch-chat-downloader { };
- twitterBootstrap = callPackage ../development/web/twitter-bootstrap { };
-
- twspace-crawler = callPackage ../tools/misc/twspace-crawler { };
-
- twspace-dl = callPackage ../tools/misc/twspace-dl { };
-
twtxt = python3Packages.callPackage ../applications/networking/twtxt { };
twurl = callPackage ../tools/misc/twurl { };
- txt2man = callPackage ../tools/misc/txt2man { };
-
- txt2tags = callPackage ../tools/text/txt2tags { };
-
- txtw = callPackage ../tools/misc/txtw { };
-
- tydra = callPackage ../tools/misc/tydra { };
-
typesense = callPackage ../servers/search/typesense { };
- tz = callPackage ../tools/misc/tz { };
-
- u9fs = callPackage ../servers/u9fs { };
-
- ua = callPackage ../tools/networking/ua { };
-
- uair = callPackage ../tools/misc/uair { };
-
ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { };
- ubi_reader = callPackage ../tools/filesystems/ubi_reader { };
-
ubpm = libsForQt5.callPackage ../applications/misc/ubpm { };
- ubertooth = callPackage ../applications/radio/ubertooth { };
-
- ucarp = callPackage ../servers/ucarp { };
-
- ucl = callPackage ../development/libraries/ucl { };
-
- ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { };
-
- udftools = callPackage ../tools/filesystems/udftools { };
-
- udp2raw = callPackage ../tools/networking/udp2raw { };
-
- udpreplay = callPackage ../tools/networking/udpreplay { };
-
- udpt = callPackage ../servers/udpt { };
-
- udptunnel = callPackage ../tools/networking/udptunnel { };
-
- udpx = callPackage ../tools/security/udpx { };
-
- uftrace = callPackage ../development/tools/uftrace { };
-
uftraceFull = uftrace.override {
withLuaJIT = true;
withPython = true;
};
- uftpd = callPackage ../servers/ftp/uftpd {};
-
- uget = callPackage ../tools/networking/uget { };
-
- uget-integrator = callPackage ../tools/networking/uget-integrator { };
-
- ugrep = callPackage ../tools/text/ugrep { };
-
- ugs = callPackage ../tools/misc/ugs { };
-
- uhk-agent = callPackage ../os-specific/linux/uhk-agent { };
-
- uhk-udev-rules = callPackage ../os-specific/linux/uhk-udev-rules { };
-
- uif2iso = callPackage ../tools/cd-dvd/uif2iso { };
-
- uivonim = callPackage ../applications/editors/uivonim { };
-
- ulid = callPackage ../tools/misc/ulid { };
-
- umlet = callPackage ../tools/misc/umlet { };
-
unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { };
- unfs3 = callPackage ../servers/unfs3 { };
-
- unfurl = callPackage ../tools/text/unfurl { };
-
- unixbench = callPackage ../development/tools/misc/unixbench { };
-
- unoconv = callPackage ../tools/text/unoconv { };
-
- unrtf = callPackage ../tools/text/unrtf { };
-
unrpa = with python3Packages; toPythonApplication unrpa;
- untex = callPackage ../tools/text/untex { };
-
- untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { };
-
- unzrip = callPackage ../tools/compression/unzrip { };
-
- up = callPackage ../tools/misc/up { };
-
- upterm = callPackage ../tools/misc/upterm { };
-
- upx = callPackage ../tools/compression/upx { };
-
- uq = callPackage ../misc/uq { };
-
- uqmi = callPackage ../tools/networking/uqmi { };
-
- urdfdom = callPackage ../development/libraries/urdfdom { };
-
- urdfdom-headers = callPackage ../development/libraries/urdfdom-headers { };
-
- urlencode = callPackage ../tools/misc/urlencode {};
-
- uriparser = callPackage ../development/libraries/uriparser { };
-
- urlscan = callPackage ../applications/misc/urlscan { };
-
- url-parser = callPackage ../tools/misc/url-parser { };
-
- urn-timer = callPackage ../tools/misc/urn-timer { };
-
- ursadb = callPackage ../servers/ursadb { };
-
- usbmuxd = callPackage ../tools/misc/usbmuxd { };
-
- usbmuxd2 = callPackage ../tools/misc/usbmuxd2 { };
-
usort = with python3Packages; toPythonApplication usort;
- ustreamer = callPackage ../applications/video/ustreamer { };
-
- usync = callPackage ../applications/misc/usync { };
-
- uwc = callPackage ../tools/text/uwc { };
-
- uwsgi = callPackage ../servers/uwsgi { };
-
- uwufetch = callPackage ../tools/misc/uwufetch { };
-
- v2ray = callPackage ../tools/networking/v2ray { };
-
- v2raya = callPackage ../tools/networking/v2raya { };
-
- v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { };
-
- v2ray-geoip = callPackage ../data/misc/v2ray-geoip { };
-
vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum {};
- validator-nu = callPackage ../tools/text/validator-nu { };
-
vampire = callPackage ../applications/science/logic/vampire { };
- vdmfec = callPackage ../applications/backup/vdmfec { };
-
- vk-bootstrap = callPackage ../development/libraries/vk-bootstrap { };
-
- vk-cli = callPackage ../applications/networking/instant-messengers/vk-cli { };
-
- vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger { };
-
- volatility3 = callPackage ../tools/security/volatility3 { };
-
- vbetool = callPackage ../tools/system/vbetool { };
-
- vcsi = callPackage ../tools/video/vcsi { };
-
- vde2 = callPackage ../tools/networking/vde2 { };
-
- vboot_reference = callPackage ../tools/system/vboot_reference { };
-
- vcftools = callPackage ../applications/science/biology/vcftools { };
-
vcmi = libsForQt5.callPackage ../games/vcmi { };
- vcsh = callPackage ../applications/version-management/vcsh { };
-
- vcs_query = callPackage ../tools/misc/vcs_query { };
-
- vcstool = callPackage ../development/tools/vcstool { };
-
- vectorscan = callPackage ../development/libraries/vectorscan { };
-
- verco = callPackage ../applications/version-management/verco { };
-
- verilator = callPackage ../applications/science/electronics/verilator { };
-
- versus = callPackage ../applications/networking/versus { };
-
- vexctl = callPackage ../tools/security/vexctl { };
-
- vgrep = callPackage ../tools/text/vgrep { };
-
- vhd2vl = callPackage ../applications/science/electronics/vhd2vl { };
-
- vhdl-ls = callPackage ../development/tools/language-servers/vhdl-ls { };
-
video2midi = callPackage ../tools/audio/video2midi {
pythonPackages = python3Packages;
};
- via = callPackage ../tools/misc/via { };
-
- vial = callPackage ../tools/misc/vial { };
-
- viking = callPackage ../applications/misc/viking { };
-
vikunja = callPackage ../by-name/vi/vikunja/package.nix { pnpm = pnpm_9; };
- vim-vint = callPackage ../development/tools/vim-vint { };
-
- vimer = callPackage ../tools/misc/vimer { };
-
vimpager = callPackage ../tools/misc/vimpager { };
vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { };
@@ -13172,40 +5699,10 @@ with pkgs;
visidata = python3Packages.callPackage ../applications/misc/visidata { };
- vit = callPackage ../applications/misc/vit { };
-
- viu = callPackage ../tools/graphics/viu { };
-
- vix = callPackage ../tools/misc/vix { };
-
vkbasalt = callPackage ../tools/graphics/vkbasalt {
vkbasalt32 = pkgsi686Linux.vkbasalt;
};
- vkbasalt-cli = callPackage ../tools/graphics/vkbasalt-cli { };
-
- vkmark = callPackage ../tools/graphics/vkmark { };
-
- vncrec = callPackage ../tools/video/vncrec { };
-
- vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { };
-
- vo-aacenc = callPackage ../development/libraries/vo-aacenc { };
-
- vobcopy = callPackage ../tools/cd-dvd/vobcopy { };
-
- vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { };
-
- void = callPackage ../tools/misc/void { };
-
- volume_key = callPackage ../development/libraries/volume-key { };
-
- vorbisgain = callPackage ../tools/misc/vorbisgain { };
-
- vpnc = callPackage ../tools/networking/vpnc { };
-
- vpnc-scripts = callPackage ../tools/networking/vpnc-scripts { };
-
vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { };
vpWithSixel = vp.override {
@@ -13214,16 +5711,10 @@ with pkgs;
SDL = SDL_sixel;
};
- vtm = callPackage ../tools/misc/vtm { };
-
- witness = callPackage ../tools/security/witness { };
-
openconnectPackages = callPackage ../tools/networking/openconnect { };
inherit (openconnectPackages) openconnect openconnect_openssl;
- ding-libs = callPackage ../tools/misc/ding-libs { };
-
sssd = callPackage ../os-specific/linux/sssd {
inherit (perlPackages) Po4a;
# python312Packages.python-ldap is broken
@@ -13235,186 +5726,71 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
};
- sentry-native = callPackage ../development/libraries/sentry-native { };
-
- twilio-cli = callPackage ../development/tools/twilio-cli { };
-
waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp {
inherit (darwin.apple_sdk.frameworks) OpenCL;
};
- wambo = callPackage ../development/tools/wambo { };
-
- weather = callPackage ../applications/misc/weather { };
-
- wego = callPackage ../applications/misc/wego { };
-
- wander = callPackage ../tools/admin/wander { };
-
watchexec = callPackage ../tools/misc/watchexec {
inherit (darwin.apple_sdk.frameworks) Cocoa AppKit;
};
- watchlog = callPackage ../tools/misc/watchlog { };
-
watchman = darwin.apple_sdk_11_0.callPackage ../development/tools/watchman {
inherit (darwin.apple_sdk_11_0.frameworks) CoreServices;
};
- wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse { };
-
- wbox = callPackage ../tools/networking/wbox { };
-
webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1";
webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1";
wasm-strip = nodePackages."@webassemblyjs/wasm-strip";
wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1";
wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1";
- wasm-tools = callPackage ../tools/misc/wasm-tools { };
-
wasmedge = callPackage ../development/tools/wasmedge {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else llvmPackages.stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) Foundation;
};
- wasmi = callPackage ../development/tools/wasmi { };
-
- wasmserve = callPackage ../development/tools/wasmserve {};
-
- welkin = callPackage ../tools/graphics/welkin { };
-
- wemux = callPackage ../tools/misc/wemux { };
-
- wf-recorder = callPackage ../applications/video/wf-recorder { };
-
- whatip = callPackage ../tools/networking/whatip { };
-
- whatsapp-chat-exporter = callPackage ../tools/misc/whatsapp-chat-exporter { };
-
whatweb = callPackage ../tools/security/whatweb { };
- whipper = callPackage ../applications/audio/whipper { };
-
- whitebophir = callPackage ../servers/web-apps/whitebophir { };
-
- whois = callPackage ../tools/networking/whois { };
-
- wimboot = callPackage ../tools/misc/wimboot { };
-
- wire = callPackage ../development/tools/wire { };
-
wireguard-tools = callPackage ../tools/networking/wireguard-tools { };
wireguard-vanity-address = callPackage ../tools/networking/wireguard-vanity-address {
inherit (darwin.apple_sdk.frameworks) Security;
};
- wiringpi = callPackage ../os-specific/linux/wiringpi { };
-
- wg-friendly-peer-names = callPackage ../tools/networking/wg-friendly-peer-names { };
-
wg-netmanager = callPackage ../tools/networking/wg-netmanager {
inherit (darwin.apple_sdk.frameworks) Security;
};
- wgautomesh = callPackage ../tools/networking/wgautomesh { };
-
- woff2 = callPackage ../development/web/woff2 { };
-
woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { };
woodpecker-cli = callPackage ../development/tools/continuous-integration/woodpecker/cli.nix { };
- woodpecker-plugin-git = callPackage ../development/tools/continuous-integration/woodpecker-plugin-git { };
-
woodpecker-server = callPackage ../development/tools/continuous-integration/woodpecker/server.nix { };
- woof = callPackage ../tools/misc/woof { };
-
- wootility = callPackage ../tools/misc/wootility { };
-
- wormhole-william = callPackage ../tools/networking/wormhole-william { };
-
wpscan = callPackage ../tools/security/wpscan { };
- write-good = callPackage ../tools/text/write-good { };
-
- wsmancli = callPackage ../tools/system/wsmancli { };
-
- wolfebin = callPackage ../tools/networking/wolfebin { };
-
- wthrr = callPackage ../applications/misc/wthrr { };
-
- xautoclick = callPackage ../applications/misc/xautoclick { };
-
- xl2tpd = callPackage ../tools/networking/xl2tpd { };
-
- xe = callPackage ../tools/system/xe { };
-
- xray = callPackage ../tools/networking/xray { };
-
- xteve = callPackage ../servers/xteve { };
-
- termbook = callPackage ../tools/text/termbook { };
-
testdisk = libsForQt5.callPackage ../tools/system/testdisk { };
testdisk-qt = testdisk.override { enableQt = true; };
- textql = callPackage ../development/tools/textql { };
-
- html2text = callPackage ../tools/text/html2text { };
-
- html-tidy = callPackage ../tools/text/html-tidy { };
-
- html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { };
-
htmldoc = callPackage ../tools/typesetting/htmldoc {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation;
};
- htmltest = callPackage ../development/tools/htmltest { };
-
td = callPackage ../tools/misc/td { };
- tdfgo = callPackage ../tools/misc/tdfgo { };
-
- tftp-hpa = callPackage ../tools/networking/tftp-hpa { };
-
- tigervnc = callPackage ../tools/admin/tigervnc { };
-
- time = callPackage ../tools/misc/time { };
-
tweet-hs = haskell.lib.compose.justStaticExecutables haskellPackages.tweet-hs;
- tweeny = callPackage ../development/libraries/tweeny { };
-
tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { };
- tm = callPackage ../tools/system/tm { };
-
- tradcpp = callPackage ../development/tools/tradcpp { };
-
- traitor = callPackage ../tools/security/traitor { };
-
- tre = callPackage ../development/libraries/tre { };
-
tremor-rs = darwin.apple_sdk_11_0.callPackage ../tools/misc/tremor-rs {
inherit (darwin.apple_sdk_11_0.frameworks) Security;
};
tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { };
- truecrack = callPackage ../tools/security/truecrack { };
truecrack-cuda = truecrack.override { cudaSupport = true; };
- ts = callPackage ../tools/system/ts { };
-
- ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
-
- ttwatch = callPackage ../tools/misc/ttwatch { };
-
turbovnc = callPackage ../tools/admin/turbovnc {
# fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ];
libjpeg_turbo = libjpeg_turbo.override { enableJava = true; };
@@ -13422,20 +5798,10 @@ with pkgs;
ufmt = with python3Packages; toPythonApplication ufmt;
- uftp = callPackage ../servers/uftp { };
-
- uhttpmock = callPackage ../development/libraries/uhttpmock { };
-
uim = callPackage ../tools/inputmethods/uim {
autoconf = buildPackages.autoconf269;
};
- uhub = callPackage ../servers/uhub { };
-
- unclutter = callPackage ../tools/misc/unclutter { };
-
- unclutter-xfixes = callPackage ../tools/misc/unclutter-xfixes { };
-
unbound-with-systemd = unbound.override {
withSystemd = true;
};
@@ -13456,64 +5822,16 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- unittest-cpp = callPackage ../development/libraries/unittest-cpp { };
-
- unnaturalscrollwheels = callPackage ../tools/inputmethods/unnaturalscrollwheels { };
-
unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { };
- uptime-kuma = callPackage ../servers/monitoring/uptime-kuma { };
-
- vul = callPackage ../applications/misc/vul { };
-
vuls = callPackage ../by-name/vu/vuls/package.nix {
buildGoModule = buildGo123Module;
};
- xarchiver = callPackage ../tools/archivers/xarchiver { };
-
- xbanish = callPackage ../tools/X11/xbanish { };
-
- xbrightness = callPackage ../tools/X11/xbrightness { };
-
- xdg-launch = callPackage ../applications/misc/xdg-launch { };
-
xdp-tools = callPackage ../tools/networking/xdp-tools {
llvmPackages = llvmPackages_14;
};
- xkbvalidate = callPackage ../tools/X11/xkbvalidate { };
-
- xkeysnail = callPackage ../tools/X11/xkeysnail { };
-
- xfstests = callPackage ../tools/misc/xfstests { };
-
- xprompt = callPackage ../tools/X11/xprompt { };
-
- xprintidle = callPackage ../tools/X11/xprintidle { };
-
- xprintidle-ng = callPackage ../tools/X11/xprintidle-ng { };
-
- xssstate = callPackage ../tools/X11/xssstate { };
-
- xscast = callPackage ../applications/video/xscast { };
-
- xsettingsd = callPackage ../tools/X11/xsettingsd { };
-
- xsensors = callPackage ../os-specific/linux/xsensors { };
-
- xspim = callPackage ../development/tools/misc/xspim { };
-
- xcrawl3r = callPackage ../tools/security/xcrawl3r { };
-
- xcruiser = callPackage ../applications/misc/xcruiser { };
-
- xwallpaper = callPackage ../tools/X11/xwallpaper { };
-
- gxkb = callPackage ../applications/misc/gxkb { };
-
- xxkb = callPackage ../applications/misc/xxkb { };
-
ugarit = callPackage ../tools/backup/ugarit {
inherit (chickenPackages_4) eggDerivation fetchegg;
};
@@ -13522,35 +5840,13 @@ with pkgs;
inherit (chickenPackages_4) eggDerivation fetchegg;
};
- ulogd = callPackage ../os-specific/linux/ulogd { };
-
unar = callPackage ../tools/archivers/unar {
inherit (darwin.apple_sdk.frameworks) Foundation AppKit;
stdenv = clangStdenv;
};
- unp = callPackage ../tools/archivers/unp { };
-
- unshield = callPackage ../tools/archivers/unshield { };
-
- unzip = callPackage ../tools/archivers/unzip { };
-
unzipNLS = lowPrio (unzip.override { enableNLS = true; });
- undmg = callPackage ../tools/archivers/undmg { };
-
- uptimed = callPackage ../tools/system/uptimed { };
-
- upwork = callPackage ../applications/misc/upwork { };
-
- urlhunter = callPackage ../tools/security/urlhunter { };
-
- urlwatch = callPackage ../tools/networking/urlwatch { };
-
- vals = callPackage ../tools/security/vals { };
-
- valum = callPackage ../development/web/valum { };
-
inherit (callPackages ../servers/varnish { })
varnish60 varnish75;
inherit (callPackages ../servers/varnish/packages.nix { })
@@ -13559,22 +5855,12 @@ with pkgs;
varnishPackages = varnish75Packages;
varnish = varnishPackages.varnish;
- hitch = callPackage ../servers/hitch { };
-
- veryfasttree = callPackage ../applications/science/biology/veryfasttree { };
-
viceroy = callPackage ../development/tools/viceroy {
inherit (darwin.apple_sdk.frameworks) Security;
};
- vlan = callPackage ../tools/networking/vlan { };
-
- vmtouch = callPackage ../tools/misc/vmtouch { };
-
vncdo = with python3Packages; toPythonApplication vncdo;
- volumeicon = callPackage ../tools/audio/volumeicon { };
-
# An alias to work around the splicing incidents
# Related:
# https://github.com/NixOS/nixpkgs/issues/204303
@@ -13582,42 +5868,12 @@ with pkgs;
# https://github.com/NixOS/nixpkgs/issues/227327
wafHook = waf.hook;
- waf-tester = callPackage ../tools/security/waf-tester { };
-
wagyu = callPackage ../tools/misc/wagyu {
inherit (darwin.apple_sdk.frameworks) Security;
};
- wakelan = callPackage ../tools/networking/wakelan { };
-
- wavemon = callPackage ../tools/networking/wavemon { };
-
- wdfs = callPackage ../tools/filesystems/wdfs { };
-
web-eid-app = libsForQt5.callPackage ../tools/security/web-eid-app { };
- wdiff = callPackage ../tools/text/wdiff { };
-
- wdisplays = callPackage ../tools/graphics/wdisplays { };
-
- weaviate = callPackage ../servers/search/weaviate { };
-
- webalizer = callPackage ../tools/networking/webalizer { };
-
- webmesh = callPackage ../servers/webmesh { };
-
- wget = callPackage ../tools/networking/wget { };
-
- wget2 = callPackage ../tools/networking/wget2 { };
-
- wg-bond = callPackage ../applications/networking/wg-bond { };
-
- wgcf = callPackage ../applications/networking/wgcf { };
-
- which = callPackage ../tools/system/which { };
-
- whsniff = callPackage ../applications/networking/sniffers/whsniff { };
-
wio = callPackage ../by-name/wi/wio/package.nix {
wlroots = wlroots_0_17;
};
@@ -13627,58 +5883,16 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth;
};
- wipefreespace = callPackage ../tools/filesystems/wipefreespace { };
-
- woeusb = callPackage ../tools/misc/woeusb { };
-
- woeusb-ng = callPackage ../tools/misc/woeusb-ng { };
-
- chase = callPackage ../tools/system/chase { };
-
- wimlib = callPackage ../tools/archivers/wimlib { };
-
- wipe = callPackage ../tools/security/wipe { };
-
wireguard-go = callPackage ../tools/networking/wireguard-go {
buildGoModule = buildGo122Module;
};
- wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { };
-
- wml = callPackage ../development/web/wml { };
-
- wol = callPackage ../tools/networking/wol { };
-
- wolf-shaper = callPackage ../applications/audio/wolf-shaper { };
-
- wpgtk = callPackage ../tools/X11/wpgtk { };
-
- wrap = callPackage ../tools/text/wrap { };
-
wring = nodePackages.wring;
- wrk = callPackage ../tools/networking/wrk { };
-
- wrk2 = callPackage ../tools/networking/wrk2 { };
-
- wsysmon = callPackage ../tools/system/wsysmon { };
-
- wuzz = callPackage ../tools/networking/wuzz { };
-
- wv = callPackage ../tools/misc/wv { };
-
- wv2 = callPackage ../tools/misc/wv2 { };
-
- wvkbd = callPackage ../applications/accessibility/wvkbd { };
-
wyrd = callPackage ../tools/misc/wyrd {
ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
};
- x86info = callPackage ../os-specific/linux/x86info { };
-
- x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
-
xbursttools = callPackage ../tools/misc/xburst-tools {
# It needs a cross compiler for mipsel to build the firmware it will
# load into the Ben Nanonote
@@ -13686,10 +5900,6 @@ with pkgs;
autoconf = buildPackages.autoconf269;
};
- clipnotify = callPackage ../tools/misc/clipnotify { };
-
- clipboard-jh = callPackage ../tools/misc/clipboard-jh { };
-
clipbuzz = callPackage ../tools/misc/clipbuzz {
zig = buildPackages.zig_0_12;
};
@@ -13698,61 +5908,24 @@ with pkgs;
# It is also needed to reduce the amount of unnecessary stuff in the Darwin bootstrap.
xarMinimal = callPackage ../by-name/xa/xar/package.nix { e2fsprogs = null; };
- xclip = callPackage ../tools/misc/xclip { };
-
- xcur2png = callPackage ../tools/graphics/xcur2png { };
-
- xcwd = callPackage ../tools/X11/xcwd { };
-
- xtitle = callPackage ../tools/misc/xtitle { };
-
xdelta = callPackage ../tools/compression/xdelta { };
xdeltaUnstable = callPackage ../tools/compression/xdelta/unstable.nix { };
xdot = with python3Packages; toPythonApplication xdot;
- xdummy = callPackage ../tools/misc/xdummy { };
-
- xdg-ninja = callPackage ../tools/misc/xdg-ninja { };
-
- xdxf2slob = callPackage ../tools/misc/xdxf2slob { };
-
- xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { };
-
xflux = callPackage ../tools/misc/xflux { };
xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { };
- xfsdump = callPackage ../tools/filesystems/xfsdump { };
-
- xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
libxfs = xfsprogs.dev;
- xml2 = callPackage ../tools/text/xml/xml2 { };
-
- xmlformat = callPackage ../tools/text/xml/xmlformat { };
-
- xmlroff = callPackage ../tools/typesetting/xmlroff { };
-
- xmloscopy = callPackage ../tools/text/xml/xmloscopy { };
-
- xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { };
-
xmlto = callPackage ../tools/typesetting/xmlto {
w3m = w3m-batch;
};
- xiccd = callPackage ../tools/misc/xiccd { };
-
xidlehook = callPackage ../tools/X11/xidlehook {
inherit (darwin.apple_sdk.frameworks) Security;
};
- xq-xml = callPackage ../tools/text/xml/xq { };
-
- xsecurelock = callPackage ../tools/X11/xsecurelock { };
-
- xsel = callPackage ../tools/misc/xsel { };
-
xsv = callPackage ../tools/text/xsv {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -13763,28 +5936,12 @@ with pkgs;
xorriso = libisoburn;
- xurls = callPackage ../tools/text/xurls { };
-
- xxv = callPackage ../tools/misc/xxv { };
-
xvfb-run = callPackage ../tools/misc/xvfb-run {
inherit (texFunctions) fontsConf;
};
- xvkbd = callPackage ../tools/X11/xvkbd { };
-
- xwinmosaic = callPackage ../tools/X11/xwinmosaic { };
-
- xwinwrap = callPackage ../tools/X11/xwinwrap { };
-
- yajsv = callPackage ../tools/misc/yajsv { };
-
- yallback = callPackage ../development/tools/analysis/yallback { };
-
yapf = with python3Packages; toPythonApplication yapf;
- yarn = callPackage ../development/tools/yarn { };
-
yarn-berry = callPackage ../development/tools/yarn-berry { };
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; };
@@ -13795,44 +5952,14 @@ with pkgs;
mkYarnModules
fixup_yarn_lock;
- yarr = callPackage ../applications/networking/feedreaders/yarr { };
-
- yascreen = callPackage ../development/libraries/yascreen { };
-
- yasr = callPackage ../applications/audio/yasr { };
-
- yank = callPackage ../tools/misc/yank { };
-
yamlfix = with python3Packages; toPythonApplication yamlfix;
- yamlfmt = callPackage ../development/tools/yamlfmt { };
-
yamllint = with python3Packages; toPythonApplication yamllint;
- yamlpath = callPackage ../development/tools/yamlpath { };
-
- yaml-merge = callPackage ../tools/text/yaml-merge { };
-
- yeshup = callPackage ../tools/system/yeshup { };
-
- ytfzf = callPackage ../tools/misc/ytfzf { };
-
yaydl = callPackage ../tools/video/yaydl {
inherit (darwin.apple_sdk.frameworks) Security;
};
- yx = callPackage ../tools/text/yx { };
-
- zarchive = callPackage ../tools/archivers/zarchive { };
-
- zprint = callPackage ../development/tools/zprint { };
-
- yle-dl = callPackage ../tools/misc/yle-dl { };
-
- you-get = callPackage ../tools/misc/you-get { };
-
- zasm = callPackage ../development/compilers/zasm { };
-
zbackup = callPackage ../tools/backup/zbackup {
protobuf = protobuf_21;
};
@@ -13841,12 +5968,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- zbctl = callPackage ../tools/admin/zbctl { };
-
- zdelta = callPackage ../tools/compression/zdelta { };
-
- zed = callPackage ../development/tools/zed { };
-
zenith = callPackage ../tools/system/zenith {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
@@ -13858,140 +5979,20 @@ with pkgs;
nvidiaSupport = true;
};
- zerofree = callPackage ../tools/filesystems/zerofree { };
-
- zet = callPackage ../tools/text/zet { };
-
- zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { };
-
- zfsbackup = callPackage ../tools/backup/zfsbackup { };
-
- zfstools = callPackage ../tools/filesystems/zfstools { };
-
- zfsnap = callPackage ../tools/backup/zfsnap { };
-
- zpool-auto-expand-partitions = callPackage ../tools/filesystems/zpool-auto-expand-partitions { };
-
- zinnia = callPackage ../tools/inputmethods/zinnia { };
- tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { };
-
- zim-tools = callPackage ../tools/text/zim-tools { };
-
- zimfw = callPackage ../shells/zsh/zimfw { };
-
- zld = callPackage ../development/tools/zld { };
-
- par = callPackage ../tools/text/par { };
-
- zip = callPackage ../tools/archivers/zip { };
-
- zkfuse = callPackage ../tools/filesystems/zkfuse { };
-
zpaq = callPackage ../tools/archivers/zpaq { };
zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };
- zplug = callPackage ../shells/zsh/zplug { };
-
- zps = callPackage ../tools/system/zps { };
-
- zi = callPackage ../shells/zsh/zi { };
-
- zinit = callPackage ../shells/zsh/zinit {} ;
-
zint = qt6Packages.callPackage ../development/libraries/zint { };
- zs-apc-spdu-ctl = callPackage ../tools/networking/zs-apc-spdu-ctl { };
-
- zs-wait4host = callPackage ../tools/networking/zs-wait4host { };
-
- zstxtns-utils = callPackage ../tools/text/zstxtns-utils { };
-
- zsh-abbr = callPackage ../shells/zsh/zsh-abbr { };
-
- zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };
-
- zsh-autopair = callPackage ../shells/zsh/zsh-autopair { };
-
- zsh-bd = callPackage ../shells/zsh/zsh-bd { };
-
- zsh-better-npm-completion = callPackage ../shells/zsh/zsh-better-npm-completion { };
-
- zsh-clipboard = callPackage ../shells/zsh/zsh-clipboard { };
-
- zsh-defer = callPackage ../shells/zsh/zsh-defer { };
-
- zsh-edit = callPackage ../shells/zsh/zsh-edit { };
-
- zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
-
- zsh-history = callPackage ../shells/zsh/zsh-history { };
-
- zsh-history-search-multi-word = callPackage ../shells/zsh/zsh-history-search-multi-word { };
-
- zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { };
-
- zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };
-
- zsh-nix-shell = callPackage ../shells/zsh/zsh-nix-shell { };
-
- zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { };
-
- zsh-system-clipboard = callPackage ../shells/zsh/zsh-system-clipboard { };
-
- zsh-f-sy-h = callPackage ../shells/zsh/zsh-f-sy-h { };
-
- zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { };
-
- zsh-forgit = callPackage ../shells/zsh/zsh-forgit { };
-
- zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { };
-
- zsh-autocomplete = callPackage ../shells/zsh/zsh-autocomplete { };
-
- zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { };
-
- zsh-powerlevel10k = callPackage ../shells/zsh/zsh-powerlevel10k { };
-
- zsh-powerlevel9k = callPackage ../shells/zsh/zsh-powerlevel9k { };
-
- zsh-command-time = callPackage ../shells/zsh/zsh-command-time { };
-
- zsh-fzf-history-search = callPackage ../shells/zsh/zsh-fzf-history-search { };
-
- zsh-vi-mode = callPackage ../shells/zsh/zsh-vi-mode { };
-
- zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { };
-
- zsh-z = callPackage ../shells/zsh/zsh-z { };
-
- zssh = callPackage ../tools/networking/zssh { };
-
zstd = callPackage ../tools/compression/zstd {
cmake = buildPackages.cmakeMinimal;
};
- zsv = callPackage ../development/tools/zsv { };
-
- zxing = callPackage ../tools/graphics/zxing { };
-
- zkar = callPackage ../tools/security/zkar { };
-
- zlint = callPackage ../tools/security/zlint { };
-
- zmap = callPackage ../tools/security/zmap { };
-
- zmusic = callPackage ../development/libraries/zmusic { };
-
- zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { };
-
-
### SHELLS
runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}";
runtimeShellPackage = bash;
- agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { };
-
bash = lowPrio (callPackage ../shells/bash/5.nix { });
# WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
bashInteractive = callPackage ../shells/bash/5.nix {
@@ -14004,68 +6005,18 @@ with pkgs;
forFHSEnv = true;
};
- bash-completion = callPackage ../shells/bash/bash-completion { };
-
- gradle-completion = callPackage ../shells/zsh/gradle-completion { };
-
- nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { };
-
- yarn-bash-completion = callPackage ../shells/bash/yarn-completion { };
-
- blesh = callPackage ../shells/bash/blesh { };
-
- undistract-me = callPackage ../shells/bash/undistract-me { };
-
carapace = callPackage ../shells/carapace {
buildGoModule = buildGo123Module;
};
- dash = callPackage ../shells/dash { };
-
- dasht = callPackage ../tools/misc/dasht { };
-
- dashing = callPackage ../tools/misc/dashing { };
-
- es = callPackage ../shells/es { };
-
fish = callPackage ../shells/fish { };
wrapFish = callPackage ../shells/fish/wrapper.nix { };
fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { });
- fzf-git-sh = callPackage ../shells/fzf-git-sh { };
-
- hishtory = callPackage ../shells/hishtory { };
-
- ion = callPackage ../shells/ion { };
-
- ksh = callPackage ../shells/ksh { };
-
- liquidprompt = callPackage ../shells/liquidprompt { };
-
- murex = callPackage ../shells/murex { };
-
- oh = callPackage ../shells/oh { };
-
- oksh = callPackage ../shells/oksh { };
-
- scponly = callPackage ../shells/scponly { };
-
- rush = callPackage ../shells/rush { };
-
zsh = callPackage ../shells/zsh { };
- nix-zsh-completions = callPackage ../shells/zsh/nix-zsh-completions { };
-
- zsh-completions = callPackage ../shells/zsh/zsh-completions { };
-
- zsh-prezto = callPackage ../shells/zsh/zsh-prezto { };
-
- yash = callPackage ../shells/yash { };
-
- grml-zsh-config = callPackage ../shells/zsh/grml-zsh-config { };
-
powerline = with python3Packages; toPythonApplication powerline;
### DEVELOPMENT / COMPILERS
@@ -14108,40 +6059,18 @@ with pkgs;
alan_2 = callPackage ../development/compilers/alan/2.nix { };
- alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { };
-
- ante = callPackage ../development/compilers/ante { };
-
armips = callPackage ../development/compilers/armips {
stdenv = gcc10Stdenv;
};
- arachne-pnr = callPackage ../development/compilers/arachne-pnr { };
-
- asciigraph = callPackage ../tools/text/asciigraph { };
-
autocorrect = callPackage ../tools/text/autocorrect {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- aspectj = callPackage ../development/compilers/aspectj { };
-
- ats = callPackage ../development/compilers/ats { };
-
- ats-acc = callPackage ../development/tools/ats-acc { };
-
- august = callPackage ../development/compilers/august { };
-
- avra = callPackage ../development/compilers/avra { };
-
ballerina = callPackage ../development/compilers/ballerina {
openjdk = openjdk17_headless;
};
- bfc = callPackage ../development/compilers/bfc { };
-
- bigloo = callPackage ../development/compilers/bigloo { };
-
binaryen = callPackage ../development/compilers/binaryen {
nodejs = nodejs-slim;
inherit (python3Packages) filecheck;
@@ -14151,18 +6080,10 @@ with pkgs;
gmp-static = gmp.override { withStatic = true; };
};
- bun = callPackage ../development/web/bun { };
-
- cakelisp = callPackage ../development/compilers/cakelisp { };
-
- ciao = callPackage ../development/compilers/ciao { };
-
codon = callPackage ../development/compilers/codon {
inherit (llvmPackages_14) lld stdenv;
};
- colm = callPackage ../development/compilers/colm { };
-
colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; };
colmapWithCuda = colmap.override { cudaSupport = true; };
@@ -14182,18 +6103,6 @@ with pkgs;
stdenv = gccStdenv;
};
- chez = callPackage ../development/compilers/chez { };
-
- chez-racket = callPackage ../development/compilers/chez-racket { };
-
- chez-srfi = callPackage ../development/chez-modules/chez-srfi { };
-
- chez-mit = callPackage ../development/chez-modules/chez-mit { };
-
- chez-scmutils = callPackage ../development/chez-modules/chez-scmutils { };
-
- chez-matchable = callPackage ../development/chez-modules/chez-matchable { };
-
libclang = llvmPackages.libclang;
clang-manpages = llvmPackages.clang-manpages;
@@ -14221,21 +6130,12 @@ with pkgs;
clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv;
libcxxStdenv = if stdenv.hostPlatform.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv;
- clean = callPackage ../development/compilers/clean { };
-
- closurecompiler = callPackage ../development/compilers/closure { };
-
- cmdstan = callPackage ../development/compilers/cmdstan { };
-
- coffeescript = callPackage ../development/compilers/coffeescript { };
-
comby = callPackage ../development/tools/comby {
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
inherit (coqPackages) compcert;
- computecpp-unwrapped = callPackage ../development/compilers/computecpp { };
computecpp = wrapCCWith rec {
cc = computecpp-unwrapped;
extraPackages = [
@@ -14254,8 +6154,6 @@ with pkgs;
'';
};
- copper = callPackage ../development/compilers/copper { };
-
corretto11 = javaPackages.compiler.corretto11;
corretto17 = javaPackages.compiler.corretto17;
corretto21 = javaPackages.compiler.corretto21;
@@ -14274,45 +6172,25 @@ with pkgs;
crystal_1_14
crystal;
- crystal2nix = callPackage ../development/compilers/crystal2nix { };
-
crystalline = callPackage ../development/tools/language-servers/crystalline {
llvmPackages = crystal.llvmPackages;
};
- icr = callPackage ../development/tools/icr { };
-
scry = callPackage ../development/tools/scry { crystal = crystal_1_2; };
- dasm = callPackage ../development/compilers/dasm { };
-
- dbmate = callPackage ../development/tools/database/dbmate { };
-
- dbmonster = callPackage ../tools/security/dbmonster { };
-
devpi-client = python3Packages.callPackage ../development/tools/devpi-client { };
devpi-server = python3Packages.callPackage ../development/tools/devpi-server { };
- dictu = callPackage ../development/compilers/dictu { };
-
- eli = callPackage ../development/compilers/eli { };
-
- erg = callPackage ../development/compilers/erg { };
-
elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix;
elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });
- apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { };
-
fasm = pkgsi686Linux.callPackage ../development/compilers/fasm {
inherit (stdenv.hostPlatform) isx86_64;
};
fasm-bin = callPackage ../development/compilers/fasm/bin.nix { };
- fasmg = callPackage ../development/compilers/fasmg { };
-
fbc = if stdenv.hostPlatform.isDarwin then
callPackage ../development/compilers/fbc/mac-bin.nix { }
else
@@ -14320,12 +6198,6 @@ with pkgs;
filecheck = with python3Packages; toPythonApplication filecheck;
- firrtl = callPackage ../development/compilers/firrtl { };
-
- flasm = callPackage ../development/compilers/flasm { };
-
- fluidd = callPackage ../applications/misc/fluidd { };
-
flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });
flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; });
flutterPackages = flutterPackages-bin;
@@ -14339,12 +6211,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security;
};
- fnlfmt = callPackage ../development/tools/fnlfmt { };
-
fpc = callPackage ../development/compilers/fpc { };
- g203-led = callPackage ../tools/misc/g203-led { };
-
gambit = callPackage ../development/compilers/gambit { };
gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { };
gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { };
@@ -14354,8 +6222,6 @@ with pkgs;
gerbilPackages-unstable = pkgs.gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries
glow-lang = pkgs.gerbilPackages-unstable.glow-lang;
- gbforth = callPackage ../development/compilers/gbforth { };
-
default-gcc-version = 13;
gcc = pkgs.${"gcc${toString default-gcc-version}"};
gccFun = callPackage ../development/compilers/gcc;
@@ -14657,14 +6523,6 @@ with pkgs;
inherit (llvmPackages_15) llvm;
};
- gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 { };
- gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 { };
- gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 { };
- gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 { };
- gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 { };
- gcc-arm-embedded-11 = callPackage ../development/compilers/gcc-arm-embedded/11 { };
- gcc-arm-embedded-12 = callPackage ../development/compilers/gcc-arm-embedded/12 { };
- gcc-arm-embedded-13 = callPackage ../development/compilers/gcc-arm-embedded/13 { };
gcc-arm-embedded = gcc-arm-embedded-12;
# It would be better to match the default gcc so that there are no linking errors
@@ -14678,17 +6536,11 @@ with pkgs;
profiledCompiler = false;
});
- gforth = callPackage ../development/compilers/gforth { };
-
gleam = callPackage ../development/compilers/gleam {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
erlang = erlang_27;
};
- gmqcc = callPackage ../development/compilers/gmqcc { };
-
- gtk-server = callPackage ../development/interpreters/gtk-server { };
-
# Haskell and GHC
haskell = callPackage ./haskell-packages.nix { };
@@ -14744,8 +6596,6 @@ with pkgs;
purescript = callPackage ../development/compilers/purescript/purescript { };
- psc-package = callPackage ../development/compilers/purescript/psc-package { };
-
purescript-psa = nodePackages.purescript-psa;
purenix = haskell.lib.compose.justStaticExecutables haskellPackages.purenix;
@@ -14758,15 +6608,9 @@ with pkgs;
coreboot-toolchain = recurseIntoAttrs (callPackage ../development/tools/misc/coreboot-toolchain { });
- remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { };
-
- remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { };
-
spicedb = callPackage ../servers/spicedb { };
spicedb-zed = callPackage ../servers/spicedb/zed.nix { };
- tacacsplus = callPackage ../servers/tacacsplus { };
-
tamarin-prover =
(haskellPackages.callPackage ../applications/science/logic/tamarin-prover {
# NOTE: do not use the haskell packages 'graphviz' and 'maude'
@@ -14786,14 +6630,10 @@ with pkgs;
haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
inherit (haxePackages) hxcpp;
- hop = callPackage ../development/compilers/hop { };
-
falcon = callPackage ../development/interpreters/falcon {
stdenv = gcc10Stdenv;
};
- fsharp = callPackage ../development/compilers/fsharp { };
-
fstar = callPackage ../development/compilers/fstar {
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
z3 = z3_4_8_5;
@@ -14801,24 +6641,6 @@ with pkgs;
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
- glslang = callPackage ../development/compilers/glslang { };
-
- gnostic = callPackage ../development/compilers/gnostic { };
-
- go-junit-report = callPackage ../development/tools/go-junit-report { };
-
- gocover-cobertura = callPackage ../development/tools/gocover-cobertura { };
-
- goblob = callPackage ../tools/security/goblob { };
-
- gogetdoc = callPackage ../development/tools/gogetdoc { };
-
- gox = callPackage ../development/tools/gox { };
-
- goxlr-utility = callPackage ../tools/audio/goxlr-utility {};
-
- gprolog = callPackage ../development/compilers/gprolog { };
-
gwe = callPackage ../tools/misc/gwe {
nvidia_x11 = linuxPackages.nvidia_x11;
};
@@ -14846,8 +6668,6 @@ with pkgs;
instawow = callPackage ../games/instawow/default.nix { };
- intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { };
-
irony-server = callPackage ../development/tools/irony-server {
# The repository of irony to use -- must match the version of the employed emacs
# package. Wishing we could merge it into one irony package, to avoid this issue,
@@ -14860,10 +6680,6 @@ with pkgs;
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
- holo-build = callPackage ../tools/package-management/holo-build { };
-
- hugs = callPackage ../development/interpreters/hugs { };
-
openjfx17 = openjfx;
openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };
openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; };
@@ -14930,18 +6746,6 @@ with pkgs;
python3 = python311;
};
- lingua-franca = callPackage ../development/compilers/lingua-franca { };
-
- openspin = callPackage ../development/compilers/openspin { };
-
- jasmin = callPackage ../development/compilers/jasmin { };
-
- java-service-wrapper = callPackage ../tools/system/java-service-wrapper { };
-
- jna = callPackage ../development/java-modules/jna { };
-
- juniper = callPackage ../development/compilers/juniper { };
-
inherit (callPackage ../development/compilers/julia { })
julia_19-bin
julia_110-bin
@@ -14960,30 +6764,6 @@ with pkgs;
kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { };
- kingstvis = callPackage ../applications/science/electronics/kingstvis { };
-
- knightos-genkfs = callPackage ../development/tools/knightos/genkfs { };
-
- regenkfs = callPackage ../development/tools/knightos/regenkfs { };
-
- knightos-kcc = callPackage ../development/tools/knightos/kcc { };
-
- knightos-kimg = callPackage ../development/tools/knightos/kimg { };
-
- knightos-kpack = callPackage ../development/tools/knightos/kpack { };
-
- knightos-mkrom = callPackage ../development/tools/knightos/mkrom { };
-
- remkrom = callPackage ../development/tools/knightos/remkrom { };
-
- knightos-patchrom = callPackage ../development/tools/knightos/patchrom { };
-
- knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { };
-
- knightos-scas = callPackage ../development/tools/knightos/scas { };
-
- knightos-z80e = callPackage ../development/tools/knightos/z80e { };
-
koka = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../development/compilers/koka { });
kotlin = callPackage ../development/compilers/kotlin { };
@@ -15000,10 +6780,6 @@ with pkgs;
lessc = nodePackages.less;
- liquibase = callPackage ../development/tools/database/liquibase { };
-
- lizardfs = callPackage ../tools/filesystems/lizardfs { };
-
lobster = callPackage ../development/compilers/lobster {
inherit (darwin.apple_sdk.frameworks)
CoreFoundation Cocoa AudioToolbox OpenGL Foundation ForceFeedback;
@@ -15102,22 +6878,12 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
- lunarml = callPackage ../development/compilers/lunarml { };
-
- manticore = callPackage ../development/compilers/manticore { };
-
mercury = callPackage ../development/compilers/mercury {
jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
- microscheme = callPackage ../development/compilers/microscheme { };
-
- minimacy = callPackage ../development/compilers/minimacy { };
-
mint = callPackage ../development/compilers/mint { crystal = crystal_1_9; };
- mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { };
-
mitscheme = callPackage ../development/compilers/mit-scheme {
texinfo = texinfo6;
};
@@ -15126,10 +6892,6 @@ with pkgs;
enableX11 = true;
};
- miranda = callPackage ../development/compilers/miranda { };
-
- mlkit = callPackage ../development/compilers/mlkit {};
-
inherit (callPackage ../development/compilers/mlton {})
mlton20130715
mlton20180207Binary
@@ -15156,14 +6918,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
-
- roslyn = callPackage ../development/compilers/roslyn { };
-
- msbuild = callPackage ../development/tools/build-managers/msbuild { };
-
- mosml = callPackage ../development/compilers/mosml { };
-
mozart2 = callPackage ../development/compilers/mozart {
emacs = emacs-nox;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -15171,8 +6925,6 @@ with pkgs;
mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
- muonlang = callPackage ../development/compilers/muonlang { };
-
nim = nim2;
nim1 = nim-1_0;
nim2 = nim-2_2;
@@ -15183,23 +6935,11 @@ with pkgs;
buildNimPackage = callPackage ../build-support/build-nim-package.nix { };
nimOverrides = callPackage ./nim-overrides.nix { };
- neko = callPackage ../development/compilers/neko { };
-
nextpnrWithGui = libsForQt5.callPackage ../by-name/ne/nextpnr/package.nix {
enableGui = true;
inherit (darwin.apple_sdk.frameworks) OpenGL;
};
- acme = callPackage ../development/compilers/acme { };
-
- nasm = callPackage ../development/compilers/nasm { };
-
- nasmfmt = callPackage ../development/tools/nasmfmt { };
-
- nqc = callPackage ../development/compilers/nqc { };
-
- nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
-
obliv-c = callPackage ../development/compilers/obliv-c {
stdenv = gcc10Stdenv;
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
@@ -15223,63 +6963,35 @@ with pkgs;
inherit (ocamlPackages) odig;
- orc = callPackage ../development/compilers/orc { };
-
- orocos-kdl = callPackage ../development/libraries/orocos-kdl { };
-
ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml.nix { };
- ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
-
- ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };
-
- ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { };
-
- opaline = callPackage ../development/tools/ocaml/opaline { };
-
opam = callPackage ../development/tools/ocaml/opam {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { };
- opam2json = callPackage ../development/tools/ocaml/opam2json { };
-
wrapWatcom = callPackage ../development/compilers/open-watcom/wrapper.nix { };
open-watcom-v2-unwrapped = callPackage ../development/compilers/open-watcom/v2.nix { };
open-watcom-v2 = wrapWatcom open-watcom-v2-unwrapped { };
open-watcom-bin-unwrapped = callPackage ../development/compilers/open-watcom/bin.nix { };
open-watcom-bin = wrapWatcom open-watcom-bin-unwrapped { };
- passerine = callPackage ../development/compilers/passerine { };
-
- picat = callPackage ../development/compilers/picat { };
-
ponyc = callPackage ../development/compilers/ponyc {
# Upstream pony no longer supports GCC
stdenv = llvmPackages.stdenv;
};
- blaze = callPackage ../development/libraries/blaze { };
-
pony-corral = callPackage ../development/compilers/ponyc/pony-corral.nix { };
- prqlc = callPackage ../development/tools/database/prqlc { };
-
- qbe = callPackage ../development/compilers/qbe { };
-
replibyte = callPackage ../development/tools/database/replibyte {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- rgbds = callPackage ../development/compilers/rgbds { };
-
rml = callPackage ../development/compilers/rml {
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
- rgxg = callPackage ../tools/text/rgxg { };
-
rtags = callPackage ../development/tools/rtags {
inherit (darwin) apple_sdk;
};
@@ -15331,16 +7043,9 @@ with pkgs;
defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };
- cargo-about = callPackage ../development/tools/rust/cargo-about { };
- cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { };
- cargo-apk = callPackage ../development/tools/rust/cargo-apk { };
cargo-audit = callPackage ../development/tools/rust/cargo-audit {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- cargo-benchcmp = callPackage ../development/tools/rust/cargo-benchcmp { };
- cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { };
- cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { };
- cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { };
cargo-c = callPackage ../development/tools/rust/cargo-c {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
@@ -15353,31 +7058,15 @@ with pkgs;
inherit rustc cargo;
};
};
- cargo-component = callPackage ../development/tools/rust/cargo-component { };
- cargo-cranky = callPackage ../development/tools/rust/cargo-cranky { };
- cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { };
cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;
};
cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-deb = callPackage ../development/tools/rust/cargo-deb { };
- cargo-docset = callPackage ../development/tools/rust/cargo-docset { };
- cargo-duplicates = callPackage ../development/tools/rust/cargo-duplicates { };
cargo-edit = callPackage ../development/tools/rust/cargo-edit {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-leptos = callPackage ../development/tools/rust/cargo-leptos { };
- cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { };
- cargo-guppy = callPackage ../development/tools/rust/cargo-guppy { };
- cargo-hack = callPackage ../development/tools/rust/cargo-hack { };
- cargo-license = callPackage ../development/tools/rust/cargo-license { };
- cargo-llvm-cov = callPackage ../development/tools/rust/cargo-llvm-cov { };
- cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { };
- cargo-local-registry = callPackage ../development/tools/rust/cargo-local-registry { };
- cargo-lock = callPackage ../development/tools/rust/cargo-lock { };
- cargo-machete = callPackage ../development/tools/rust/cargo-machete { };
cargo-outdated = callPackage ../development/tools/rust/cargo-outdated {
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration;
};
@@ -15392,174 +7081,85 @@ with pkgs;
buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-release = callPackage ../development/tools/rust/cargo-release { };
- cargo-rr = callPackage ../development/tools/rust/cargo-rr { };
cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-update = callPackage ../development/tools/rust/cargo-update { };
-
cargo-asm = callPackage ../development/tools/rust/cargo-asm {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-bazel = callPackage ../development/tools/rust/cargo-bazel {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-binutils = callPackage ../development/tools/rust/cargo-binutils { };
- cargo-bolero = callPackage ../development/tools/rust/cargo-bolero { };
- cargo-bundle = callPackage ../development/tools/rust/cargo-bundle { };
- cargo-bundle-licenses = callPackage ../development/tools/rust/cargo-bundle-licenses { };
cargo-cache = callPackage ../development/tools/rust/cargo-cache {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-careful = callPackage ../development/tools/rust/cargo-careful { };
- cargo-chef = callPackage ../development/tools/rust/cargo-chef { };
cargo-crev = callPackage ../development/tools/rust/cargo-crev {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;
};
- cargo-cross = callPackage ../development/tools/rust/cargo-cross { };
- cargo-deny = callPackage ../development/tools/rust/cargo-deny { };
- cargo-depgraph = callPackage ../development/tools/rust/cargo-depgraph { };
- cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { };
- cargo-diet = callPackage ../development/tools/rust/cargo-diet { };
- cargo-dist = callPackage ../development/tools/rust/cargo-dist { };
- cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { };
- cargo-feature = callPackage ../development/tools/rust/cargo-feature { };
cargo-fund = callPackage ../development/tools/rust/cargo-fund {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
-
cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- cargo-info = callPackage ../development/tools/rust/cargo-info { };
cargo-inspect = callPackage ../development/tools/rust/cargo-inspect {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-insta = callPackage ../development/tools/rust/cargo-insta { };
cargo-lambda = callPackage ../development/tools/rust/cargo-lambda {
zig = buildPackages.zig_0_12;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
- cargo-limit = callPackage ../development/tools/rust/cargo-limit { };
- cargo-mommy = callPackage ../development/tools/rust/cargo-mommy { };
cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-mutants = callPackage ../development/tools/rust/cargo-mutants { };
-
cargo-ndk = callPackage ../development/tools/rust/cargo-ndk {
inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation;
};
- cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { };
- cargo-play = callPackage ../development/tools/rust/cargo-play { };
cargo-rdme = callPackage ../by-name/ca/cargo-rdme/package.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-readme = callPackage ../development/tools/rust/cargo-readme { };
- cargo-run-bin = callPackage ../development/tools/rust/cargo-run-bin {};
- cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { };
-
- cargo-show-asm = callPackage ../development/tools/rust/cargo-show-asm { };
- cargo-shuttle = callPackage ../development/tools/rust/cargo-shuttle { };
-
- cargo-sort = callPackage ../development/tools/rust/cargo-sort { };
cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- cargo-supply-chain = callPackage ../development/tools/rust/cargo-supply-chain { };
- cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };
- cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme { };
- cargo-tally = callPackage ../development/tools/rust/cargo-tally { };
- cargo-temp = callPackage ../development/tools/rust/cargo-temp { };
- cargo-toml-lint = callPackage ../development/tools/rust/cargo-toml-lint { };
cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
};
- cargo-ui = callPackage ../development/tools/rust/cargo-ui { };
- cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { };
-
- cargo-mobile2 = callPackage ../development/tools/rust/cargo-mobile2 { };
-
- cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { };
cargo-vet = callPackage ../development/tools/rust/cargo-vet {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-watch = callPackage ../development/tools/rust/cargo-watch {
inherit (darwin.apple_sdk.frameworks) Foundation Cocoa;
};
- cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { };
- cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { };
- cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
- cargo-generate = callPackage ../development/tools/rust/cargo-generate { };
- cargo-bootimage = callPackage ../development/tools/rust/bootimage { };
-
cargo-whatfeatures = callPackage ../development/tools/rust/cargo-whatfeatures {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { };
-
cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild {
zig = buildPackages.zig_0_12;
};
- cauwugo = callPackage ../development/tools/rust/cauwugo { };
-
- critcmp = callPackage ../development/tools/rust/critcmp { };
-
- devspace = callPackage ../development/tools/misc/devspace { };
-
- djlint = callPackage ../development/tools/djlint { };
-
- leptosfmt = callPackage ../development/tools/rust/leptosfmt { };
-
- panamax = callPackage ../development/tools/rust/panamax { };
-
- ograc = callPackage ../development/tools/rust/ograc { };
-
opensmalltalk-vm = callPackage ../development/compilers/opensmalltalk-vm { };
opensycl = darwin.apple_sdk_11_0.callPackage ../development/compilers/opensycl { };
opensyclWithRocm = opensycl.override { rocmSupport = true; };
- pest-ide-tools = callPackage ../development/tools/misc/pest-ide-tools { };
-
- ravedude = callPackage ../development/tools/rust/ravedude { };
-
- ra-multiplex = callPackage ../development/tools/rust/ra-multiplex {};
-
- rhack = callPackage ../development/tools/rust/rhack { };
- roogle = callPackage ../development/tools/rust/roogle { };
rustfmt = rustPackages.rustfmt;
rust-analyzer-unwrapped = callPackage ../development/tools/rust/rust-analyzer {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
rust-analyzer = callPackage ../development/tools/rust/rust-analyzer/wrapper.nix { };
- rust-audit-info = callPackage ../development/tools/rust/rust-audit-info { };
rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { };
rust-bindgen = callPackage ../development/tools/rust/bindgen { };
rust-cbindgen = callPackage ../development/tools/rust/cbindgen {
inherit (darwin.apple_sdk.frameworks) Security;
};
- rust-script = callPackage ../development/tools/rust/rust-script { };
rustup = callPackage ../development/tools/rust/rustup {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master {
inherit (darwin.apple_sdk.frameworks) Security;
};
- rusty-man = callPackage ../development/tools/rust/rusty-man { };
- rustycli = callPackage ../development/tools/rust/rustycli { };
- specr-transpile = callPackage ../development/tools/rust/specr-transpile { };
- typeshare = callPackage ../development/tools/rust/typeshare { };
-
- sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme { };
-
- roswell = callPackage ../development/tools/roswell { };
-
scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; };
scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; };
scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; };
@@ -15574,40 +7174,12 @@ with pkgs;
scalafix = callPackage ../development/tools/scalafix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
- scalafmt = callPackage ../development/tools/scalafmt { };
-
- scryer-prolog = callPackage ../development/compilers/scryer-prolog { };
-
- seren = callPackage ../applications/networking/instant-messengers/seren { };
-
- serialdv = callPackage ../development/libraries/serialdv { };
-
- serpent = callPackage ../development/compilers/serpent { };
-
- shmig = callPackage ../development/tools/database/shmig { };
-
- sleek = callPackage ../development/tools/database/sleek { };
-
- smlfmt = callPackage ../development/tools/smlfmt { };
-
# smlnjBootstrap should be redundant, now that smlnj works on Darwin natively
smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
smlnj = callPackage ../development/compilers/smlnj {
inherit (darwin) Libsystem;
};
- smlpkg = callPackage ../tools/package-management/smlpkg { };
-
- solc = callPackage ../development/compilers/solc { };
-
- souffle = callPackage ../development/compilers/souffle { };
-
- spasm-ng = callPackage ../development/compilers/spasm-ng { };
-
- spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { };
-
- sqlfluff = callPackage ../development/tools/database/sqlfluff { };
-
sqlx-cli = callPackage ../development/tools/rust/sqlx-cli {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security;
};
@@ -15624,12 +7196,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- stalin = callPackage ../development/compilers/stalin { };
-
- metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { };
-
- svd2rust = callPackage ../development/tools/rust/svd2rust { };
-
swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { });
inherit (swiftPackages) swift swiftpm sourcekit-lsp swift-format swiftpm2nix;
@@ -15663,28 +7229,12 @@ with pkgs;
llvmPackages = llvmPackages_18;
};
- tinyscheme = callPackage ../development/interpreters/tinyscheme { };
-
- tbox = callPackage ../development/libraries/tbox { };
-
- typescript = callPackage ../development/compilers/typescript { };
-
ubports-click = python3Packages.callPackage ../development/tools/click { };
- uasm = callPackage ../development/compilers/uasm { };
-
- urn = callPackage ../development/compilers/urn { };
-
urweb = callPackage ../development/compilers/urweb {
icu = icu67;
};
- urbackup-client = callPackage ../applications/backup/urbackup-client { };
-
- vlang = callPackage ../development/compilers/vlang { };
-
- vala-lint = callPackage ../development/tools/vala-lint { };
-
vcard = python3Packages.toPythonApplication python3Packages.vcard;
inherit (callPackage ../development/compilers/vala { })
@@ -15693,12 +7243,6 @@ with pkgs;
vyper = with python3Packages; toPythonApplication vyper;
- wazero = callPackage ../development/interpreters/wazero { };
-
- wcc = callPackage ../development/compilers/wcc { };
-
- wla-dx = callPackage ../development/compilers/wla-dx { };
-
wrapCCWith =
{ cc
, # This should be the only bintools runtime dep with this sort of logic. The
@@ -15752,25 +7296,13 @@ with pkgs;
inherit bintools libc;
} // extraArgs; in self);
- yaml-language-server = callPackage ../development/tools/language-servers/yaml-language-server { };
-
# prolog
- yap = callPackage ../development/compilers/yap { };
-
- yasm = callPackage ../development/compilers/yasm { };
-
yosys = callPackage ../development/compilers/yosys { };
yosys-bluespec = callPackage ../development/compilers/yosys/plugins/bluespec.nix { };
yosys-ghdl = callPackage ../development/compilers/yosys/plugins/ghdl.nix { };
yosys-synlig = callPackage ../development/compilers/yosys/plugins/synlig.nix { };
yosys-symbiflow = callPackage ../development/compilers/yosys/plugins/symbiflow.nix { };
- z88dk = callPackage ../development/compilers/z88dk { };
-
- zulip = callPackage ../applications/networking/instant-messengers/zulip { };
-
- zulip-term = callPackage ../applications/networking/instant-messengers/zulip-term { };
-
zulu8 = callPackage ../development/compilers/zulu/8.nix { };
zulu11 = callPackage ../development/compilers/zulu/11.nix { };
zulu17 = callPackage ../development/compilers/zulu/17.nix { };
@@ -15783,10 +7315,6 @@ with pkgs;
acl2 = callPackage ../development/interpreters/acl2 { };
acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; };
- angelscript = callPackage ../development/interpreters/angelscript { };
-
- anko = callPackage ../development/interpreters/anko { };
-
babashka-unwrapped = callPackage ../development/interpreters/babashka { };
babashka = callPackage ../development/interpreters/babashka/wrapped.nix { };
@@ -15861,16 +7389,6 @@ with pkgs;
jdk = graalvm-ce;
};
- chibi = callPackage ../development/interpreters/chibi { };
-
- ceptre = callPackage ../development/interpreters/ceptre { };
-
- cg3 = callPackage ../development/interpreters/cg3 { };
-
- cling = callPackage ../development/interpreters/cling { };
-
- clips = callPackage ../development/interpreters/clips { };
-
cliscord = callPackage ../misc/cliscord {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -15908,8 +7426,6 @@ with pkgs;
dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { });
- duktape = callPackage ../development/interpreters/duktape { };
-
duckscript = callPackage ../development/tools/rust/duckscript {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
@@ -15948,10 +7464,6 @@ with pkgs;
erlang_language_platform = callPackage ../by-name/er/erlang-language-platform/package.nix { };
- expr = callPackage ../development/interpreters/expr { };
-
- genemichaels = callPackage ../development/tools/rust/genemichaels { };
-
gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage {
inherit (llvmPackages) openmp;
inherit (darwin.apple_sdk.frameworks) Cocoa;
@@ -15959,18 +7471,10 @@ with pkgs;
mpi = mpich;
};
- gpython = callPackage ../development/interpreters/gpython { };
-
graphql-client = callPackage ../development/tools/graphql-client {
inherit (darwin.apple_sdk.frameworks) Security;
};
- graphqlmap = callPackage ../tools/security/graphqlmap { };
-
- graphqurl = callPackage ../tools/networking/graphqurl { };
-
- groovy = callPackage ../development/interpreters/groovy { };
-
inherit (callPackages ../applications/networking/cluster/hadoop {})
hadoop_3_4
hadoop_3_3
@@ -15978,47 +7482,22 @@ with pkgs;
hadoop3 = hadoop_3_4;
hadoop = hadoop3;
- hashlink = callPackage ../development/interpreters/hashlink { };
-
- io = callPackage ../development/interpreters/io { };
-
- ivy = callPackage ../development/interpreters/ivy { };
-
jacinda = haskell.lib.compose.justStaticExecutables haskellPackages.jacinda;
janet = callPackage ../development/interpreters/janet { };
jpm = callPackage ../development/interpreters/janet/jpm.nix { };
- jelly = callPackage ../development/interpreters/jelly { };
-
- jimtcl = callPackage ../development/interpreters/jimtcl { };
-
- jmeter = callPackage ../applications/networking/jmeter { };
-
- joker = callPackage ../development/interpreters/joker { };
-
davmail = callPackage ../applications/networking/davmail {
zulu = zulu11;
};
- kamilalisp = callPackage ../development/interpreters/kamilalisp { };
-
- kanif = callPackage ../applications/networking/cluster/kanif { };
-
- kona = callPackage ../development/interpreters/kona { };
-
- lambda-lisp = callPackage ../development/interpreters/lambda-lisp { };
lambda-lisp-blc = lambda-lisp;
love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
love_11 = callPackage ../development/interpreters/love/11.nix { };
love = love_11;
- wabt = callPackage ../development/tools/wabt { };
-
- zuo = callPackage ../development/interpreters/zuo { };
-
### LUA interpreters
emiluaPlugins = recurseIntoAttrs
(callPackage ./emilua-plugins.nix {}
@@ -16049,10 +7528,6 @@ with pkgs;
pluginupdate = ../../maintainers/scripts/pluginupdate-py;
};
- luau = callPackage ../development/interpreters/luau { };
-
- lune = callPackage ../development/interpreters/lune { };
-
toluapp = callPackage ../development/tools/toluapp {
lua = lua5_1; # doesn't work with any other :(
};
@@ -16066,24 +7541,6 @@ with pkgs;
### End of CuboCore
- maude = callPackage ../development/interpreters/maude { };
-
- me_cleaner = callPackage ../tools/misc/me_cleaner { };
-
- metamath = callPackage ../development/interpreters/metamath { };
-
- minder = callPackage ../applications/misc/minder { };
-
- mujs = callPackage ../development/interpreters/mujs { };
-
- nelua = callPackage ../development/interpreters/nelua { };
-
- nextflow = callPackage ../development/interpreters/nextflow { };
-
- ngn-k = callPackage ../development/interpreters/ngn-k { };
-
- oak = callPackage ../development/interpreters/oak { };
-
obb = callPackage ../development/interpreters/clojure/obb.nix { };
octave = callPackage ../development/interpreters/octave { };
@@ -16096,9 +7553,6 @@ with pkgs;
octavePackages = recurseIntoAttrs octave.pkgs;
- pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
-
-
# PHP interpreters, packages and extensions.
#
# Set default PHP interpreter, extensions and packages
@@ -16146,10 +7600,6 @@ with pkgs;
php81Extensions = recurseIntoAttrs php81.extensions;
php81Packages = recurseIntoAttrs php81.packages;
- picoc = callPackage ../development/interpreters/picoc { };
-
- picolisp = callPackage ../development/interpreters/picolisp { };
-
polyml = callPackage ../development/compilers/polyml { };
polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
polyml57 = callPackage ../development/compilers/polyml/5.7.nix { };
@@ -16243,39 +7693,19 @@ with pkgs;
pypy39Packages = pypy39.pkgs;
pypy310Packages = pypy310.pkgs;
- py3c = callPackage ../development/libraries/py3c { };
-
pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { };
pythonCondaPackages = callPackage ./../development/interpreters/python/conda { };
- update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { };
-
# Should eventually be moved inside Python interpreters.
python-setup-hook = buildPackages.callPackage ../development/interpreters/python/setup-hook.nix { };
pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
- check-jsonschema = callPackage ../development/tools/check-jsonschema { };
-
- pypi-mirror = callPackage ../development/tools/pypi-mirror { };
-
svg2tikz = with python3.pkgs; toPythonApplication svg2tikz;
- svg2pdf = callPackage ../tools/graphics/svg2pdf { };
-
- pew = callPackage ../development/tools/pew { };
-
- poetry = callPackage ../tools/package-management/poetry { };
-
poetryPlugins = recurseIntoAttrs poetry.plugins;
- poetry2conda = callPackage ../tools/package-management/poetry2conda { };
-
- pip-audit = callPackage ../development/tools/pip-audit { };
-
- pipenv = callPackage ../development/tools/pipenv { };
-
pipx = with python3.pkgs; toPythonApplication pipx;
pipewire = callPackage ../development/libraries/pipewire {
@@ -16288,8 +7718,6 @@ with pkgs;
wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { };
- pw-volume = callPackage ../tools/audio/pw-volume { };
-
racket = callPackage ../development/interpreters/racket {
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
@@ -16305,14 +7733,6 @@ with pkgs;
nqp = callPackage ../development/interpreters/rakudo/nqp.nix { };
zef = callPackage ../development/interpreters/rakudo/zef.nix { };
- rascal = callPackage ../development/interpreters/rascal { };
-
- red = callPackage ../development/interpreters/red { };
-
- regexploit = callPackage ../tools/security/regexploit { };
-
- regextester = callPackage ../applications/misc/regextester { };
-
inherit (ocamlPackages) reason;
buildRubyGem = callPackage ../development/ruby-modules/gem {
@@ -16322,19 +7742,14 @@ with pkgs;
inherit (darwin) DarwinTools autoSignDarwinBinariesHook;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- bundler = callPackage ../development/ruby-modules/bundler { };
bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
bundlerApp = callPackage ../development/ruby-modules/bundler-app { };
bundlerUpdateScript = callPackage ../development/ruby-modules/bundler-update-script { };
bundler-audit = callPackage ../tools/security/bundler-audit { };
- sol2 = callPackage ../development/libraries/sol2 { };
-
solargraph = rubyPackages.solargraph;
- rbenv = callPackage ../development/ruby-modules/rbenv { };
-
rubyfmt = darwin.apple_sdk_11_0.callPackage ../development/tools/rubyfmt {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
inherit (darwin) libobjc;
@@ -16359,25 +7774,13 @@ with pkgs;
rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems;
rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems;
- mruby = callPackage ../development/compilers/mruby { };
-
samplebrain = libsForQt5.callPackage ../applications/audio/samplebrain { };
- scsh = callPackage ../development/interpreters/scsh { };
-
- scheme48 = callPackage ../development/interpreters/scheme48 { };
-
- scheme-bytestructures = callPackage ../development/scheme-modules/scheme-bytestructures { };
-
- smiley-sans = callPackage ../data/fonts/smiley-sans { };
-
inherit (callPackages ../applications/networking/cluster/spark { })
spark_3_5 spark_3_4;
spark3 = spark_3_5;
spark = spark3;
- sparkleshare = callPackage ../applications/version-management/sparkleshare { };
-
inherit
({
spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix {
@@ -16399,8 +7802,6 @@ with pkgs;
spidermonkey_128
;
- starlark-rust = callPackage ../development/interpreters/starlark-rust { };
-
supercollider = libsForQt5.callPackage ../development/interpreters/supercollider {
fftw = fftwSinglePrec;
};
@@ -16421,8 +7822,6 @@ with pkgs;
plugins = with supercolliderPlugins; [ sc3-plugins ];
};
- taktuk = callPackage ../applications/networking/cluster/taktuk { };
-
tcl = tcl-8_6;
tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
@@ -16433,14 +7832,8 @@ with pkgs;
tclreadline = tclPackages.tclreadline;
- eltclsh = callPackage ../development/tools/eltclsh { };
-
wasm = ocamlPackages.wasm;
- wasm3 = callPackage ../development/interpreters/wasm3 { };
-
- yaegi = callPackage ../development/interpreters/yaegi { };
-
### DEVELOPMENT / MISC
inherit (callPackages ../development/misc/h3 { }) h3_3 h3_4;
@@ -16451,20 +7844,10 @@ with pkgs;
stdenv = stdenvNoLibc;
};
- avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
-
- cppreference-doc = callPackage ../development/misc/cppreference-doc { };
-
sourceFromHead = callPackage ../build-support/source-from-head-fun.nix { };
jruby = callPackage ../development/interpreters/jruby { };
- jython = callPackage ../development/interpreters/jython { };
-
- gImageReader = callPackage ../applications/misc/gImageReader { };
-
- gimme-aws-creds = callPackage ../tools/admin/gimme-aws-creds { };
-
guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
# Needed for autogen
@@ -16484,8 +7867,6 @@ with pkgs;
guile = guile_2_2;
};
- inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { };
-
msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { };
msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };
@@ -16499,63 +7880,21 @@ with pkgs;
or1k-newlib = callPackage ../development/misc/or1k/newlib.nix { };
- rappel = callPackage ../development/misc/rappel { };
-
- protege-distribution = callPackage ../development/web/protege-distribution { };
-
- publii = callPackage ../development/web/publii {};
-
- umr = callPackage ../development/misc/umr { };
-
- refurb = callPackage ../development/tools/refurb { };
-
- srandrd = callPackage ../tools/X11/srandrd { };
-
- srecord = callPackage ../development/tools/misc/srecord { };
-
- srelay = callPackage ../tools/networking/srelay { };
-
- xidel = callPackage ../tools/text/xidel { };
-
- asdf-vm = callPackage ../tools/misc/asdf-vm { };
-
mise = callPackage ../by-name/mi/mise/package.nix {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
### DEVELOPMENT / TOOLS
- abi-compliance-checker = callPackage ../development/tools/misc/abi-compliance-checker { };
-
- abi-dumper = callPackage ../development/tools/misc/abi-dumper { };
-
- abuild = callPackage ../development/tools/abuild { };
-
actiona = libsForQt5.callPackage ../applications/misc/actiona { };
- adreaper = callPackage ../tools/security/adreaper { };
-
- aeron = callPackage ../servers/aeron { };
-
inherit (callPackage ../development/tools/alloy { })
alloy5
alloy6
alloy;
- altair = callPackage ../development/tools/altair-graphql-client { };
-
- ameba = callPackage ../development/tools/ameba { };
-
anybadge = with python3Packages; toPythonApplication anybadge;
- apgdiff = callPackage ../development/tools/database/apgdiff { };
-
- apkg = callPackage ../tools/package-management/apkg { };
-
- augeas = callPackage ../tools/system/augeas { };
-
- autoadb = callPackage ../misc/autoadb { };
-
ansible = ansible_2_17;
ansible_2_17 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_16 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
@@ -16578,84 +7917,28 @@ with pkgs;
ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };
- dbus-test-runner = callPackage ../development/tools/dbus-test-runner { };
-
- doq = callPackage ../development/tools/misc/doq { };
-
- espup = callPackage ../development/tools/espup { };
-
- karma-runner = callPackage ../development/tools/karma-runner { };
-
- teller = callPackage ../development/tools/teller { };
-
yakut = python3Packages.callPackage ../development/tools/misc/yakut { };
### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS
- ansible-language-server = callPackage ../development/tools/language-servers/ansible-language-server { };
-
- beancount-language-server = callPackage ../development/tools/language-servers/beancount-language-server { };
-
- buf-language-server = callPackage ../development/tools/language-servers/buf-language-server { };
-
ccls = callPackage ../development/tools/language-servers/ccls {
llvmPackages = llvmPackages_14;
};
- docker-compose-language-service = callPackage ../development/tools/language-servers/docker-compose-language-service { };
-
- dockerfile-language-server-nodejs = callPackage ../development/tools/language-servers/dockerfile-language-server-nodejs { };
-
- dot-language-server = callPackage ../development/tools/language-servers/dot-language-server { };
-
- emmet-ls = callPackage ../development/tools/language-servers/emmet-ls { };
-
- emmet-language-server = callPackage ../development/tools/language-servers/emmet-language-server { };
-
fortls = python3.pkgs.callPackage ../development/tools/language-servers/fortls { };
fortran-language-server = python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server { };
- glslls = callPackage ../development/tools/language-servers/glslls { };
-
- helm-ls = callPackage ../development/tools/language-servers/helm-ls { };
-
- javascript-typescript-langserver = callPackage ../development/tools/language-servers/javascript-typescript-langserver { };
-
- jsonnet-language-server = callPackage ../development/tools/language-servers/jsonnet-language-server { };
-
- kotlin-language-server = callPackage ../development/tools/language-servers/kotlin-language-server { };
-
lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/lua-language-server {
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation;
inherit (darwin) ditto;
};
- metals = callPackage ../development/tools/language-servers/metals { };
-
- millet = callPackage ../development/tools/language-servers/millet { };
-
- neocmakelsp = callPackage ../development/tools/language-servers/neocmakelsp { };
-
inherit (callPackages ../development/tools/language-servers/nixd {
llvmPackages = llvmPackages_16;
nix = nixVersions.nix_2_19;
}) nixf nixt nixd;
- openscad-lsp = callPackage ../development/tools/language-servers/openscad-lsp { };
-
- perlnavigator = callPackage ../development/tools/language-servers/perlnavigator { };
-
- postgres-lsp = callPackage ../development/tools/language-servers/postgres-lsp { };
-
- rune-languageserver = callPackage ../development/tools/language-servers/rune-languageserver { };
-
- svls = callPackage ../development/tools/language-servers/svls { };
-
- vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { };
-
- vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { };
-
ansible-later = callPackage ../tools/admin/ansible/later.nix { };
ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
@@ -16677,7 +7960,6 @@ with pkgs;
antlr = antlr4;
- apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
ant = apacheAnt;
inherit (callPackages ../servers/apache-kafka { })
@@ -16687,29 +7969,10 @@ with pkgs;
apacheKafka = apacheKafka_3_8;
- apng2gif = callPackage ../tools/graphics/apng2gif { };
-
- gif2apng = callPackage ../tools/graphics/gif2apng { };
-
- apngopt = callPackage ../tools/graphics/apngopt { };
-
- kt = callPackage ../tools/misc/kt { };
-
- arpa2cm = callPackage ../development/tools/build-managers/arpa2cm { };
-
- arpa2common = callPackage ../development/libraries/arpa2common { };
-
asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder { };
- astyle = callPackage ../development/tools/misc/astyle { };
libastyle = astyle.override { asLibrary = true; };
- automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { };
-
- aviator = callPackage ../development/tools/misc/aviator { };
-
- awf = callPackage ../development/tools/misc/awf { };
-
aws-adfs = with python3Packages; toPythonApplication aws-adfs;
electron-source = callPackage ../development/tools/electron { };
@@ -16745,18 +8008,12 @@ with pkgs;
electron-bin = electron_33-bin;
electron-chromedriver = electron-chromedriver_33;
- autobuild = callPackage ../development/tools/misc/autobuild { };
-
- autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { };
-
autoconf = callPackage ../development/tools/misc/autoconf { };
autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { };
autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { };
autoconf271 = callPackage ../development/tools/misc/autoconf/2.71.nix { };
- autocutsel = callPackage ../tools/X11/autocutsel{ };
-
automake = automake116x;
automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
@@ -16767,12 +8024,6 @@ with pkgs;
automake117x = callPackage ../development/tools/misc/automake/automake-1.17.x.nix { };
- avrdude = callPackage ../development/embedded/avrdude { };
-
- b4 = callPackage ../development/tools/b4 { };
-
- bam = callPackage ../development/tools/build-managers/bam { };
-
bandit = with python3Packages; toPythonApplication bandit;
bazel = bazel_6;
@@ -16811,29 +8062,16 @@ with pkgs;
bazel_self = bazel_7;
};
- bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
buildifier = bazel-buildtools;
buildozer = bazel-buildtools;
unused_deps = bazel-buildtools;
- bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { };
-
- bazel-watcher = callPackage ../development/tools/bazel-watcher { };
-
- bazel-gazelle = callPackage ../development/tools/bazel-gazelle { };
-
- bazel-kazel = callPackage ../development/tools/bazel-kazel { };
-
- bazelisk = callPackage ../development/tools/bazelisk { };
-
rebazel = callPackage ../development/tools/rebazel {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
buildBazelPackage = darwin.apple_sdk_11_0.callPackage ../build-support/build-bazel-package { };
- bingrep = callPackage ../development/tools/analysis/bingrep { };
-
binutils-unwrapped = callPackage ../development/tools/misc/binutils {
inherit (darwin.apple_sdk.frameworks) CoreServices;
# FHS sys dirs presumably only have stuff for the build platform
@@ -16913,33 +8151,21 @@ with pkgs;
wrapGas = true;
};
- bison = callPackage ../development/tools/parsing/bison { };
-
- bisoncpp = callPackage ../development/tools/parsing/bisonc++ { };
-
black = with python3Packages; toPythonApplication black;
blackfire = callPackage ../development/tools/misc/blackfire { };
black-macchiato = with python3Packages; toPythonApplication black-macchiato;
- blackmagic = callPackage ../development/embedded/blackmagic { };
-
- bloomrpc = callPackage ../development/web/bloomrpc { };
-
- bloop = callPackage ../development/tools/build-managers/bloop { };
-
bossa = callPackage ../development/embedded/bossa { };
bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { };
- bob = callPackage ../development/tools/build-managers/bob { };
-
buck = callPackage ../development/tools/build-managers/buck {
python3 = python311;
};
- buck2 = callPackage ../development/tools/build-managers/buck2 { };
+ buck2 = callPackage ../development/tools/build-managers/buck2 { stdenv = stdenvNoCC; };
build2 = callPackage ../development/tools/build-managers/build2 {
# Break cycle by using self-contained toolchain for bootstrapping
@@ -16952,9 +8178,6 @@ with pkgs;
inherit (darwin) DarwinTools;
};
- libbpkg = callPackage ../development/libraries/libbpkg { };
- libodb = callPackage ../development/libraries/libodb { };
- libodb-sqlite = callPackage ../development/libraries/libodb-sqlite { };
bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { };
bore-cli = callPackage ../tools/networking/bore-cli/default.nix {
@@ -16963,37 +8186,17 @@ with pkgs;
bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { };
- buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { };
-
- buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { };
-
buildkite-test-collector-rust = callPackage ../development/tools/continuous-integration/buildkite-test-collector-rust {
inherit (darwin.apple_sdk.frameworks) Security;
};
- bump = callPackage ../development/tools/github/bump { };
-
libbpf = callPackage ../os-specific/linux/libbpf { };
libbpf_0 = callPackage ../os-specific/linux/libbpf/0.x.nix { };
bundlewrap = with python3.pkgs; toPythonApplication bundlewrap;
- bpftools = callPackage ../os-specific/linux/bpftools { };
-
- bpm-tools = callPackage ../tools/audio/bpm-tools { };
-
cadre = callPackage ../development/tools/cadre { };
- carto = callPackage ../development/tools/carto { };
-
- catnip = callPackage ../tools/audio/catnip { };
-
- catnip-gtk4 = callPackage ../tools/audio/catnip-gtk4 { };
-
- cbrowser = callPackage ../development/tools/misc/cbrowser { };
-
- cc-tool = callPackage ../development/embedded/cc-tool { };
-
# Wrapper that works as gcc or g++
# It can be used by setting in nixpkgs config like this, for example:
# replaceStdenv = { pkgs }: pkgs.ccacheStdenv;
@@ -17034,78 +8237,26 @@ with pkgs;
inherit stdenv;
});
- cccc = callPackage ../development/tools/analysis/cccc { };
-
- cgdb = callPackage ../development/tools/misc/cgdb { };
-
- cheat = callPackage ../applications/misc/cheat { };
-
matter-compiler = callPackage ../development/compilers/matter-compiler { };
- cfr = callPackage ../development/tools/java/cfr { };
-
- cfripper = callPackage ../tools/security/cfripper { };
-
- checkra1n = callPackage ../development/mobile/checkra1n { };
-
- checkstyle = callPackage ../development/tools/analysis/checkstyle { };
-
chromedriver = callPackage ../development/tools/selenium/chromedriver { };
- chromium-xorg-conf = callPackage ../os-specific/linux/chromium-xorg-conf { };
-
- chrpath = callPackage ../development/tools/misc/chrpath { };
-
chruby = callPackage ../development/tools/misc/chruby { rubies = null; };
- chruby-fish = callPackage ../development/tools/misc/chruby-fish { };
-
- cl-launch = callPackage ../development/tools/misc/cl-launch { };
-
- cloud-nuke = callPackage ../development/tools/cloud-nuke { };
-
cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { };
- cloudlog = callPackage ../applications/radio/cloudlog { };
-
- cloudflare-warp = callPackage ../tools/networking/cloudflare-warp { };
-
- cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { };
-
- coan = callPackage ../development/tools/analysis/coan { };
-
coder = callPackage ../development/tools/coder { };
- compile-daemon = callPackage ../development/tools/compile-daemon { };
-
- complexity = callPackage ../development/tools/misc/complexity { };
-
- complgen = callPackage ../development/tools/misc/complgen { };
-
- conan = callPackage ../development/tools/build-managers/conan { };
-
cookiecutter = with python3Packages; toPythonApplication cookiecutter;
- cordova = callPackage ../development/mobile/cordova { };
-
- corrosion = callPackage ../development/tools/build-managers/corrosion { };
-
corundum = callPackage ../development/tools/corundum { };
- confluencepot = callPackage ../servers/confluencepot { };
-
- confluent-platform = callPackage ../servers/confluent-platform { };
-
ctags = callPackage ../development/tools/misc/ctags { };
ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix { };
- ctodo = callPackage ../applications/misc/ctodo { };
-
cubiomes-viewer = libsForQt5.callPackage ../applications/misc/cubiomes-viewer { };
- ctmg = callPackage ../tools/security/ctmg { };
-
# can't use override - it triggers infinite recursion
cmakeMinimal = callPackage ../by-name/cm/cmake/package.nix {
isMinimalBuild = true;
@@ -17132,39 +8283,21 @@ with pkgs;
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
- cpptest = callPackage ../development/libraries/cpptest { };
-
- cppi = callPackage ../development/tools/misc/cppi { };
-
- cproto = callPackage ../development/tools/misc/cproto { };
-
- cflow = callPackage ../development/tools/misc/cflow { };
-
- cov-build = callPackage ../development/tools/analysis/cov-build { };
-
credstash = with python3Packages; toPythonApplication credstash;
creduce = callPackage ../development/tools/misc/creduce {
inherit (llvmPackages_16) llvm libclang;
};
- cscope = callPackage ../development/tools/misc/cscope { };
-
- csmith = callPackage ../development/tools/misc/csmith { };
-
inherit (nodePackages) csslint;
css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify;
- cvehound = callPackage ../development/tools/analysis/cvehound { };
-
cvise = python3Packages.callPackage ../development/tools/misc/cvise {
# cvise keeps up with fresh llvm releases and supports wide version range
inherit (llvmPackages_14) llvm libclang;
};
- cwltool = callPackage ../applications/science/misc/cwltool { };
-
dbt = with python3Packages; toPythonApplication dbt-core;
dprint = callPackage ../development/tools/dprint {
@@ -17191,36 +8324,6 @@ with pkgs;
python = python3;
};
- libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
-
- sqlcl = callPackage ../development/tools/database/sqlcl { };
-
- sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { };
-
- datree = callPackage ../development/tools/datree { };
-
- detekt = callPackage ../development/tools/detekt { };
-
- dcadec = callPackage ../development/tools/dcadec { };
-
- dejagnu = callPackage ../development/tools/misc/dejagnu { };
-
- devd = callPackage ../development/tools/devd { };
-
- devtodo = callPackage ../development/tools/devtodo { };
-
- d-spy = callPackage ../development/tools/misc/d-spy { };
-
- dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };
-
- dfu-util = callPackage ../development/tools/misc/dfu-util { };
-
- ddd = callPackage ../development/tools/misc/ddd { };
-
- lattice-diamond = callPackage ../development/embedded/fpga/lattice-diamond { };
-
- direvent = callPackage ../development/tools/misc/direvent { };
-
distcc = callPackage ../development/tools/misc/distcc {
libiberty_static = libiberty.override { staticBuild = true; };
};
@@ -17249,20 +8352,10 @@ with pkgs;
binutils = binutils;
};
- dive = callPackage ../development/tools/dive { };
-
- dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { };
-
- doclifter = callPackage ../development/tools/misc/doclifter { };
-
docutils = with python3Packages; toPythonApplication docutils;
- doctl = callPackage ../development/tools/doctl { };
-
doit = with python3Packages; toPythonApplication doit;
- dolt = callPackage ../servers/sql/dolt { };
-
dot2tex = with python3.pkgs; toPythonApplication dot2tex;
doxygen = darwin.apple_sdk_11_0.callPackage ../development/tools/documentation/doxygen {
@@ -17274,129 +8367,39 @@ with pkgs;
drake = callPackage ../development/tools/build-managers/drake { };
- drip = callPackage ../development/tools/drip { };
-
- drm_info = callPackage ../development/tools/drm_info { };
-
dura = callPackage ../development/tools/misc/dura {
inherit (darwin.apple_sdk.frameworks) Security;
};
- dwz = callPackage ../development/tools/misc/dwz { };
-
- easypdkprog = callPackage ../development/embedded/easypdkprog { };
-
- editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { };
-
- editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };
-
edb = libsForQt5.callPackage ../development/tools/misc/edb { };
- eggdbus = callPackage ../development/tools/misc/eggdbus { };
-
- effitask = callPackage ../applications/misc/effitask { };
-
- efm-langserver = callPackage ../development/tools/efm-langserver { };
-
- egypt = callPackage ../development/tools/analysis/egypt { };
-
- electron-fiddle = callPackage ../development/tools/electron-fiddle { };
-
elf2uf2-rs = darwin.apple_sdk_11_0.callPackage ../development/embedded/elf2uf2-rs {
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation DiskArbitration Foundation;
};
- elfinfo = callPackage ../development/tools/misc/elfinfo { };
-
- elfkickers = callPackage ../development/tools/misc/elfkickers { };
-
- elfutils = callPackage ../development/tools/misc/elfutils { };
-
- eliot-tree = callPackage ../development/tools/eliot-tree { };
-
- emma = callPackage ../development/tools/analysis/emma { };
-
- ent-go = callPackage ../development/tools/ent { };
-
- epm = callPackage ../development/tools/misc/epm { };
-
- eresi = callPackage ../development/tools/analysis/eresi { };
-
- evmdis = callPackage ../development/tools/analysis/evmdis { };
-
- explain = callPackage ../development/tools/explain { };
-
- ezno = callPackage ../development/tools/misc/ezno { };
-
- func = callPackage ../applications/networking/cluster/func { };
-
license_finder = callPackage ../development/tools/license_finder { };
- license-scanner = callPackage ../development/tools/license-scanner { };
-
# NOTE: Override and set useIcon = false to use Awk instead of Icon.
- noweb = callPackage ../development/tools/literate-programming/noweb { };
-
- eztrace = callPackage ../development/tools/profiling/EZTrace { };
-
- faas-cli = callPackage ../development/tools/faas-cli { };
-
- fastddsgen = callPackage ../development/tools/fastddsgen { };
-
- fastgron = callPackage ../development/tools/fastgron { };
-
- fatcat = callPackage ../development/tools/fatcat { };
-
- findbugs = callPackage ../development/tools/analysis/findbugs { };
-
- findnewest = callPackage ../development/tools/misc/findnewest { };
-
- flootty = callPackage ../development/tools/flootty { };
-
fffuu = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { });
- ffuf = callPackage ../tools/security/ffuf { };
-
flow = callPackage ../development/tools/analysis/flow {
inherit (darwin.apple_sdk.frameworks) CoreServices;
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
- fly = callPackage ../development/tools/continuous-integration/fly { };
-
- fprettify = callPackage ../development/tools/fprettify { };
-
- framac = callPackage ../development/tools/analysis/frama-c { };
-
- frame = callPackage ../development/libraries/frame { };
-
- framesh = callPackage ../applications/blockchains/framesh { };
-
- frp = callPackage ../tools/networking/frp { };
-
- fsatrace = callPackage ../development/tools/misc/fsatrace { };
-
fswatch = callPackage ../development/tools/misc/fswatch {
inherit (darwin.apple_sdk.frameworks) CoreServices;
autoreconfHook = buildPackages.autoreconfHook269;
};
- fsearch = callPackage ../tools/misc/fsearch { };
-
fujprog = callPackage ../development/embedded/fpga/fujprog {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- fundoc = callPackage ../development/tools/fundoc { };
-
- funzzy = callPackage ../development/tools/misc/funzzy { };
-
gede = libsForQt5.callPackage ../development/tools/misc/gede { };
gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { };
- pifpaf = callPackage ../development/tools/pifpaf { };
-
pmd = callPackage ../development/tools/analysis/pmd {
openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
@@ -17408,66 +8411,9 @@ with pkgs;
flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
flex = callPackage ../development/tools/parsing/flex { };
- re-flex = callPackage ../development/tools/parsing/re-flex { };
-
- flexibee = callPackage ../applications/office/flexibee { };
-
- flexcpp = callPackage ../development/tools/parsing/flexc++ { };
-
- gi-docgen = callPackage ../development/tools/documentation/gi-docgen { };
-
- git2-cpp = callPackage ../development/libraries/git2-cpp { };
-
- github-release = callPackage ../development/tools/github/github-release { };
-
- global = callPackage ../development/tools/misc/global { };
-
- gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils { };
-
- gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing { };
-
- gnome-tecla = callPackage ../applications/misc/gnome-tecla { };
-
- gnome-usage = callPackage ../applications/misc/gnome-usage { };
-
- gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { };
-
- gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { };
-
- gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer { };
-
- gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { };
-
- gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { };
-
- gnum4 = callPackage ../development/tools/misc/gnum4 { };
m4 = gnum4;
- om4 = callPackage ../development/tools/misc/om4 { };
-
gnumake = callPackage ../development/tools/build-managers/gnumake { };
- gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
-
- go-licenses = callPackage ../development/tools/misc/go-licenses { };
-
- gob2 = callPackage ../development/tools/misc/gob2 { };
-
- gocd-agent = callPackage ../development/tools/continuous-integration/gocd-agent { };
-
- gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { };
-
- gopatch = callPackage ../development/tools/misc/gopatch { };
-
- gotify-server = callPackage ../servers/gotify { };
-
- gotty = callPackage ../servers/gotty { };
-
- gputils = callPackage ../development/embedded/gputils { };
-
- gpuvis = callPackage ../development/tools/misc/gpuvis { };
-
- gqlint = callPackage ../development/tools/gqlint { };
-
gradle-packages = import ../development/tools/build-managers/gradle {
inherit jdk11 jdk17 jdk21;
};
@@ -17486,24 +8432,8 @@ with pkgs;
# 3.1 changed some parameters from int to size_t, leading to mismatches.
gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { };
- grail = callPackage ../development/libraries/grail { };
-
- graphene = callPackage ../development/libraries/graphene { };
-
griffe = with python3Packages; toPythonApplication griffe;
- gtk-doc = callPackage ../development/tools/documentation/gtk-doc { };
-
- gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
-
- crowdin-cli = callPackage ../tools/text/crowdin-cli { };
-
- gtranslator = callPackage ../tools/text/gtranslator { };
-
- gtree = callPackage ../tools/text/gtree { };
-
- guff = callPackage ../tools/graphics/guff { };
-
gwrap = g-wrap;
g-wrap = callPackage ../by-name/g-/g-wrap/package.nix {
guile = guile_2_2;
@@ -17514,68 +8444,22 @@ with pkgs;
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
haskellPackages.hadolint;
- halfempty = callPackage ../development/tools/halfempty { };
-
- hcloud = callPackage ../development/tools/hcloud { };
-
- help2man = callPackage ../development/tools/misc/help2man { };
-
- heroku = callPackage ../development/tools/heroku { };
-
- highlight-assertions = callPackage ../development/tools/misc/highlight-assertions { };
-
- confluent-cli = callPackage ../development/tools/confluent-cli { };
-
- html-minifier = callPackage ../development/tools/html-minifier { };
-
- htmlhint = callPackage ../development/tools/htmlhint { };
-
- htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };
-
- hyenae = callPackage ../tools/networking/hyenae { };
-
iaca_2_1 = callPackage ../development/tools/iaca/2.1.nix { };
iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { };
iaca = iaca_3_0;
- icestorm = callPackage ../development/embedded/fpga/icestorm { };
-
- icmake = callPackage ../development/tools/build-managers/icmake { };
-
- iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { };
-
ikos = callPackage ../development/tools/analysis/ikos {
inherit (llvmPackages_14) stdenv clang llvm;
tbb = tbb_2021_11;
};
- img = callPackage ../development/tools/img { };
-
include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
llvmPackages = llvmPackages_18;
};
- indent = callPackage ../development/tools/misc/indent { };
-
- inotify-tools = callPackage ../development/tools/misc/inotify-tools { };
-
inherit (callPackage ../applications/misc/inochi2d { })
inochi-creator inochi-session;
- intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { };
-
- insomnia = callPackage ../development/web/insomnia { };
-
- ihp-new = callPackage ../development/web/ihp-new { };
-
- iozone = callPackage ../development/tools/misc/iozone { };
-
- itstool = callPackage ../development/tools/misc/itstool { };
-
- jacoco = callPackage ../development/tools/analysis/jacoco { };
-
- jake = callPackage ../development/tools/jake { };
-
javacc = callPackage ../development/tools/parsing/javacc {
# Upstream doesn't support anything newer than Java 8.
# https://github.com/javacc/javacc/blob/c708628423b71ce8bc3b70143fa5b6a2b7362b3a/README.md#building-javacc-from-source
@@ -17583,82 +8467,10 @@ with pkgs;
jre = jre8;
};
- jbake = callPackage ../development/tools/jbake { };
-
- jbang = callPackage ../development/tools/jbang { };
-
- jikespg = callPackage ../development/tools/parsing/jikespg { };
-
- jenkins = callPackage ../development/tools/continuous-integration/jenkins { };
-
jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder;
- jpexs = callPackage ../development/tools/jpexs { };
-
- k0sctl = callPackage ../applications/networking/cluster/k0sctl { };
-
- k2tf = callPackage ../development/tools/misc/k2tf { };
-
- kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { };
-
- kamid = callPackage ../servers/ftp/kamid { };
-
- karate = callPackage ../development/tools/karate { };
-
- kati = callPackage ../development/tools/build-managers/kati { };
-
- kafkactl = callPackage ../development/tools/kafkactl { };
-
- kcat = callPackage ../development/tools/kcat { };
-
kcc = libsForQt5.callPackage ../applications/graphics/kcc { };
- kcgi = callPackage ../development/web/kcgi { };
-
- kcov = callPackage ../development/tools/analysis/kcov { };
-
- kind = callPackage ../development/tools/kind { };
-
- khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { };
-
- ko = callPackage ../development/tools/ko { };
-
- konstraint = callPackage ../development/tools/konstraint { };
-
- krankerl = callPackage ../development/tools/krankerl { };
-
- krew = callPackage ../development/tools/krew { };
-
- kube-bench = callPackage ../tools/security/kube-bench { };
-
- kube-hunter = callPackage ../tools/security/kube-hunter { };
-
- kubeaudit = callPackage ../tools/security/kubeaudit { };
-
- kubectx = callPackage ../development/tools/kubectx { };
-
- kube-linter = callPackage ../development/tools/kube-linter { };
-
- kube-prompt = callPackage ../development/tools/kube-prompt { };
-
- kubeclarity = callPackage ../tools/security/kubeclarity { };
-
- kubemq-community = callPackage ../servers/kubemq-community { };
-
- kubeone = callPackage ../applications/networking/cluster/kubeone { };
-
- kubeprompt = callPackage ../development/tools/kubeprompt { };
-
- kubernetes-polaris = callPackage ../tools/security/kubernetes-polaris { };
-
- kubescape = callPackage ../tools/security/kubescape { };
-
- kubesec = callPackage ../tools/security/kubesec { };
-
- kubespy = callPackage ../applications/networking/cluster/kubespy { };
-
- kubeswitch = callPackage ../development/tools/kubeswitch { };
-
kubie = callPackage ../development/tools/kubie {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -17671,26 +8483,12 @@ with pkgs;
kustomize-sops = callPackage ../development/tools/kustomize/kustomize-sops.nix { };
- ktlint = callPackage ../development/tools/ktlint { };
-
- kythe = callPackage ../development/tools/kythe { };
-
- laminar = callPackage ../development/tools/continuous-integration/laminar { };
-
- lcov = callPackage ../development/tools/analysis/lcov { };
-
- lemon = callPackage ../development/tools/parsing/lemon { };
-
libtool = libtool_2;
libtool_1_5 = callPackage ../development/tools/misc/libtool { };
libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
- libwhich = callPackage ../development/tools/misc/libwhich { };
-
- libwtk-sdl2 = callPackage ../development/libraries/libwtk-sdl2 { };
-
linuxkit = callPackage ../development/tools/misc/linuxkit {
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa Virtualization;
inherit (darwin) sigtool;
@@ -17702,82 +8500,36 @@ with pkgs;
lit = with python3Packages; toPythonApplication lit;
- litecli = callPackage ../development/tools/database/litecli { };
-
- litefs = callPackage ../development/tools/database/litefs { };
-
- litestream = callPackage ../development/tools/database/litestream { };
-
- ls-lint = callPackage ../development/tools/ls-lint { };
-
- lsof = callPackage ../development/tools/misc/lsof { };
-
- ltrace = callPackage ../development/tools/misc/ltrace { };
-
- lttng-tools = callPackage ../development/tools/misc/lttng-tools { };
-
lttng-ust = callPackage ../development/tools/misc/lttng-ust { };
lttng-ust_2_12 = callPackage ../development/tools/misc/lttng-ust/2.12.nix { };
- lttv = callPackage ../development/tools/misc/lttv { };
-
- lurk = callPackage ../development/tools/lurk { };
-
- maizzle = callPackage ../development/tools/maizzle { };
-
- malt = callPackage ../development/tools/profiling/malt { };
-
marksman = callPackage ../development/tools/marksman { };
massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
- mastodon-archive = callPackage ../tools/backup/mastodon-archive { };
-
- math-preview = callPackage ../tools/text/math-review { };
-
maven3 = maven;
inherit (maven) buildMaven;
mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { };
- go-md2man = callPackage ../development/tools/misc/go-md2man { };
-
- mage = callPackage ../development/tools/build-managers/mage { };
-
- mbed-cli = callPackage ../development/tools/mbed-cli { };
-
mdl = callPackage ../development/tools/misc/mdl { };
meraki-cli = python3Packages.callPackage ../tools/admin/meraki-cli { };
- mermerd = callPackage ../development/tools/database/mermerd { };
-
python-matter-server = with python3Packages; toPythonApplication (
python-matter-server.overridePythonAttrs (oldAttrs: {
dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.server;
})
);
- minify = callPackage ../development/web/minify { };
-
minizinc = callPackage ../development/tools/minizinc { };
minizincide = qt6Packages.callPackage ../development/tools/minizinc/ide.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa;
};
- mkcert = callPackage ../development/tools/misc/mkcert { };
-
mkdocs = with python3Packages; toPythonApplication mkdocs;
- mmtf-cpp = callPackage ../development/libraries/science/chemistry/mmtf-cpp { };
-
- mockgen = callPackage ../development/tools/mockgen { };
-
- mockoon = callPackage ../tools/networking/mockoon { };
-
- modd = callPackage ../development/tools/modd { };
-
mold = callPackage ../by-name/mo/mold/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
tbb = tbb_2021_11;
@@ -17795,60 +8547,30 @@ with pkgs;
mopsa = ocamlPackages.mopsa.bin;
- msgpack-tools = callPackage ../development/tools/msgpack-tools { };
-
- msgpuck = callPackage ../development/libraries/msgpuck { };
-
- msitools = callPackage ../development/tools/misc/msitools { };
-
haskell-ci =
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
haskellPackages.haskell-ci;
- nailgun = callPackage ../development/tools/nailgun { };
-
- nap = callPackage ../development/tools/nap { };
-
- nex = callPackage ../development/tools/parsing/nex { };
-
nimbo = with python3Packages; callPackage ../applications/misc/nimbo { };
- gn = callPackage ../development/tools/build-managers/gn { };
-
nixbang = callPackage ../development/tools/misc/nixbang {
pythonPackages = python3Packages;
};
- nix-bisect = callPackage ../development/tools/misc/nix-bisect { };
-
- nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { };
-
nexusmods-app-unfree = nexusmods-app.override {
pname = "nexusmods-app-unfree";
_7zz = _7zz-rar;
};
- nmrpflash = callPackage ../development/embedded/nmrpflash { };
-
- norminette = callPackage ../development/tools/norminette { };
-
nwjs = callPackage ../development/tools/nwjs { };
nwjs-sdk = callPackage ../development/tools/nwjs {
sdk = true;
};
- nrf5-sdk = callPackage ../development/libraries/nrf5-sdk { };
-
obelisk = callPackage ../development/tools/ocaml/obelisk { menhir = ocamlPackages.menhir; };
- obuild = callPackage ../development/tools/ocaml/obuild { };
-
- omake = callPackage ../development/tools/ocaml/omake { };
-
- omniorb = callPackage ../development/tools/omniorb { };
-
openai = with python3Packages; toPythonApplication openai;
openai-whisper = with python3.pkgs; toPythonApplication openai-whisper;
@@ -17857,10 +8579,6 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) Accelerate CoreGraphics CoreML CoreVideo MetalKit;
};
- opengrok = callPackage ../development/tools/misc/opengrok { };
-
- openocd = callPackage ../development/embedded/openocd { };
-
openocd-rp2040 = openocd.overrideAttrs (old: {
pname = "openocd-rp2040";
src = fetchFromGitHub {
@@ -17881,38 +8599,16 @@ with pkgs;
libiberty_static = libiberty.override { staticBuild = true; };
};
- package-project-cmake = callPackage ../development/tools/package-project-cmake { };
-
pactorio = callPackage ../development/tools/pactorio {
inherit (darwin.apple_sdk.frameworks) Security;
};
- panopticon = callPackage ../development/tools/analysis/panopticon { };
-
- parinfer-rust = callPackage ../development/tools/parinfer-rust { };
-
- parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
-
patchelf = callPackage ../development/tools/misc/patchelf { };
patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });
- patsh = callPackage ../development/tools/misc/patsh { };
-
- pax-rs = callPackage ../development/tools/pax-rs { };
-
- perfect-hash = callPackage ../development/tools/misc/perfect-hash { };
-
- peg = callPackage ../development/tools/parsing/peg { };
-
pgcli = with pkgs.python3Packages; toPythonApplication pgcli;
- picotool = callPackage ../development/tools/picotool { };
-
- planus = callPackage ../development/tools/misc/planus { };
-
- pmccabe = callPackage ../development/tools/misc/pmccabe { };
-
pkgconf-unwrapped = libpkgconf;
pkgconf = callPackage ../build-support/pkg-config-wrapper {
@@ -17920,7 +8616,6 @@ with pkgs;
baseBinName = "pkgconf";
};
- pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { };
pkg-config = callPackage ../build-support/pkg-config-wrapper {
pkg-config = pkg-config-unwrapped;
};
@@ -17939,18 +8634,8 @@ with pkgs;
inherit (nodePackages) postcss-cli;
- postiats-utilities = callPackage ../development/tools/postiats-utilities { };
-
- postman = callPackage ../development/web/postman { };
-
- pprof = callPackage ../development/tools/profiling/pprof { };
-
- pqrs = callPackage ../development/tools/pqrs { };
-
pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree;
- prelink = callPackage ../development/tools/misc/prelink { };
-
premake3 = callPackage ../development/tools/misc/premake/3.nix { };
premake4 = callPackage ../development/tools/misc/premake { };
@@ -17961,30 +8646,12 @@ with pkgs;
premake = premake4;
- process-compose = callPackage ../applications/misc/process-compose { };
-
- process-viewer = callPackage ../applications/misc/process-viewer { };
-
procodile = callPackage ../tools/system/procodile { };
- protox = callPackage ../development/tools/misc/protox { };
-
- proxmove = callPackage ../tools/admin/proxmove { };
-
pry = callPackage ../development/tools/pry { };
- pup = callPackage ../development/tools/pup { };
-
- puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli { };
-
- pyrseas = callPackage ../development/tools/database/pyrseas { };
-
pycritty = with python3Packages; toPythonApplication pycritty;
- pylint-exit = callPackage ../development/tools/pylint-exit { };
-
- qc = callPackage ../development/tools/qc { };
-
qtcreator = qt6Packages.callPackage ../development/tools/qtcreator {
inherit (linuxPackages) perf;
stdenv = llvmPackages.stdenv;
@@ -17996,10 +8663,6 @@ with pkgs;
lua = lua5;
} // (config.radare or {}));
- ran = callPackage ../servers/http/ran { };
-
- retry = callPackage ../tools/system/retry { };
-
rizin = pkgs.callPackage ../development/tools/analysis/rizin { };
rizinPlugins = recurseIntoAttrs rizin.plugins;
@@ -18010,74 +8673,25 @@ with pkgs;
ragel = ragelStable;
- randoop = callPackage ../development/tools/analysis/randoop { };
-
inherit (callPackages ../development/tools/parsing/ragel { }) ragelStable ragelDev;
- hammer = callPackage ../development/tools/parsing/hammer { };
-
- rcodesign = callPackage ../development/tools/rcodesign { };
-
- rdocker = callPackage ../development/tools/rdocker { };
-
- react-static = callPackage ../development/tools/react-static { };
-
redis-dump = callPackage ../development/tools/redis-dump { };
- redis-plus-plus = callPackage ../development/libraries/redis-plus-plus { };
-
- redisinsight = callPackage ../development/tools/redisinsight { };
-
- redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { };
-
- redo-c = callPackage ../development/tools/build-managers/redo-c { };
-
- redo-sh = callPackage ../development/tools/build-managers/redo-sh { };
-
- regclient = callPackage ../development/tools/regclient { };
inherit (regclient) regbot regctl regsync;
- regex-cli = callPackage ../development/tools/misc/regex-cli { };
-
reno = callPackage ../development/tools/reno {
python3Packages = python311Packages;
};
- re2c = callPackage ../development/tools/parsing/re2c { };
-
- remake = callPackage ../development/tools/build-managers/remake { };
-
replace-secret = callPackage ../build-support/replace-secret/replace-secret.nix { };
- replacement = callPackage ../development/tools/misc/replacement { };
-
inherit (callPackage ../development/tools/replay-io { })
replay-io replay-node-cli;
- requestly = callPackage ../tools/networking/requestly { };
-
- reshape = callPackage ../development/tools/reshape { } ;
-
- retdec = callPackage ../development/tools/analysis/retdec { };
-
- reviewdog = callPackage ../development/tools/misc/reviewdog { };
-
- revive = callPackage ../development/tools/revive { };
-
- riff = callPackage ../development/tools/misc/riff { };
-
- rman = callPackage ../development/tools/misc/rman { };
-
rnginline = with python3Packages; toPythonApplication rnginline;
- rolespec = callPackage ../development/tools/misc/rolespec { };
-
rr = callPackage ../development/tools/analysis/rr { };
- rsass = callPackage ../development/tools/misc/rsass { };
-
- rsonpath = callPackage ../development/tools/misc/rsonpath { };
-
rufo = callPackage ../development/tools/rufo { };
muonStandalone = muon.override {
@@ -18085,50 +8699,22 @@ with pkgs;
buildDocs = false;
};
- saleae-logic = callPackage ../development/tools/misc/saleae-logic { };
-
- saleae-logic-2 = callPackage ../development/tools/misc/saleae-logic-2 { };
-
- samply = callPackage ../development/tools/misc/samply { };
-
sauce-connect = callPackage ../development/tools/sauce-connect { };
- sawjap = callPackage ../development/tools/java/sawjap { };
-
sbomnix = python3.pkgs.callPackage ../tools/security/sbomnix { };
- sd-local = callPackage ../development/tools/sd-local { };
-
seer = libsForQt5.callPackage ../development/tools/misc/seer { };
- selenium-server-standalone = callPackage ../development/tools/selenium/server { };
-
- selendroid = callPackage ../development/tools/selenium/selendroid { };
-
- sem = callPackage ../development/tools/sem { };
-
- semver-tool = callPackage ../development/tools/misc/semver-tool { };
-
semantik = libsForQt5.callPackage ../applications/office/semantik { };
- sca2d = callPackage ../development/tools/sca2d { };
-
- mill = callPackage ../development/tools/build-managers/mill { };
-
sbt = callPackage ../development/tools/build-managers/sbt { };
sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
simpleBuildTool = sbt;
- sbt-extras = callPackage ../development/tools/build-managers/sbt-extras { };
-
scala-cli = callPackage ../development/tools/build-managers/scala-cli { };
scss-lint = callPackage ../development/tools/scss-lint { };
- segger-ozone = callPackage ../development/tools/misc/segger-ozone { };
-
- selene = callPackage ../development/tools/selene { };
-
shadowenv = callPackage ../tools/misc/shadowenv {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -18138,8 +8724,6 @@ with pkgs;
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
haskellPackages.shake;
- shallot = callPackage ../tools/misc/shallot { };
-
inherit (callPackage ../development/tools/build-managers/shards { })
shards_0_17
shards;
@@ -18154,34 +8738,12 @@ with pkgs;
# pandoc takes long to build and documentation isn't needed for just running the cli
shellcheck-minimal = haskell.lib.compose.justStaticExecutables shellcheck.unwrapped;
- shellharden = callPackage ../development/tools/shellharden { };
-
- scenebuilder = callPackage ../development/tools/scenebuilder { };
-
- scenic-view = callPackage ../development/tools/scenic-view { };
-
- shncpd = callPackage ../tools/networking/shncpd { };
-
- sigrok-cli = callPackage ../development/tools/sigrok-cli { };
-
- simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { };
-
- slimerjs = callPackage ../development/tools/slimerjs { };
-
slint-lsp = callPackage ../by-name/sl/slint-lsp/package.nix {
inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
};
- sloccount = callPackage ../development/tools/misc/sloccount { };
-
sloc = nodePackages.sloc;
- smc = callPackage ../tools/misc/smc { };
-
- snore = callPackage ../tools/misc/snore { };
-
- snzip = callPackage ../tools/archivers/snzip { };
-
snowman = qt5.callPackage ../development/tools/analysis/snowman { };
sparse = callPackage ../development/tools/analysis/sparse {
@@ -18190,13 +8752,6 @@ with pkgs;
speedtest-cli = with python3Packages; toPythonApplication speedtest-cli;
- spicy-parser-generator = callPackage ../development/tools/parsing/spicy { };
-
- spin = callPackage ../development/tools/analysis/spin { };
-
- spirv-headers = callPackage ../development/libraries/spirv-headers { };
- spirv-tools = callPackage ../development/tools/spirv-tools { };
-
splint = callPackage ../development/tools/analysis/splint {
flex = flex_2_5_35;
};
@@ -18210,113 +8765,32 @@ with pkgs;
protobuf = protobuf_21;
};
- spooles = callPackage ../development/libraries/science/math/spooles { };
-
spr = callPackage ../development/tools/spr {
inherit (darwin.apple_sdk.frameworks) Security;
};
- spruce = callPackage ../development/tools/misc/spruce { };
-
- sqlboiler-crdb = callPackage ../development/tools/database/sqlboiler-crdb { };
-
- sqlcheck = callPackage ../development/tools/database/sqlcheck { };
-
- sqlcmd = callPackage ../development/tools/database/sqlcmd { };
-
sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
sqlite-utils = with python3Packages; toPythonApplication sqlite-utils;
- sqlite-web = callPackage ../development/tools/database/sqlite-web { };
-
sqlmap = with python3Packages; toPythonApplication sqlmap;
- sqlpage = callPackage ../servers/sqlpage { };
-
- src-cli = callPackage ../development/tools/misc/src-cli { };
-
- sselp = callPackage ../tools/X11/sselp{ };
-
- statix = callPackage ../tools/nix/statix { };
-
- stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { };
-
- stm32flash = callPackage ../development/embedded/stm32/stm32flash { };
-
- stm8flash = callPackage ../development/embedded/stm8/stm8flash { };
-
- strace = callPackage ../development/tools/misc/strace { };
-
- strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { };
-
- stylua = callPackage ../development/tools/stylua { };
-
- summon = callPackage ../development/tools/summon { };
-
- supabase-cli = callPackage ../development/tools/supabase-cli { };
-
- surge-cli = callPackage ../development/tools/surge-cli { };
-
- svlint = callPackage ../development/tools/analysis/svlint { };
-
- swarm = callPackage ../development/tools/analysis/swarm { };
-
- swiftformat = callPackage ../development/tools/swiftformat { };
-
- swiftshader = callPackage ../development/libraries/swiftshader { };
-
- systemfd = callPackage ../development/tools/systemfd { };
-
- c2ffi = callPackage ../development/tools/misc/c2ffi { };
-
c0 = callPackage ../development/compilers/c0 {
stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
};
- c3c = callPackage ../development/compilers/c3c { };
-
- swfmill = callPackage ../tools/video/swfmill { };
-
swftools = callPackage ../tools/video/swftools {
stdenv = gccStdenv;
};
- szyszka = callPackage ../tools/misc/szyszka { };
-
- taplo = callPackage ../development/tools/taplo { };
-
- taoup = callPackage ../tools/misc/taoup { };
-
tarmac = callPackage ../development/tools/tarmac {
inherit (darwin.apple_sdk.frameworks) Security;
};
- tcptrack = callPackage ../development/tools/misc/tcptrack { };
-
- teensy-cmake-macros = callPackage ../development/embedded/teensy-cmake-macros { };
-
teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; };
- teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { };
-
tytools = libsForQt5.callPackage ../development/embedded/tytools { };
- terracognita = callPackage ../development/tools/misc/terracognita { };
-
- terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { };
- terraform-ls = callPackage ../development/tools/misc/terraform-ls { };
-
- terraformer = callPackage ../development/tools/misc/terraformer { };
-
- terramate = callPackage ../development/tools/misc/terramate { };
-
- terrascan = callPackage ../tools/security/terrascan { };
-
- terser = callPackage ../development/tools/misc/terser { };
-
- tesh = callPackage ../tools/text/tesh {};
-
texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
inherit (texinfoPackages)
texinfo413
@@ -18329,26 +8803,14 @@ with pkgs;
texinfo = texinfo7;
texinfoInteractive = texinfo.override { interactive = true; };
- texi2html = callPackage ../development/tools/misc/texi2html { };
-
- texi2mdoc = callPackage ../tools/misc/texi2mdoc { };
-
texlab = callPackage ../development/tools/misc/texlab {
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};
- time-ghc-modules = callPackage ../development/tools/time-ghc-modules { };
-
tflint-plugins = recurseIntoAttrs (
callPackage ../development/tools/analysis/tflint-plugins { }
);
- tfsec = callPackage ../development/tools/analysis/tfsec { };
-
- todoist = callPackage ../applications/misc/todoist { };
-
- todoist-electron = callPackage ../applications/misc/todoist-electron { };
-
travis = callPackage ../development/tools/misc/travis { };
tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) {
@@ -18357,56 +8819,22 @@ with pkgs;
tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars;
- trellis = callPackage ../development/embedded/fpga/trellis { };
-
- ttags = callPackage ../development/tools/misc/ttags { };
-
- ttyd = callPackage ../servers/ttyd { };
-
- tweak = callPackage ../applications/editors/tweak { };
-
- typical = callPackage ../development/tools/misc/typical { };
-
- tyson = callPackage ../development/tools/misc/tyson { };
-
- uddup = callPackage ../tools/security/uddup { };
-
- udis86 = callPackage ../development/tools/udis86 { };
-
uhd = callPackage ../applications/radio/uhd { };
uhdMinimal = uhd.override {
enableUtils = false;
enablePythonApi = false;
};
- uisp = callPackage ../development/embedded/uisp { };
-
- wch-isp = callPackage ../development/embedded/wch-isp { };
-
- uncrustify = callPackage ../development/tools/misc/uncrustify { };
-
- unused = callPackage ../development/tools/misc/unused { };
-
- vagrant = callPackage ../development/tools/vagrant { };
-
- bashdb = callPackage ../development/tools/misc/bashdb { };
-
gdb = callPackage ../development/tools/misc/gdb {
guile = null;
};
gdbHostCpuOnly = gdb.override { hostCpuOnly = true; };
- gf = callPackage ../development/tools/misc/gf { };
-
- java-language-server = callPackage ../development/tools/java/java-language-server { };
-
jprofiler = callPackage ../development/tools/java/jprofiler {
jdk = jdk11;
};
- jhiccup = callPackage ../development/tools/java/jhiccup { };
-
valgrind = callPackage ../development/tools/analysis/valgrind {
inherit (buildPackages.darwin) xnu bootstrap_cmds;
};
@@ -18418,44 +8846,20 @@ with pkgs;
vcpkg-tool-unwrapped = callPackage ../by-name/vc/vcpkg-tool/package.nix { doWrap = false; };
- visualvm = callPackage ../development/tools/java/visualvm { };
-
- volta = callPackage ../development/tools/volta { };
-
- vultr = callPackage ../development/tools/vultr { };
-
- vultr-cli = callPackage ../development/tools/vultr-cli { };
-
- vulnix = callPackage ../tools/security/vulnix { };
-
- vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { };
-
wails = callPackage ../development/tools/wails {
stdenv = gccStdenv;
};
- wasmer-pack = callPackage ../development/tools/misc/wasmer-pack { };
-
- whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { };
-
whatstyle = callPackage ../development/tools/misc/whatstyle {
inherit (llvmPackages) clang-unwrapped;
};
watson-ruby = callPackage ../development/tools/misc/watson-ruby { };
- web-ext = callPackage ../development/tools/web-ext { };
-
- webdis = callPackage ../development/tools/database/webdis { };
-
xmake = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/xmake {
inherit (darwin.apple_sdk_11_0.frameworks) CoreServices;
};
- xc3sprog = callPackage ../development/embedded/xc3sprog { };
-
- xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
-
xcode-install = callPackage ../development/tools/xcode-install { };
xcbuild = callPackage ../by-name/xc/xcbuild/package.nix {
@@ -18476,63 +8880,29 @@ with pkgs;
xcpretty = callPackage ../development/tools/xcpretty { };
- xeus = callPackage ../development/libraries/xeus { };
-
- xeus-zmq = callPackage ../development/libraries/xeus-zmq { };
-
- xmlindent = callPackage ../development/web/xmlindent { };
-
- xpwn = callPackage ../development/mobile/xpwn { };
-
xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { };
xxe-pe = callPackage ../applications/editors/xxe-pe { };
xxdiff-tip = xxdiff;
- xxgdb = callPackage ../development/tools/misc/xxgdb { };
-
- yaml2json = callPackage ../development/tools/yaml2json { };
-
- yams = callPackage ../applications/audio/yams { };
-
ycmd = callPackage ../by-name/yc/ycmd/package.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
python = python3;
};
- yo = callPackage ../development/tools/yo { };
-
- yodl = callPackage ../development/tools/misc/yodl { };
-
yourkit-java = callPackage ../by-name/yo/yourkit-java/package.nix {
jre = jdk17;
};
yq = python3.pkgs.toPythonApplication python3.pkgs.yq;
- yq-go = callPackage ../development/tools/yq-go { };
-
- ytt = callPackage ../development/tools/ytt { };
-
- grabserial = callPackage ../development/tools/grabserial { };
-
mypy = with python3Packages; toPythonApplication mypy;
mypy-protobuf = with python3Packages; toPythonApplication mypy-protobuf;
- nsis = callPackage ../development/tools/nsis { };
-
- tockloader = callPackage ../development/tools/misc/tockloader { };
-
- zon2nix = callPackage ../tools/nix/zon2nix { };
-
- ztags = callPackage ../development/tools/misc/ztags { };
-
### DEVELOPMENT / LIBRARIES
- aalib = callPackage ../development/libraries/aalib { };
-
abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix {
# If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
@@ -18559,93 +8929,37 @@ with pkgs;
};
abseil-cpp = abseil-cpp_202407;
- accountsservice = callPackage ../development/libraries/accountsservice { };
-
acl = callPackage ../development/libraries/acl { };
- acltoolkit = callPackage ../tools/security/acltoolkit { };
-
- acsccid = callPackage ../tools/security/acsccid { };
-
- adns = callPackage ../development/libraries/adns { };
-
- adslib = callPackage ../development/libraries/adslib { };
-
- aemu = callPackage ../development/libraries/aemu { };
-
- afflib = callPackage ../development/libraries/afflib { };
-
- aften = callPackage ../development/libraries/aften { };
-
- alure = callPackage ../development/libraries/alure { };
-
- alure2 = callPackage ../development/libraries/alure2 { };
-
agg = callPackage ../development/libraries/agg {
stdenv = gccStdenv;
};
- agkozak-zsh-prompt = callPackage ../shells/zsh/agkozak-zsh-prompt { };
-
- alass = callPackage ../applications/video/alass { };
-
allegro = allegro4;
allegro4 = callPackage ../development/libraries/allegro { };
allegro5 = callPackage ../development/libraries/allegro/5.nix { };
- amf-headers = callPackage ../development/libraries/amf-headers { };
-
- aml = callPackage ../development/libraries/aml { };
-
- amrnb = callPackage ../development/libraries/amrnb { };
-
- amrwb = callPackage ../development/libraries/amrwb { };
-
ansi2html = with python3.pkgs; toPythonApplication ansi2html;
- antic = callPackage ../development/libraries/antic { };
-
- anttweakbar = callPackage ../development/libraries/AntTweakBar { };
-
appstream = callPackage ../development/libraries/appstream { };
- appstream-glib = callPackage ../development/libraries/appstream-glib { };
-
apr = callPackage ../development/libraries/apr {
autoreconfHook = buildPackages.autoreconfHook269;
};
- aprutil = callPackage ../development/libraries/apr-util { };
-
- aravis = callPackage ../development/libraries/aravis { };
-
- arb = callPackage ../development/libraries/arb { };
-
- argparse = callPackage ../development/libraries/argparse { };
-
argparse-manpage = with python3Packages; toPythonApplication argparse-manpage;
- argp-standalone = callPackage ../development/libraries/argp-standalone { };
-
aribb25 = callPackage ../development/libraries/aribb25 {
inherit (darwin.apple_sdk.frameworks) PCSC;
};
- armadillo = callPackage ../development/libraries/armadillo { };
-
arrayfire = callPackage ../development/libraries/arrayfire {
cudaPackages = cudaPackages_12;
};
- arsenal = callPackage ../tools/security/arsenal { };
-
- assimp = callPackage ../development/libraries/assimp { };
-
asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { };
asio = callPackage ../development/libraries/asio { };
- asmjit = callPackage ../development/libraries/asmjit { };
-
aspell = callPackage ../development/libraries/aspell { };
aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {});
@@ -18656,101 +8970,40 @@ with pkgs;
attr = callPackage ../development/libraries/attr { };
- at-spi2-core = callPackage ../development/libraries/at-spi2-core { };
-
# Not moved to aliases while we decide if we should split the package again.
at-spi2-atk = at-spi2-core;
aqbanking = callPackage ../development/libraries/aqbanking { };
- aubio = callPackage ../development/libraries/aubio { };
-
- audiality2 = callPackage ../development/libraries/audiality2 { };
-
audiofile = callPackage ../development/libraries/audiofile {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices;
};
- aws-c-auth = callPackage ../development/libraries/aws-c-auth { };
-
aws-c-cal = callPackage ../development/libraries/aws-c-cal {
inherit (darwin.apple_sdk.frameworks) Security;
};
- aws-c-common = callPackage ../development/libraries/aws-c-common { };
-
- aws-c-compression = callPackage ../development/libraries/aws-c-compression { };
-
- aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { };
-
- aws-c-http = callPackage ../development/libraries/aws-c-http { };
-
aws-c-io = callPackage ../development/libraries/aws-c-io {
inherit (darwin.apple_sdk.frameworks) Security;
};
- aws-c-mqtt = callPackage ../development/libraries/aws-c-mqtt { };
-
- aws-c-s3 = callPackage ../development/libraries/aws-c-s3 { };
-
- aws-c-sdkutils = callPackage ../development/libraries/aws-c-sdkutils { };
-
- aws-checksums = callPackage ../development/libraries/aws-checksums { };
-
- aws-crt-cpp = callPackage ../development/libraries/aws-crt-cpp { };
-
aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp {
inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox;
};
- ayatana-webmail = callPackage ../applications/networking/mailreaders/ayatana-webmail { };
-
- azmq = callPackage ../development/libraries/azmq { };
-
- babl = callPackage ../development/libraries/babl { };
-
backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix {
zig = buildPackages.zig_0_11;
};
- backward-cpp = callPackage ../development/libraries/backward-cpp { };
-
- bamf = callPackage ../development/libraries/bamf { };
-
inherit (callPackages ../development/libraries/bashup-events { }) bashup-events32 bashup-events44;
- bcg729 = callPackage ../development/libraries/bcg729 { };
-
- bctoolbox = callPackage ../development/libraries/bctoolbox { };
-
bc-soci = callPackage ../development/libraries/soci/bc-soci.nix { };
- bearssl = callPackage ../development/libraries/bearssl { };
-
- beecrypt = callPackage ../development/libraries/beecrypt { };
-
- belcard = callPackage ../development/libraries/belcard { };
-
- belr = callPackage ../development/libraries/belr { };
-
- bencode = callPackage ../development/libraries/bencode { };
-
- bencodetools = callPackage ../development/libraries/bencodetools { };
-
- belle-sip = callPackage ../development/libraries/belle-sip { };
-
-
- bicpl = callPackage ../development/libraries/science/biology/bicpl { };
-
- bicgl = callPackage ../development/libraries/science/biology/bicgl { };
-
# TODO(@Ericson2314): Build bionic libc from source
bionic = if stdenv.hostPlatform.useAndroidPrebuilt
then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVersion}".libraries
else callPackage ../os-specific/linux/bionic-prebuilt { };
- boolstuff = callPackage ../development/libraries/boolstuff { };
-
inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; })
boost175
boost177
@@ -18767,8 +9020,6 @@ with pkgs;
boost = boost181;
- bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { };
-
inherit (callPackages ../development/libraries/botan { })
botan2
botan3
@@ -18778,18 +9029,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL;
};
- boxfort = callPackage ../development/libraries/boxfort { };
-
- brunsli = callPackage ../development/libraries/brunsli { };
-
- buddy = callPackage ../development/libraries/buddy { };
-
- buildkit-nix = callPackage ../applications/virtualization/buildkit-nix { };
-
- bulletml = callPackage ../development/libraries/bulletml { };
-
- bzrtp = callPackage ../development/libraries/bzrtp { };
-
c-ares = callPackage ../development/libraries/c-ares { };
c-aresMinimal = callPackage ../development/libraries/c-ares {
@@ -18801,8 +9040,6 @@ with pkgs;
cachix = lib.getBin haskellPackages.cachix;
- calcium = callPackage ../development/libraries/calcium { };
-
cubeb = callPackage ../development/libraries/audio/cubeb {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreServices;
};
@@ -18817,33 +9054,11 @@ with pkgs;
ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu);
- capnproto = callPackage ../development/libraries/capnproto { };
-
- capnproto-java = callPackage ../development/tools/capnproto-java { };
-
- capnproto-rust = callPackage ../development/tools/capnproto-rust { };
-
- captive-browser = callPackage ../applications/networking/browsers/captive-browser { };
-
catboost = callPackage ../by-name/ca/catboost/package.nix {
# https://github.com/catboost/catboost/issues/2540
cudaPackages = cudaPackages_11;
};
- cddlib = callPackage ../development/libraries/cddlib { };
-
- cdk-go = callPackage ../tools/security/cdk-go { };
-
- cdo = callPackage ../development/libraries/cdo { };
-
- cista = callPackage ../development/libraries/cista { };
-
- cjose = callPackage ../development/libraries/cjose { };
-
- scmccid = callPackage ../development/libraries/scmccid { };
-
- ccrtp = callPackage ../development/libraries/ccrtp { };
-
cctag = callPackage ../development/libraries/cctag {
stdenv = clangStdenv;
tbb = tbb_2021_11;
@@ -18859,8 +9074,6 @@ with pkgs;
celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { };
celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { };
- cegui = callPackage ../development/libraries/cegui { };
-
certbot = python3.pkgs.toPythonApplication python3.pkgs.certbot;
certbot-full = certbot.withPlugins (cp: with cp; [
@@ -18871,106 +9084,36 @@ with pkgs;
certbot-dns-route53
]);
- caf = callPackage ../development/libraries/caf { };
-
# CGAL 5 has API changes
cgal_4 = callPackage ../development/libraries/CGAL/4.nix { };
cgal_5 = callPackage ../development/libraries/CGAL { };
cgal = cgal_5;
- cgui = callPackage ../development/libraries/cgui { };
-
- charls = callPackage ../development/libraries/charls { };
-
check = callPackage ../development/libraries/check {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- chipmunk = callPackage ../development/libraries/chipmunk { };
-
- chmlib = callPackage ../development/libraries/chmlib { };
-
- chromaprint = callPackage ../development/libraries/chromaprint { };
-
- cl = callPackage ../development/libraries/cl { };
-
- clanlib = callPackage ../development/libraries/clanlib { };
-
- clap = callPackage ../development/libraries/clap { };
-
- classads = callPackage ../development/libraries/classads { };
-
- clfft = callPackage ../development/libraries/clfft { };
-
- clipp = callPackage ../development/libraries/clipp { };
-
- clipper = callPackage ../development/libraries/clipper { };
-
- cln = callPackage ../development/libraries/cln { };
-
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
clucene_core = clucene_core_2;
- clutter = callPackage ../development/libraries/clutter { };
-
clutter-gst = callPackage ../development/libraries/clutter-gst {
};
- clutter-gtk = callPackage ../development/libraries/clutter-gtk { };
-
- cminpack = callPackage ../development/libraries/cminpack { };
-
- cmocka = callPackage ../development/libraries/cmocka { };
-
- cmrt = callPackage ../development/libraries/cmrt { };
-
codecserver = callPackage ../applications/audio/codecserver {
protobuf = protobuf_21;
};
- coercer = callPackage ../tools/security/coercer { };
-
cogl = callPackage ../development/libraries/cogl {
inherit (darwin.apple_sdk.frameworks) OpenGL;
};
- coin3d = callPackage ../development/libraries/coin3d { };
-
- soxt = callPackage ../development/libraries/soxt { };
-
coinlive = callPackage ../tools/misc/coinlive {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cointop = callPackage ../applications/misc/cointop { };
-
- coloquinte = callPackage ../development/libraries/science/electronics/coloquinte { };
-
- cog = callPackage ../development/web/cog { };
-
inherit (cosmopolitan) cosmocc;
- python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { };
-
- ctpp2 = callPackage ../development/libraries/ctpp2 { };
-
- ctpl = callPackage ../development/libraries/ctpl { };
-
- cppe = callPackage ../development/libraries/science/chemistry/cppe { };
-
- cppdb = callPackage ../development/libraries/cppdb { };
-
- cpp-utilities = callPackage ../development/libraries/cpp-utilities { };
-
- cpp-hocon = callPackage ../development/libraries/cpp-hocon { };
-
- cpp-ipfs-http-client = callPackage ../development/libraries/cpp-ipfs-http-client { };
-
- cpp-netlib = callPackage ../development/libraries/cpp-netlib { };
-
- cpp-jwt = callPackage ../development/libraries/cpp-jwt { };
-
ctranslate2 = callPackage ../development/libraries/ctranslate2 rec {
stdenv = if withCUDA then gcc11Stdenv else pkgs.stdenv;
withCUDA = pkgs.config.cudaSupport;
@@ -18978,12 +9121,6 @@ with pkgs;
cudaPackages = pkgs.cudaPackages;
};
- ubus = callPackage ../development/libraries/ubus { };
-
- uci = callPackage ../development/libraries/uci { };
-
- uclient = callPackage ../development/libraries/uclient { };
-
ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; };
ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; additional_buildInputs = [ openssl ]; };
@@ -18993,52 +9130,10 @@ with pkgs;
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
- uri = callPackage ../development/libraries/uri { };
-
- cppcms = callPackage ../development/libraries/cppcms { };
-
- cppcodec = callPackage ../development/libraries/cppcodec { };
-
- cppunit = callPackage ../development/libraries/cppunit { };
-
- cpputest = callPackage ../development/libraries/cpputest { };
-
- cracklib = callPackage ../development/libraries/cracklib { };
-
- cre2 = callPackage ../development/libraries/cre2 { };
-
- croaring = callPackage ../development/libraries/croaring { };
-
- crossguid = callPackage ../development/libraries/crossguid { };
-
- cryptopp = callPackage ../development/libraries/crypto++ { };
-
- cryptominisat = callPackage ../applications/science/logic/cryptominisat { };
-
- csdr = callPackage ../applications/radio/csdr { };
-
- ctypes_sh = callPackage ../development/libraries/ctypes_sh { };
-
- curlpp = callPackage ../development/libraries/curlpp { };
-
- cutee = callPackage ../development/libraries/cutee { };
-
- cxxtools = callPackage ../development/libraries/cxxtools { };
-
- cwiid = callPackage ../development/libraries/cwiid { };
-
- cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { };
-
- cxxopts = callPackage ../development/libraries/cxxopts { };
-
cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { };
cypress = callPackage ../development/web/cypress { };
- cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
-
- cyrus-sasl-xoauth2 = callPackage ../development/libraries/cyrus-sasl-xoauth2 { };
-
# Make bdb5 the default as it is the last release under the custom
# bsd-like license
db = db5;
@@ -19050,13 +9145,7 @@ with pkgs;
db60 = callPackage ../development/libraries/db/db-6.0.nix { };
db62 = callPackage ../development/libraries/db/db-6.2.nix { };
- dbxml = callPackage ../development/libraries/dbxml { };
-
dbus = callPackage ../development/libraries/dbus { };
- dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { };
- dbus-glib = callPackage ../development/libraries/dbus-glib { };
- dbus_java = callPackage ../development/libraries/java/dbus-java { };
-
dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { };
dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { };
@@ -19072,30 +9161,10 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
};
- dhex = callPackage ../applications/editors/dhex { };
-
- double-conversion = callPackage ../development/libraries/double-conversion { };
-
- dclib = callPackage ../development/libraries/dclib { };
-
- digiham = callPackage ../applications/radio/digiham { };
-
- directfb = callPackage ../development/libraries/directfb { };
-
discord-rpc = callPackage ../development/libraries/discord-rpc {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- discord-sh = callPackage ../tools/networking/discord-sh { };
-
- dlib = callPackage ../development/libraries/dlib { };
-
- doctest = callPackage ../development/libraries/doctest { };
-
- docopt_cpp = callPackage ../development/libraries/docopt_cpp { };
-
- dotconf = callPackage ../development/libraries/dotconf { };
-
draco = callPackage ../development/libraries/draco {
tinygltf = callPackage ../development/libraries/draco/tinygltf.nix { };
};
@@ -19113,31 +9182,19 @@ with pkgs;
vdpauinfo;
};
- drogon = callPackage ../development/libraries/drogon { };
-
- dssi = callPackage ../development/libraries/dssi { };
-
duckdb = callPackage ../development/libraries/duckdb { };
- easyloggingpp = callPackage ../development/libraries/easyloggingpp { };
-
eccodes = callPackage ../development/libraries/eccodes {
pythonPackages = python3Packages;
stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
};
- eclib = callPackage ../development/libraries/eclib { };
-
- editline = callPackage ../development/libraries/editline { };
-
edencommon = darwin.apple_sdk_11_0.callPackage ../development/libraries/edencommon { };
eigen = callPackage ../development/libraries/eigen { };
eigen2 = callPackage ../development/libraries/eigen/2.0.nix { };
- eigenmath = callPackage ../applications/science/math/eigenmath { };
-
vapoursynth = callPackage ../by-name/va/vapoursynth/package.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
@@ -19148,16 +9205,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
};
- eglexternalplatform = callPackage ../development/libraries/eglexternalplatform { };
-
- egl-wayland = callPackage ../development/libraries/egl-wayland { };
-
elastix = callPackage ../development/libraries/science/biology/elastix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- elfio = callPackage ../development/libraries/elfio { };
-
# TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013
emanote = haskellPackages.emanote;
@@ -19166,28 +9217,10 @@ with pkgs;
};
enchant = enchant2;
- enet = callPackage ../development/libraries/enet { };
-
- entt = callPackage ../development/libraries/entt { };
-
libepoxy = callPackage ../development/libraries/libepoxy {
inherit (darwin.apple_sdk.frameworks) Carbon OpenGL;
};
- libesmtp = callPackage ../development/libraries/libesmtp { };
-
- exiv2 = callPackage ../development/libraries/exiv2 { };
-
- expat = callPackage ../development/libraries/expat { };
-
- exprtk = callPackage ../development/libraries/exprtk { };
-
- eventlog = callPackage ../development/libraries/eventlog { };
-
- faac = callPackage ../development/libraries/faac { };
-
- faad2 = callPackage ../development/libraries/faad2 { };
-
factor-lang-scope = callPackage ../development/compilers/factor-lang/scope.nix { };
factor-lang = factor-lang-scope.interpreter;
@@ -19195,8 +9228,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL System;
};
- farbfeld = callPackage ../development/libraries/farbfeld { };
-
farstream = callPackage ../development/libraries/farstream {
inherit (gst_all_1)
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
@@ -19208,16 +9239,6 @@ with pkgs;
fb303 = darwin.apple_sdk_11_0.callPackage ../development/libraries/fb303 { };
- fcl = callPackage ../development/libraries/fcl { };
-
- ffcast = callPackage ../tools/X11/ffcast { };
-
- fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { };
-
- forge = callPackage ../development/libraries/forge { };
-
- linbox = callPackage ../development/libraries/linbox { };
-
inherit (callPackage ../development/libraries/ffmpeg { })
ffmpeg_4
ffmpeg_4-headless
@@ -19232,11 +9253,6 @@ with pkgs;
ffmpeg-headless
ffmpeg-full;
- ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };
-
- ffms = callPackage ../development/libraries/ffms { };
-
- fftw = callPackage ../development/libraries/fftw { };
fftwSinglePrec = fftw.override { precision = "single"; };
fftwFloat = fftwSinglePrec; # the configure option is just an alias
fftwLongDouble = fftw.override { precision = "long-double"; };
@@ -19247,16 +9263,8 @@ with pkgs;
};
fftwMpi = fftw.override { enableMpi = true; };
- filter-audio = callPackage ../development/libraries/filter-audio { };
-
- filtron = callPackage ../servers/filtron { };
-
fizz = darwin.apple_sdk_11_0.callPackage ../development/libraries/fizz { };
- flann = callPackage ../development/libraries/flann { };
-
- flatcc = callPackage ../development/libraries/flatcc { };
-
flint = callPackage ../development/libraries/flint { };
flint3 = callPackage ../development/libraries/flint/3.nix { };
@@ -19284,8 +9292,6 @@ with pkgs;
fltk = fltk13;
fltk-minimal = fltk13-minimal;
- flyway = callPackage ../development/tools/flyway { };
-
inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10 fmt_11;
fmt = fmt_10;
@@ -19307,26 +9313,14 @@ with pkgs;
};
};
- freetts = callPackage ../development/libraries/freetts { };
-
frog = res.languageMachines.frog;
- fstrcmp = callPackage ../development/libraries/fstrcmp { };
-
- fstrm = callPackage ../development/libraries/fstrm { };
-
- cfitsio = callPackage ../development/libraries/science/astronomy/cfitsio { };
-
fontconfig = callPackage ../development/libraries/fontconfig {
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
folly = darwin.apple_sdk_11_0.callPackage ../development/libraries/folly { };
- folks = callPackage ../development/libraries/folks { };
-
- fortify-headers = callPackage ../development/libraries/fortify-headers { };
-
makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { };
makeFontsCache = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
@@ -19334,76 +9328,34 @@ with pkgs;
inherit fontconfig fontDirectories;
};
- f2c = callPackage ../development/tools/f2c { };
-
- freealut = callPackage ../development/libraries/freealut { };
-
- freeglut = callPackage ../development/libraries/freeglut { };
-
freenect = callPackage ../development/libraries/freenect {
inherit (darwin.apple_sdk.frameworks) Cocoa GLUT;
};
- freetype = callPackage ../development/libraries/freetype { };
-
- freexl = callPackage ../development/libraries/freexl { };
-
- frei0r = callPackage ../development/libraries/frei0r { };
-
- fribidi = callPackage ../development/libraries/fribidi { };
-
- frozen = callPackage ../development/libraries/frozen { };
-
- funambol = callPackage ../development/libraries/funambol { };
-
- function-runner = callPackage ../development/web/function-runner { };
-
- functionalplus = callPackage ../development/libraries/functionalplus { };
-
- galer = callPackage ../tools/security/galer { };
-
- gallia = callPackage ../tools/security/gallia { };
-
gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets {
protobuf = protobuf_21;
};
- game-music-emu = callPackage ../development/libraries/audio/game-music-emu { };
-
- ganv = callPackage ../development/libraries/ganv { };
-
- gcab = callPackage ../development/libraries/gcab { };
-
gcovr = with python3Packages; toPythonApplication gcovr;
gcr = callPackage ../development/libraries/gcr { };
gcr_4 = callPackage ../development/libraries/gcr/4.nix { };
- gdl = callPackage ../development/libraries/gdl { };
-
- gdome2 = callPackage ../development/libraries/gdome2 { };
-
gecode_3 = callPackage ../development/libraries/gecode/3.nix { };
gecode_6 = qt5.callPackage ../development/libraries/gecode { };
gecode = gecode_6;
geph = recurseIntoAttrs (callPackages ../applications/networking/geph { pnpm = pnpm_8; });
- gephi = callPackage ../applications/science/misc/gephi { };
-
gegl = callPackage ../development/libraries/gegl {
inherit (darwin.apple_sdk.frameworks) OpenCL;
};
gensio = darwin.apple_sdk_11_0.callPackage ../development/libraries/gensio { };
- geoclue2 = callPackage ../development/libraries/geoclue { };
-
geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; };
- geocode-glib = callPackage ../development/libraries/geocode-glib { };
-
geocode-glib_2 = geocode-glib.override {
libsoup = libsoup_3;
};
@@ -19413,31 +9365,19 @@ with pkgs;
geoipDatabase = geolite-legacy;
};
- geogram = callPackage ../development/libraries/geogram { };
-
geoip = callPackage ../development/libraries/geoip { };
- geoipjava = callPackage ../development/libraries/java/geoipjava { };
-
- geomyidae = callPackage ../applications/networking/gopher/geomyidae { };
-
geos = callPackage ../development/libraries/geos { };
geos_3_9 = callPackage ../development/libraries/geos/3.9.nix { };
geos_3_11 = callPackage ../development/libraries/geos/3.11.nix { };
- getdata = callPackage ../development/libraries/getdata { };
-
inherit (callPackages ../development/libraries/getdns { })
getdns stubby;
gettext = callPackage ../development/libraries/gettext { };
- gf2x = callPackage ../development/libraries/gf2x { };
-
- gfxstream = callPackage ../development/libraries/gfxstream { };
-
gd = callPackage ../development/libraries/gd {
automake = automake115x;
};
@@ -19453,18 +9393,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa;
};
- ggz_base_libs = callPackage ../development/libraries/ggz_base_libs { };
-
- gifticlib = callPackage ../development/libraries/science/biology/gifticlib { };
-
- gio-sharp = callPackage ../development/libraries/gio-sharp { };
-
givaro = callPackage ../development/libraries/givaro { };
givaro_3 = callPackage ../development/libraries/givaro/3.nix { };
givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix { };
- ghc_filesystem = callPackage ../development/libraries/ghc_filesystem { };
-
ghp-import = with python3Packages; toPythonApplication ghp-import;
ghcid = haskellPackages.ghcid.bin;
@@ -19475,24 +9407,10 @@ with pkgs;
graphia = qt6Packages.callPackage ../applications/science/misc/graphia { };
- graphinder = callPackage ../tools/security/graphinder { };
-
- hnswlib = callPackage ../development/libraries/hnswlib { };
-
- icon-lang = callPackage ../development/interpreters/icon-lang { };
-
libgit2 = callPackage ../development/libraries/libgit2 {
inherit (darwin.apple_sdk.frameworks) Security;
};
- libgit2-glib = callPackage ../development/libraries/libgit2-glib { };
-
- libhsts = callPackage ../development/libraries/libhsts { };
-
- glbinding = callPackage ../development/libraries/glbinding { };
-
- gle = callPackage ../development/libraries/gle { };
-
glew = callPackage ../development/libraries/glew {
inherit (darwin.apple_sdk.frameworks) OpenGL;
};
@@ -19515,8 +9433,6 @@ with pkgs;
# Provided by libc on Operating Systems that use the Extensible Linker Format.
elf-header = if stdenv.hostPlatform.isElf then null else elf-header-real;
- elf-header-real = callPackage ../development/libraries/elf-header { };
-
glibc_memusage = callPackage ../development/libraries/glibc {
withGd = true;
};
@@ -19616,45 +9532,21 @@ with pkgs;
glibc32 = pkgsi686Linux.buildPackages.glibc;
};
- glm = callPackage ../development/libraries/glm { };
-
- glog = callPackage ../development/libraries/glog { };
-
- gloox = callPackage ../development/libraries/gloox { };
-
- glpk = callPackage ../development/libraries/glpk { };
-
glsurf = callPackage ../applications/science/math/glsurf {
ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
};
- glui = callPackage ../development/libraries/glui { };
-
gmime2 = callPackage ../development/libraries/gmime/2.nix { };
gmime3 = callPackage ../development/libraries/gmime/3.nix { };
gmime = gmime2;
- gmm = callPackage ../development/libraries/gmm { };
-
gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions
gmp6 = callPackage ../development/libraries/gmp/6.x.nix { };
gmp = gmp6;
gmpxx = gmp.override { cxx = true; };
#GMP ex-satellite, so better keep it near gmp
- mpfr = callPackage ../development/libraries/mpfr { };
-
- mpfi = callPackage ../development/libraries/mpfi { };
-
- mpdecimal = callPackage ../development/libraries/mpdecimal { };
-
- mpfshell = callPackage ../development/tools/mpfshell { };
-
# A GMP fork
- mpir = callPackage ../development/libraries/mpir { };
-
- gl3w = callPackage ../development/libraries/gl3w { };
-
gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { });
gns3-gui = gns3Packages.guiStable;
gns3-server = gns3Packages.serverStable;
@@ -19668,16 +9560,6 @@ with pkgs;
goocanvas = callPackage ../development/libraries/goocanvas { };
goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { };
goocanvas3 = callPackage ../development/libraries/goocanvas/3.x.nix { };
- goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { };
-
- gflags = callPackage ../development/libraries/gflags { };
-
- gperftools = callPackage ../development/libraries/gperftools { };
-
- grilo = callPackage ../development/libraries/grilo { };
-
- grilo-plugins = callPackage ../development/libraries/grilo-plugins { };
-
grpc = darwin.apple_sdk_11_0.callPackage ../development/libraries/grpc {
stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
then overrideSDK darwin.apple_sdk_11_0.stdenv { darwinMinVersion = "10.13"; }
@@ -19693,14 +9575,8 @@ with pkgs;
inherit (darwin.apple_sdk_12_3.libs) xpc;
});
- gusb = callPackage ../development/libraries/gusb { };
-
qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp { };
- gnet = callPackage ../development/libraries/gnet { };
-
- gnu-config = callPackage ../development/libraries/gnu-config { };
-
gnu-efi = if stdenv.hostPlatform.isEfi
then callPackage ../development/libraries/gnu-efi { }
else null;
@@ -19717,30 +9593,8 @@ with pkgs;
gpgme = callPackage ../development/libraries/gpgme { };
- pgpdump = callPackage ../tools/security/pgpdump { };
-
- pgpkeyserver-lite = callPackage ../servers/web-apps/pgpkeyserver-lite { };
-
- pgweb = callPackage ../development/tools/database/pgweb { };
-
grantlee = libsForQt5.callPackage ../development/libraries/grantlee { };
- gsasl = callPackage ../development/libraries/gsasl { };
-
- gsl = callPackage ../development/libraries/gsl { };
-
- gsl-lite = callPackage ../development/libraries/gsl-lite { };
-
- gsm = callPackage ../development/libraries/gsm { };
-
- gsoap = callPackage ../development/libraries/gsoap { };
-
- gsound = callPackage ../development/libraries/gsound { };
-
- gss = callPackage ../development/libraries/gss { };
-
- gtkimageview = callPackage ../development/libraries/gtkimageview { };
-
glib = callPackage ../development/libraries/glib (let
glib-untested = glib.overrideAttrs { doCheck = false; };
in {
@@ -19757,16 +9611,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- glib-networking = callPackage ../development/libraries/glib-networking { };
-
- glib-testing = callPackage ../development/libraries/glib-testing { };
-
glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc;
- gom = callPackage ../development/libraries/gom { };
-
- ace = callPackage ../development/libraries/ace { };
-
# Not moved to aliases while we decide if we should split the package again.
atk = at-spi2-core;
@@ -19774,12 +9620,6 @@ with pkgs;
atkmm_2_36 = callPackage ../development/libraries/atkmm/2.36.nix { };
- pixman = callPackage ../development/libraries/pixman { };
-
- cairo = callPackage ../development/libraries/cairo { };
-
- cairo-lang = callPackage ../development/compilers/cairo { };
-
cairomm = callPackage ../development/libraries/cairomm { };
cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix {
@@ -19810,10 +9650,6 @@ with pkgs;
gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { };
- gnome-menus = callPackage ../development/libraries/gnome-menus { };
-
- gnote = callPackage ../applications/office/gnote { };
-
gtk2 = callPackage ../development/libraries/gtk/2.x.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
@@ -19824,8 +9660,6 @@ with pkgs;
gdktarget = "x11";
};
- gtkextra = callPackage ../development/libraries/gtkextra { };
-
gtk3 = callPackage ../development/libraries/gtk/3.x.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa QuartzCore;
};
@@ -19844,18 +9678,10 @@ with pkgs;
gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
gtkmm4 = callPackage ../development/libraries/gtkmm/4.x.nix { };
- gtk_engines = callPackage ../development/libraries/gtk-engines { };
-
- gtk-engine-bluecurve = callPackage ../development/libraries/gtk-engine-bluecurve { };
-
- gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { };
-
gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { };
gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { };
- gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
-
gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration {
gtk = gtk3;
};
@@ -19866,8 +9692,6 @@ with pkgs;
gtk-mac-integration-gtk3 = gtk-mac-integration;
- gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler { };
-
gtksourceview = gtksourceview3;
gtksourceview3 = callPackage ../development/libraries/gtksourceview/3.x.nix { };
@@ -19884,20 +9708,6 @@ with pkgs;
gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
- gtkspellmm = callPackage ../development/libraries/gtkspellmm { };
-
- gtk-layer-shell = callPackage ../development/libraries/gtk-layer-shell { };
-
- gtk4-layer-shell = callPackage ../development/libraries/gtk4-layer-shell { };
-
- gts = callPackage ../development/libraries/gts { };
-
- gumbo = callPackage ../development/libraries/gumbo { };
-
- gvfs = callPackage ../development/libraries/gvfs { };
-
- gvm-libs = callPackage ../development/libraries/gvm-libs { };
-
gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
hamlib = hamlib_3;
@@ -19919,36 +9729,18 @@ with pkgs;
withIcu = true;
};
- hawknl = callPackage ../development/libraries/hawknl { };
-
- haxor-news = callPackage ../applications/misc/haxor-news { };
-
- hdt = callPackage ../misc/hdt { };
-
- hfinger = callPackage ../tools/security/hfinger { };
-
herqq = libsForQt5.callPackage ../development/libraries/herqq { };
hidapi = callPackage ../development/libraries/hidapi {
inherit (darwin.apple_sdk.frameworks) Cocoa IOKit;
};
- highfive = callPackage ../development/libraries/highfive { };
-
highfive-mpi = highfive.override { hdf5 = hdf5-mpi; };
- hiredis = callPackage ../development/libraries/hiredis { };
-
- hiredis-vip = callPackage ../development/libraries/hiredis-vip { };
-
hivex = callPackage ../development/libraries/hivex {
autoreconfHook = buildPackages.autoreconfHook269;
};
- hmat-oss = callPackage ../development/libraries/hmat-oss { };
-
- hound = callPackage ../development/tools/misc/hound { };
-
hpx = callPackage ../development/libraries/hpx {
boost = boost179;
asio = asio.override { boost = boost179; };
@@ -19958,20 +9750,6 @@ with pkgs;
hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { };
- hsqldb = callPackage ../development/libraries/java/hsqldb { };
-
- hstr = callPackage ../applications/misc/hstr { };
-
- hstsparser = callPackage ../tools/security/hstsparser { };
-
- htmlcxx = callPackage ../development/libraries/htmlcxx { };
-
- http-parser = callPackage ../development/libraries/http-parser { };
-
- httpref = callPackage ../development/tools/misc/httpref { };
-
- hubble = callPackage ../applications/networking/cluster/hubble { };
-
hunspell = callPackage ../development/libraries/hunspell { };
hunspellDicts = recurseIntoAttrs (callPackages ../development/libraries/hunspell/dictionaries.nix {});
@@ -19980,20 +9758,10 @@ with pkgs;
hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; };
- hwloc = callPackage ../development/libraries/hwloc { };
-
hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_24; };
- hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
-
- hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
-
hydra-check = with python3.pkgs; toPythonApplication hydra-check;
- hyena = callPackage ../development/libraries/hyena { };
-
- hyperscan = callPackage ../development/libraries/hyperscan { };
-
icu-versions = callPackages ../development/libraries/icu { };
inherit (icu-versions)
icu60
@@ -20013,29 +9781,12 @@ with pkgs;
icu = icu74;
- id3lib = callPackage ../development/libraries/id3lib { };
-
idasen = with python3Packages; toPythonApplication idasen;
- ikill = callPackage ../tools/misc/ikill { };
-
- ilbc = callPackage ../development/libraries/ilbc { };
-
- ilmbase = callPackage ../development/libraries/ilmbase { };
-
imgui = callPackage ../development/libraries/imgui {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
- imtui = callPackage ../development/libraries/imtui { };
-
- immer = callPackage ../development/libraries/immer { };
-
- imv = callPackage ../applications/graphics/imv { };
-
- iml = callPackage ../development/libraries/iml { };
-
- imlib2 = callPackage ../development/libraries/imlib2 { };
imlib2Full = imlib2.override {
# Compilation error on Darwin with librsvg. For more information see:
# https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613
@@ -20051,44 +9802,20 @@ with pkgs;
imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ;
- impy = callPackage ../development/libraries/impy { };
-
- ijs = callPackage ../development/libraries/ijs { };
-
indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { };
indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { };
- indicator-sound-switcher = callPackage ../applications/audio/indicator-sound-switcher { };
-
indilib = darwin.apple_sdk_11_0.callPackage ../development/libraries/science/astronomy/indilib { };
indi-3rdparty = recurseIntoAttrs (callPackages ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { });
- inih = callPackage ../development/libraries/inih { };
-
- iniparser = callPackage ../development/libraries/iniparser { };
-
- initool = callPackage ../development/tools/initool { };
-
- intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { };
-
- intel-media-driver = callPackage ../development/libraries/intel-media-driver { };
-
- intltool = callPackage ../development/tools/misc/intltool { };
-
ios-cross-compile = callPackage ../development/compilers/ios-cross-compile/9.2.nix { };
- ip2location-c = callPackage ../development/libraries/ip2location-c { };
-
irrlicht = if !stdenv.hostPlatform.isDarwin then
callPackage ../development/libraries/irrlicht { }
else callPackage ../development/libraries/irrlicht/mac.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit;
};
- isocodes = callPackage ../development/libraries/iso-codes { };
-
- iso-flags = callPackage ../data/icons/iso-flags { };
-
iso-flags-png-320x240 = iso-flags.overrideAttrs (oldAttrs: {
buildFlags = [ "png-country-320x240-fancy" ];
installPhase = ''
@@ -20120,66 +9847,18 @@ with pkgs;
itk = itk_5;
- jama = callPackage ../development/libraries/jama { };
-
- jarowinkler-cpp = callPackage ../development/libraries/jarowinkler-cpp { };
-
- jbig2dec = callPackage ../development/libraries/jbig2dec { };
-
- jbig2enc = callPackage ../development/libraries/jbig2enc { };
-
- jcal = callPackage ../development/libraries/jcal { };
-
- jbigkit = callPackage ../development/libraries/jbigkit { };
-
- jefferson = callPackage ../tools/filesystems/jefferson { };
-
jemalloc = callPackage ../development/libraries/jemalloc { };
rust-jemalloc-sys = callPackage ../development/libraries/jemalloc/rust.nix { };
rust-jemalloc-sys-unprefixed = rust-jemalloc-sys.override { unprefixed = true; };
- jose = callPackage ../development/libraries/jose { };
-
- jpcre2 = callPackage ../development/libraries/jpcre2 { };
-
- jshon = callPackage ../development/tools/parsing/jshon { };
-
- json2hcl = callPackage ../development/tools/json2hcl { };
-
json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml;
- json-glib = callPackage ../development/libraries/json-glib { };
-
- json_c = callPackage ../development/libraries/json-c { };
-
- jsoncpp = callPackage ../development/libraries/jsoncpp { };
-
- json-fortran = callPackage ../development/libraries/json-fortran { };
-
- jsonnet = callPackage ../development/compilers/jsonnet { };
-
- jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { };
-
- jrsonnet = callPackage ../development/compilers/jrsonnet { };
-
- jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { };
-
- jxrlib = callPackage ../development/libraries/jxrlib { };
-
- libjson = callPackage ../development/libraries/libjson { };
-
libjodycode = callPackage ../development/libraries/libjodycode {
# missing aligned_alloc()
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
- libb64 = callPackage ../development/libraries/libb64 { };
-
- judy = callPackage ../development/libraries/judy { };
-
- kcp = callPackage ../development/libraries/kcp { };
-
kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { };
keybinder = callPackage ../development/libraries/keybinder {
@@ -20197,8 +9876,6 @@ with pkgs;
};
libkrb5 = krb5; # TODO(de11n) Try to make krb5 reuse libkrb5 as a dependency
- kronosnet = callPackage ../development/libraries/kronosnet { };
-
ktextaddons = libsForQt5.callPackage ../development/libraries/ktextaddons {};
l-smash = callPackage ../development/libraries/l-smash {
@@ -20209,76 +9886,22 @@ with pkgs;
inherit pkgs;
});
- lasem = callPackage ../development/libraries/lasem { };
-
- lasso = callPackage ../development/libraries/lasso { };
-
- LAStools = callPackage ../development/libraries/LAStools { };
-
laurel = callPackage ../servers/monitoring/laurel/default.nix { };
- lcm = callPackage ../development/libraries/lcm { };
-
lcms = lcms2;
- lcms1 = callPackage ../development/libraries/lcms { };
-
- lcms2 = callPackage ../development/libraries/lcms2 { };
-
- lcrq = callPackage ../development/libraries/lcrq { };
-
- ldacbt = callPackage ../development/libraries/ldacbt { };
-
- ldb = callPackage ../development/libraries/ldb { };
-
- lensfun = callPackage ../development/libraries/lensfun { };
-
- lesbar = callPackage ../applications/window-managers/lesbar { };
-
- lesstif = callPackage ../development/libraries/lesstif { };
-
- leveldb = callPackage ../development/libraries/leveldb { };
-
- lmdb = callPackage ../development/libraries/lmdb { };
-
- lmdbxx = callPackage ../development/libraries/lmdbxx { };
-
- lemon-graph = callPackage ../development/libraries/lemon-graph { };
-
- levmar = callPackage ../development/libraries/levmar { };
-
- leptonica = callPackage ../development/libraries/leptonica { };
-
- lerc = callPackage ../development/libraries/lerc { };
-
lib2geom = callPackage ../development/libraries/lib2geom {
stdenv = if stdenv.cc.isClang then llvmPackages_13.stdenv else stdenv;
};
- lib3ds = callPackage ../development/libraries/lib3ds { };
-
- lib3mf = callPackage ../development/libraries/lib3mf { };
-
- libaacs = callPackage ../development/libraries/libaacs { };
-
- libaal = callPackage ../development/libraries/libaal { };
-
- libabigail = callPackage ../development/libraries/libabigail { };
-
- libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { };
-
libacr38u = callPackage ../tools/security/libacr38u {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- libad9361 = callPackage ../development/libraries/libad9361 { };
-
libadwaita = callPackage ../development/libraries/libadwaita {
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation;
};
- libaec = callPackage ../development/libraries/libaec { };
-
libagar = callPackage ../development/libraries/libagar { };
libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };
@@ -20287,24 +9910,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
};
- libaosd = callPackage ../development/libraries/libaosd { };
-
- libabw = callPackage ../development/libraries/libabw { };
-
- libamqpcpp = callPackage ../development/libraries/libamqpcpp { };
-
- libantlr3c = callPackage ../development/libraries/libantlr3c { };
-
- libaom = callPackage ../development/libraries/libaom { };
-
libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
- libappindicator = callPackage ../development/libraries/libappindicator { };
-
- libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { };
-
- libargs = callPackage ../development/libraries/libargs { };
-
libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { };
libaribcaption = callPackage ../by-name/li/libaribcaption/package.nix {
@@ -20313,54 +9920,19 @@ with pkgs;
libasn1c = callPackage ../servers/osmocom/libasn1c/default.nix { };
- libasr = callPackage ../development/libraries/libasr { };
-
- libass = callPackage ../development/libraries/libass { };
-
- libassuan = callPackage ../development/libraries/libassuan { };
-
- libasyncns = callPackage ../development/libraries/libasyncns { };
-
- libatomic_ops = callPackage ../development/libraries/libatomic_ops { };
-
- libaudclient = callPackage ../development/libraries/libaudclient { };
-
- libaudec = callPackage ../development/libraries/libaudec { };
-
- libavc1394 = callPackage ../development/libraries/libavc1394 { };
-
- libavif = callPackage ../development/libraries/libavif { };
-
- libayatana-common = callPackage ../development/libraries/libayatana-common { };
-
- libb2 = callPackage ../development/libraries/libb2 { };
-
- libbacktrace = callPackage ../development/libraries/libbacktrace { };
-
libbap = callPackage ../development/libraries/libbap {
inherit (ocaml-ng.ocamlPackages_4_14) bap ocaml findlib ctypes ctypes-foreign;
};
- libbaseencode = callPackage ../development/libraries/libbaseencode { };
-
libbass = (callPackage ../development/libraries/audio/libbass { }).bass;
libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;
+ libbassmidi = (callPackage ../development/libraries/audio/libbass { }).bassmidi;
libbassmix = (callPackage ../development/libraries/audio/libbass { }).bassmix;
- libbdplus = callPackage ../development/libraries/libbdplus { };
-
- libblockdev = callPackage ../development/libraries/libblockdev { };
-
- libblocksruntime = callPackage ../development/libraries/libblocksruntime { };
-
libbluray = callPackage ../development/libraries/libbluray {
inherit (darwin.apple_sdk.frameworks) DiskArbitration;
};
- libbs2b = callPackage ../development/libraries/audio/libbs2b { };
-
- libcacard = callPackage ../development/libraries/libcacard { };
-
libcamera-qcam = callPackage ../by-name/li/libcamera/package.nix { withQcam = true; };
libcanberra = callPackage ../development/libraries/libcanberra {
@@ -20377,28 +9949,12 @@ with pkgs;
then pkgs.libcanberra
else pkgs.libcanberra-gtk2;
- libcaption = callPackage ../development/libraries/libcaption { };
-
- libcbor = callPackage ../development/libraries/libcbor { };
-
- libccd = callPackage ../development/libraries/libccd { };
-
libcec = callPackage ../development/libraries/libcec { };
libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };
libcef = callPackage ../development/libraries/libcef { };
- libcello = callPackage ../development/libraries/libcello { };
-
- libcerf = callPackage ../development/libraries/libcerf { };
-
- libcdada = callPackage ../development/libraries/libcdada { };
-
- libcdaudio = callPackage ../development/libraries/libcdaudio { };
-
- libcddb = callPackage ../development/libraries/libcddb { };
-
libcdio = callPackage ../development/libraries/libcdio {
inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
};
@@ -20409,82 +9965,23 @@ with pkgs;
libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
- libchamplain = callPackage ../development/libraries/libchamplain { };
-
libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; };
- libchardet = callPackage ../development/libraries/libchardet { };
-
libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { };
- libcrafter = callPackage ../development/libraries/libcrafter { };
-
- libcrossguid = callPackage ../development/libraries/libcrossguid { };
-
- libcs50 = callPackage ../development/libraries/libcs50 { };
-
- libuchardet = callPackage ../development/libraries/libuchardet { };
-
- libchop = callPackage ../development/libraries/libchop { };
-
- libcifpp = callPackage ../development/libraries/libcifpp { };
-
- libcint = callPackage ../development/libraries/libcint { };
-
- libcli = callPackage ../development/libraries/libcli { };
-
- libclthreads = callPackage ../development/libraries/libclthreads { };
-
- libclxclient = callPackage ../development/libraries/libclxclient { };
-
- libconfuse = callPackage ../development/libraries/libconfuse { };
-
- libcangjie = callPackage ../development/libraries/libcangjie { };
-
- libcollectdclient = callPackage ../development/libraries/libcollectdclient { };
-
libcomps = callPackage ../tools/package-management/libcomps { python = python3; };
- libcredis = callPackage ../development/libraries/libcredis { };
-
- libctb = callPackage ../development/libraries/libctb { };
-
- libctemplate = callPackage ../development/libraries/libctemplate { };
-
- libctl = callPackage ../development/libraries/libctl { };
-
- libcotp = callPackage ../development/libraries/libcotp { };
-
- libcouchbase = callPackage ../development/libraries/libcouchbase { };
-
- libcue = callPackage ../development/libraries/libcue { };
-
libcxxrt = callPackage ../development/libraries/libcxxrt {
stdenv = if stdenv.hostPlatform.useLLVM or false
then overrideCC stdenv buildPackages.llvmPackages.tools.clangNoLibcxx
else stdenv;
};
- libdaemon = callPackage ../development/libraries/libdaemon { };
-
- libdatovka = callPackage ../development/libraries/libdatovka { };
-
- libdatrie = callPackage ../development/libraries/libdatrie { };
-
- libdazzle = callPackage ../development/libraries/libdazzle { };
-
- libdbi = callPackage ../development/libraries/libdbi { };
-
libdbiDriversBase = libdbiDrivers.override {
libmysqlclient = null;
sqlite = null;
};
- libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
-
- libunity = callPackage ../development/libraries/libunity { };
-
- libdbusmenu = callPackage ../development/libraries/libdbusmenu { };
libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };
libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; };
@@ -20492,8 +9989,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- libde265 = callPackage ../development/libraries/libde265 { };
-
libdeflate = darwin.apple_sdk_11_0.callPackage ../development/libraries/libdeflate { };
libdevil = callPackage ../development/libraries/libdevil {
@@ -20505,42 +10000,8 @@ with pkgs;
withXorg = false;
};
- libdecor = callPackage ../development/libraries/libdecor { };
-
- libdex = callPackage ../development/libraries/libdex { };
-
- libdicom = callPackage ../development/libraries/libdicom { };
-
- libdigidocpp = callPackage ../development/libraries/libdigidocpp { };
-
- libdiscid = callPackage ../development/libraries/libdiscid { };
-
- libdisplay-info = callPackage ../development/libraries/libdisplay-info { };
-
- libdivecomputer = callPackage ../development/libraries/libdivecomputer { };
-
- libdivsufsort = callPackage ../development/libraries/libdivsufsort { };
-
- libdmtx = callPackage ../development/libraries/libdmtx { };
-
- libdmapsharing = callPackage ../development/libraries/libdmapsharing { };
-
- libdnet = callPackage ../development/libraries/libdnet { };
-
libdnf = callPackage ../tools/package-management/libdnf { python = python3; };
- libdovi = callPackage ../development/libraries/libdovi { };
-
- libdrm = callPackage ../development/libraries/libdrm { };
-
- libdv = callPackage ../development/libraries/libdv { };
-
- libdvbcsa = callPackage ../development/libraries/libdvbcsa { };
-
- libdvbpsi = callPackage ../development/libraries/libdvbpsi { };
-
- libdwg = callPackage ../development/libraries/libdwg { };
-
libdvdcss = callPackage ../development/libraries/libdvdcss {
inherit (darwin) IOKit;
};
@@ -20553,193 +10014,51 @@ with pkgs;
libdvdread = callPackage ../development/libraries/libdvdread { };
libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { };
- libdwarf = callPackage ../development/libraries/libdwarf { };
dwarfdump = libdwarf.bin;
- libe57format = callPackage ../development/libraries/libe57format { };
-
- libeatmydata = callPackage ../development/libraries/libeatmydata { };
-
- libeb = callPackage ../development/libraries/libeb { };
-
- libebml = callPackage ../development/libraries/libebml { };
-
- libebur128 = callPackage ../development/libraries/libebur128 { };
-
- libei = callPackage ../development/libraries/libei { };
-
- libelf = callPackage ../development/libraries/libelf { };
-
- libelfin = callPackage ../development/libraries/libelfin { };
-
- libetpan = callPackage ../development/libraries/libetpan { };
-
- libexecinfo = callPackage ../development/libraries/libexecinfo { };
-
- libfaketime = callPackage ../development/libraries/libfaketime { };
-
- libfakekey = callPackage ../development/libraries/libfakekey { };
-
- libfido2 = callPackage ../development/libraries/libfido2 {};
-
libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla {
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices;
};
- libfishsound = callPackage ../development/libraries/libfishsound { };
-
- libfm = callPackage ../development/libraries/libfm { };
libfm-extra = libfm.override {
extraOnly = true;
};
- libfprint-tod = callPackage ../development/libraries/libfprint-tod { };
-
- libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { };
-
- libfprint-2-tod1-goodix-550a = callPackage ../development/libraries/libfprint-2-tod1-goodix-550a { };
-
- libfprint-2-tod1-vfs0090 = callPackage ../development/libraries/libfprint-2-tod1-vfs0090 { };
-
- libfprint-2-tod1-elan = callPackage ../development/libraries/libfprint-2-tod1-elan { };
-
- libfpx = callPackage ../development/libraries/libfpx { };
-
- libgadu = callPackage ../development/libraries/libgadu { };
-
- libgbinder = callPackage ../development/libraries/libgbinder { };
-
libgda = callPackage ../development/libraries/libgda { };
libgda6 = callPackage ../development/libraries/libgda/6.x.nix { };
- libgdamm = callPackage ../development/libraries/libgdamm { };
-
- libgdata = callPackage ../development/libraries/libgdata { };
-
- libgee = callPackage ../development/libraries/libgee { };
-
- libgepub = callPackage ../development/libraries/libgepub { };
-
- libgig = callPackage ../development/libraries/libgig { };
-
- libglibutil = callPackage ../development/libraries/libglibutil { };
-
libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { };
libgnome-games-support_2_0 = callPackage ../development/libraries/libgnome-games-support/2.0.nix { };
- libgnomekbd = callPackage ../development/libraries/libgnomekbd { };
-
- libglvnd = callPackage ../development/libraries/libglvnd { };
-
- libgnurl = callPackage ../development/libraries/libgnurl { };
-
- libgourou = callPackage ../development/libraries/libgourou { };
-
- libgringotts = callPackage ../development/libraries/libgringotts { };
-
libgrss = callPackage ../development/libraries/libgrss {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;
};
- libgweather = callPackage ../development/libraries/libgweather { };
-
- libgxps = callPackage ../development/libraries/libgxps { };
-
libiio = callPackage ../development/libraries/libiio {
inherit (darwin.apple_sdk.frameworks) CFNetwork CoreServices;
python = python3;
};
- libinjection = callPackage ../development/libraries/libinjection { };
-
- libinklevel = callPackage ../development/libraries/libinklevel { };
-
- libkcapi = callPackage ../development/libraries/libkcapi { };
-
- libnats-c = callPackage ../development/libraries/libnats-c { };
-
- liburing = callPackage ../development/libraries/liburing { };
-
- librseq = callPackage ../development/libraries/librseq { };
-
- libseccomp = callPackage ../development/libraries/libseccomp { };
-
- libsecret = callPackage ../development/libraries/libsecret { };
-
- libsegfault = callPackage ../development/libraries/libsegfault { };
-
- libserdes = callPackage ../development/libraries/libserdes { };
-
- libserialport = callPackage ../development/libraries/libserialport { };
-
- libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { };
-
- libsignon-glib = callPackage ../development/libraries/libsignon-glib { };
-
libsoundio = callPackage ../development/libraries/libsoundio {
inherit (darwin.apple_sdk.frameworks) AudioUnit;
};
- libspelling = callPackage ../development/libraries/libspelling { };
-
- libsystemtap = callPackage ../development/libraries/libsystemtap { };
-
- libgtop = callPackage ../development/libraries/libgtop { };
-
- libLAS = callPackage ../development/libraries/libLAS { };
-
- liblaxjson = callPackage ../development/libraries/liblaxjson { };
-
- liblo = callPackage ../development/libraries/liblo { };
-
- liblscp = callPackage ../development/libraries/liblscp { };
-
- libe-book = callPackage ../development/libraries/libe-book { };
-
- libemf2svg = callPackage ../development/libraries/libemf2svg { };
-
- libev = callPackage ../development/libraries/libev { };
-
- libevent = callPackage ../development/libraries/libevent { };
-
- libewf = callPackage ../development/libraries/libewf { };
-
- libexif = callPackage ../development/libraries/libexif { };
-
- libexosip = callPackage ../development/libraries/exosip { };
-
- libexsid = callPackage ../development/libraries/libexsid { };
-
libextractor = callPackage ../development/libraries/libextractor {
libmpeg2 = mpeg2dec;
};
- libexttextcat = callPackage ../development/libraries/libexttextcat { };
-
- libf2c = callPackage ../development/libraries/libf2c { };
-
- libfabric = callPackage ../development/libraries/libfabric { };
-
libfive = libsForQt5.callPackage ../development/libraries/libfive {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
python = python3;
};
- libfixposix = callPackage ../development/libraries/libfixposix { };
-
- libff = callPackage ../development/libraries/libff { };
-
- libffcall = callPackage ../development/libraries/libffcall { };
-
libffi = callPackage ../development/libraries/libffi { };
libffi_3_3 = callPackage ../development/libraries/libffi/3.3.nix { };
libffiBoot = libffi.override {
doCheck = false;
};
- libfreeaptx = callPackage ../development/libraries/libfreeaptx { };
-
libfreefare = callPackage ../development/libraries/libfreefare {
inherit (darwin.apple_sdk.frameworks) IOKit Security;
inherit (darwin) libobjc;
@@ -20752,8 +10071,6 @@ with pkgs;
libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { };
- libfyaml = callPackage ../development/libraries/libfyaml { };
-
libgcrypt = callPackage ../development/libraries/libgcrypt { };
libgcrypt_1_8 = callPackage ../development/libraries/libgcrypt/1.8.nix { };
@@ -20762,81 +10079,25 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon;
};
- libgnt = callPackage ../development/libraries/libgnt { };
-
- libgpg-error = callPackage ../development/libraries/libgpg-error { };
-
# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118
libgpg-error-gen-posix-lock-obj = libgpg-error.override {
genPosixLockObjOnly = true;
};
- libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
-
- libgpiod = callPackage ../development/libraries/libgpiod { };
-
libgpod = callPackage ../development/libraries/libgpod {
autoreconfHook = buildPackages.autoreconfHook269;
};
- libgssglue = callPackage ../development/libraries/libgssglue { };
-
- libgudev = callPackage ../development/libraries/libgudev { };
-
- libhangul = callPackage ../development/libraries/libhangul { };
-
- libharu = callPackage ../development/libraries/libharu { };
-
- libhdhomerun = callPackage ../development/libraries/libhdhomerun { };
-
- libheif = callPackage ../development/libraries/libheif { };
-
- libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { };
-
- libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { };
-
- libhwy = callPackage ../development/libraries/libhwy { };
-
- libHX = callPackage ../development/libraries/libHX { };
-
- libibmad = callPackage ../development/libraries/libibmad { };
-
- libibumad = callPackage ../development/libraries/libibumad { };
-
- libical = callPackage ../development/libraries/libical { };
-
- libicns = callPackage ../development/libraries/libicns { };
-
- libieee1284 = callPackage ../development/libraries/libieee1284 { };
-
libimobiledevice = callPackage ../development/libraries/libimobiledevice {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation;
};
- libimobiledevice-glue = callPackage ../development/libraries/libimobiledevice-glue { };
-
libindicator-gtk2 = libindicator.override { gtkVersion = "2"; };
libindicator-gtk3 = libindicator.override { gtkVersion = "3"; };
- libindicator = callPackage ../development/libraries/libindicator { };
-
- libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { };
-
libiodbc = callPackage ../development/libraries/libiodbc {
inherit (darwin.apple_sdk.frameworks) Carbon;
};
- libirecovery = callPackage ../development/libraries/libirecovery { };
-
- libivykis = callPackage ../development/libraries/libivykis { };
-
- libkqueue = callPackage ../development/libraries/libkqueue { };
-
- liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
-
- liblcf = callPackage ../development/libraries/liblcf { };
-
- liblc3 = callPackage ../development/libraries/liblc3 { };
-
inherit (callPackage ../development/libraries/libliftoff { }) libliftoff_0_4 libliftoff_0_5;
libliftoff = libliftoff_0_5;
@@ -20844,56 +10105,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon AppKit;
};
- liblockfile = callPackage ../development/libraries/liblockfile { };
-
- liblogging = callPackage ../development/libraries/liblogging { };
-
- liblognorm = callPackage ../development/libraries/liblognorm { };
-
- libltc = callPackage ../development/libraries/libltc { };
-
- liblxi = callPackage ../development/libraries/liblxi { };
-
- libmaxminddb = callPackage ../development/libraries/libmaxminddb { };
-
- libmcfp = callPackage ../development/libraries/libmcfp { };
-
- libmcrypt = callPackage ../development/libraries/libmcrypt { };
-
- libmediaart = callPackage ../development/libraries/libmediaart { };
-
- libmhash = callPackage ../development/libraries/libmhash { };
-
- libmodbus = callPackage ../development/libraries/libmodbus { };
-
- libmtp = callPackage ../development/libraries/libmtp { };
-
- libmypaint = callPackage ../development/libraries/libmypaint { };
-
- libmysofa = callPackage ../development/libraries/audio/libmysofa { };
-
- libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { };
-
- libnatpmp = callPackage ../development/libraries/libnatpmp { };
-
- libnatspec = callPackage ../development/libraries/libnatspec { };
-
- libndp = callPackage ../development/libraries/libndp { };
-
- libnfc = callPackage ../development/libraries/libnfc { };
-
- libnfs = callPackage ../development/libraries/libnfs { };
-
- libnice = callPackage ../development/libraries/libnice { };
-
- libnitrokey = callPackage ../development/libraries/libnitrokey { };
-
- libnsl = callPackage ../development/libraries/libnsl { };
-
- liboping = callPackage ../development/libraries/liboping { };
-
- libplist = callPackage ../development/libraries/libplist { };
-
libqtdbusmock = libsForQt5.callPackage ../development/libraries/libqtdbusmock {
inherit (lomiri) cmake-extras;
};
@@ -20906,49 +10117,21 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
- librecast = callPackage ../development/libraries/librecast { };
-
- libredwg = callPackage ../development/libraries/libredwg { };
-
- librem = callPackage ../development/libraries/librem { };
-
libremines = qt6.callPackage ../games/libremines { };
- librelp = callPackage ../development/libraries/librelp { };
-
librepo = callPackage ../tools/package-management/librepo {
python = python3;
};
- librevenge = callPackage ../development/libraries/librevenge { };
-
- librime = callPackage ../development/libraries/librime { };
-
librsb = callPackage ../development/libraries/librsb {
# Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec
memHierarchy = "L3:16/64/8192K,L2:16/64/2048K,L1:8/64/16K";
};
- librtprocess = callPackage ../development/libraries/librtprocess { };
-
libsamplerate = callPackage ../development/libraries/libsamplerate {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices;
};
- libsieve = callPackage ../development/libraries/libsieve { };
-
- libsixel = callPackage ../development/libraries/libsixel { };
-
- libsolv = callPackage ../development/libraries/libsolv { };
-
- libspectre = callPackage ../development/libraries/libspectre { };
-
- libspecbleach = callPackage ../development/libraries/audio/libspecbleach { };
-
- libspnav = callPackage ../development/libraries/libspnav { };
-
- libgsf = callPackage ../development/libraries/libgsf { };
-
# GNU libc provides libiconv so systems with glibc don't need to
# build libiconv separately. Additionally, Apple forked/repackaged
# libiconv, so build and use the upstream one with a compatible ABI,
@@ -20988,80 +10171,24 @@ with pkgs;
# On non-GNU systems we need GNU Gettext for libintl.
libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null;
- libid3tag = callPackage ../development/libraries/libid3tag { };
-
- libidn = callPackage ../development/libraries/libidn { };
-
libidn2 = callPackage ../development/libraries/libidn2 { };
- idnkit = callPackage ../development/libraries/idnkit { };
-
- libiec61883 = callPackage ../development/libraries/libiec61883 { };
-
- libimagequant = callPackage ../development/libraries/libimagequant { };
-
- libime = callPackage ../development/libraries/libime { };
-
- libinfinity = callPackage ../development/libraries/libinfinity { };
-
libinput = callPackage ../development/libraries/libinput {
graphviz = graphviz-nox;
};
- libinput-gestures = callPackage ../tools/inputmethods/libinput-gestures { };
-
- libinstpatch = callPackage ../development/libraries/audio/libinstpatch { };
-
- libipt = callPackage ../development/libraries/libipt { };
-
- libiptcdata = callPackage ../development/libraries/libiptcdata { };
-
- libjcat = callPackage ../development/libraries/libjcat { };
-
- libjpeg_original = callPackage ../development/libraries/libjpeg { };
# also known as libturbojpeg
- libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
libjpeg = libjpeg_turbo;
libjpeg8 = libjpeg_turbo.override { enableJpeg8 = true; };
- libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { };
-
- libjwt = callPackage ../development/libraries/libjwt { };
-
- libjxl = callPackage ../development/libraries/libjxl { };
-
- libkate = callPackage ../development/libraries/libkate { };
-
- libkeyfinder = callPackage ../development/libraries/audio/libkeyfinder { };
-
- libks = callPackage ../development/libraries/libks { };
-
- libksba = callPackage ../development/libraries/libksba { };
-
- libksi = callPackage ../development/libraries/libksi { };
-
- liblinear = callPackage ../development/libraries/liblinear { };
-
- libmad = callPackage ../development/libraries/libmad { };
-
malcontent = callPackage ../development/libraries/malcontent { };
malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { };
- libmanette = callPackage ../development/libraries/libmanette { };
-
- libmatchbox = callPackage ../development/libraries/libmatchbox { };
-
- libmatheval = callPackage ../development/libraries/libmatheval { };
-
libmatthew_java = callPackage ../development/libraries/java/libmatthew-java {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
- libmd = callPackage ../development/libraries/libmd { };
-
- libmemcached = callPackage ../development/libraries/libmemcached { };
-
inherit
({
libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { };
@@ -21077,131 +10204,21 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreAudio;
};
- libmilter = callPackage ../development/libraries/libmilter { };
-
- libminc = callPackage ../development/libraries/libminc { };
-
- libmkv = callPackage ../development/libraries/libmkv { };
-
- libnut = callPackage ../development/libraries/libnut { };
-
- libmms = callPackage ../development/libraries/libmms { };
-
- libmowgli = callPackage ../development/libraries/libmowgli { };
-
- libmng = callPackage ../development/libraries/libmng { };
-
- libmnl = callPackage ../development/libraries/libmnl { };
-
- libmodplug = callPackage ../development/libraries/libmodplug { };
-
- libmodule = callPackage ../development/libraries/libmodule { };
-
- libmpcdec = callPackage ../development/libraries/libmpcdec { };
-
- libmp3splt = callPackage ../development/libraries/libmp3splt { };
-
- libmspack = callPackage ../development/libraries/libmspack { };
-
libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
libmusicbrainz = libmusicbrainz3;
- libmwaw = callPackage ../development/libraries/libmwaw { };
-
- libmx = callPackage ../development/libraries/libmx { };
-
- libndctl = callPackage ../development/libraries/libndctl { };
-
- libnest2d = callPackage ../development/libraries/libnest2d { };
-
- libnet = callPackage ../development/libraries/libnet { };
-
- libnetfilter_acct = callPackage ../development/libraries/libnetfilter_acct { };
-
- libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };
-
- libnetfilter_cthelper = callPackage ../development/libraries/libnetfilter_cthelper { };
-
- libnetfilter_cttimeout = callPackage ../development/libraries/libnetfilter_cttimeout { };
-
- libnetfilter_log = callPackage ../development/libraries/libnetfilter_log { };
-
- libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { };
-
- libnfnetlink = callPackage ../development/libraries/libnfnetlink { };
-
- libnftnl = callPackage ../development/libraries/libnftnl { };
-
- libnova = callPackage ../development/libraries/science/astronomy/libnova { };
-
- libodfgen = callPackage ../development/libraries/libodfgen { };
-
- libofa = callPackage ../development/libraries/libofa { };
-
- libofx = callPackage ../development/libraries/libofx { };
-
- libogg = callPackage ../development/libraries/libogg { };
-
- liboggz = callPackage ../development/libraries/liboggz { };
-
- liboil = callPackage ../development/libraries/liboil { };
-
- libomxil-bellagio = callPackage ../development/libraries/libomxil-bellagio { };
-
- libopenaptx = callPackage ../development/libraries/libopenaptx { };
-
- libopenglrecorder = callPackage ../development/libraries/libopenglrecorder { };
-
- libopusenc = callPackage ../development/libraries/libopusenc { };
-
- libosinfo = callPackage ../development/libraries/libosinfo { };
-
- libosip = callPackage ../development/libraries/osip { };
-
- libosmium = callPackage ../development/libraries/libosmium { };
-
- libosmoabis = callPackage ../servers/osmocom/libosmoabis { };
-
- libosmocore = callPackage ../servers/osmocom/libosmocore { };
-
- libosmo-netif = callPackage ../servers/osmocom/libosmo-netif { };
-
- libosmo-sccp = callPackage ../servers/osmocom/libosmo-sccp { };
-
libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
- libotr = callPackage ../development/libraries/libotr { };
-
- libow = callPackage ../development/libraries/libow { };
-
- libp11 = callPackage ../development/libraries/libp11 { };
-
- libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { };
-
- libpanel = callPackage ../development/libraries/libpanel { };
-
- libpar2 = callPackage ../development/libraries/libpar2 { };
-
- libpcap = callPackage ../development/libraries/libpcap { };
-
libpeas = callPackage ../development/libraries/libpeas { };
libpeas2 = callPackage ../development/libraries/libpeas/2.x.nix { };
- libpg_query = callPackage ../development/libraries/libpg_query { };
-
- libpipeline = callPackage ../development/libraries/libpipeline { };
-
- libpgf = callPackage ../development/libraries/libpgf { };
-
libphonenumber = callPackage ../development/libraries/libphonenumber {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- libplacebo = callPackage ../development/libraries/libplacebo { };
-
libpng = callPackage ../development/libraries/libpng {
stdenv =
# libpng is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
@@ -21214,28 +10231,12 @@ with pkgs;
libpng12 = callPackage ../development/libraries/libpng/12.nix { };
- libpostal = callPackage ../development/libraries/libpostal { };
-
- libpaper = callPackage ../development/libraries/libpaper { };
-
- libpfm = callPackage ../development/libraries/libpfm { };
-
- libpqxx = callPackage ../development/libraries/libpqxx { };
-
inherit (callPackages ../development/libraries/prometheus-client-c {
stdenv = gccStdenv; # Required for darwin
}) libprom libpromhttp;
libproxy = callPackage ../development/libraries/libproxy { };
- libpseudo = callPackage ../development/libraries/libpseudo { };
-
- libpsl = callPackage ../development/libraries/libpsl { };
-
- libpst = callPackage ../development/libraries/libpst { };
-
- libptytty = callPackage ../development/libraries/libptytty { };
-
libpulsar = callPackage ../development/libraries/libpulsar {
protobuf = protobuf_21;
};
@@ -21244,111 +10245,35 @@ with pkgs;
python = python3;
};
- libqalculate = callPackage ../development/libraries/libqalculate { };
-
libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { };
- librclone = callPackage ../development/libraries/librclone { };
-
- libroxml = callPackage ../development/libraries/libroxml { };
-
librsvg = callPackage ../development/libraries/librsvg {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
};
- librsync = callPackage ../development/libraries/librsync { };
-
- librttopo = callPackage ../development/libraries/librttopo { };
-
- libschrift = callPackage ../development/libraries/libschrift { };
-
- libsciter = callPackage ../development/libraries/libsciter { };
-
- libsearpc = callPackage ../development/libraries/libsearpc { };
-
libsigcxx = callPackage ../development/libraries/libsigcxx { };
libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { };
- libsigsegv = callPackage ../development/libraries/libsigsegv { };
-
- libslirp = callPackage ../development/libraries/libslirp { };
-
libsndfile = callPackage ../development/libraries/libsndfile {
inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox;
};
- libsodium = callPackage ../development/libraries/libsodium { };
-
libsoup = callPackage ../development/libraries/libsoup { };
libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { };
- libspectrum = callPackage ../development/libraries/libspectrum { };
-
- libspiro = callPackage ../development/libraries/libspiro { };
-
- libspng = callPackage ../development/libraries/libspng { };
-
- libssh = callPackage ../development/libraries/libssh { };
-
- libssh2 = callPackage ../development/libraries/libssh2 { };
-
- libstartup_notification = callPackage ../development/libraries/startup-notification { };
-
- libstemmer = callPackage ../development/libraries/libstemmer { };
-
- libstroke = callPackage ../development/libraries/libstroke { };
-
- libspatialaudio = callPackage ../development/libraries/libspatialaudio { };
-
- libspatialite = callPackage ../development/libraries/libspatialite { };
-
libstatgrab = callPackage ../development/libraries/libstatgrab {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- libsvm = callPackage ../development/libraries/libsvm { };
-
- libtar = callPackage ../development/libraries/libtar { };
-
- libtasn1 = callPackage ../development/libraries/libtasn1 { };
-
- libthai = callPackage ../development/libraries/libthai { };
-
- libthreadar = callPackage ../development/libraries/libthreadar { };
-
- libticables2 = callPackage ../development/libraries/libticables2 { };
-
libticalcs2 = callPackage ../development/libraries/libticalcs2 {
inherit (darwin) libobjc;
};
- libticonv = callPackage ../development/libraries/libticonv { };
-
- libtifiles2 = callPackage ../development/libraries/libtifiles2 { };
-
- libtiger = callPackage ../development/libraries/libtiger { };
-
- libtommath = callPackage ../development/libraries/libtommath { };
-
- libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
-
libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
- libtpms = callPackage ../tools/security/libtpms { };
-
- libtsm = callPackage ../development/libraries/libtsm { };
-
- libsv = callPackage ../development/libraries/libsv { };
-
- libgeotiff = callPackage ../development/libraries/libgeotiff { };
-
- libu2f-host = callPackage ../development/libraries/libu2f-host { };
-
- libu2f-server = callPackage ../development/libraries/libu2f-server { };
-
libubox-nossl = callPackage ../development/libraries/libubox { };
libubox = callPackage ../development/libraries/libubox { with_ustream_ssl = true; };
@@ -21357,43 +10282,19 @@ with pkgs;
libubox-mbedtls = callPackage ../development/libraries/libubox { with_ustream_ssl = true; ustream-ssl = ustream-ssl-mbedtls; };
- libudev-zero = callPackage ../development/libraries/libudev-zero { };
-
- libudfread = callPackage ../development/libraries/libudfread { };
-
- libuecc = callPackage ../development/libraries/libuecc { };
-
- libuev = callPackage ../development/libraries/libuev {};
-
libui = callPackage ../development/libraries/libui {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- libuinputplus = callPackage ../development/libraries/libuinputplus { };
-
libuiohook = callPackage ../development/libraries/libuiohook {
inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices Carbon;
};
libunistring = callPackage ../development/libraries/libunistring { };
- libupnp = callPackage ../development/libraries/pupnp { };
-
- libwhereami = callPackage ../development/libraries/libwhereami { };
-
- giflib = callPackage ../development/libraries/giflib { };
-
- libunarr = callPackage ../development/libraries/libunarr { };
-
- libunibreak = callPackage ../development/libraries/libunibreak { };
-
- libuninameslist = callPackage ../development/libraries/libuninameslist { };
-
libunique = callPackage ../development/libraries/libunique { };
libunique3 = callPackage ../development/libraries/libunique/3.x.nix { };
- liburcu = callPackage ../development/libraries/liburcu { };
-
libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { };
libusb1 = callPackage ../development/libraries/libusb1 {
@@ -21401,16 +10302,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit Security;
};
- libusbgx = callPackage ../development/libraries/libusbgx { };
-
- libusbsio = callPackage ../development/libraries/libusbsio { };
-
- libucontext = callPackage ../development/libraries/libucontext { };
-
- libutempter = callPackage ../development/libraries/libutempter { };
-
- libuldaq = callPackage ../development/libraries/libuldaq { };
-
libunicode = callPackage ../development/libraries/libunicode {
catch2 = catch2_3;
fmt = fmt_9;
@@ -21426,8 +10317,6 @@ with pkgs;
libuv = darwin.apple_sdk_11_0.callPackage ../development/libraries/libuv { };
- libuvc = callPackage ../development/libraries/libuvc { };
-
libv4l = lowPrio (v4l-utils.override {
withUtils = false;
});
@@ -21439,18 +10328,6 @@ with pkgs;
libva1 = callPackage ../development/libraries/libva/1.nix { };
libva1-minimal = libva1.override { minimal = true; };
- libvarlink = callPackage ../development/libraries/libvarlink { };
-
- libvdpau = callPackage ../development/libraries/libvdpau { };
-
- libvdwxc = callPackage ../development/libraries/science/chemistry/libvdwxc { };
-
- libmodulemd = callPackage ../development/libraries/libmodulemd { };
-
- libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { };
-
- libversion = callPackage ../development/libraries/libversion { };
-
libvgm = callPackage ../development/libraries/libvgm {
inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox;
};
@@ -21459,41 +10336,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon AppKit;
};
- libvirt-glib = callPackage ../development/libraries/libvirt-glib { };
-
- libvisio = callPackage ../development/libraries/libvisio { };
-
- libvisio2svg = callPackage ../development/libraries/libvisio2svg { };
-
- libvisual = callPackage ../development/libraries/libvisual { };
-
- libvmaf = callPackage ../development/libraries/libvmaf { };
-
libvncserver = callPackage ../development/libraries/libvncserver {
inherit (darwin.apple_sdk.frameworks) Carbon;
};
- libviper = callPackage ../development/libraries/libviper { };
-
- libviperfx = callPackage ../development/libraries/libviperfx { };
-
- libvpx = callPackage ../development/libraries/libvpx { };
-
- libvterm = callPackage ../development/libraries/libvterm { };
- libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { };
-
- libvorbis = callPackage ../development/libraries/libvorbis { };
-
- libvori = callPackage ../development/libraries/libvori { };
-
- libwbxml = callPackage ../development/libraries/libwbxml { };
-
- libwebcam = callPackage ../os-specific/linux/libwebcam { };
-
- libwebp = callPackage ../development/libraries/libwebp { };
-
- libwmf = callPackage ../development/libraries/libwmf { };
-
libwnck = callPackage ../development/libraries/libwnck { };
libwnck2 = callPackage ../development/libraries/libwnck/2.nix { };
@@ -21501,12 +10347,6 @@ with pkgs;
libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix { };
- libwps = callPackage ../development/libraries/libwps { };
-
- libwpg = callPackage ../development/libraries/libwpg { };
-
- libx86 = callPackage ../development/libraries/libx86 { };
-
libxcrypt = callPackage ../development/libraries/libxcrypt {
fetchurl = stdenv.fetchurlBoot;
perl = buildPackages.perl.override {
@@ -21516,21 +10356,7 @@ with pkgs;
};
libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
- libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };
-
- libxisf = callPackage ../development/libraries/science/astronomy/libxisf { };
-
libxkbcommon = libxkbcommon_8;
- libxkbcommon_8 = callPackage ../development/libraries/libxkbcommon { };
-
- libxklavier = callPackage ../development/libraries/libxklavier { };
-
- libxls = callPackage ../development/libraries/libxls { };
-
- libxlsxwriter = callPackage ../development/libraries/libxlsxwriter { };
-
- libxmi = callPackage ../development/libraries/libxmi { };
-
libxml2 = callPackage ../development/libraries/libxml2 {
python = python3;
stdenv =
@@ -21556,131 +10382,47 @@ with pkgs;
'';
};
- libxmlb = callPackage ../development/libraries/libxmlb { };
-
libxmlxx = callPackage ../development/libraries/libxmlxx { };
libxmlxx3 = callPackage ../development/libraries/libxmlxx/v3.nix { };
- libxmp = callPackage ../development/libraries/libxmp { };
-
libxslt = callPackage ../development/libraries/libxslt {
python = python3;
};
- libxsmm = callPackage ../development/libraries/libxsmm { };
-
- libixp = callPackage ../development/libraries/libixp { };
-
libwpe = callPackage ../development/libraries/libwpe { };
libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { };
- libyaml = callPackage ../development/libraries/libyaml { };
-
yaml-cpp = callPackage ../development/libraries/yaml-cpp { };
yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { };
- yas = callPackage ../development/libraries/yas { };
-
- rang = callPackage ../development/libraries/rang { };
-
- libykclient = callPackage ../development/libraries/libykclient { };
-
- libykneomgr = callPackage ../development/libraries/libykneomgr { };
-
- libytnef = callPackage ../development/libraries/libytnef { };
-
- libyubikey = callPackage ../development/libraries/libyubikey { };
-
- libyuv = callPackage ../development/libraries/libyuv { };
-
- libzapojit = callPackage ../development/libraries/libzapojit { };
-
- libzen = callPackage ../development/libraries/libzen { };
-
- libzip = callPackage ../development/libraries/libzip { };
-
- libzdb = callPackage ../development/libraries/libzdb { };
-
- lightlocker = callPackage ../misc/screensavers/light-locker { };
-
- lightspark = callPackage ../misc/lightspark { };
-
- opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { };
-
- ligolo-ng = callPackage ../tools/networking/ligolo-ng { };
-
- linenoise = callPackage ../development/libraries/linenoise { };
-
- linenoise-ng = callPackage ../development/libraries/linenoise-ng { };
-
- lirc = callPackage ../development/libraries/lirc { };
-
liquid-dsp = callPackage ../development/libraries/liquid-dsp {
inherit (darwin) autoSignDarwinBinariesHook;
};
- liquidfun = callPackage ../development/libraries/liquidfun { };
-
- litehtml = callPackage ../development/libraries/litehtml { };
-
- llhttp = callPackage ../development/libraries/llhttp { };
-
- log4cpp = callPackage ../development/libraries/log4cpp { };
-
- log4cxx = callPackage ../development/libraries/log4cxx { };
-
- log4cplus = callPackage ../development/libraries/log4cplus { };
-
- log4shib = callPackage ../development/libraries/log4shib { };
-
- loudmouth = callPackage ../development/libraries/loudmouth { };
-
- lrdf = callPackage ../development/libraries/lrdf { };
-
luabind = callPackage ../development/libraries/luabind { lua = lua5_1; };
luabind_luajit = luabind.override { lua = luajit; };
- luabridge = callPackage ../development/libraries/luabridge { };
-
luksmeta = callPackage ../development/libraries/luksmeta {
asciidoc = asciidoc-full;
};
- lyra = callPackage ../development/libraries/lyra { };
-
- lzo = callPackage ../development/libraries/lzo { };
-
- opencl-clang = callPackage ../development/libraries/opencl-clang { };
-
- magic-enum = callPackage ../development/libraries/magic-enum { };
-
mapnik = callPackage ../development/libraries/mapnik {
harfbuzz = harfbuzz.override {
withIcu = true;
};
};
- marisa = callPackage ../development/libraries/marisa { };
-
- mathgl = callPackage ../development/libraries/mathgl { };
-
- matio = callPackage ../development/libraries/matio { };
-
matterhorn =
# TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
haskellPackages.matterhorn;
- maxflow = callPackage ../development/libraries/maxflow { };
-
mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { };
mbedtls = callPackage ../development/libraries/mbedtls/3.nix { };
- mdctags = callPackage ../development/tools/misc/mdctags { };
-
mediastreamer = libsForQt5.callPackage ../development/libraries/mediastreamer { };
mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { };
@@ -21691,42 +10433,20 @@ with pkgs;
propagatedBuildInputs = [ memorymapping ];
} ../development/libraries/memorymapping/setup-hook.sh;
- memray = callPackage ../development/tools/memray { };
-
memstream = callPackage ../development/libraries/memstream { };
memstreamHook = makeSetupHook {
name = "memstream-hook";
propagatedBuildInputs = [ memstream ];
} ../development/libraries/memstream/setup-hook.sh;
- menu-cache = callPackage ../development/libraries/menu-cache { };
-
mergerfs = callPackage ../tools/filesystems/mergerfs { };
mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { };
- meshoptimizer = callPackage ../development/libraries/meshoptimizer { };
-
- mctc-lib = callPackage ../development/libraries/science/chemistry/mctc-lib { };
-
- mstore = callPackage ../development/libraries/science/chemistry/mstore { };
-
- multicharge = callPackage ../development/libraries/science/chemistry/multicharge { };
-
- test-drive = callPackage ../development/libraries/test-drive { };
-
- dftd4 = callPackage ../development/libraries/science/chemistry/dftd4 { };
-
simple-dftd3 = callPackage ../development/libraries/science/chemistry/simple-dftd3 { };
tblite = callPackage ../development/libraries/science/chemistry/tblite { };
- toml-f = callPackage ../development/libraries/toml-f { };
-
- dbcsr = callPackage ../development/libraries/science/math/dbcsr { };
-
- taco = callPackage ../development/libraries/taco { };
-
## libGL/libGLU/Mesa stuff
# Default libGL implementation.
@@ -21781,40 +10501,12 @@ with pkgs;
mesa_i686 = pkgsi686Linux.mesa; # make it build on Hydra
- mesa_glu = callPackage ../development/libraries/mesa-glu {};
-
## End libGL/libGLU/Mesa stuff
- meterbridge = callPackage ../applications/audio/meterbridge { };
-
- mhddfs = callPackage ../tools/filesystems/mhddfs { };
-
- microsoft-gsl = callPackage ../development/libraries/microsoft-gsl { };
-
- micronucleus = callPackage ../development/tools/misc/micronucleus { };
-
- markdown-anki-decks = callPackage ../tools/misc/markdown-anki-decks { };
-
- mdk-sdk = callPackage ../development/libraries/mdk-sdk { };
-
- mdslides = callPackage ../tools/misc/mdslides { };
-
- micropython = callPackage ../development/interpreters/micropython { };
-
midivisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midivisualizer {
inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel;
};
- mimalloc = callPackage ../development/libraries/mimalloc { };
-
- miniaudio = callPackage ../development/libraries/miniaudio { };
-
- miniz = callPackage ../development/libraries/miniz { };
-
- minizip = callPackage ../development/libraries/minizip { };
-
- minizip-ng = callPackage ../development/libraries/minizip-ng { };
-
mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
@@ -21823,70 +10515,20 @@ with pkgs;
withGUI = false;
};
- mlc = callPackage ../tools/system/mlc { };
-
mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { };
- mlib = callPackage ../development/libraries/mlib { };
-
mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { };
- mono-addins = callPackage ../development/libraries/mono-addins { };
-
- movine = callPackage ../development/tools/database/movine { };
-
- movit = callPackage ../development/libraries/movit { };
-
- moserial = callPackage ../tools/misc/moserial { };
-
- mosquitto = callPackage ../servers/mqtt/mosquitto { };
-
- mps = callPackage ../development/libraries/mps { };
-
- libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
-
mpeg2dec = libmpeg2;
- mqtt-benchmark = callPackage ../tools/networking/mqtt-benchmark { };
-
- mqttmultimeter = callPackage ../tools/networking/mqttmultimeter { };
-
- msgpack = callPackage ../development/libraries/msgpack { };
-
- msgpack-c = callPackage ../development/libraries/msgpack-c { };
-
- msgpack-cxx = callPackage ../development/libraries/msgpack-cxx { };
-
msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool;
- msilbc = callPackage ../development/libraries/msilbc { };
-
- mp4v2 = callPackage ../development/libraries/mp4v2 { };
-
- libmpc = callPackage ../development/libraries/libmpc { };
-
mpich = callPackage ../development/libraries/mpich {
ch4backend = libfabric;
};
mpich-pmix = mpich.override { pmixSupport = true; withPm = [ ]; };
- mstpd = callPackage ../os-specific/linux/mstpd { };
-
- mtdev = callPackage ../development/libraries/mtdev { };
-
- mtpfs = callPackage ../tools/filesystems/mtpfs { };
-
- mu = callPackage ../tools/networking/mu { };
-
- mueval = callPackage ../development/tools/haskell/mueval { };
-
- muparserx = callPackage ../development/libraries/muparserx { };
-
- mutest = callPackage ../development/libraries/mutest { };
-
- mvapich = callPackage ../development/libraries/mvapich { };
-
mvfst = darwin.apple_sdk_11_0.callPackage ../development/libraries/mvfst { };
mygpoclient = with python3.pkgs; toPythonApplication mygpoclient;
@@ -21895,30 +10537,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- mythes = callPackage ../development/libraries/mythes { };
-
- nanodbc = callPackage ../development/libraries/nanodbc { };
-
- nanomsg = callPackage ../development/libraries/nanomsg { };
-
- nanosvg = callPackage ../development/libraries/nanosvg { };
-
nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { };
- nanotts = callPackage ../tools/audio/nanotts { };
-
- ncnn = callPackage ../development/libraries/ncnn { };
-
- ndpi = callPackage ../development/libraries/ndpi { };
-
nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { };
- netflix = callPackage ../applications/video/netflix { };
-
- nifticlib = callPackage ../development/libraries/science/biology/nifticlib { };
-
- notify-sharp = callPackage ../development/libraries/notify-sharp { };
-
ncurses5 = ncurses.override {
abiVersion = "5";
};
@@ -21939,19 +10561,10 @@ with pkgs;
ndi = callPackage ../development/libraries/ndi { };
- neardal = callPackage ../development/libraries/neardal { };
-
- neatvnc = callPackage ../development/libraries/neatvnc { };
-
- neon = callPackage ../development/libraries/neon { };
-
nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; };
- newman = callPackage ../development/web/newman { };
-
newt = callPackage ../development/libraries/newt { python = python3; };
- nghttp2 = callPackage ../development/libraries/nghttp2 { };
libnghttp2 = nghttp2.lib;
nghttp3 = callPackage ../development/libraries/nghttp3 { inherit (darwin.apple_sdk.frameworks) CoreServices; };
@@ -21959,24 +10572,10 @@ with pkgs;
ngtcp2 = callPackage ../development/libraries/ngtcp2 { inherit (darwin.apple_sdk.frameworks) CoreServices; };
ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { };
- nix-plugins = callPackage ../development/libraries/nix-plugins { };
-
- nika-fonts = callPackage ../data/fonts/nika-fonts { };
-
- nikto = callPackage ../tools/networking/nikto { };
-
- nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
-
- nng = callPackage ../development/libraries/nng { };
-
- nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
-
non = callPackage ../applications/audio/non {
wafHook = (waf.override { extraTools = [ "gccdeps" ]; }).hook;
};
- ntl = callPackage ../development/libraries/ntl { };
-
nspr = callPackage ../development/libraries/nspr {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -21986,16 +10585,6 @@ with pkgs;
nss = nss_esr;
nssTools = nss.tools;
- nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
-
- ntbtls = callPackage ../development/libraries/ntbtls { };
-
- ntk = callPackage ../development/libraries/audio/ntk { };
-
- numcpp = callPackage ../development/libraries/numcpp { };
-
- nuraft = callPackage ../development/libraries/nuraft { };
-
nuspell = callPackage ../development/libraries/nuspell { };
nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; };
@@ -22013,39 +10602,21 @@ with pkgs;
nvidia-vaapi-driver = lib.hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { });
- nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { };
-
nvidia-system-monitor-qt = libsForQt5.callPackage ../tools/system/nvidia-system-monitor-qt { };
- nvitop = callPackage ../tools/system/nvitop { };
-
nvtopPackages = recurseIntoAttrs (import ../tools/system/nvtop { inherit callPackage; });
- ocl-icd = callPackage ../development/libraries/ocl-icd { };
-
- ode = callPackage ../development/libraries/ode { };
-
inherit (callPackages ../development/libraries/ogre { })
ogre_13 ogre_14;
ogre = ogre_14;
- olm = callPackage ../development/libraries/olm { };
-
one_gadget = callPackage ../development/tools/misc/one_gadget { };
oneDNN = callPackage ../development/libraries/oneDNN { };
oneDNN_2 = callPackage ../development/libraries/oneDNN/2.nix { };
- oneko = callPackage ../applications/misc/oneko { };
-
- oniguruma = callPackage ../development/libraries/oniguruma { };
-
- oobicpl = callPackage ../development/libraries/science/biology/oobicpl { };
-
- ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { };
-
openalSoft = callPackage ../development/libraries/openal-soft {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
};
@@ -22059,8 +10630,6 @@ with pkgs;
python = python3;
};
- opencascade-occt = callPackage ../development/libraries/opencascade-occt { };
-
opencascade-occt_7_6 = opencascade-occt.overrideAttrs rec {
pname = "opencascade-occt";
version = "7.6.2";
@@ -22079,21 +10648,11 @@ with pkgs;
];
};
- opencl-headers = callPackage ../development/libraries/opencl-headers { };
-
- opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { };
-
- opencollada = callPackage ../development/libraries/opencollada { };
-
- opencore-amr = callPackage ../development/libraries/opencore-amr { };
-
opencsg = callPackage ../development/libraries/opencsg {
inherit (qt5) qmake;
inherit (darwin.apple_sdk.frameworks) GLUT;
};
- openct = callPackage ../development/libraries/openct { };
-
opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
inherit (darwin.apple_sdk.frameworks)
AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate;
@@ -22111,41 +10670,23 @@ with pkgs;
opencv = opencv4;
- imath = callPackage ../development/libraries/imath { };
-
openexr = openexr_2;
openexr_2 = callPackage ../development/libraries/openexr { };
openexr_3 = callPackage ../development/libraries/openexr/3.nix { };
- openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };
-
- openldap = callPackage ../development/libraries/openldap { };
-
opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio {
inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa;
};
opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { };
- opendmarc = callPackage ../development/libraries/opendmarc { };
-
ois = callPackage ../development/libraries/ois {
inherit (darwin.apple_sdk.frameworks) Cocoa IOKit Kernel;
};
- openjpeg = callPackage ../development/libraries/openjpeg { };
-
- openpa = callPackage ../development/libraries/openpa { };
-
- opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
-
openscenegraph = callPackage ../development/libraries/openscenegraph {
inherit (darwin.apple_sdk.frameworks) AGL Accelerate Carbon Cocoa Foundation;
};
- openslide = callPackage ../development/libraries/openslide { };
-
- openslp = callPackage ../development/libraries/openslp { };
-
openstackclient = with python311Packages; toPythonApplication python-openstackclient;
openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: {
dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.cli-plugins;
@@ -22178,8 +10719,6 @@ with pkgs;
libressl = libressl_4_0;
- boringssl = callPackage ../development/libraries/boringssl { };
-
wolfssl = darwin.apple_sdk_11_0.callPackage ../development/libraries/wolfssl {
inherit (darwin.apple_sdk_11_0.frameworks) Security;
};
@@ -22195,46 +10734,11 @@ with pkgs;
openssl_3
openssl_3_3;
- opensubdiv = callPackage ../development/libraries/opensubdiv { };
-
- opensupaplex = callPackage ../games/opensupaplex { };
-
- open-wbo = callPackage ../applications/science/logic/open-wbo { };
-
- openwsman = callPackage ../development/libraries/openwsman { };
-
- ortp = callPackage ../development/libraries/ortp { };
-
- openhmd = callPackage ../development/libraries/openhmd { };
-
openwebrx = callPackage ../applications/radio/openwebrx {
inherit (python3Packages)
buildPythonPackage buildPythonApplication setuptools pycsdr pydigiham;
};
- oras = callPackage ../development/tools/oras { };
-
- orcania = callPackage ../development/libraries/orcania { };
-
- orogene = callPackage ../development/tools/misc/orogene { };
-
- osm-gps-map = callPackage ../development/libraries/osm-gps-map { };
-
- osmid = callPackage ../applications/audio/osmid { };
-
- osinfo-db = callPackage ../data/misc/osinfo-db { };
- osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { };
-
- pacemaker = callPackage ../misc/logging/pacemaker { };
-
- p11-kit = callPackage ../development/libraries/p11-kit { };
-
- parsero = callPackage ../tools/security/parsero { };
-
- pcaudiolib = callPackage ../development/libraries/pcaudiolib { };
-
- pcg_c = callPackage ../development/libraries/pcg-c { };
-
pcl = libsForQt5.callPackage ../development/libraries/pcl {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL;
@@ -22247,12 +10751,8 @@ with pkgs;
pcre2 = callPackage ../development/libraries/pcre2 { };
- pdal = callPackage ../development/libraries/pdal { };
-
pdfhummus = libsForQt5.callPackage ../development/libraries/pdfhummus { };
- pe-parse = callPackage ../development/libraries/pe-parse { };
-
phetch = callPackage ../applications/networking/gopher/phetch {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -22263,8 +10763,6 @@ with pkgs;
physfs_2
physfs;
- pico-sdk = callPackage ../development/libraries/pico-sdk { };
-
pingvin-share = callPackage ../servers/pingvin-share { };
pipelight = callPackage ../tools/misc/pipelight {
@@ -22272,26 +10770,12 @@ with pkgs;
wine-staging = pkgsi686Linux.wine-staging;
};
- pkcs11helper = callPackage ../development/libraries/pkcs11helper { };
-
- pkgdiff = callPackage ../tools/misc/pkgdiff { };
-
- pkgtop = callPackage ../tools/misc/pkgtop { };
-
place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at;
- platform-folders = callPackage ../development/libraries/platform-folders { };
-
- plib = callPackage ../development/libraries/plib { };
-
- poco = callPackage ../development/libraries/poco { };
-
podofo = callPackage ../development/libraries/podofo { };
podofo010 = callPackage ../development/libraries/podofo/0.10.x.nix { };
- polkit = callPackage ../development/libraries/polkit { };
-
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
poppler_gi = lowPrio (poppler.override {
@@ -22308,8 +10792,6 @@ with pkgs;
utils = true;
};
- popt = callPackage ../development/libraries/popt { };
-
portaudio = callPackage ../development/libraries/portaudio {
inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon;
};
@@ -22318,18 +10800,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices;
};
- presage = callPackage ../development/libraries/presage { };
-
- present = callPackage ../misc/present { };
-
- prime-server = callPackage ../development/libraries/prime-server { };
-
proj = callPackage ../development/libraries/proj { };
proj_7 = callPackage ../development/libraries/proj/7.nix { };
- proj-datumgrid = callPackage ../development/libraries/proj-datumgrid { };
-
proselint = callPackage ../tools/text/proselint {
inherit (python3Packages)
buildPythonApplication click future six;
@@ -22362,38 +10836,17 @@ with pkgs;
protobuf_21
;
- protobufc = callPackage ../development/libraries/protobufc { };
-
- protolock = callPackage ../development/libraries/protolock { };
-
- protozero = callPackage ../development/libraries/protozero { };
-
flatbuffers = callPackage ../development/libraries/flatbuffers { };
flatbuffers_23 = callPackage ../development/libraries/flatbuffers/23.nix { };
nanopbMalloc = callPackage ../by-name/na/nanopb/package.nix { enableMalloc = true; };
- gnupth = callPackage ../development/libraries/pth { };
pth = if stdenv.hostPlatform.isMusl then npth else gnupth;
- pslib = callPackage ../development/libraries/pslib { };
-
- pstreams = callPackage ../development/libraries/pstreams { };
-
- pufferpanel = callPackage ../servers/pufferpanel { };
-
- pugixml = callPackage ../development/libraries/pugixml { };
-
- pylode = callPackage ../misc/pylode { };
-
python-qt = libsForQt5.callPackage ../development/libraries/python-qt { };
pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { };
- plasma-hud = callPackage ../misc/plasma-hud { };
-
- re2 = callPackage ../development/libraries/re2 { };
-
qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { };
qdjango = libsForQt5.callPackage ../development/libraries/qdjango { };
@@ -22402,8 +10855,6 @@ with pkgs;
inherit (lomiri) cmake-extras;
};
- qoi = callPackage ../development/libraries/qoi { };
-
qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
quarto = callPackage ../development/libraries/quarto { };
@@ -22439,45 +10890,17 @@ with pkgs;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
});
- quark-engine = callPackage ../tools/security/quark-engine { };
-
- quantlib = callPackage ../development/libraries/quantlib { };
-
- quesoglc = callPackage ../development/libraries/quesoglc { };
-
- quickmem = callPackage ../development/libraries/quickmem { };
-
- quicksynergy = callPackage ../applications/misc/quicksynergy { };
-
quill = callPackage ../tools/security/quill {
inherit (darwin.apple_sdk.frameworks) Security;
};
qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray { };
- rabbitmq-c = callPackage ../development/libraries/rabbitmq-c { };
-
- raft-canonical = callPackage ../development/libraries/raft-canonical { };
-
- range-v3 = callPackage ../development/libraries/range-v3 { };
-
rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
- rapidcheck = callPackage ../development/libraries/rapidcheck { };
-
- rapidfuzz-cpp = callPackage ../development/libraries/rapidfuzz-cpp { };
-
- rapidxml = callPackage ../development/libraries/rapidxml { };
-
- rapidyaml = callPackage ../development/libraries/rapidyaml {};
-
- raul = callPackage ../development/libraries/audio/raul { };
-
- raylib = callPackage ../development/libraries/raylib { };
-
readline = readline82;
readline70 = callPackage ../development/libraries/readline/7.0.nix { };
@@ -22486,14 +10909,6 @@ with pkgs;
readmdict = with python3Packages; toPythonApplication readmdict;
- readosm = callPackage ../development/libraries/readosm { };
-
- recastnavigation = callPackage ../development/libraries/recastnavigation { };
-
- rinutils = callPackage ../development/libraries/rinutils { };
-
- rtrlib = callPackage ../development/libraries/rtrlib { };
-
kissfftFloat = kissfft.override {
datatype = "float";
};
@@ -22502,8 +10917,6 @@ with pkgs;
haskellLib = haskell.lib.compose;
};
- lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { };
-
librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };
@@ -22513,22 +10926,10 @@ with pkgs;
librdf_redland = callPackage ../development/libraries/librdf/redland.nix { };
redland = librdf_redland; # added 2018-04-25
- libsmf = callPackage ../development/libraries/audio/libsmf { };
-
- lilv = callPackage ../development/libraries/audio/lilv { };
-
- lv2 = callPackage ../development/libraries/audio/lv2 { };
-
- lvtk = callPackage ../development/libraries/audio/lvtk { };
-
- qm-dsp = callPackage ../development/libraries/audio/qm-dsp { };
-
qradiolink = callPackage ../applications/radio/qradiolink {
protobuf = protobuf_21;
};
- qrupdate = callPackage ../development/libraries/qrupdate { };
-
qadwaitadecorations-qt6 = callPackage ../by-name/qa/qadwaitadecorations/package.nix {
useQt6 = true;
};
@@ -22545,23 +10946,11 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- retro-gtk = callPackage ../development/libraries/retro-gtk { };
-
- resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
-
- restish = callPackage ../tools/networking/restish { };
-
rhino = callPackage ../development/libraries/java/rhino {
javac = jdk8;
jvm = jre8;
};
- rlog = callPackage ../development/libraries/rlog { };
-
- rlottie = callPackage ../development/libraries/rlottie { };
-
- rocksdb = callPackage ../development/libraries/rocksdb { };
-
rocksdb_8_11 = rocksdb.overrideAttrs rec {
pname = "rocksdb";
version = "8.11.4";
@@ -22606,52 +10995,22 @@ with pkgs;
};
};
- rotate-backups = callPackage ../tools/backup/rotate-backups { };
-
- rote = callPackage ../development/libraries/rote { };
-
- round = callPackage ../applications/graphics/round { };
-
- router = callPackage ../servers/http/router { };
-
rover = callPackage ../development/tools/rover { };
- rqlite = callPackage ../servers/sql/rqlite { };
-
rshell = python3.pkgs.callPackage ../development/embedded/rshell { };
- rtlcss = callPackage ../development/libraries/rtlcss { };
-
- rttr = callPackage ../development/libraries/rttr { };
-
- rubberband = callPackage ../development/libraries/rubberband { };
-
- rutabaga_gfx = callPackage ../development/libraries/rutabaga_gfx { };
-
rure = callPackage ../development/libraries/rure { };
- rustc-demangle = callPackage ../development/libraries/rustc-demangle { };
-
- s2geometry = callPackage ../development/libraries/s2geometry { };
-
- safefile = callPackage ../development/libraries/safefile { };
-
- sbc = callPackage ../development/libraries/sbc { };
-
schroedinger = callPackage ../development/libraries/schroedinger {
autoreconfHook = buildPackages.autoreconfHook269;
};
- scope-lite = callPackage ../development/libraries/scope-lite { };
-
SDL = SDL1;
SDL2 = callPackage ../development/libraries/SDL2 {
inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
};
- sdrplay = callPackage ../applications/radio/sdrplay { };
-
sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { };
sdrpp = callPackage ../applications/radio/sdrpp {
@@ -22660,59 +11019,21 @@ with pkgs;
sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { };
- sigutils = callPackage ../applications/radio/sigutils { };
-
- sblim-sfcc = callPackage ../development/libraries/sblim-sfcc { };
-
- selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { };
-
- sealcurses = callPackage ../development/libraries/sealcurses { };
-
- seasocks = callPackage ../development/libraries/seasocks { };
-
- serd = callPackage ../development/libraries/serd { };
-
- serf = callPackage ../development/libraries/serf { };
-
sev-snp-measure = with python3Packages; toPythonApplication sev-snp-measure;
- sfsexp = callPackage ../development/libraries/sfsexp { };
-
- shhmsg = callPackage ../development/libraries/shhmsg { };
-
- shhopt = callPackage ../development/libraries/shhopt { };
-
- shine = callPackage ../development/libraries/shine { };
-
graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix { };
- s2n-tls = callPackage ../development/libraries/s2n-tls { };
-
simavr = callPackage ../development/tools/simavr {
avrgcc = pkgsCross.avr.buildPackages.gcc;
avrlibc = pkgsCross.avr.libcCross;
inherit (darwin.apple_sdk.frameworks) GLUT;
};
- simgear = callPackage ../development/libraries/simgear { };
-
- simp_le = callPackage ../tools/admin/simp_le { };
-
simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; };
sfml = callPackage ../development/libraries/sfml {
inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
};
- csfml = callPackage ../development/libraries/csfml { };
-
- sharness = callPackage ../development/libraries/sharness { };
-
- shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { };
-
- skaffold = callPackage ../development/tools/skaffold { };
-
- skjold = callPackage ../development/tools/skjold { };
-
skawarePackages = recurseIntoAttrs (callPackage ../development/skaware-packages { });
inherit (skawarePackages)
@@ -22745,26 +11066,12 @@ with pkgs;
inherit (skawarePackages) cleanPackaging;
};
- shaq = callPackage ../tools/audio/shaq { };
-
slibGuile = callPackage ../development/libraries/slib {
scheme = guile;
};
- smpeg = callPackage ../development/libraries/smpeg { };
-
- smpeg2 = callPackage ../development/libraries/smpeg2 { };
-
- snappy = callPackage ../development/libraries/snappy { };
-
snac2 = darwin.apple_sdk_11_0.callPackage ../servers/snac2 { };
- snappymail = callPackage ../servers/snappymail { };
-
- snow = callPackage ../tools/security/snow { };
-
- snowcrash = callPackage ../tools/security/snowcrash { };
-
soapyairspy = callPackage ../applications/radio/soapyairspy {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) IOKit Security;
@@ -22786,10 +11093,6 @@ with pkgs;
soapysdr = callPackage ../applications/radio/soapysdr { };
- soapyremote = callPackage ../applications/radio/soapyremote { };
-
- soapysdrplay = callPackage ../applications/radio/soapysdrplay { };
-
soapysdr-with-plugins = callPackage ../applications/radio/soapysdr {
extraPackages = [
limesuite
@@ -22813,10 +11116,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit Security;
};
- social-engineer-toolkit = callPackage ../tools/security/social-engineer-toolkit { };
-
- socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
-
sofia_sip = callPackage ../development/libraries/sofia-sip {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
@@ -22825,31 +11124,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon;
};
- sokol = callPackage ../development/libraries/sokol { };
-
- sonic = callPackage ../development/libraries/sonic { };
-
- sonivox = callPackage ../development/libraries/sonivox { };
-
- sope = callPackage ../development/libraries/sope { };
-
- sord = callPackage ../development/libraries/sord { };
-
- soundtouch = callPackage ../development/libraries/soundtouch { };
-
- span-lite = callPackage ../development/libraries/span-lite { };
-
spandsp = callPackage ../development/libraries/spandsp { };
spandsp3 = callPackage ../development/libraries/spandsp/3.nix { };
- spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt { };
-
- sparrow3d = callPackage ../development/libraries/sparrow3d {};
-
- spdk = callPackage ../development/libraries/spdk { };
-
- speechd = callPackage ../development/libraries/speechd { };
-
speechd-minimal = speechd.override {
withLibao = false;
withPulse = false;
@@ -22881,44 +11158,8 @@ with pkgs;
inherit (python3Packages) sphinxHook;
- sphinxsearch = callPackage ../servers/search/sphinxsearch { };
-
- spice = callPackage ../development/libraries/spice { };
-
- spice-gtk = callPackage ../development/libraries/spice-gtk { };
-
- spice-protocol = callPackage ../development/libraries/spice-protocol { };
-
- spice-up = callPackage ../applications/office/spice-up { };
-
- spirv-cross = callPackage ../tools/graphics/spirv-cross { };
-
- splat = callPackage ../applications/radio/splat { };
-
- suscan = callPackage ../applications/radio/suscan { };
-
suwidgets = libsForQt5.callPackage ../applications/radio/suwidgets { };
- sratom = callPackage ../development/libraries/audio/sratom { };
-
- srm = callPackage ../tools/security/srm { };
-
- srt = callPackage ../development/libraries/srt { };
-
- srtp = callPackage ../development/libraries/srtp { };
-
- stargate-libcds = callPackage ../development/libraries/stargate-libcds { };
-
- stb = callPackage ../development/libraries/stb { };
-
- stegsolve = callPackage ../tools/graphics/stegsolve { };
-
- stxxl = callPackage ../development/libraries/stxxl { };
-
- sv-lang = callPackage ../applications/science/electronics/sv-lang { };
-
- sqld = callPackage ../servers/sql/sqld { };
-
sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
unqlite = lowPrio (callPackage ../development/libraries/unqlite { });
@@ -22929,86 +11170,37 @@ with pkgs;
sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { };
- sqlitecpp = callPackage ../development/libraries/sqlitecpp { };
-
sqlite-interactive = (sqlite.override { interactive = true; }).bin;
- sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
-
- sregex = callPackage ../development/libraries/sregex { };
-
- dqlite = callPackage ../development/libraries/dqlite { };
-
- sqlcipher = callPackage ../development/libraries/sqlcipher { };
-
standardnotes = callPackage ../applications/editors/standardnotes { };
- stfl = callPackage ../development/libraries/stfl { };
-
stlink = callPackage ../development/tools/misc/stlink { };
stlink-gui = callPackage ../development/tools/misc/stlink { withGUI = true; };
- stegseek = callPackage ../tools/security/stegseek { };
-
- streamlink = callPackage ../applications/video/streamlink { };
streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix { };
structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { };
- sub-batch = callPackage ../applications/video/sub-batch { };
-
- subdl = callPackage ../applications/video/subdl { };
-
- subtitleeditor = callPackage ../applications/video/subtitleeditor { };
-
- subxt = callPackage ../development/tools/subxt { };
-
suil = darwin.apple_sdk_11_0.callPackage ../development/libraries/audio/suil { };
sundials = callPackage ../development/libraries/sundials {
python = python3;
};
- sutils = callPackage ../tools/misc/sutils { };
-
- svrcore = callPackage ../development/libraries/svrcore { };
-
svxlink = libsForQt5.callPackage ../applications/radio/svxlink { };
- szip = callPackage ../development/libraries/szip { };
-
- t1lib = callPackage ../development/libraries/t1lib { };
-
tachyon = callPackage ../development/libraries/tachyon {
inherit (darwin.apple_sdk.frameworks) Carbon;
};
tageditor = libsForQt5.callPackage ../applications/audio/tageditor { };
- ta-lib = callPackage ../development/libraries/ta-lib { };
-
- taglib = callPackage ../development/libraries/taglib { };
-
- taglib_extras = callPackage ../development/libraries/taglib-extras { };
-
- taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
-
- tanidvr = callPackage ../applications/video/tanidvr { };
-
- talloc = callPackage ../development/libraries/talloc { };
-
- tagparser = callPackage ../development/libraries/tagparser { };
-
tclap = tclap_1_2;
tclap_1_2 = callPackage ../development/libraries/tclap/1.2.nix { };
tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { };
- tdb = callPackage ../development/libraries/tdb { };
-
- tdlib = callPackage ../development/libraries/tdlib { };
-
tectonic = callPackage ../tools/typesetting/tectonic/wrapper.nix { };
tectonic-unwrapped = callPackage ../tools/typesetting/tectonic {
@@ -23017,118 +11209,30 @@ with pkgs;
termbench-pro = callPackage ../development/libraries/termbench-pro { fmt = fmt_8; };
- telepathy-glib = callPackage ../development/libraries/telepathy/glib { };
-
- telepathy-farstream = callPackage ../development/libraries/telepathy/farstream { };
-
- termbox = callPackage ../development/libraries/termbox { };
-
- tevent = callPackage ../development/libraries/tevent { };
-
- tet = callPackage ../development/tools/misc/tet { };
-
texpresso = callPackage ../tools/typesetting/tex/texpresso {
texpresso-tectonic = callPackage ../tools/typesetting/tex/texpresso/tectonic.nix { };
};
- text-engine = callPackage ../development/libraries/text-engine { };
-
- the-foundation = callPackage ../development/libraries/the-foundation { };
-
- theft = callPackage ../development/libraries/theft { };
-
- thrift = callPackage ../development/libraries/thrift { };
-
- tidyp = callPackage ../development/libraries/tidyp { };
-
- tidal-hifi = callPackage ../applications/audio/tidal-hifi { };
-
- tinycdb = callPackage ../development/libraries/tinycdb { };
-
tinyxml = tinyxml2;
tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
- tiscamera = callPackage ../os-specific/linux/tiscamera { };
-
- tivodecode = callPackage ../applications/video/tivodecode { };
-
tk = tk-8_6;
tk-9_0 = callPackage ../development/libraries/tk/9.0.nix { tcl = tcl-9_0; };
tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; };
- tkrzw = callPackage ../development/libraries/tkrzw { };
-
- tl-expected = callPackage ../development/libraries/tl-expected { };
-
- tnt = callPackage ../development/libraries/tnt { };
-
- tntnet = callPackage ../development/libraries/tntnet { };
-
- tntdb = callPackage ../development/libraries/tntdb { };
-
- kyotocabinet = callPackage ../development/libraries/kyotocabinet { };
-
- tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { };
-
- tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { };
-
- totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { };
-
tpm2-tss = callPackage ../development/libraries/tpm2-tss {
autoreconfHook = buildPackages.autoreconfHook269;
};
- tremor = callPackage ../development/libraries/tremor { };
-
- trillian = callPackage ../tools/misc/trillian { };
-
- udns = callPackage ../development/libraries/udns { };
-
- uid_wrapper = callPackage ../development/libraries/uid_wrapper { };
-
- umockdev = callPackage ../development/libraries/umockdev { };
-
- unconvert = callPackage ../development/tools/unconvert { };
-
- uncover = callPackage ../tools/security/uncover { };
-
- unibilium = callPackage ../development/libraries/unibilium { };
-
- unicap = callPackage ../development/libraries/unicap { };
-
- unicon-lang = callPackage ../development/interpreters/unicon-lang { };
-
- updfparser = callPackage ../development/libraries/updfparser { };
-
- tsocks = callPackage ../development/libraries/tsocks { };
-
- unixODBC = callPackage ../development/libraries/unixODBC { };
-
unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
- usrsctp = callPackage ../development/libraries/usrsctp { };
-
- usbredir = callPackage ../development/libraries/usbredir { };
-
- usbrip = callPackage ../tools/security/usbrip { };
-
- uthash = callPackage ../development/libraries/uthash { };
-
- uthenticode = callPackage ../development/libraries/uthenticode { };
-
- ucommon = callPackage ../development/libraries/ucommon { };
-
v8 = callPackage ../development/libraries/v8 {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
- vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { };
-
- libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { };
-
valeStyles = recurseIntoAttrs (callPackages ../by-name/va/vale/styles.nix { });
valhalla = callPackage ../development/libraries/valhalla {
@@ -23140,16 +11244,10 @@ with pkgs;
};
};
- vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { };
-
vc = callPackage ../development/libraries/vc { };
vc_0_7 = callPackage ../development/libraries/vc/0.7.nix { };
- vcdimager = callPackage ../development/libraries/vcdimager { };
-
- vcg = callPackage ../development/libraries/vcg { };
-
vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; };
vid-stab = callPackage ../development/libraries/vid-stab {
@@ -23160,24 +11258,6 @@ with pkgs;
hdf5 = hdf5.override { usev110Api = true; };
};
- vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { };
-
- vkdt = callPackage ../applications/graphics/vkdt { };
-
- vlock = callPackage ../misc/screensavers/vlock { };
-
- virtualpg = callPackage ../development/libraries/virtualpg { };
-
- vmime = callPackage ../development/libraries/vmime { };
-
- vrb = callPackage ../development/libraries/vrb { };
-
- vrpn = callPackage ../development/libraries/vrpn { };
-
- vsqlite = callPackage ../development/libraries/vsqlite { };
-
- vte = callPackage ../development/libraries/vte { };
-
vte-gtk4 = vte.override {
gtkVersion = "4";
};
@@ -23202,29 +11282,12 @@ with pkgs;
vulkan-cts = callPackage ../tools/graphics/vulkan-cts { };
- vulkan-helper = callPackage ../tools/graphics/vulkan-helper { };
-
- vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
- vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
vulkan-tools = callPackage ../tools/graphics/vulkan-tools {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
- vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
- vulkan-utility-libraries = callPackage ../development/libraries/vulkan-utility-libraries { };
- vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
-
- vxl = callPackage ../development/libraries/vxl { };
-
- waffle = callPackage ../development/libraries/waffle { };
-
- wally-cli = callPackage ../development/tools/wally-cli { };
- zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { };
-
wangle = darwin.apple_sdk_11_0.callPackage ../development/libraries/wangle { };
- wavpack = callPackage ../development/libraries/wavpack { };
-
wayland = darwin.apple_sdk_11_0.callPackage ../development/libraries/wayland { };
wayland-scanner = callPackage ../development/libraries/wayland/scanner.nix { };
@@ -23234,8 +11297,6 @@ with pkgs;
graphviz = graphviz-nox;
};
- wcslib = callPackage ../development/libraries/science/astronomy/wcslib { };
-
webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk {
harfbuzz = harfbuzzFull;
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
@@ -23251,33 +11312,21 @@ with pkgs;
gtk3 = gtk4;
};
- webp-pixbuf-loader = callPackage ../development/libraries/webp-pixbuf-loader { };
-
- websocketpp = callPackage ../development/libraries/websocket++ { };
-
- wfa2-lib = callPackage ../development/libraries/wfa2-lib { };
-
webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { };
webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { };
# bump when majoring of packages have updated
webrtc-audio-processing = webrtc-audio-processing_0_3;
- whereami = callPackage ../development/libraries/whereami { };
-
wildmidi = callPackage ../development/libraries/wildmidi {
inherit (darwin.apple_sdk.frameworks) OpenAL CoreAudioKit;
};
- wiredtiger = callPackage ../development/libraries/wiredtiger { };
-
wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { };
wt = wt4;
inherit (libsForQt5.callPackage ../development/libraries/wt { })
wt4;
- wxformbuilder = callPackage ../development/tools/wxformbuilder { };
-
wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix {
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
@@ -23292,12 +11341,6 @@ with pkgs;
wxGTK = wxGTK32;
};
- wtk = callPackage ../development/libraries/wtk { };
-
- x264 = callPackage ../development/libraries/x264 { };
-
- x265 = callPackage ../development/libraries/x265 { };
-
inherit (callPackages ../development/libraries/xapian { })
xapian_1_4;
xapian = xapian_1_4;
@@ -23306,87 +11349,21 @@ with pkgs;
libmagic = file;
};
- xavs = callPackage ../development/libraries/xavs { };
-
- Xaw3d = callPackage ../development/libraries/Xaw3d { };
-
- xbase = callPackage ../development/libraries/xbase { };
-
xcb-util-cursor = xorg.xcbutilcursor;
xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { };
xcbutilxrm = callPackage ../servers/x11/xorg/xcb-util-xrm.nix { };
- xdo = callPackage ../tools/misc/xdo { };
-
- xdiskusage = callPackage ../tools/misc/xdiskusage { };
-
- xed = callPackage ../development/libraries/xed { };
-
- xedit = callPackage ../applications/editors/xedit { };
-
- xautolock = callPackage ../misc/screensavers/xautolock { };
-
- xercesc = callPackage ../development/libraries/xercesc { };
-
- xalanc = callPackage ../development/libraries/xalanc { };
-
- xgboost = callPackage ../development/libraries/xgboost { };
-
xgboostWithCuda = xgboost.override { cudaSupport = true; };
- xgeometry-select = callPackage ../tools/X11/xgeometry-select { };
-
- xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };
-
- xmlsec = callPackage ../development/libraries/xmlsec { };
-
- xml-security-c = callPackage ../development/libraries/xml-security-c { };
-
- xlslib = callPackage ../development/libraries/xlslib { };
-
- xtensor = callPackage ../development/libraries/xtensor { };
-
- xtl = callPackage ../development/libraries/xtl { };
-
- xvidcore = callPackage ../development/libraries/xvidcore { };
-
- xxHash = callPackage ../development/libraries/xxHash { };
-
- xylib = callPackage ../development/libraries/xylib { };
-
- yajl = callPackage ../development/libraries/yajl { };
-
- yder = callPackage ../development/libraries/yder { };
-
- yojimbo = callPackage ../development/libraries/yojimbo { };
-
yubico-pam = callPackage ../development/libraries/yubico-pam {
inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
};
- yubihsm-connector = callPackage ../tools/security/yubihsm-connector { };
-
- yubikey-manager = callPackage ../tools/misc/yubikey-manager { };
-
yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { };
- yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { };
-
yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };
- yubikey-agent = callPackage ../tools/security/yubikey-agent { };
-
- yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { };
-
- yubihsm-shell = callPackage ../tools/security/yubihsm-shell { };
-
- yubioath-flutter = callPackage ../applications/misc/yubioath-flutter { };
-
- yyjson = callPackage ../development/libraries/yyjson { };
-
- zeitgeist = callPackage ../development/libraries/zeitgeist { };
-
zlib = callPackage ../development/libraries/zlib {
stdenv =
# zlib is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
@@ -23397,23 +11374,9 @@ with pkgs;
stdenv;
};
- zlib-ng = callPackage ../development/libraries/zlib-ng { };
-
- libdynd = callPackage ../development/libraries/libdynd { };
-
- zlog = callPackage ../development/libraries/zlog { };
-
zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix { };
zeromq = zeromq4;
- cppzmq = callPackage ../development/libraries/cppzmq { };
-
- czmq = callPackage ../development/libraries/czmq { };
-
- zmqpp = callPackage ../development/libraries/zmqpp { };
-
- libzra = callPackage ../development/libraries/libzra { };
-
# requires a newer Apple SDK
zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9 {
llvmPackages = llvmPackages_13;
@@ -23443,18 +11406,6 @@ with pkgs;
aroccStdenv = if stdenv.cc.isArocc then stdenv else lowPrio arocc.cc.passthru.stdenv;
- zimlib = callPackage ../development/libraries/zimlib { };
-
- zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };
-
- zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { };
-
- zita-resampler = callPackage ../development/libraries/audio/zita-resampler { };
-
- zitadel-tools = callPackage ../tools/misc/zitadel-tools { };
-
- zix = callPackage ../development/libraries/audio/zix { };
-
gsignond = callPackage ../development/libraries/gsignond {
plugins = [];
};
@@ -23466,8 +11417,6 @@ with pkgs;
mail = callPackage ../development/libraries/gsignond/plugins/mail.nix { };
};
- plumed = callPackage ../development/libraries/science/chemistry/plumed { };
-
### DEVELOPMENT / LIBRARIES / DARWIN SDKS
apple-sdk_10_12 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "10.12"; };
@@ -23510,48 +11459,12 @@ with pkgs;
### DEVELOPMENT / LIBRARIES / BASH
- bash-preexec = callPackage ../development/libraries/bash/bash-preexec { };
-
### DEVELOPMENT / LIBRARIES / JAVA
- commonsBcel = callPackage ../development/libraries/java/commons/bcel { };
-
- commonsBsf = callPackage ../development/libraries/java/commons/bsf { };
-
- commonsCompress = callPackage ../development/libraries/java/commons/compress { };
-
- commonsDaemon = callPackage ../development/libraries/java/commons/daemon { };
-
- commonsFileUpload = callPackage ../development/libraries/java/commons/fileupload { };
-
- commonsLang = callPackage ../development/libraries/java/commons/lang { };
-
- commonsLogging = callPackage ../development/libraries/java/commons/logging { };
-
- commonsIo = callPackage ../development/libraries/java/commons/io { };
-
- commonsMath = callPackage ../development/libraries/java/commons/math { };
-
- httpunit = callPackage ../development/libraries/java/httpunit { };
-
javaCup = callPackage ../development/libraries/java/cup {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
- jdom = callPackage ../development/libraries/java/jdom { };
-
- jffi = callPackage ../development/libraries/java/jffi { };
-
- jflex = callPackage ../development/libraries/java/jflex { };
-
- lombok = callPackage ../development/libraries/java/lombok { };
-
- lucene = callPackage ../development/libraries/java/lucene { };
-
- lucenepp = callPackage ../development/libraries/lucene++ { };
-
- mockobjects = callPackage ../development/libraries/java/mockobjects { };
-
saxonb = saxonb_8_8;
saxon-he = saxon_12-he;
@@ -23566,8 +11479,6 @@ with pkgs;
saxon_11-he
saxon_12-he;
- smack = callPackage ../development/libraries/java/smack { };
-
swt_jdk8 = callPackage ../by-name/sw/swt/package.nix {
jdk = jdk8;
};
@@ -23575,10 +11486,6 @@ with pkgs;
### DEVELOPMENT / LIBRARIES / JAVASCRIPT
- nodehun = callPackage ../development/tools/nodehun { };
-
- yuicompressor = callPackage ../development/tools/yuicompressor { };
-
### DEVELOPMENT / BOWER MODULES (JAVASCRIPT)
buildBowerComponents = callPackage ../development/bower-modules/generic { };
@@ -23606,8 +11513,6 @@ with pkgs;
go = buildPackages.go_1_23;
};
- leaps = callPackage ../development/tools/leaps { };
-
### DEVELOPMENT / HARE
hareHook = callPackage ../by-name/ha/hare/hook.nix { };
@@ -23790,20 +11695,12 @@ with pkgs;
### SERVERS
- _5etools = callPackage ../servers/web-apps/5etools { };
-
adguardhome = callPackage ../servers/adguardhome { };
alerta = callPackage ../servers/monitoring/alerta/client.nix { };
alerta-server = callPackage ../servers/monitoring/alerta { };
- alps = callPackage ../servers/alps { };
-
- anuko-time-tracker = callPackage ../servers/web-apps/anuko-time-tracker { };
-
- apache-directory-server = callPackage ../servers/ldap/apache-directory-server { };
-
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
@@ -23843,8 +11740,6 @@ with pkgs;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
- cadvisor = callPackage ../servers/monitoring/cadvisor { };
-
cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
python = python2;
@@ -23871,72 +11766,35 @@ with pkgs;
java = jre;
};
- apcupsd = callPackage ../servers/apcupsd { };
-
inherit (callPackages ../servers/asterisk { })
asterisk asterisk-stable asterisk-lts
asterisk_18 asterisk_20;
- asterisk-module-sccp = callPackage ../servers/asterisk/sccp { };
-
asterisk-ldap = lowPrio (asterisk.override { ldapSupport = true; });
- baserow = callPackage ../servers/baserow { };
-
- bftpd = callPackage ../servers/ftp/bftpd { };
-
- bind = callPackage ../servers/dns/bind { };
dnsutils = bind.dnsutils;
dig = lib.addMetaAttrs { mainProgram = "dig"; } bind.dnsutils;
- bird = callPackage ../servers/bird { };
-
- bird-lg = callPackage ../servers/bird-lg { };
-
- bloat = callPackage ../servers/bloat { };
-
- bosun = callPackage ../servers/monitoring/bosun { };
-
- cayley = callPackage ../servers/cayley { };
-
- cgiserver = callPackage ../servers/http/cgiserver { };
-
charybdis = callPackage ../servers/irc/charybdis {
autoreconfHook = buildPackages.autoreconfHook269;
};
- clamsmtp = callPackage ../servers/mail/clamsmtp { };
-
clickhouse = callPackage ../servers/clickhouse {
llvmPackages = llvmPackages_16;
};
clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
- clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { };
-
- codeowners = callPackage ../development/tools/codeowners { };
-
couchdb3 = callPackage ../servers/http/couchdb/3.nix { };
dcnnt = python3Packages.callPackage ../servers/dcnnt { };
deconz = qt5.callPackage ../servers/deconz { };
- dendrite = callPackage ../servers/dendrite { };
-
- dex-oidc = callPackage ../servers/dex { };
-
- dex2jar = callPackage ../development/tools/java/dex2jar { };
-
doh-proxy-rust = callPackage ../servers/dns/doh-proxy-rust {
inherit (darwin.apple_sdk.frameworks) Security;
};
- dgraph = callPackage ../servers/dgraph { };
-
- dico = callPackage ../servers/dico { };
-
dict = callPackage ../servers/dict {
libmaa = callPackage ../servers/dict/libmaa.nix { };
};
@@ -23947,58 +11805,27 @@ with pkgs;
diod = callPackage ../servers/diod { lua = lua5_1; };
- directx-headers = callPackage ../development/libraries/directx-headers { };
-
directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {
# https://github.com/NixOS/nixpkgs/issues/216294
stdenv = if stdenv.cc.isGNU && stdenv.hostPlatform.isi686 then gcc11Stdenv else stdenv;
};
- dkimproxy = callPackage ../servers/mail/dkimproxy { };
-
- dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { };
-
- do-agent = callPackage ../servers/monitoring/do-agent { };
-
dodgy = with python3Packages; toPythonApplication dodgy;
dovecot = callPackage ../servers/mail/dovecot { };
- dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { };
- dovecot_fts_xapian = callPackage ../servers/mail/dovecot/plugins/fts_xapian { };
-
- dspam = callPackage ../servers/mail/dspam { };
-
- engelsystem = callPackage ../servers/web-apps/engelsystem { };
-
envoy = callPackage ../by-name/en/envoy/package.nix {
jdk = openjdk11_headless;
};
- ergochat = callPackage ../servers/irc/ergochat { };
-
etcd = etcd_3_5;
etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
etcd_3_5 = callPackage ../servers/etcd/3.5 { };
- exhaustive = callPackage ../development/tools/exhaustive { };
-
- hyp = callPackage ../servers/http/hyp { };
-
- peering-manager = callPackage ../servers/web-apps/peering-manager { };
-
- podgrab = callPackage ../servers/misc/podgrab { };
-
- portunus = callPackage ../servers/portunus { };
-
prosody = callPackage ../servers/xmpp/prosody {
withExtraLibs = [];
withExtraLuaPackages = _: [];
};
- prosody-filer = callPackage ../servers/xmpp/prosody-filer { };
-
- biboumi = callPackage ../servers/xmpp/biboumi { };
-
elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -24006,32 +11833,20 @@ with pkgs;
eventstore = callPackage ../servers/nosql/eventstore { };
- exabgp = callPackage ../servers/networking/exabgp { };
-
rustus = callPackage ../servers/networking/rustus {
inherit (darwin.apple_sdk.frameworks) Security;
};
- exim = callPackage ../servers/mail/exim { };
-
- fastnetmon-advanced = callPackage ../servers/fastnetmon-advanced { };
-
- fcgiwrap = callPackage ../servers/fcgiwrap { };
-
fedigroups = callPackage ../servers/fedigroups {
inherit (darwin.apple_sdk.frameworks) Security;
};
- ferretdb = callPackage ../servers/nosql/ferretdb { };
-
felix = callPackage ../servers/felix { };
felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { };
inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird;
- freeradius = callPackage ../servers/freeradius { };
-
freshrss = callPackage ../servers/web-apps/freshrss { };
freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { });
@@ -24039,52 +11854,14 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
- fusionInventory = callPackage ../servers/monitoring/fusion-inventory { };
-
- gamehub = callPackage ../games/gamehub { };
-
- gatling = callPackage ../servers/http/gatling { };
-
- glabels = callPackage ../applications/graphics/glabels { };
-
glabels-qt = libsForQt5.callPackage ../applications/graphics/glabels-qt { };
- nats-server = callPackage ../servers/nats-server { };
-
- go-autoconfig = callPackage ../servers/go-autoconfig { };
-
- go-cqhttp = callPackage ../servers/go-cqhttp { };
-
grafana = callPackage ../servers/monitoring/grafana { };
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
- grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
-
grafana-loki = callPackage ../servers/monitoring/loki { };
promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
- phlare = callPackage ../servers/monitoring/phlare { };
-
- grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { };
-
- grafana-dash-n-grab = callPackage ../servers/monitoring/grafana-dash-n-grab { };
-
- gerbera = callPackage ../servers/gerbera { };
-
- gobetween = callPackage ../servers/gobetween { };
-
- gobgpd = callPackage ../servers/misc/gobgpd { };
-
- graph-cli = callPackage ../tools/graphics/graph-cli { };
-
- h2o = callPackage ../servers/http/h2o { };
-
- haka = callPackage ../tools/security/haka { };
-
- hashi-ui = callPackage ../servers/hashi-ui { };
-
- hashi-up = callPackage ../applications/networking/cluster/hashi-up { };
-
hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine;
hasura-cli = callPackage ../servers/hasura/cli.nix { };
@@ -24094,14 +11871,6 @@ with pkgs;
hbase3 = hbase_3_0;
hbase = hbase2; # when updating, point to the latest stable release
- headphones = callPackage ../servers/headphones { };
-
- hiawatha = callPackage ../servers/http/hiawatha { };
-
- hiraeth = callPackage ../servers/hiraeth { };
-
- hoard = callPackage ../tools/misc/hoard { };
-
home-assistant = callPackage ../servers/home-assistant { };
buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { };
@@ -24116,16 +11885,6 @@ with pkgs;
home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components;
- honk = callPackage ../servers/honk { };
-
- hqplayerd = callPackage ../servers/hqplayerd { };
-
- https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { };
-
- ic-keysmith = callPackage ../tools/security/ic-keysmith { };
-
- icecream = callPackage ../servers/icecream { };
-
icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { };
icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { };
icingaweb2 = callPackage ../servers/icingaweb2 { };
@@ -24137,26 +11896,10 @@ with pkgs;
theme-spring = callPackage ../servers/icingaweb2/theme-spring { };
};
- inspircd = callPackage ../servers/irc/inspircd { };
-
inspircdMinimal = inspircd.override { extraModules = []; };
- imaginary = callPackage ../servers/imaginary { };
-
- imgproxy = callPackage ../servers/imgproxy { };
-
- irccat = callPackage ../servers/irc/irccat { };
-
- ircdog = callPackage ../applications/networking/irc/ircdog { };
-
- ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
-
- janusgraph = callPackage ../servers/nosql/janusgraph { };
-
jboss = callPackage ../servers/http/jboss { };
- jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { };
-
jetty = jetty_12;
jetty_12 = callPackage ../servers/http/jetty/12.x.nix { };
jetty_11 = callPackage ../servers/http/jetty/11.x.nix { };
@@ -24165,29 +11908,16 @@ with pkgs;
jicofo = callPackage ../servers/jicofo { };
- jitsi-excalidraw = callPackage ../servers/jitsi-excalidraw { };
-
- jigasi = callPackage ../servers/jigasi { };
-
jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { };
jitsi-meet-prosody = callPackage ../misc/jitsi-meet-prosody { };
jitsi-videobridge = callPackage ../servers/jitsi-videobridge { };
- kamailio = callPackage ../servers/sip/kamailio { };
-
- kapowbang = callPackage ../servers/kapowbang { };
-
- keycloak = callPackage ../servers/keycloak { };
-
- knot-dns = callPackage ../servers/dns/knot-dns { };
knot-resolver = callPackage ../servers/dns/knot-resolver {
systemd = systemdMinimal; # in closure already anyway
};
- rdkafka = callPackage ../development/libraries/rdkafka { };
-
leafnode = callPackage ../servers/news/leafnode { };
leafnode1 = callPackage ../servers/news/leafnode/1.nix { };
@@ -24200,22 +11930,6 @@ with pkgs;
nodejs = nodejs_18;
};
- lightgbm = callPackage ../development/libraries/lightgbm { };
-
- lighttpd = callPackage ../servers/http/lighttpd { };
-
- linx-server = callPackage ../servers/web-apps/linx-server { };
-
- livepeer = callPackage ../servers/livepeer { };
-
- lldap = callPackage ../servers/ldap/lldap { };
-
- lwan = callPackage ../servers/http/lwan { };
-
- labelImg = callPackage ../applications/science/machine-learning/labelimg { };
-
- mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { };
-
mailmanPackages = callPackage ../servers/mail/mailman {
# Hyperkitty test fails with 3.12:
# https://gitlab.com/mailman/hyperkitty/-/issues/514
@@ -24224,10 +11938,6 @@ with pkgs;
inherit (mailmanPackages) mailman mailman-hyperkitty;
mailman-web = mailmanPackages.web;
- listadmin = callPackage ../applications/networking/listadmin { };
-
- maker-panel = callPackage ../tools/misc/maker-panel { };
-
mastodon = callPackage ../servers/mastodon {
nodejs-slim = nodejs-slim_22;
python3 = python311;
@@ -24235,23 +11945,11 @@ with pkgs;
yarn-berry = yarn-berry.override { nodejs = nodejs-slim_22; };
};
- gotosocial = callPackage ../servers/gotosocial { };
-
materialize = callPackage ../servers/sql/materialize {
inherit (buildPackages.darwin) bootstrap_cmds;
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
};
- matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { };
-
- mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };
-
- memcached = callPackage ../servers/memcached { };
-
- merecat = callPackage ../servers/http/merecat { };
-
- meteor = callPackage ../servers/meteor { };
-
micro-full = micro.wrapper.override {
extraPackages = [
wl-clipboard
@@ -24271,8 +11969,6 @@ with pkgs;
];
};
- micronaut = callPackage ../development/tools/micronaut { };
-
minio = callPackage ../servers/minio { };
# Keep around to allow people to migrate their data from the old legacy fs format
# https://github.com/minio/minio/releases/tag/RELEASE.2022-10-29T06-21-33Z
@@ -24284,24 +11980,12 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
}) mpd mpd-small mpdWithFeatures;
- mpdscribble = callPackage ../tools/misc/mpdscribble { };
-
mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { };
- micro-httpd = callPackage ../servers/http/micro-httpd { };
-
- miniHttpd = callPackage ../servers/http/mini-httpd { };
-
- mlflow-server = callPackage ../servers/mlflow-server { };
-
- mlmmj = callPackage ../servers/mail/mlmmj { };
-
moodle = callPackage ../servers/web-apps/moodle { };
moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { };
- morty = callPackage ../servers/web-apps/morty { };
-
inherit (callPackage ../applications/networking/mullvad { })
mullvad;
@@ -24309,8 +11993,6 @@ with pkgs;
mullvad-closest = with python3Packages; toPythonApplication mullvad-closest;
- mycorrhiza = callPackage ../servers/mycorrhiza { };
-
napalm = with python3Packages; toPythonApplication (
napalm.overridePythonAttrs (attrs: {
# add community frontends that depend on the napalm python package
@@ -24320,24 +12002,8 @@ with pkgs;
})
);
- nas = callPackage ../servers/nas { };
-
- nats-streaming-server = callPackage ../servers/nats-streaming-server { };
-
- neard = callPackage ../servers/neard { };
-
- networkaudiod = callPackage ../servers/networkaudiod { };
-
- unifiedpush-common-proxies = callPackage ../servers/unifiedpush-common-proxies { };
-
- unit = callPackage ../servers/http/unit { };
-
- ncdns = callPackage ../servers/dns/ncdns { };
-
nginx = nginxStable;
- nginx-doc = callPackage ../data/documentation/nginx-doc { };
-
nginxQuic = callPackage ../servers/http/nginx/quic.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
withPerl = false;
@@ -24376,33 +12042,13 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
};
- ngircd = callPackage ../servers/irc/ngircd { };
-
- nix-binary-cache = callPackage ../servers/http/nix-binary-cache { };
-
- nix-tour = callPackage ../applications/misc/nix-tour { };
-
- noseyparker = callPackage ../tools/security/noseyparker { };
-
- nosqli = callPackage ../tools/security/nosqli { };
-
nsd = callPackage ../servers/dns/nsd (config.nsd or {});
- nsq = callPackage ../servers/nsq { };
-
- oauth2-proxy = callPackage ../servers/oauth2-proxy { };
-
- olaris-server = callPackage ../servers/olaris { };
-
- onlyoffice-documentserver = callPackage ../servers/onlyoffice-documentserver { };
-
outline = callPackage ../servers/web-apps/outline (lib.fix (super: {
yarn = yarn.override { inherit (super) nodejs; };
nodejs = nodejs_20;
}));
- openbgpd = callPackage ../servers/openbgpd { };
-
openafs = callPackage ../servers/openafs/1.8 { };
openresty = callPackage ../servers/http/openresty {
@@ -24413,51 +12059,18 @@ with pkgs;
opensmtpd = callPackage ../servers/mail/opensmtpd { };
opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { };
opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };
- opensmtpd-filter-dkimsign = callPackage ../servers/mail/opensmtpd/filter-dkimsign { };
- libopensmtpd = callPackage ../servers/mail/opensmtpd/libopensmtpd { };
-
- openxr-loader = callPackage ../development/libraries/openxr-loader { };
-
osrm-backend = callPackage ../servers/osrm-backend {
tbb = tbb_2021_11;
# https://github.com/Project-OSRM/osrm-backend/issues/6503
boost = boost179;
};
- oven-media-engine = callPackage ../servers/misc/oven-media-engine { };
-
- p910nd = callPackage ../servers/p910nd { };
-
- petidomo = callPackage ../servers/mail/petidomo { };
-
- pict-rs = callPackage ../servers/web-apps/pict-rs { };
-
- popa3d = callPackage ../servers/mail/popa3d { };
-
postfix = callPackage ../servers/mail/postfix { };
- postfixadmin = callPackage ../servers/postfixadmin { };
-
- postsrsd = callPackage ../servers/mail/postsrsd { };
-
- rspamd = callPackage ../servers/mail/rspamd { };
-
pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { };
pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { };
- pomerium-cli = callPackage ../tools/security/pomerium-cli { };
-
- postgrey = callPackage ../servers/mail/postgrey { };
-
- quark = callPackage ../servers/http/quark { };
-
- smtprelay = callPackage ../servers/mail/smtprelay { };
-
- soft-serve = callPackage ../servers/soft-serve { };
-
- sympa = callPackage ../servers/mail/sympa { };
-
system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { });
# PulseAudio daemons
@@ -24488,18 +12101,8 @@ with pkgs;
libpressureaudio = callPackage ../misc/apulse/pressureaudio.nix { };
- libcardiacarrest = callPackage ../misc/libcardiacarrest { };
-
- pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { };
-
tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { };
- pies = callPackage ../servers/pies { };
-
- rpcbind = callPackage ../servers/rpcbind { };
-
- rpcsvc-proto = callPackage ../tools/misc/rpcsvc-proto { };
-
libmysqlclient = libmysqlclient_3_3;
libmysqlclient_3_1 = mariadb-connector-c_3_1;
libmysqlclient_3_2 = mariadb-connector-c_3_2;
@@ -24546,8 +12149,6 @@ with pkgs;
if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
};
- immudb = callPackage ../servers/nosql/immudb { };
-
influxdb = callPackage ../servers/nosql/influxdb { };
influxdb2-server = callPackage ../servers/nosql/influxdb2 { };
influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { };
@@ -24566,13 +12167,9 @@ with pkgs;
protobuf = protobuf_21;
};
- mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
-
mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { };
jtds_jdbc = callPackage ../servers/sql/mssql/jdbc/jtds.nix { };
- azuredatastudio = callPackage ../applications/misc/azuredatastudio { };
-
miniflux = callPackage ../by-name/mi/miniflux/package.nix {
buildGoModule = buildGo123Module;
};
@@ -24590,31 +12187,10 @@ with pkgs;
withIcingadb = false;
};
- munin = callPackage ../servers/monitoring/munin { };
-
- nagios = callPackage ../servers/monitoring/nagios { };
-
nagiosPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/nagios-plugins { });
- monitoring-plugins = callPackage ../servers/monitoring/plugins { };
-
- neo4j = callPackage ../servers/nosql/neo4j { };
-
- neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { };
-
- net-snmp = callPackage ../servers/monitoring/net-snmp { };
-
- newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { };
-
- nullidentdmod = callPackage ../servers/identd/nullidentdmod { };
-
- riemann = callPackage ../servers/monitoring/riemann { };
riemann-dash = callPackage ../servers/monitoring/riemann-dash { };
- unpfs = callPackage ../servers/unpfs { };
-
- oidentd = callPackage ../servers/identd/oidentd { };
-
qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };
rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { };
@@ -24631,27 +12207,12 @@ with pkgs;
msVarsTemplate = stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64;
};
- ops = callPackage ../applications/virtualization/ops { };
-
- vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
-
- pgbouncer = callPackage ../servers/sql/pgbouncer { };
-
- pgcat = callPackage ../servers/sql/pgcat {};
-
- pgpool = callPackage ../servers/sql/pgpool { };
-
tang = callPackage ../servers/tang {
asciidoc = asciidoc-full;
};
- promscale = callPackage ../servers/monitoring/prometheus/promscale { };
-
- timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { };
-
- timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
-
- inherit (import ../servers/sql/postgresql pkgs)
+ postgresqlVersions = import ../servers/sql/postgresql pkgs;
+ inherit (postgresqlVersions)
postgresql_12
postgresql_13
postgresql_14
@@ -24683,16 +12244,8 @@ with pkgs;
postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs;
postgresql17JitPackages = recurseIntoAttrs postgresql_17_jit.pkgs;
- postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
-
- postgresqlTestHook = callPackage ../build-support/setup-hooks/postgresql-test-hook { };
-
postgrest = haskellPackages.postgrest.bin;
- redshift_jdbc = callPackage ../development/java-modules/redshift_jdbc { };
-
- liquibase_redshift_extension = callPackage ../development/java-modules/liquibase_redshift_extension { };
-
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
@@ -24706,7 +12259,6 @@ with pkgs;
prometheus-cloudflare-exporter = callPackage ../servers/monitoring/prometheus/cloudflare-exporter.nix { };
prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
- prometheus-dcgm-exporter = callPackage ../servers/monitoring/prometheus/dcgm-exporter { };
prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { };
prometheus-fastly-exporter = callPackage ../servers/monitoring/prometheus/fastly-exporter.nix { };
@@ -24752,11 +12304,9 @@ with pkgs;
prometheus-sachet = callPackage ../servers/monitoring/prometheus/sachet.nix { };
prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { };
prometheus-shelly-exporter = callPackage ../servers/monitoring/prometheus/shelly-exporter.nix { };
- prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { };
prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { };
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
- prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter { };
prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { };
prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { };
prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { };
@@ -24768,28 +12318,14 @@ with pkgs;
prometheus-zfs-exporter = callPackage ../servers/monitoring/prometheus/zfs-exporter.nix { };
prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { };
- prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { };
-
- proximity-sort = callPackage ../tools/misc/proximity-sort { };
-
- psql2csv = callPackage ../tools/misc/psql2csv { };
-
- psqlodbc = callPackage ../development/libraries/psqlodbc { };
-
public-inbox = perlPackages.callPackage ../servers/mail/public-inbox { };
- pure-ftpd = callPackage ../servers/ftp/pure-ftpd { };
-
spf-engine = python3.pkgs.callPackage ../servers/mail/spf-engine { };
pypiserver = with python3Packages; toPythonApplication pypiserver;
- qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
-
qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { };
- questdb = callPackage ../servers/nosql/questdb { };
-
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
erlang = erlang_26;
@@ -24800,23 +12336,10 @@ with pkgs;
qcal = callPackage ../tools/networking/qcal/default.nix { };
- qcard = callPackage ../tools/networking/qcard { };
-
rake = callPackage ../development/tools/build-managers/rake { };
- rakkess = callPackage ../development/tools/rakkess { };
-
- redis = callPackage ../servers/nosql/redis { };
-
- redli = callPackage ../tools/networking/redli { };
-
- redstore = callPackage ../servers/http/redstore { };
-
- repro-get = callPackage ../tools/package-management/repro-get { };
-
restic = callPackage ../tools/backup/restic { };
- restic-integrity = callPackage ../applications/backup/restic-integrity { };
restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { };
rethinkdb = callPackage ../servers/nosql/rethinkdb {
@@ -24831,22 +12354,10 @@ with pkgs;
rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { };
- roon-bridge = callPackage ../servers/roon-bridge { };
-
- rpiplay = callPackage ../servers/rpiplay { };
-
- roon-server = callPackage ../servers/roon-server { };
-
rustic = callPackage ../by-name/ru/rustic/package.nix {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- supervise = callPackage ../tools/system/supervise { };
-
- spamassassin = callPackage ../servers/mail/spamassassin { };
-
- deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { };
-
samba4 = darwin.apple_sdk_11_0.callPackage ../servers/samba/4.x.nix { };
samba = samba4;
@@ -24862,26 +12373,12 @@ with pkgs;
sambaFull = samba4Full;
- sampler = callPackage ../applications/misc/sampler { };
-
scalene = with python3Packages; toPythonApplication scalene;
- scalr-cli = callPackage ../tools/admin/scalr-cli { };
-
- scaphandre = callPackage ../servers/scaphandre { };
-
shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
- shairport-sync = callPackage ../servers/shairport-sync { };
-
- sharing = callPackage ../servers/sharing { };
-
showoff = callPackage ../servers/http/showoff { };
- serfdom = callPackage ../servers/serf { };
-
- seyren = callPackage ../servers/monitoring/seyren { };
-
ruby-zoom = callPackage ../tools/text/ruby-zoom { };
inherit (callPackages ../servers/monitoring/sensu-go { })
@@ -24896,51 +12393,13 @@ with pkgs;
sickgear = callPackage ../servers/sickbeard/sickgear.nix { };
- sipwitch = callPackage ../servers/sip/sipwitch { };
-
- smcroute = callPackage ../servers/smcroute { };
-
snipe-it = callPackage ../by-name/sn/snipe-it/package.nix {
php = php81;
};
- sogo = callPackage ../servers/web-apps/sogo { };
-
spacecookie =
haskell.lib.compose.justStaticExecutables haskellPackages.spacecookie;
- spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
-
- spring-boot-cli = callPackage ../development/tools/spring-boot-cli { };
-
- squid = callPackage ../servers/squid { };
-
- duckling-proxy = callPackage ../servers/duckling-proxy { };
-
- sslh = callPackage ../servers/sslh { };
-
- thttpd = callPackage ../servers/http/thttpd { };
-
- static-web-server = callPackage ../servers/static-web-server { };
-
- stone = callPackage ../servers/stone { };
-
- storm = callPackage ../servers/computing/storm { };
-
- switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { };
-
- slurm = callPackage ../servers/computing/slurm { };
-
- slurm-spank-stunnel = callPackage ../servers/computing/slurm-spank-stunnel { };
-
- slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { };
-
- systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
-
- tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
-
- trafficserver = callPackage ../servers/http/trafficserver { };
-
inherit (callPackages ../servers/http/tomcat { })
tomcat9
tomcat10
@@ -24948,26 +12407,11 @@ with pkgs;
tomcat = tomcat11;
- tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
-
torque = callPackage ../servers/computing/torque {
autoreconfHook = buildPackages.autoreconfHook269;
};
tt-rss = callPackage ../servers/tt-rss { };
- tt-rss-plugin-feediron = callPackage ../servers/tt-rss/plugin-feediron { };
- tt-rss-plugin-ff-instagram = callPackage ../servers/tt-rss/plugin-ff-instagram { };
- tt-rss-plugin-auth-ldap = callPackage ../servers/tt-rss/plugin-auth-ldap { };
- tt-rss-theme-feedly = callPackage ../servers/tt-rss/theme-feedly { };
-
- rss-bridge = callPackage ../servers/web-apps/rss-bridge { };
-
- selfoss = callPackage ../servers/web-apps/selfoss { };
-
- shaarli = callPackage ../servers/web-apps/shaarli { };
-
- shiori = callPackage ../servers/web-apps/shiori { };
-
inherit (callPackages ../servers/web-apps/matomo {})
matomo
matomo_5
@@ -24978,52 +12422,16 @@ with pkgs;
unifi = unifi8;
- unifi-protect-backup = callPackage ../applications/backup/unifi-protect-backup { };
-
unpackerr = callPackage ../servers/unpackerr {
inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;
};
unstructured-api = callPackage ../servers/unstructured-api { };
- urserver = callPackage ../servers/urserver { };
-
- vouch-proxy = callPackage ../servers/vouch-proxy { };
-
- virtiofsd = callPackage ../servers/misc/virtiofsd { };
-
virtualenv = with python3Packages; toPythonApplication virtualenv;
virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
- vsftpd = callPackage ../servers/ftp/vsftpd { };
-
- wallabag = callPackage ../servers/web-apps/wallabag { };
-
- webdav = callPackage ../servers/webdav { };
-
- webdav-server-rs = callPackage ../servers/webdav-server-rs { };
-
- webmetro = callPackage ../servers/webmetro { };
-
- wesher = callPackage ../servers/wesher { };
-
- wishlist = callPackage ../servers/wishlist { };
-
- wsdd = callPackage ../servers/wsdd { };
-
- webhook = callPackage ../servers/http/webhook { };
-
- xinetd = callPackage ../servers/xinetd { };
-
- zookeeper = callPackage ../servers/zookeeper { };
-
- zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
-
- xqilla = callPackage ../development/tools/xqilla { };
-
- xquartz = callPackage ../servers/x11/xquartz { };
-
quartz-wm = callPackage ../servers/x11/quartz-wm {
stdenv = clangStdenv;
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
@@ -25051,12 +12459,8 @@ with pkgs;
in recurseIntoAttrs xorgPackages;
- xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { };
-
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
- yaws = callPackage ../servers/http/yaws { };
-
zabbixFor = version: rec {
agent = (callPackages ../servers/monitoring/zabbix/agent.nix {}).${version};
proxy-mysql = (callPackages ../servers/monitoring/zabbix/proxy.nix { mysqlSupport = true; }).${version};
@@ -25078,46 +12482,20 @@ with pkgs;
zabbix = zabbix60;
- zipkin = callPackage ../servers/monitoring/zipkin { };
-
### SERVERS / GEOSPATIAL
martin = callPackage ../servers/geospatial/martin {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { };
-
- pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { };
-
### OS-SPECIFIC
- airbuddy = callPackage ../os-specific/darwin/airbuddy { };
-
- afuse = callPackage ../os-specific/linux/afuse { };
-
- autofs5 = callPackage ../os-specific/linux/autofs { };
-
- _915resolution = callPackage ../os-specific/linux/915resolution { };
-
- nfs-utils = callPackage ../os-specific/linux/nfs-utils { };
-
- acpi = callPackage ../os-specific/linux/acpi { };
-
- acpid = callPackage ../os-specific/linux/acpid { };
-
- acpitool = callPackage ../os-specific/linux/acpitool { };
-
alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { };
- alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { };
-
alsa-utils = callPackage ../by-name/al/alsa-utils/package.nix {
fftw = fftwFloat;
};
- apparency = callPackage ../os-specific/darwin/apparency { };
-
arm-trusted-firmware = callPackage ../misc/arm-trusted-firmware { };
inherit (arm-trusted-firmware)
buildArmTrustedFirmware
@@ -25132,44 +12510,20 @@ with pkgs;
armTrustedFirmwareS905
;
- mlxbf-bootimages = callPackage ../misc/mlxbf-bootimages { };
-
inherit (callPackages ../os-specific/linux/apparmor { })
libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam
apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure;
- aseq2json = callPackage ../os-specific/linux/aseq2json { };
-
- atop = callPackage ../os-specific/linux/atop { };
-
ath9k-htc-blobless-firmware = callPackage ../os-specific/linux/firmware/ath9k { };
ath9k-htc-blobless-firmware-unstable =
callPackage ../os-specific/linux/firmware/ath9k { enableUnstable = true; };
- bartender = callPackage ../os-specific/darwin/bartender { };
-
b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { };
- b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { };
-
- epilys-bb = callPackage ../tools/system/epilys-bb { };
-
- below = callPackage ../os-specific/linux/below { };
-
- bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { };
-
- brillo = callPackage ../os-specific/linux/brillo { };
-
- broadcom-bt-firmware = callPackage ../os-specific/linux/firmware/broadcom-bt-firmware { };
-
batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
- beefi = callPackage ../os-specific/linux/beefi { };
-
- blktrace = callPackage ../os-specific/linux/blktrace { };
-
bluez5 = bluez;
bluez5-experimental = bluez-experimental;
@@ -25177,16 +12531,6 @@ with pkgs;
enableExperimental = true;
};
- bolt = callPackage ../os-specific/linux/bolt { };
-
- bpf-linker = callPackage ../development/tools/bpf-linker { };
-
- bpftune = callPackage ../os-specific/linux/bpftune { };
-
- bpfmon = callPackage ../os-specific/linux/bpfmon { };
-
- bridge-utils = callPackage ../os-specific/linux/bridge-utils { };
-
busybox = callPackage ../os-specific/linux/busybox {
# Fixes libunwind from being dynamically linked to a static binary.
stdenv = if (stdenv.targetPlatform.useLLVM or false) then
@@ -25200,53 +12544,21 @@ with pkgs;
else busybox;
};
- cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
-
- cariddi = callPackage ../tools/security/cariddi { };
-
- checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
-
- checksec = callPackage ../os-specific/linux/checksec { };
-
- cifs-utils = callPackage ../os-specific/linux/cifs-utils { };
-
cm-rgb = python3Packages.callPackage ../tools/system/cm-rgb { };
- cpustat = callPackage ../os-specific/linux/cpustat { };
-
- cockroachdb = callPackage ../servers/sql/cockroachdb { };
-
- coconutbattery = callPackage ../os-specific/darwin/coconutbattery { };
-
conky = callPackage ../os-specific/linux/conky ({
lua = lua5_4;
inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl;
} // config.conky or {});
- conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { };
-
- coredns = callPackage ../servers/dns/coredns { };
-
- cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
-
cpupower-gui = python3Packages.callPackage ../os-specific/linux/cpupower-gui {
inherit (pkgs) meson;
};
- criu = callPackage ../os-specific/linux/criu { };
-
cryptomator = callPackage ../tools/security/cryptomator {
jdk = jdk23.override { enableJavaFX = true; };
};
- cryptsetup = callPackage ../os-specific/linux/cryptsetup { };
-
- cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { };
-
- cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
-
- cshatag = callPackage ../os-specific/linux/cshatag { };
-
# Darwin package set
#
# Even though this is a set of packages not single package, use `callPackage`
@@ -25258,87 +12570,29 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
-
displaylink = callPackage ../os-specific/linux/displaylink {
inherit (linuxPackages) evdi;
};
- dmidecode = callPackage ../os-specific/linux/dmidecode { };
-
- dmtcp = callPackage ../os-specific/linux/dmtcp { };
-
- directvnc = callPackage ../os-specific/linux/directvnc { };
-
dmraid = callPackage ../os-specific/linux/dmraid { lvm2 = lvm2_dmeventd; };
drbd = callPackage ../os-specific/linux/drbd/utils.nix { };
- dropwatch = callPackage ../os-specific/linux/dropwatch { };
-
- dsd = callPackage ../applications/radio/dsd { };
-
- dstat = callPackage ../os-specific/linux/dstat { };
-
- esdm = callPackage ../os-specific/linux/esdm { };
-
- evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { };
-
# unstable until the first 1.x release
- fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
-
- fsverity-utils = callPackage ../os-specific/linux/fsverity-utils { };
-
- fwanalyzer = callPackage ../tools/filesystems/fwanalyzer { };
-
- fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { };
-
- firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { };
-
- firmware-updater = callPackage ../os-specific/linux/firmware/firmware-updater { };
-
fwts = callPackage ../os-specific/linux/fwts { };
- gobi_loader = callPackage ../os-specific/linux/gobi_loader { };
-
- libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
-
libuuid = if stdenv.hostPlatform.isLinux
then util-linuxMinimal
else null;
- lightum = callPackage ../os-specific/linux/lightum { };
-
- ebtables = callPackage ../os-specific/linux/ebtables { };
-
elegant-sddm = libsForQt5.callPackage ../data/themes/elegant-sddm { };
error-inject = callPackages ../os-specific/linux/error-inject { };
- extrace = callPackage ../os-specific/linux/extrace { };
-
- facetimehd-calibration = callPackage ../os-specific/linux/firmware/facetimehd-calibration { };
-
- facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { };
-
- fan2go = callPackage ../os-specific/linux/fan2go { };
-
- fanctl = callPackage ../os-specific/linux/fanctl { };
-
- fatrace = callPackage ../os-specific/linux/fatrace { };
-
ffado = callPackage ../os-specific/linux/ffado { };
ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; };
libffado = ffado;
- fbterm = callPackage ../os-specific/linux/fbterm { };
-
- firejail = callPackage ../os-specific/linux/firejail { };
-
- fnotifystat = callPackage ../os-specific/linux/fnotifystat { };
-
- forkstat = callPackage ../os-specific/linux/forkstat { };
-
freefall = callPackage ../os-specific/linux/freefall {
inherit (linuxPackages) kernel;
};
@@ -25350,16 +12604,6 @@ with pkgs;
fuse2 = lowPrio (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fusePackages.fuse_2);
fuse3 = fusePackages.fuse_3;
- fxload = callPackage ../os-specific/linux/fxload { };
-
- gfxtablet = callPackage ../os-specific/linux/gfxtablet { };
-
- gmailctl = callPackage ../applications/networking/gmailctl { };
-
- gomp = callPackage ../applications/version-management/gomp { };
-
- gomplate = callPackage ../development/tools/gomplate { };
-
gpm = callPackage ../servers/gpm {
withNcurses = false; # Keep curses disabled for lack of value
@@ -25370,24 +12614,6 @@ with pkgs;
gpm-ncurses = gpm.override { withNcurses = true; };
- gpu-switch = callPackage ../os-specific/linux/gpu-switch { };
-
- gradm = callPackage ../os-specific/linux/gradm { };
-
- gt = callPackage ../os-specific/linux/gt { };
-
- gtop = callPackage ../tools/system/gtop { };
-
- hd-idle = callPackage ../os-specific/linux/hd-idle { };
-
- hdparm = callPackage ../os-specific/linux/hdparm { };
-
- health-check = callPackage ../os-specific/linux/health-check { };
-
- hibernate = callPackage ../os-specific/linux/hibernate { };
-
- hostapd = callPackage ../os-specific/linux/hostapd { };
-
htop = callPackage ../tools/system/htop {
inherit (darwin) IOKit;
};
@@ -25401,37 +12627,8 @@ with pkgs;
btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop { };
btop-rocm = btop.override { rocmSupport = true; };
- nmon = callPackage ../os-specific/linux/nmon { };
-
- hwdata = callPackage ../os-specific/linux/hwdata { };
-
i7z = qt5.callPackage ../os-specific/linux/i7z { };
- pcm = callPackage ../os-specific/linux/pcm { };
-
- ifmetric = callPackage ../os-specific/linux/ifmetric { };
-
- ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { };
-
- intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { };
-
- intel-cmt-cat = callPackage ../os-specific/linux/intel-cmt-cat { };
-
- intel-compute-runtime = callPackage ../os-specific/linux/intel-compute-runtime { };
-
- intel-ocl = callPackage ../os-specific/linux/intel-ocl { };
-
- level-zero = callPackage ../development/libraries/level-zero { };
-
- iomelt = callPackage ../os-specific/linux/iomelt { };
-
- iotop = callPackage ../os-specific/linux/iotop { };
- iotop-c = callPackage ../os-specific/linux/iotop-c { };
-
- iproute2 = callPackage ../os-specific/linux/iproute { };
-
- ipu6-camera-bins = callPackage ../os-specific/linux/firmware/ipu6-camera-bins {};
-
ipu6-camera-hal = callPackage ../development/libraries/ipu6-camera-hal {};
ipu6ep-camera-hal = callPackage ../development/libraries/ipu6-camera-hal {
@@ -25442,8 +12639,6 @@ with pkgs;
ipuVersion = "ipu6epmtl";
};
- ivsc-firmware = callPackage ../os-specific/linux/firmware/ivsc-firmware { };
-
iputils = hiPrio (callPackage ../os-specific/linux/iputils { });
# hiPrio for collisions with inetutils (ping)
@@ -25451,80 +12646,12 @@ with pkgs;
iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; };
iptables-nftables-compat = iptables;
- iptstate = callPackage ../os-specific/linux/iptstate { } ;
-
- ipset = callPackage ../os-specific/linux/ipset { };
-
- irqbalance = callPackage ../os-specific/linux/irqbalance { };
-
- itpp = callPackage ../development/libraries/science/math/itpp { };
-
- iwd = callPackage ../os-specific/linux/iwd { };
-
jool-cli = callPackage ../os-specific/linux/jool/cli.nix { };
- juju = callPackage ../applications/networking/juju { };
-
- jujuutils = callPackage ../os-specific/linux/jujuutils { };
-
- karabiner-elements = callPackage ../os-specific/darwin/karabiner-elements { };
-
- kbd = callPackage ../os-specific/linux/kbd { };
-
- kbdlight = callPackage ../os-specific/linux/kbdlight { };
-
- kinect-audio-setup = callPackage ../os-specific/linux/kinect-audio-setup { };
-
- kmscon = callPackage ../os-specific/linux/kmscon { };
-
- kmscube = callPackage ../os-specific/linux/kmscube { };
-
- kmsxx = callPackage ../development/libraries/kmsxx { };
-
- latencytop = callPackage ../os-specific/linux/latencytop { };
-
- ldm = callPackage ../os-specific/linux/ldm { };
-
- libaio = callPackage ../os-specific/linux/libaio { };
-
- libajantv2 = callPackage ../development/libraries/libajantv2 { };
-
- libargon2 = callPackage ../development/libraries/libargon2 { };
-
- libatasmart = callPackage ../os-specific/linux/libatasmart { };
-
- libax25 = callPackage ../development/libraries/libax25 { };
-
- libcgroup = callPackage ../os-specific/linux/libcgroup { };
-
- libdatachannel = callPackage ../development/libraries/libdatachannel { };
-
- libkrun = callPackage ../development/libraries/libkrun { };
-
libkrun-sev = libkrun.override { sevVariant = true; };
- libkrunfw = callPackage ../development/libraries/libkrunfw { };
-
- libnl = callPackage ../os-specific/linux/libnl { };
-
- libnl-tiny = callPackage ../os-specific/linux/libnl-tiny { };
-
- libtraceevent = callPackage ../os-specific/linux/libtraceevent { };
-
- libtracefs = callPackage ../os-specific/linux/libtracefs { };
-
- lieer = callPackage ../applications/networking/lieer { };
-
- linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
-
linthesia = callPackage ../games/linthesia/default.nix { };
- libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { };
-
- openiscsi = callPackage ../os-specific/linux/open-iscsi { };
-
- open-isns = callPackage ../os-specific/linux/open-isns { };
-
osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
@@ -25533,22 +12660,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) DiskArbitration;
};
- osxsnarf = callPackage ../os-specific/darwin/osxsnarf { };
-
- plistwatch = callPackage ../os-specific/darwin/plistwatch { };
-
- power-calibrate = callPackage ../os-specific/linux/power-calibrate { };
-
- powercap = callPackage ../os-specific/linux/powercap { };
-
- powerstat = callPackage ../os-specific/linux/powerstat { };
-
projecteur = libsForQt5.callPackage ../os-specific/linux/projecteur { };
- smemstat = callPackage ../os-specific/linux/smemstat { };
-
- tgt = callPackage ../tools/networking/tgt { };
-
lkl = callPackage ../applications/virtualization/lkl { };
lklWithFirewall = callPackage ../applications/virtualization/lkl { firewallSupport = true; };
@@ -25641,12 +12754,6 @@ with pkgs;
cryptodev = linuxPackages.cryptodev;
- dpdk = callPackage ../os-specific/linux/dpdk { };
-
- keyutils = callPackage ../os-specific/linux/keyutils { };
-
- libselinux = callPackage ../os-specific/linux/libselinux { };
-
libsemanage = callPackage ../os-specific/linux/libsemanage {
python = python3;
};
@@ -25655,12 +12762,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
- libraqm = callPackage ../development/libraries/libraqm { };
-
- libraw = callPackage ../development/libraries/libraw { };
-
- libraw1394 = callPackage ../development/libraries/libraw1394 { };
-
librealsense = darwin.apple_sdk_11_0.callPackage ../development/libraries/librealsense { };
librealsenseWithCuda = callPackage ../development/libraries/librealsense {
@@ -25678,38 +12779,8 @@ with pkgs;
enableGUI = true;
};
- libsass = callPackage ../development/libraries/libsass { };
-
- libsepol = callPackage ../os-specific/linux/libsepol { };
-
- libsmbios = callPackage ../os-specific/linux/libsmbios { };
-
- libsurvive = callPackage ../development/libraries/libsurvive { };
-
- lm_sensors = callPackage ../os-specific/linux/lm-sensors { };
-
- lockdep = callPackage ../os-specific/linux/lockdep { };
-
- lsirec = callPackage ../os-specific/linux/lsirec { };
-
- lsiutil = callPackage ../os-specific/linux/lsiutil { };
-
- kaitai-struct-compiler = callPackage ../development/compilers/kaitai-struct-compiler { };
-
kmod = callPackage ../os-specific/linux/kmod { };
- kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { };
-
- libcap = callPackage ../os-specific/linux/libcap { };
-
- libcap_ng = callPackage ../os-specific/linux/libcap-ng { };
-
- libnotify = callPackage ../development/libraries/libnotify { };
-
- libvolume_id = callPackage ../os-specific/linux/libvolume_id { };
-
- lsscsi = callPackage ../os-specific/linux/lsscsi { };
-
lvm2 = callPackage ../os-specific/linux/lvm2/2_03.nix {
# break the cyclic dependency:
# util-linux (non-minimal) depends (optionally, but on by default) on systemd,
@@ -25725,19 +12796,7 @@ with pkgs;
enableVDO = true;
};
- maddy = callPackage ../servers/maddy { };
-
- mbelib = callPackage ../development/libraries/audio/mbelib { };
-
- mbpfan = callPackage ../os-specific/linux/mbpfan { };
-
mdadm = mdadm4;
- mdadm4 = callPackage ../os-specific/linux/mdadm { };
-
- mdevctl = callPackage ../os-specific/linux/mdevctl { };
-
- metastore = callPackage ../os-specific/linux/metastore { };
-
minimal-bootstrap = recurseIntoAttrs (import ../os-specific/linux/minimal-bootstrap {
inherit (stdenv) buildPlatform hostPlatform;
inherit lib config;
@@ -25753,38 +12812,17 @@ with pkgs;
inherit (stdenv) hostPlatform;
};
- mingetty = callPackage ../os-specific/linux/mingetty { };
-
- miraclecast = callPackage ../os-specific/linux/miraclecast { };
-
- mkinitcpio-nfs-utils = callPackage ../os-specific/linux/mkinitcpio-nfs-utils { };
-
- mmc-utils = callPackage ../os-specific/linux/mmc-utils { };
-
aggregateModules = modules:
callPackage ../os-specific/linux/kmod/aggregator.nix {
inherit (buildPackages) kmod;
inherit modules;
};
- multipart-parser-c = callPackage ../development/libraries/multipart-parser-c { };
-
- multipath-tools = callPackage ../os-specific/linux/multipath-tools { };
-
- musl = callPackage ../os-specific/linux/musl { };
-
- musl-fts = callPackage ../os-specific/linux/musl-fts { };
- musl-obstack = callPackage ../os-specific/linux/musl-obstack { };
-
- nsh = callPackage ../shells/nsh { };
-
nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell {
inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security;
};
- nu_scripts = callPackage ../shells/nushell/nu_scripts { };
-
nushellPlugins = recurseIntoAttrs (callPackage ../shells/nushell/plugins {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Foundation;
@@ -25800,238 +12838,34 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Hypervisor;
};
- numactl = callPackage ../os-specific/linux/numactl { };
-
- numad = callPackage ../os-specific/linux/numad { };
-
- nvme-cli = callPackage ../os-specific/linux/nvme-cli { };
-
- nvmet-cli = callPackage ../os-specific/linux/nvmet-cli { };
-
- system76-firmware = callPackage ../os-specific/linux/firmware/system76-firmware { };
-
- system76-keyboard-configurator = callPackage ../applications/misc/system76-keyboard-configurator { };
-
- ocf-resource-agents = callPackage ../os-specific/linux/ocf-resource-agents { };
-
open-vm-tools-headless = open-vm-tools.override { withX = false; };
- oxtools = callPackage ../os-specific/linux/oxtools { };
-
- air = callPackage ../development/tools/air { };
-
- delve = callPackage ../development/tools/delve { };
-
- easyjson = callPackage ../development/tools/easyjson { };
-
- iferr = callPackage ../development/tools/iferr { };
-
- gci = callPackage ../development/tools/gci { };
-
- gcov2lcov = callPackage ../development/tools/gcov2lcov { };
-
- ginkgo = callPackage ../development/tools/ginkgo { };
-
gdlv = callPackage ../by-name/gd/gdlv/package.nix {
inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics Foundation Metal;
};
- go-bindata = callPackage ../development/tools/go-bindata { };
-
- go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { };
-
- go-minimock = callPackage ../development/tools/go-minimock { };
-
- go-protobuf = callPackage ../development/tools/go-protobuf { };
-
- go-toml = callPackage ../development/tools/go-toml { };
-
- go-outline = callPackage ../development/tools/go-outline { };
-
- gocode-gomod = callPackage ../development/tools/gocode-gomod { };
-
- goconst = callPackage ../development/tools/goconst { };
-
- goconvey = callPackage ../development/tools/goconvey { };
-
- go-callvis = callPackage ../development/tools/go-callvis { };
-
- gotags = callPackage ../development/tools/gotags { };
-
- go-task = callPackage ../development/tools/go-task { };
-
- golines = callPackage ../development/tools/golines { };
-
- golint = callPackage ../development/tools/golint { };
-
- golangci-lint = callPackage ../development/tools/golangci-lint { };
-
- golangci-lint-langserver = callPackage ../development/tools/golangci-lint-langserver { };
-
- gocyclo = callPackage ../development/tools/gocyclo { };
-
- godef = callPackage ../development/tools/godef { };
-
- goimports-reviser = callPackage ../development/tools/goimports-reviser { };
-
- gopkgs = callPackage ../development/tools/gopkgs { };
-
- gosec = callPackage ../development/tools/gosec { };
-
- gotemplate = callPackage ../development/tools/gotemplate { };
-
- gotraceui = callPackage ../development/tools/gotraceui { };
-
- goverview = callPackage ../tools/security/goverview { };
-
- go-tools = callPackage ../development/tools/go-tools { };
-
- gotest = callPackage ../development/tools/gotest { };
-
- gotestfmt = callPackage ../development/tools/gotestfmt { };
-
gotop = callPackage ../tools/system/gotop {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- go-migrate = callPackage ../development/tools/go-migrate { };
-
- go-jet = callPackage ../development/tools/go-jet { };
-
- go-mockery = callPackage ../development/tools/go-mockery { };
-
- go-mod-graph-chart = callPackage ../development/tools/go-mod-graph-chart { };
-
- gomacro = callPackage ../development/tools/gomacro { };
-
- gomodifytags = callPackage ../development/tools/gomodifytags { };
-
- gops = callPackage ../development/tools/gops { };
-
- gore = callPackage ../development/tools/gore { };
-
- goresym = callPackage ../development/tools/goresym { };
-
- gotests = callPackage ../development/tools/gotests { };
-
- gqlgenc = callPackage ../development/tools/gqlgenc { };
-
- impl = callPackage ../development/tools/impl { };
-
- moq = callPackage ../development/tools/moq { };
-
- quicktemplate = callPackage ../development/tools/quicktemplate { };
-
- linux_logo = callPackage ../tools/misc/linux-logo { };
-
- linux-pam = callPackage ../os-specific/linux/pam { };
-
- nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
-
- octomap = callPackage ../development/libraries/octomap { };
-
odin = callPackage ../by-name/od/odin/package.nix {
inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
llvmPackages = llvmPackages_18;
};
- odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
-
- odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };
-
- ofono = callPackage ../tools/networking/ofono { };
-
okapi = callPackage ../development/libraries/okapi {
inherit (darwin.apple_sdk.frameworks) Security;
};
- openbsm = callPackage ../development/libraries/openbsm { };
-
- pagemon = callPackage ../os-specific/linux/pagemon { };
-
pam = if stdenv.hostPlatform.isLinux then linux-pam else openpam;
# pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
- pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { };
-
- pam_dp9ik = callPackage ../os-specific/linux/pam_dp9ik { };
-
- pam_gnupg = callPackage ../os-specific/linux/pam_gnupg { };
-
- pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { };
-
- pam_ldap = callPackage ../os-specific/linux/pam_ldap { };
-
- pam_mktemp = callPackage ../os-specific/linux/pam_mktemp { };
-
- pam_mount = callPackage ../os-specific/linux/pam_mount { };
-
- pam_mysql = callPackage ../os-specific/linux/pam_mysql { };
-
- pam_p11 = callPackage ../os-specific/linux/pam_p11 { };
-
- pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { };
-
- pam_rssh = callPackage ../os-specific/linux/pam_rssh { };
-
- pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { };
-
- pam_tmpdir = callPackage ../os-specific/linux/pam_tmpdir { };
-
- pam_u2f = callPackage ../os-specific/linux/pam_u2f { };
-
- pam_ussh = callPackage ../os-specific/linux/pam_ussh { };
-
- paxctl = callPackage ../os-specific/linux/paxctl { };
-
- paxtest = callPackage ../os-specific/linux/paxtest { };
-
- pax-utils = callPackage ../os-specific/linux/pax-utils { };
-
- pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { };
-
- pcstat = callPackage ../tools/system/pcstat { };
-
- perf-tools = callPackage ../os-specific/linux/perf-tools { };
-
- picoprobe-udev-rules = callPackage ../os-specific/linux/picoprobe-udev-rules { };
-
- pipes = callPackage ../misc/screensavers/pipes { };
-
- pipes-rs = callPackage ../misc/screensavers/pipes-rs { };
-
- pipework = callPackage ../os-specific/linux/pipework { };
-
- pktgen = callPackage ../os-specific/linux/pktgen { };
-
- plymouth = callPackage ../os-specific/linux/plymouth { };
-
- pmount = callPackage ../os-specific/linux/pmount { };
-
- pmutils = callPackage ../os-specific/linux/pm-utils { };
-
- policycoreutils = callPackage ../os-specific/linux/policycoreutils { };
-
- semodule-utils = callPackage ../os-specific/linux/semodule-utils { };
-
- pdns = callPackage ../servers/dns/pdns { };
-
- powerdns-admin = callPackage ../applications/networking/powerdns-admin { };
-
- dnsdist = callPackage ../servers/dns/dnsdist { };
-
- pps-tools = callPackage ../os-specific/linux/pps-tools { };
-
procps = if stdenv.hostPlatform.isLinux
then callPackage ../os-specific/linux/procps-ng { }
else unixtools.procps;
- procdump = callPackage ../os-specific/linux/procdump { };
-
- prototool = callPackage ../development/tools/prototool { };
-
qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
qemu_full = lowPrio (qemu.override {
smbdSupport = lib.meta.availableOn stdenv.hostPlatform samba;
@@ -26041,128 +12875,44 @@ with pkgs;
qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; });
- quick-lint-js = callPackage ../development/tools/quick-lint-js { };
-
linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { };
- qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { };
-
- radeontools = callPackage ../os-specific/linux/radeontools { };
-
- radeontop = callPackage ../os-specific/linux/radeontop { };
-
- rasdaemon = callPackage ../os-specific/linux/rasdaemon { };
-
raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi { };
- raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { };
-
raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix { };
- reap = callPackage ../os-specific/linux/reap { };
-
- regionset = callPackage ../os-specific/linux/regionset { };
-
rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
- riscv-pk = callPackage ../misc/riscv-pk { };
-
- ristate = callPackage ../tools/misc/ristate { };
-
- roccat-tools = callPackage ../os-specific/linux/roccat-tools { };
-
- rojo = callPackage ../development/tools/rojo { };
-
- rtkit = callPackage ../os-specific/linux/rtkit { };
-
- rt-tests = callPackage ../os-specific/linux/rt-tests { };
-
- rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { };
-
- rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { };
-
- rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { };
-
- rvvm = callPackage ../applications/virtualization/rvvm { };
-
- s3ql = callPackage ../tools/backup/s3ql { };
-
- sasutils = callPackage ../os-specific/linux/sasutils { };
-
sass = callPackage ../development/tools/sass { };
- sassc = callPackage ../development/tools/sassc { };
-
- scanmem = callPackage ../tools/misc/scanmem { };
-
- schedtool = callPackage ../os-specific/linux/schedtool { };
-
sddm-astronaut = qt6Packages.callPackage ../data/themes/sddm-astronaut { };
sddm-chili-theme = libsForQt5.callPackage ../data/themes/chili-sddm { };
sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { };
- sdparm = callPackage ../os-specific/linux/sdparm { };
-
sdrangel = qt6Packages.callPackage ../applications/radio/sdrangel {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "12.3" else stdenv;
};
- setools = callPackage ../os-specific/linux/setools { };
-
- seturgent = callPackage ../os-specific/linux/seturgent { };
-
- sgx-azure-dcap-client = callPackage ../os-specific/linux/sgx/azure-dcap-client { };
-
sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { };
- sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { };
-
sgx-psw = callPackage ../os-specific/linux/sgx/psw {
protobuf = protobuf_21;
};
- shadow = callPackage ../os-specific/linux/shadow { };
-
- shortcat = callPackage ../os-specific/darwin/shortcat { };
-
sinit = callPackage ../os-specific/linux/sinit {
rcinit = "/etc/rc.d/rc.init";
rcshutdown = "/etc/rc.d/rc.shutdown";
};
- skopeo = callPackage ../development/tools/skopeo { };
-
- srisum = callPackage ../tools/misc/srisum { };
-
- smem = callPackage ../os-specific/linux/smem { };
-
- smimesign = callPackage ../os-specific/darwin/smimesign { };
-
- statik = callPackage ../development/tools/statik { };
-
- statifier = callPackage ../os-specific/linux/statifier { };
-
- steamos-devkit = callPackage ../development/tools/steamos-devkit { };
-
- swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { };
-
sysdig = callPackage ../os-specific/linux/sysdig {
kernel = null;
}; # sysdig is a client, for a driver look at linuxPackagesFor
- sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
-
sysprof = callPackage ../development/tools/profiling/sysprof { };
libsysprof-capture = callPackage ../development/tools/profiling/sysprof/capture.nix { };
- sysklogd = callPackage ../os-specific/linux/sysklogd { };
-
- syslinux = callPackage ../os-specific/linux/syslinux { };
-
- sysstat = callPackage ../os-specific/linux/sysstat { };
-
systemd = callPackage ../os-specific/linux/systemd {
# break some cyclic dependencies
util-linux = util-linuxMinimal;
@@ -26232,39 +12982,17 @@ with pkgs;
if (with stdenv.hostPlatform; isLinux && isStatic) then libudev-zero
else systemdLibs;
- systemd-wait = callPackage ../os-specific/linux/systemd-wait { };
-
- sysvinit = callPackage ../os-specific/linux/sysvinit { };
-
sysvtools = sysvinit.override {
withoutInitTools = true;
};
# FIXME: `tcp-wrapper' is actually not OS-specific.
- tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { };
-
- tiptop = callPackage ../os-specific/linux/tiptop { };
-
- tpacpi-bat = callPackage ../os-specific/linux/tpacpi-bat { };
-
trickster = callPackage ../servers/trickster/trickster.nix { };
- trinity = callPackage ../os-specific/linux/trinity { };
-
- trino-cli = callPackage ../development/tools/database/trino-cli { };
-
trinsic-cli = callPackage ../tools/admin/trinsic-cli {
inherit (darwin.apple_sdk.frameworks) Security;
};
- trustymail = callPackage ../tools/security/trustymail { };
-
- tunctl = callPackage ../os-specific/linux/tunctl { };
-
- twa = callPackage ../tools/networking/twa { };
-
- twingate = callPackage ../applications/networking/twingate { };
-
# Upstream U-Boots:
inherit (callPackage ../misc/uboot {})
buildUBoot
@@ -26336,36 +13064,12 @@ with pkgs;
util-linux = util-linuxMinimal;
};
- libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { };
-
udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
udisks = udisks2;
- ugtrain = callPackage ../tools/misc/ugtrain { };
-
- unscd = callPackage ../os-specific/linux/unscd { };
-
- untie = callPackage ../os-specific/linux/untie { };
-
- upower = callPackage ../os-specific/linux/upower { };
-
- usbguard = callPackage ../os-specific/linux/usbguard { };
-
- usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { };
-
usbrelay = callPackage ../os-specific/linux/usbrelay { };
usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };
- usbtop = callPackage ../os-specific/linux/usbtop { };
-
- usbutils = callPackage ../os-specific/linux/usbutils { };
-
- userhosts = callPackage ../tools/networking/userhosts { };
-
- usermount = callPackage ../os-specific/linux/usermount { };
-
- util-linux = callPackage ../os-specific/linux/util-linux { };
-
util-linuxMinimal = util-linux.override {
nlsSupport = false;
ncursesSupport = false;
@@ -26375,38 +13079,12 @@ with pkgs;
v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
- v4l2-relayd = callPackage ../os-specific/linux/v4l2-relayd { };
-
- vendir = callPackage ../development/tools/vendir { };
-
- vdo = callPackage ../os-specific/linux/vdo { };
-
windows = callPackages ../os-specific/windows {};
- wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
-
- wooting-udev-rules = callPackage ../os-specific/linux/wooting-udev-rules { };
-
- teensy-udev-rules = callPackage ../os-specific/linux/teensy-udev-rules { };
-
- sensible-side-buttons = callPackage ../os-specific/darwin/sensible-side-buttons { };
-
wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
- xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { };
-
- xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
-
- xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { };
-
- xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
-
- zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
-
- zenmonitor = callPackage ../os-specific/linux/zenmonitor { };
-
inherit
({
zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix {
@@ -26426,183 +13104,37 @@ with pkgs;
### DATA
- _3270font = callPackage ../data/fonts/3270font { };
-
- adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { };
-
- adapta-gtk-theme = callPackage ../data/themes/adapta { };
-
- adapta-kde-theme = callPackage ../data/themes/adapta-kde { };
-
- adementary-theme = callPackage ../data/themes/adementary { };
-
- adi1090x-plymouth-themes = callPackage ../data/themes/adi1090x-plymouth-themes { };
-
adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { };
adwaita-qt6 = qt6Packages.callPackage ../data/themes/adwaita-qt {
useQt6 = true;
};
- agave = callPackage ../data/fonts/agave { };
-
- aileron = callPackage ../data/fonts/aileron { };
-
- alacritty-theme = callPackage ../data/themes/alacritty-theme { };
-
- albatross = callPackage ../data/themes/albatross { };
-
- alegreya = callPackage ../data/fonts/alegreya { };
-
- alegreya-sans = callPackage ../data/fonts/alegreya-sans { };
-
- alice = callPackage ../data/fonts/alice { };
-
- alkalami = callPackage ../data/fonts/alkalami { };
-
- amber-theme = callPackage ../data/themes/amber { };
-
- amiri = callPackage ../data/fonts/amiri { };
-
- anarchism = callPackage ../data/documentation/anarchism { };
-
- ananicy = callPackage ../misc/ananicy { };
-
- andagii = callPackage ../data/fonts/andagii { };
-
- andika = callPackage ../data/fonts/andika { };
-
androguard = with python3.pkgs; toPythonApplication androguard;
- android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { };
-
andromeda-gtk-theme = libsForQt5.callPackage ../data/themes/andromeda-gtk-theme { };
ankacoder = callPackage ../data/fonts/ankacoder { };
ankacoder-condensed = callPackage ../data/fonts/ankacoder/condensed.nix { };
- annapurna-sil = callPackage ../data/fonts/annapurna-sil { };
-
- anonymousPro = callPackage ../data/fonts/anonymous-pro { };
-
ant-theme = callPackage ../data/themes/ant-theme/ant.nix { };
ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { };
- dracula-theme = callPackage ../data/themes/dracula-theme { };
-
- dracula-qt5-theme = callPackage ../data/themes/dracula-qt5-theme { };
-
ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { };
- arc-icon-theme = callPackage ../data/icons/arc-icon-theme { };
-
- arc-kde-theme = callPackage ../data/themes/arc-kde { };
-
- arc-theme = callPackage ../data/themes/arc { };
-
- arkpandora_ttf = callPackage ../data/fonts/arkpandora { };
-
- aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
-
- ayu-theme-gtk = callPackage ../data/themes/ayu-theme-gtk { };
-
- b612 = callPackage ../data/fonts/b612 { };
-
- babelstone-han = callPackage ../data/fonts/babelstone-han { };
-
- baekmuk-ttf = callPackage ../data/fonts/baekmuk-ttf { };
-
- bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };
-
- barlow = callPackage ../data/fonts/barlow { };
-
- base16-schemes = callPackage ../data/themes/base16-schemes { };
-
- bgnet = callPackage ../data/documentation/bgnet { };
-
bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { };
- apple-cursor = callPackage ../data/icons/apple-cursor { };
-
- blackbird = callPackage ../data/themes/blackbird { };
-
- blackout = callPackage ../data/fonts/blackout { };
-
breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { };
- brise = callPackage ../data/misc/brise { };
-
- bqn386 = callPackage ../data/fonts/bqn386 { };
-
cacert = callPackage ../data/misc/cacert { };
- caladea = callPackage ../data/fonts/caladea { };
-
- canta-theme = callPackage ../data/themes/canta { };
-
- cantarell-fonts = callPackage ../data/fonts/cantarell-fonts { };
-
- capitaine-cursors = callPackage ../data/icons/capitaine-cursors { };
-
- capitaine-cursors-themed = callPackage ../data/icons/capitaine-cursors-themed { };
-
- carlito = callPackage ../data/fonts/carlito { };
-
- cascadia-code = callPackage ../data/fonts/cascadia-code { };
-
- ccsymbols = callPackage ../data/fonts/ccsymbols { };
-
- charis-sil = callPackage ../data/fonts/charis-sil { };
-
- changie = callPackage ../development/tools/changie { };
-
- cherry = callPackage ../data/fonts/cherry { };
-
- chonburi-font = callPackage ../data/fonts/chonburi { };
-
- chunk = callPackage ../data/fonts/chunk { };
-
- cldr-annotations = callPackage ../data/misc/cldr-annotations { };
-
- clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };
-
cnspec = callPackage ../tools/security/cnspec {
buildGoModule = buildGo123Module;
};
- cnstrokeorder = callPackage ../data/fonts/cnstrokeorder { };
-
- colloid-gtk-theme = callPackage ../data/themes/colloid-gtk-theme { };
-
- colloid-icon-theme = callPackage ../data/icons/colloid-icon-theme { };
-
- comfortaa = callPackage ../data/fonts/comfortaa { };
-
colloid-kde = libsForQt5.callPackage ../data/themes/colloid-kde { };
- comic-mono = callPackage ../data/fonts/comic-mono { };
-
- comic-relief = callPackage ../data/fonts/comic-relief { };
-
- comixcursors = callPackage ../data/icons/comixcursors { };
-
- courier-prime = callPackage ../data/fonts/courier-prime { };
-
- cozette = callPackage ../data/fonts/cozette { };
-
- culmus = callPackage ../data/fonts/culmus { };
-
- clearlyU = callPackage ../data/fonts/clearlyU { };
-
- cm_unicode = callPackage ../data/fonts/cm-unicode { };
-
- creep = callPackage ../data/fonts/creep { };
-
- crimson = callPackage ../data/fonts/crimson { };
-
- crimson-pro = callPackage ../data/fonts/crimson-pro { };
-
dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {});
# solve collision for nix-env before https://github.com/NixOS/nix/pull/815
@@ -26611,13 +13143,6 @@ with pkgs;
paths = [ dejavu_fonts.out ];
};
- dina-font = callPackage ../data/fonts/dina { };
-
- dm-sans = callPackage ../data/fonts/dm-sans { };
- dns-root-data = callPackage ../data/misc/dns-root-data { };
-
- docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { };
-
docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { };
docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { };
@@ -26632,8 +13157,6 @@ with pkgs;
docbook_xml_dtd_45 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix { };
- docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { };
-
inherit (callPackages ../data/sgml+xml/stylesheets/xslt/docbook-xsl { })
docbook-xsl-nons
docbook-xsl-ns;
@@ -26644,151 +13167,30 @@ with pkgs;
documentation-highlighter = callPackage ../misc/documentation-highlighter { };
- mmdoc = callPackage ../tools/text/mmdoc { };
-
- documize-community = callPackage ../servers/documize-community { };
-
- doulos-sil = callPackage ../data/fonts/doulos-sil { };
-
- cabin = callPackage ../data/fonts/cabin { };
-
- camingo-code = callPackage ../data/fonts/camingo-code { };
-
- combinatorial_designs = callPackage ../data/misc/combinatorial_designs { };
-
- commit-mono = callPackage ../data/fonts/commit-mono { };
-
- cooper-hewitt = callPackage ../data/fonts/cooper-hewitt { };
-
- d2coding = callPackage ../data/fonts/d2coding { };
-
- dosis = callPackage ../data/fonts/dosis { };
-
- dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };
-
- dotcolon-fonts = callPackage ../data/fonts/dotcolon-fonts { };
-
- dracula-icon-theme = callPackage ../data/icons/dracula-icon-theme { };
-
- e17gtk = callPackage ../data/themes/e17gtk { };
-
- eb-garamond = callPackage ../data/fonts/eb-garamond { };
-
- edukai = callPackage ../data/fonts/edukai { };
-
- eduli = callPackage ../data/fonts/eduli { };
-
epapirus-icon-theme = papirus-icon-theme.override { withElementary = true; };
moeli = eduli;
- edusong = callPackage ../data/fonts/edusong { };
-
- efont-unicode = callPackage ../data/fonts/efont-unicode { };
-
- elliptic_curves = callPackage ../data/misc/elliptic_curves { };
-
- equilux-theme = callPackage ../data/themes/equilux-theme { };
-
- eunomia = callPackage ../data/fonts/eunomia { };
-
- fa_1 = callPackage ../data/fonts/fa_1 { };
-
- f1_8 = callPackage ../data/fonts/f1_8 { };
-
- f5_6 = callPackage ../data/fonts/f5_6 { };
-
- faba-icon-theme = callPackage ../data/icons/faba-icon-theme { };
-
- faba-mono-icons = callPackage ../data/icons/faba-mono-icons { };
-
- ferrum = callPackage ../data/fonts/ferrum { };
-
- fg-virgil = callPackage ../data/fonts/fg-virgil { };
-
- fixedsys-excelsior = callPackage ../data/fonts/fixedsys-excelsior { };
-
- graphs = callPackage ../data/misc/graphs { };
-
- emacs-all-the-icons-fonts = callPackage ../data/fonts/emacs-all-the-icons-fonts { };
-
emojione = callPackage ../data/fonts/emojione {
inherit (nodePackages) svgo;
};
- emojipick = callPackage ../applications/misc/emojipick { };
-
- encode-sans = callPackage ../data/fonts/encode-sans { };
-
- envypn-font = callPackage ../data/fonts/envypn-font { };
-
- ezra-sil = callPackage ../data/fonts/ezra-sil { };
-
- fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono { };
-
- fanwood = callPackage ../data/fonts/fanwood { };
-
fira-code = callPackage ../data/fonts/fira-code { };
fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { };
fira-code-nerdfont = nerdfonts.override {
fonts = [ "FiraCode" ];
};
- fira-go = callPackage ../data/fonts/fira-go { };
-
flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
inherit (plasma5Packages) breeze-icons;
};
- flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { };
- flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { };
-
- fluent-icon-theme = callPackage ../data/icons/fluent-icon-theme { };
-
font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4;
font-awesome_5 = (callPackage ../data/fonts/font-awesome { }).v5;
font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6;
font-awesome = font-awesome_6;
- fraunces = callPackage ../data/fonts/fraunces { };
-
- freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
-
- freepats = callPackage ../data/misc/freepats { };
-
- game-devices-udev-rules = callPackage ../os-specific/linux/game-devices-udev-rules { };
-
- garamond-libre = callPackage ../data/fonts/garamond-libre { };
-
- g15daemon = callPackage ../os-specific/linux/g15daemon { };
-
- galatia-sil = callPackage ../data/fonts/galatia-sil { };
-
- gentium = callPackage ../data/fonts/gentium { };
-
- gentium-book-basic = callPackage ../data/fonts/gentium-book-basic { };
-
- geolite-legacy = callPackage ../data/misc/geolite-legacy { };
-
- gohufont = callPackage ../data/fonts/gohufont { };
-
- gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { };
-
- gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { };
-
- gnome-icon-theme = callPackage ../data/icons/gnome-icon-theme { };
-
- go-font = callPackage ../data/fonts/go-font { };
-
- goudy-bookletter-1911 = callPackage ../data/fonts/goudy-bookletter-1911 { };
-
- graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { };
-
graphite-kde-theme = libsForQt5.callPackage ../data/themes/graphite-kde-theme { };
- greybird = callPackage ../data/themes/greybird { };
-
- gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { };
-
palenight-theme = callPackage ../data/themes/gtk-theme-framework { theme = "palenight"; };
amarena-theme = callPackage ../data/themes/gtk-theme-framework { theme = "amarena"; };
@@ -26820,46 +13222,10 @@ with pkgs;
inherit (plasma5Packages) breeze-icons;
};
- gubbi-font = callPackage ../data/fonts/gubbi { };
-
- gyre-fonts = callPackage ../data/fonts/gyre { };
-
- hack-font = callPackage ../data/fonts/hack { };
-
hackgen-font = callPackage ../data/fonts/hackgen { };
hackgen-nf-font = callPackage ../data/fonts/hackgen/nerdfont.nix { };
- helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { };
-
- helvum = callPackage ../applications/audio/helvum { };
-
- hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { };
-
- hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { };
-
- hannom = callPackage ../data/fonts/hannom { };
-
- hanazono = callPackage ../data/fonts/hanazono { };
-
- hermit = callPackage ../data/fonts/hermit { };
-
- hubot-sans = callPackage ../data/fonts/hubot-sans { };
-
- humanity-icon-theme = callPackage ../data/icons/humanity-icon-theme { };
-
- hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { };
-
- ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { };
-
- i-dot-ming = callPackage ../data/fonts/i-dot-ming { };
-
- ibm-plex = callPackage ../data/fonts/ibm-plex { };
-
- iconpack-jade = callPackage ../data/icons/iconpack-jade { };
-
- iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { };
-
inconsolata = callPackage ../data/fonts/inconsolata { };
inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix { };
@@ -26868,142 +13234,37 @@ with pkgs;
fonts = [ "Inconsolata" ];
};
- intel-one-mono = callPackage ../data/fonts/intel-one-mono {};
-
input-fonts = callPackage ../data/fonts/input-fonts { };
- inriafonts = callPackage ../data/fonts/inriafonts { };
-
iosevka = callPackage ../data/fonts/iosevka { };
iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix { };
iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {});
- ipafont = callPackage ../data/fonts/ipafont { };
- ipaexfont = callPackage ../data/fonts/ipaexfont { };
-
- iwona = callPackage ../data/fonts/iwona { };
-
- jetbrains-mono = callPackage ../data/fonts/jetbrains-mono { };
-
- jost = callPackage ../data/fonts/jost { };
-
joypixels = callPackage ../data/fonts/joypixels { };
- junction-font = callPackage ../data/fonts/junction { };
-
- junicode = callPackage ../data/fonts/junicode { };
-
- julia-mono = callPackage ../data/fonts/julia-mono { };
-
- juno-theme = callPackage ../data/themes/juno { };
-
- kanit-font = callPackage ../data/fonts/kanit { };
-
- kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font { };
-
- kacst = callPackage ../data/fonts/kacst { };
-
- kawkab-mono-font = callPackage ../data/fonts/kawkab-mono { };
-
kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { };
- khmeros = callPackage ../data/fonts/khmeros { };
-
- knewave = callPackage ../data/fonts/knewave { };
-
- kochi-substitute = callPackage ../data/fonts/kochi-substitute { };
-
- kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 { };
-
- kode-mono = callPackage ../data/fonts/kode-mono { };
-
- kopia = callPackage ../tools/backup/kopia { };
-
kora-icon-theme = callPackage ../data/icons/kora-icon-theme {
inherit (libsForQt5.kdeFrameworks) breeze-icons;
};
- koreader = callPackage ../applications/misc/koreader { };
-
- kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { };
-
la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme {
inherit (plasma5Packages) breeze-icons;
inherit (pantheon) elementary-icon-theme;
};
- layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { };
-
layan-kde = libsForQt5.callPackage ../data/themes/layan-kde { };
- lao = callPackage ../data/fonts/lao { };
-
- lato = callPackage ../data/fonts/lato { };
-
- league-gothic = callPackage ../data/fonts/league-gothic { };
-
- league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type { };
-
- league-script-number-one = callPackage ../data/fonts/league-script-number-one { };
-
- league-spartan = callPackage ../data/fonts/league-spartan { };
-
- ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules { };
-
- libGDSII = callPackage ../development/libraries/science/chemistry/libGDSII { };
-
inherit (callPackages ../data/fonts/liberation-fonts { })
liberation_ttf_v1
liberation_ttf_v2
;
liberation_ttf = liberation_ttf_v2;
- liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { };
-
- libevdevc = callPackage ../os-specific/linux/libevdevc { };
-
- libgestures = callPackage ../os-specific/linux/libgestures { };
-
- liberastika = callPackage ../data/fonts/liberastika { };
-
- libertine = callPackage ../data/fonts/libertine { };
-
- libertinus = callPackage ../data/fonts/libertinus { };
-
- libratbag = callPackage ../os-specific/linux/libratbag { };
-
- librist = callPackage ../development/libraries/librist { };
-
- libre-baskerville = callPackage ../data/fonts/libre-baskerville { };
-
- libre-bodoni = callPackage ../data/fonts/libre-bodoni { };
-
- libre-caslon = callPackage ../data/fonts/libre-caslon { };
-
- libre-franklin = callPackage ../data/fonts/libre-franklin { };
-
lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { };
lightly-boehs = libsForQt5.callPackage ../data/themes/lightly-boehs { };
- linden-hill = callPackage ../data/fonts/linden-hill { };
-
- line-awesome = callPackage ../data/fonts/line-awesome { };
-
- linearicons-free = callPackage ../data/fonts/linearicons-free { };
-
- linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin { };
-
- linja-sike = callPackage ../data/fonts/linja-sike { };
-
- linux-manual = callPackage ../data/documentation/linux-manual { };
-
- lklug-sinhala = callPackage ../data/fonts/lklug-sinhala { };
-
- lmmath = callPackage ../data/fonts/lmmath { };
-
- lmodern = callPackage ../data/fonts/lmodern { };
-
# ltunifi and solaar both provide udev rules but solaar's rules are more
# up-to-date so we simply use that instead of having to maintain our own rules
logitech-udev-rules = solaar.udev;
@@ -27014,110 +13275,18 @@ with pkgs;
# lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi
lohit-fonts = recurseIntoAttrs ( callPackages ../data/fonts/lohit-fonts { } );
- lounge-gtk-theme = callPackage ../data/themes/lounge { };
-
- luculent = callPackage ../data/fonts/luculent { };
-
maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { };
- mailcap = callPackage ../data/misc/mailcap { };
-
- marathi-cursive = callPackage ../data/fonts/marathi-cursive { };
-
- man-pages = callPackage ../data/documentation/man-pages { };
-
- man-pages-posix = callPackage ../data/documentation/man-pages-posix { };
-
- manrope = callPackage ../data/fonts/manrope { };
-
- martian-mono = callPackage ../data/fonts/martian-mono { };
-
marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix {
inherit (kdePackages) breeze-icons;
};
- matcha-gtk-theme = callPackage ../data/themes/matcha { };
-
- materia-theme = callPackage ../data/themes/materia-theme { };
-
- materia-kde-theme = callPackage ../data/themes/materia-kde { };
-
- material-design-icons = callPackage ../data/fonts/material-design-icons { };
-
- material-icons = callPackage ../data/fonts/material-icons { };
-
- material-symbols = callPackage ../data/fonts/material-symbols { };
-
material-kwin-decoration = libsForQt5.callPackage ../data/themes/material-kwin-decoration { };
- meslo-lg = callPackage ../data/fonts/meslo-lg { };
-
- meslo-lgs-nf = callPackage ../data/fonts/meslo-lgs-nf { };
-
- migmix = callPackage ../data/fonts/migmix { };
-
- migu = callPackage ../data/fonts/migu { };
-
- miscfiles = callPackage ../data/misc/miscfiles { };
-
- media-player-info = callPackage ../data/misc/media-player-info { };
-
- medio = callPackage ../data/fonts/medio { };
-
- melete = callPackage ../data/fonts/melete { };
-
- mno16 = callPackage ../data/fonts/mno16 { };
-
- mnist = callPackage ../data/machine-learning/mnist { };
-
- mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };
-
- mojave-gtk-theme = callPackage ../data/themes/mojave { };
-
- moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
-
- mona-sans = callPackage ../data/fonts/mona-sans { };
-
- monoid = callPackage ../data/fonts/monoid { };
-
- mononoki = callPackage ../data/fonts/mononoki { };
-
- montserrat = callPackage ../data/fonts/montserrat { };
-
- mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
-
mplus-outline-fonts = recurseIntoAttrs (callPackage ../data/fonts/mplus-outline-fonts { });
- mro-unicode = callPackage ../data/fonts/mro-unicode { };
-
- mustache-spec = callPackage ../data/documentation/mustache-spec { };
-
- mustache-go = callPackage ../development/tools/mustache-go { };
-
- mustache-hpp = callPackage ../development/libraries/mustache-hpp { };
-
- myrddin = callPackage ../development/compilers/myrddin { };
-
- myrica = callPackage ../data/fonts/myrica { };
-
- nacelle = callPackage ../data/fonts/nacelle { };
-
- nafees = callPackage ../data/fonts/nafees { };
-
- nanum = callPackage ../data/fonts/nanum { };
-
- nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { };
-
- nasin-nanpa = callPackage ../data/fonts/nasin-nanpa { };
-
- national-park-typeface = callPackage ../data/fonts/national-park { };
-
nordic = libsForQt5.callPackage ../data/themes/nordic { };
- nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { };
-
- nordzy-icon-theme = callPackage ../data/icons/nordzy-icon-theme { };
-
noto-fonts-lgc-plus = callPackage ../by-name/no/noto-fonts/package.nix {
suffix = "-lgc-plus";
variants = [
@@ -27135,8 +13304,6 @@ with pkgs;
'';
};
- nuclei = callPackage ../tools/security/nuclei { };
-
nullmailer = callPackage ../servers/mail/nullmailer {
stdenv = gccStdenv;
};
@@ -27145,58 +13312,10 @@ with pkgs;
inherit (plasma5Packages) breeze-icons;
};
- numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { };
-
- numix-icon-theme-square = callPackage ../data/icons/numix-icon-theme-square { };
-
- numix-cursor-theme = callPackage ../data/icons/numix-cursor-theme { };
-
- numix-gtk-theme = callPackage ../data/themes/numix { };
-
- numix-solarized-gtk-theme = callPackage ../data/themes/numix-solarized { };
-
- numix-sx-gtk-theme = callPackage ../data/themes/numix-sx { };
-
- _0xproto = callPackage ../data/fonts/0xproto { };
-
- oldstandard = callPackage ../data/fonts/oldstandard { };
-
- oldsindhi = callPackage ../data/fonts/oldsindhi { };
-
- omni-gtk-theme = callPackage ../data/themes/omni-gtk-theme { };
-
- onestepback = callPackage ../data/themes/onestepback { };
-
- open-dyslexic = callPackage ../data/fonts/open-dyslexic { };
-
- open-sans = callPackage ../data/fonts/open-sans { };
-
openmoji-color = callPackage ../data/fonts/openmoji { fontFormats = ["glyf_colr_0"]; };
openmoji-black = callPackage ../data/fonts/openmoji { fontFormats = ["glyf"]; };
- openzone-cursors = callPackage ../data/themes/openzone { };
-
- oranchelo-icon-theme = callPackage ../data/icons/oranchelo-icon-theme { };
-
- orbitron = callPackage ../data/fonts/orbitron { };
-
- orbuculum = callPackage ../development/embedded/orbuculum { };
-
- orchis-theme = callPackage ../data/themes/orchis-theme { };
-
- orion = callPackage ../data/themes/orion { };
-
- ostrich-sans = callPackage ../data/fonts/ostrich-sans { };
-
- overpass = callPackage ../data/fonts/overpass { };
-
- oxygenfonts = callPackage ../data/fonts/oxygenfonts { };
-
- paper-gtk-theme = callPackage ../data/themes/paper-gtk { };
-
- paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
-
papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme {
inherit (pantheon) elementary-icon-theme;
inherit (plasma5Packages) breeze-icons;
@@ -27206,242 +13325,55 @@ with pkgs;
inherit (plasma5Packages) breeze-icons;
};
- papirus-folders = callPackage ../data/misc/papirus-folders { };
-
- papirus-nord = callPackage ../data/icons/papirus-nord { };
-
- plasma-overdose-kde-theme = callPackage ../data/themes/plasma-overdose-kde-theme { };
-
papis = with python3Packages; toPythonApplication papis;
- paperlike-go = callPackage ../tools/misc/paperlike-go { };
-
- paps = callPackage ../tools/misc/paps { };
-
- pecita = callPackage ../data/fonts/pecita { };
-
paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix { };
paratype-pt-sans = callPackage ../data/fonts/paratype-pt/sans.nix { };
paratype-pt-serif = callPackage ../data/fonts/paratype-pt/serif.nix { };
- pari-galdata = callPackage ../data/misc/pari-galdata { };
-
- pari-seadata-small = callPackage ../data/misc/pari-seadata-small { };
-
- penna = callPackage ../data/fonts/penna { };
-
- pitch-black = callPackage ../data/themes/pitch-black { };
-
- plano-theme = callPackage ../data/themes/plano { };
-
plata-theme = callPackage ../data/themes/plata {
inherit (mate) marco;
};
- poly = callPackage ../data/fonts/poly { };
-
polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { };
- polytopes_db = callPackage ../data/misc/polytopes_db { };
-
- pop-gtk-theme = callPackage ../data/themes/pop-gtk { };
-
- pop-icon-theme = callPackage ../data/icons/pop-icon-theme { };
-
- powerline-fonts = callPackage ../data/fonts/powerline-fonts { };
-
- powerline-symbols = callPackage ../data/fonts/powerline-symbols { };
-
- powerline-go = callPackage ../tools/misc/powerline-go { };
-
powerline-rs = callPackage ../tools/misc/powerline-rs {
inherit (darwin.apple_sdk.frameworks) Security;
};
- prociono = callPackage ../data/fonts/prociono { };
-
profont = callPackage ../data/fonts/profont { };
- proggyfonts = callPackage ../data/fonts/proggyfonts { };
-
- public-sans = callPackage ../data/fonts/public-sans { };
-
- publicsuffix-list = callPackage ../data/misc/publicsuffix-list { };
-
- phinger-cursors = callPackage ../data/icons/phinger-cursors { };
-
- qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { };
-
qogir-kde = libsForQt5.callPackage ../data/themes/qogir-kde { };
- qogir-theme = callPackage ../data/themes/qogir { };
-
- quintom-cursor-theme = callPackage ../data/icons/quintom-cursor-theme { };
-
- redhat-official-fonts = callPackage ../data/fonts/redhat-official { };
-
ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix {
protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178
};
- rime-data = callPackage ../data/misc/rime-data { };
-
roapi-http = callPackage ../servers/roapi/http.nix { };
- rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { };
- rose-pine-icon-theme = callPackage ../data/icons/rose-pine { };
-
- route159 = callPackage ../data/fonts/route159 { };
-
- ruwudu = callPackage ../data/fonts/ruwudu { };
-
- sampradaya = callPackage ../data/fonts/sampradaya { };
-
- sarabun-font = callPackage ../data/fonts/sarabun { };
-
- savepagenow = callPackage ../tools/misc/savepagenow { };
-
- scheme-manpages = callPackage ../data/documentation/scheme-manpages { };
-
- scowl = callPackage ../data/misc/scowl { };
-
- seshat = callPackage ../data/fonts/seshat { };
-
- session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { };
-
shaderc = callPackage ../development/compilers/shaderc {
inherit (darwin) autoSignDarwinBinariesHook;
};
- shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };
-
sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { useQt5 = true; };
- simp1e-cursors = callPackage ../data/icons/simp1e-cursors { };
-
- sjasmplus = callPackage ../development/compilers/sjasmplus { };
-
- skeu = callPackage ../data/themes/skeu { };
-
- sweet-nova = callPackage ../data/themes/sweet-nova { };
-
- shared-mime-info = callPackage ../data/misc/shared-mime-info { };
-
- shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };
-
scheherazade = callPackage ../data/fonts/scheherazade { version = "2.100"; };
scheherazade-new = callPackage ../data/fonts/scheherazade { };
- signwriting = callPackage ../data/fonts/signwriting { };
-
- sierra-gtk-theme = callPackage ../data/themes/sierra { };
-
- sil-abyssinica = callPackage ../data/fonts/sil-abyssinica { };
-
- sil-padauk = callPackage ../data/fonts/sil-padauk { };
-
- snap7 = callPackage ../development/libraries/snap7 { };
-
- sniglet = callPackage ../data/fonts/sniglet { };
-
- snowblind = callPackage ../data/themes/snowblind { };
-
- solarc-gtk-theme = callPackage ../data/themes/solarc { };
-
- sorts-mill-goudy = callPackage ../data/fonts/sorts-mill-goudy { };
-
- soundfont-fluid = callPackage ../data/soundfonts/fluid { };
-
- soundfont-generaluser = callPackage ../data/soundfonts/generaluser { };
-
- soundfont-ydp-grand = callPackage ../data/soundfonts/ydp-grand { };
-
- spdx-license-list-data = callPackage ../data/misc/spdx-license-list-data { };
-
- stdmanpages = callPackage ../data/documentation/std-man-pages { };
-
- star-history = callPackage ../tools/misc/star-history { };
-
- starfetch = callPackage ../tools/misc/starfetch { };
-
- starry = callPackage ../tools/misc/starry { };
-
starship = callPackage ../tools/misc/starship {
inherit (darwin.apple_sdk.frameworks) Security Foundation Cocoa;
};
- stig = callPackage ../applications/networking/p2p/stig { };
-
- stix-otf = callPackage ../data/fonts/stix-otf { };
-
- stix-two = callPackage ../data/fonts/stix-two { };
-
- super-tiny-icons = callPackage ../data/icons/super-tiny-icons { };
-
inherit (callPackages ../data/fonts/gdouros { })
aegan aegyptus akkadian assyrian eemusic maya symbola textfonts unidings;
- iana-etc = callPackage ../data/misc/iana-etc { };
-
- poppler_data = callPackage ../data/misc/poppler-data { };
-
inherit (callPackages ../data/fonts/pretendard { })
pretendard
pretendard-gov
pretendard-jp
pretendard-std;
- quattrocento = callPackage ../data/fonts/quattrocento { };
-
- quattrocento-sans = callPackage ../data/fonts/quattrocento-sans { };
-
- quivira = callPackage ../data/fonts/quivira { };
-
- raleway = callPackage ../data/fonts/raleway { };
-
- recursive = callPackage ../data/fonts/recursive { };
-
- reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { };
-
- rubik = callPackage ../data/fonts/rubik { };
-
- rhodium-libre = callPackage ../data/fonts/rhodium-libre { };
-
- rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { };
-
- roboto = callPackage ../data/fonts/roboto { };
-
- roboto-mono = callPackage ../data/fonts/roboto-mono { };
-
- roboto-serif = callPackage ../data/fonts/roboto-serif { };
-
- roboto-slab = callPackage ../data/fonts/roboto-slab { };
-
- hasklig = callPackage ../data/fonts/hasklig { };
-
- inter = callPackage ../data/fonts/inter { };
-
- open-fonts = callPackage ../data/fonts/open-fonts { };
-
- scientifica = callPackage ../data/fonts/scientifica { };
-
- siji = callPackage ../data/fonts/siji { };
-
- smc-chilanka = callPackage ../data/fonts/smc-chilanka { };
-
- sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { };
-
- source-code-pro = callPackage ../data/fonts/source-code-pro { };
-
- source-sans = callPackage ../data/fonts/source-sans { };
- source-sans-pro = callPackage ../data/fonts/source-sans-pro { };
-
- source-serif = callPackage ../data/fonts/source-serif { };
- source-serif-pro = callPackage ../data/fonts/source-serif-pro { };
-
- source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { };
-
sourceHanPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han { });
source-han-sans = sourceHanPackages.sans;
source-han-serif = sourceHanPackages.serif;
@@ -27451,54 +13383,18 @@ with pkgs;
source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf;
source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf;
- spleen = callPackage ../data/fonts/spleen { };
-
- stilo-themes = callPackage ../data/themes/stilo { };
-
- sudo-font = callPackage ../data/fonts/sudo { };
-
inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
- takao = callPackage ../data/fonts/takao { };
-
- taskspooler = callPackage ../tools/system/taskspooler { };
-
- tamsyn = callPackage ../data/fonts/tamsyn { };
-
- tamzen = callPackage ../data/fonts/tamzen { };
-
tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
gtk = res.gtk2;
};
- tau-hydrogen = callPackage ../data/icons/tau-hydrogen { };
-
- theme-jade1 = callPackage ../data/themes/jade1 { };
-
- theme-obsidian2 = callPackage ../data/themes/obsidian2 { };
-
themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { };
- theano = callPackage ../data/fonts/theano { };
-
- the-neue-black = callPackage ../data/fonts/the-neue-black { };
-
tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme {
inherit (libsForQt5) breeze-icons;
};
- tela-icon-theme = callPackage ../data/icons/tela-icon-theme { };
-
- template-glib = callPackage ../development/libraries/template-glib { };
-
- tempora_lgc = callPackage ../data/fonts/tempora-lgc { };
-
- tenderness = callPackage ../data/fonts/tenderness { };
-
- terminus_font = callPackage ../data/fonts/terminus-font { };
-
- terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };
-
terminus-nerdfont = nerdfonts.override {
fonts = [ "Terminus" ];
};
@@ -27507,127 +13403,17 @@ with pkgs;
tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
- theme-vertex = callPackage ../data/themes/vertex { };
-
- tibetan-machine = callPackage ../data/fonts/tibetan-machine { };
-
- times-newer-roman = callPackage ../data/fonts/times-newer-roman { };
-
- tipa = callPackage ../data/fonts/tipa { };
-
- ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { };
-
- ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r { };
-
- ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { };
-
- twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { };
-
- twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { };
-
- tzdata = callPackage ../data/misc/tzdata { };
-
- ubuntu-themes = callPackage ../data/themes/ubuntu-themes { };
-
- ucs-fonts = callPackage ../data/fonts/ucs-fonts { };
-
- bront_fonts = callPackage ../data/fonts/bront { };
-
- ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };
-
- ultralist = callPackage ../applications/misc/ultralist { };
-
- undefined-medium = callPackage ../data/fonts/undefined-medium { };
-
- unfonts-core = callPackage ../data/fonts/unfonts-core { };
-
- uni-vga = callPackage ../data/fonts/uni-vga { };
-
- unicode-character-database = callPackage ../data/misc/unicode-character-database { };
-
- unicode-emoji = callPackage ../data/misc/unicode-emoji { };
-
- unihan-database = callPackage ../data/misc/unihan-database { };
-
- unifont = callPackage ../data/fonts/unifont { };
-
- unifont_upper = callPackage ../data/fonts/unifont_upper { };
-
- unscii = callPackage ../data/fonts/unscii { };
-
utterly-nord-plasma = kdePackages.callPackage ../data/themes/utterly-nord-plasma {
# renamed in KF6
plasma-framework = kdePackages.libplasma;
};
- utterly-round-plasma-style = callPackage ../data/themes/utterly-round-plasma-style { };
-
- uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { };
-
- u001-font = callPackage ../data/fonts/u001 { };
-
- vanilla-dmz = callPackage ../data/icons/vanilla-dmz { };
-
- vdrsymbols = callPackage ../data/fonts/vdrsymbols { };
-
- vegur = callPackage ../data/fonts/vegur { };
-
- vegeta = callPackage ../tools/networking/vegeta { };
-
- venta = callPackage ../data/themes/venta { };
-
- victor-mono = callPackage ../data/fonts/victor-mono { };
-
- vimix-cursor-theme = callPackage ../data/icons/vimix-cursor-theme { };
-
- vimix-gtk-themes = callPackage ../data/themes/vimix { };
-
- vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { };
-
- vistafonts = callPackage ../data/fonts/vista-fonts { };
-
- vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { };
-
- vistafonts-cht = callPackage ../data/fonts/vista-fonts-cht { };
-
- vollkorn = callPackage ../data/fonts/vollkorn { };
-
- weather-icons = callPackage ../data/fonts/weather-icons { };
-
- whitesur-cursors = callPackage ../data/icons/whitesur-cursors { };
-
- whitesur-gtk-theme = callPackage ../data/themes/whitesur { };
-
- whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { };
-
whitesur-kde = kdePackages.callPackage ../data/themes/whitesur-kde { };
- wireless-regdb = callPackage ../data/misc/wireless-regdb { };
-
- work-sans = callPackage ../data/fonts/work-sans { };
-
- wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
-
- wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { };
-
- xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { };
-
- xits-math = callPackage ../data/fonts/xits-math { };
-
- xkcd-font = callPackage ../data/fonts/xkcd-font { };
-
xkeyboard_config = xorg.xkeyboardconfig;
xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;
- xorg-rgb = callPackage ../data/misc/xorg-rgb { };
-
- yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz { };
-
- yaru-theme = callPackage ../data/themes/yaru { };
-
- yaru-remix-theme = callPackage ../data/themes/yaru-remix { };
-
zafiro-icons = callPackage ../data/icons/zafiro-icons {
inherit (plasma5Packages) breeze-icons;
};
@@ -27638,10 +13424,6 @@ with pkgs;
qtx11extras = null; # Because it does not exist in qt6
};
- zilla-slab = callPackage ../data/fonts/zilla-slab { };
-
- zuki-themes = callPackage ../data/themes/zuki { };
-
### APPLICATIONS / GIS
grass = callPackage ../applications/gis/grass {
@@ -27659,10 +13441,6 @@ with pkgs;
wxGTK = wxGTK32;
};
- spatialite_tools = callPackage ../applications/gis/spatialite-tools { };
-
- udig = callPackage ../applications/gis/udig { };
-
whitebox-tools = callPackage ../applications/gis/whitebox-tools {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -27675,20 +13453,10 @@ with pkgs;
patches = config."2bwm".patches or [];
};
- a2jmidid = callPackage ../applications/audio/a2jmidid { };
-
- aacgain = callPackage ../applications/audio/aacgain { };
-
- aaxtomp3 = callPackage ../applications/audio/aaxtomp3 { };
-
abcde = callPackage ../applications/audio/abcde {
inherit (python3Packages) eyed3;
};
- abiword = callPackage ../applications/office/abiword { };
-
- abook = callPackage ../applications/misc/abook { };
-
acd-cli = callPackage ../applications/networking/sync/acd_cli {
inherit (python3Packages)
buildPythonApplication appdirs colorama python-dateutil
@@ -27704,14 +13472,8 @@ with pkgs;
activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { };
- aw-watcher-window-wayland = callPackage ../tools/wayland/aw-watcher-window-wayland { };
-
adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { };
- adl = callPackage ../applications/video/adl { };
-
- appvm = callPackage ../applications/virtualization/appvm { };
-
anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { };
masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { };
@@ -27735,50 +13497,20 @@ with pkgs;
pdfstudioviewer
;
- abaddon = callPackage ../applications/networking/instant-messengers/abaddon { };
-
acpic = callPackage ../applications/misc/acpic/default.nix { };
- adguardian = callPackage ../applications/networking/adguardian { };
-
aeolus = callPackage ../applications/audio/aeolus { };
aeolus-stops = callPackage ../applications/audio/aeolus/stops.nix { };
- aewan = callPackage ../applications/editors/aewan { };
-
- agedu = callPackage ../tools/misc/agedu { };
-
- agenda = callPackage ../applications/office/agenda { };
-
- ahoviewer = callPackage ../applications/graphics/ahoviewer { };
-
airwave = libsForQt5.callPackage ../applications/audio/airwave { };
- akira-unstable = callPackage ../applications/graphics/akira { };
-
alembic = callPackage ../development/libraries/alembic {
openexr = openexr_3;
};
- alfaview = callPackage ../applications/networking/instant-messengers/alfaview { };
-
- alchemy = callPackage ../applications/graphics/alchemy { };
-
- alock = callPackage ../misc/screensavers/alock { };
-
- alot = callPackage ../applications/networking/mailreaders/alot { };
-
- alpine = callPackage ../applications/networking/mailreaders/alpine { };
-
- msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { };
-
amarok = libsForQt5.callPackage ../applications/audio/amarok { };
amarok-kf5 = amarok; # for compatibility
- AMB-plugins = callPackage ../applications/audio/AMB-plugins { };
-
- ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
-
androidStudioPackages = recurseIntoAttrs
(callPackage ../applications/editors/android-studio { });
android-studio = androidStudioPackages.stable;
@@ -27788,20 +13520,12 @@ with pkgs;
(callPackage ../applications/editors/android-studio-for-platform { });
android-studio-for-platform = androidStudioForPlatformPackages.stable;
- antfs-cli = callPackage ../applications/misc/antfs-cli { };
-
antimony = libsForQt5.callPackage ../applications/graphics/antimony { };
- antiword = callPackage ../applications/office/antiword { };
-
anup = callPackage ../applications/misc/anup {
inherit (darwin.apple_sdk.frameworks) Security;
};
- anytone-emu = callPackage ../applications/radio/anytone-emu { };
-
- apache-directory-studio = callPackage ../applications/networking/apache-directory-studio { };
-
apkeep = callPackage ../tools/misc/apkeep {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
@@ -27809,80 +13533,28 @@ with pkgs;
apngasm = callPackage ../applications/graphics/apngasm { };
apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix { };
- appcleaner = callPackage ../applications/misc/appcleaner { };
-
- appeditor = callPackage ../applications/misc/appeditor { };
-
- appgate-sdp = callPackage ../applications/networking/appgate-sdp { };
-
ardour = callPackage ../applications/audio/ardour { };
ardour_7 = callPackage ../applications/audio/ardour/7.nix { };
arelle = with python3Packages; toPythonApplication arelle;
- argo = callPackage ../applications/networking/cluster/argo { };
-
- argocd = callPackage ../applications/networking/cluster/argocd { };
-
- argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { };
-
- argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { };
-
- ario = callPackage ../applications/audio/ario { };
-
- arion = callPackage ../applications/virtualization/arion { };
-
- arkade = callPackage ../applications/networking/cluster/arkade { };
-
- artem = callPackage ../applications/graphics/artem { };
-
asuka = callPackage ../applications/networking/browsers/asuka {
inherit (darwin.apple_sdk.frameworks) Security;
};
- ascii-image-converter = callPackage ../applications/graphics/ascii-image-converter { };
-
- artha = callPackage ../applications/misc/artha { };
-
- atlassian-cli = callPackage ../applications/office/atlassian-cli { };
-
- asap = callPackage ../tools/audio/asap { };
-
- assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { };
-
astroid = callPackage ../applications/networking/mailreaders/astroid {
vim = vim-full.override { features = "normal"; };
protobuf = protobuf_21;
};
- aucatctl = callPackage ../applications/audio/aucatctl { };
-
audacious = qt6Packages.callPackage ../applications/audio/audacious { };
audacious-plugins = qt6Packages.callPackage ../applications/audio/audacious/plugins.nix {
# Avoid circular dependency
audacious = audacious.override { audacious-plugins = null; };
};
- audio-recorder = callPackage ../applications/audio/audio-recorder { };
-
- auto-multiple-choice = callPackage ../applications/misc/auto-multiple-choice { };
-
- autokey = callPackage ../applications/office/autokey { };
-
- autotalent = callPackage ../applications/audio/autotalent { };
-
- autotrace = callPackage ../applications/graphics/autotrace { };
-
av-98 = callPackage ../applications/networking/browsers/av-98 { };
- avizo = callPackage ../applications/misc/avizo { };
-
- avocode = callPackage ../applications/graphics/avocode { };
-
- ax25-apps = callPackage ../applications/radio/ax25-apps { };
-
- ax25-tools = callPackage ../applications/radio/ax25-tools { };
-
bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker {
stdenv = if stdenv.hostPlatform.isDarwin then
darwin.apple_sdk_11_0.stdenv
@@ -27896,14 +13568,6 @@ with pkgs;
stdenv;
};
- blocky = callPackage ../applications/networking/blocky { };
-
- brutefir = callPackage ../applications/audio/brutefir { };
-
- cheesecutter = callPackage ../applications/audio/cheesecutter { };
-
- cutecapture = callPackage ../applications/video/cutecapture { };
-
milkytracker = callPackage ../applications/audio/milkytracker {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio Foundation;
};
@@ -27916,14 +13580,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- jnetmap = callPackage ../applications/networking/jnetmap { };
-
- jxplorer = callPackage ../applications/networking/jxplorer {};
-
- joincap = callPackage ../tools/security/joincap { };
-
- json-plot = callPackage ../applications/graphics/json-plot { };
-
libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix {
boost = boost175; # fatal error: 'boost/interprocess/detail/posix_time_types_wrk.hpp' file not found
};
@@ -27940,14 +13596,10 @@ with pkgs;
boost = boost175;
};
- autopanosiftc = callPackage ../applications/graphics/autopanosiftc { };
-
ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { };
avidemux = libsForQt5.callPackage ../applications/video/avidemux { };
- avrdudess = callPackage ../applications/misc/avrdudess { };
-
awesome = callPackage ../applications/window-managers/awesome {
cairo = cairo.override { xcbSupport = true; };
inherit (texFunctions) fontsConf;
@@ -27955,32 +13607,14 @@ with pkgs;
awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { };
- badwolf = callPackage ../applications/networking/browsers/badwolf { };
-
backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { };
backintime-qt = qt6.callPackage ../applications/networking/sync/backintime/qt.nix { };
backintime = backintime-qt;
- balsa = callPackage ../applications/networking/mailreaders/balsa { };
-
- bandwidth = callPackage ../tools/misc/bandwidth { };
-
- banking = callPackage ../applications/office/banking { };
-
barrier = libsForQt5.callPackage ../applications/misc/barrier { };
- bashSnippets = callPackage ../applications/misc/bashSnippets { };
-
- batsignal = callPackage ../applications/misc/batsignal { };
-
- baudline = callPackage ../applications/audio/baudline { };
-
- bb = callPackage ../applications/misc/bb { };
-
- bchoppr = callPackage ../applications/audio/bchoppr { };
-
bespokesynth = darwin.apple_sdk_11_0.callPackage ../applications/audio/bespokesynth {
inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices CoreAudioKit IOBluetooth MetalKit;
};
@@ -27996,16 +13630,6 @@ with pkgs;
bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };
- bitlbee-discord = callPackage ../applications/networking/instant-messengers/bitlbee-discord { };
-
- bitlbee-facebook = callPackage ../applications/networking/instant-messengers/bitlbee-facebook { };
-
- bitlbee-steam = callPackage ../applications/networking/instant-messengers/bitlbee-steam { };
-
- bitlbee-mastodon = callPackage ../applications/networking/instant-messengers/bitlbee-mastodon { };
-
- bitmeter = callPackage ../applications/audio/bitmeter { };
-
bitscope = recurseIntoAttrs
(callPackage ../applications/science/electronics/bitscope/packages.nix { });
@@ -28019,18 +13643,10 @@ with pkgs;
bitwig-studio = bitwig-studio5;
- bgpdump = callPackage ../tools/networking/bgpdump { };
-
- bgpq3 = callPackage ../tools/networking/bgpq3 { };
-
- bgpq4 = callPackage ../tools/networking/bgpq4 { };
-
blackbox = callPackage ../applications/version-management/blackbox {
pinentry = pinentry-curses;
};
- bleachbit = callPackage ../applications/misc/bleachbit { };
-
blender = callPackage ../applications/misc/blender {
openexr = openexr_3;
python3Packages = python311Packages;
@@ -28039,12 +13655,6 @@ with pkgs;
blender-hip = blender.override { hipSupport = true; };
- blflash = callPackage ../tools/misc/blflash { };
-
- blogc = callPackage ../applications/misc/blogc { };
-
- bloodhound = callPackage ../applications/misc/bloodhound { };
-
blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix {
inherit (haskellPackages) ghcWithPackages;
};
@@ -28062,56 +13672,12 @@ with pkgs;
bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { };
- bluemail = callPackage ../applications/networking/mailreaders/bluemail { };
-
- blugon = callPackage ../applications/misc/blugon { };
-
- bombadillo = callPackage ../applications/networking/browsers/bombadillo { };
-
- bombono = callPackage ../applications/video/bombono { };
-
- bonzomatic = callPackage ../applications/editors/bonzomatic { };
-
- booster = callPackage ../applications/system/booster { };
-
bottles = callPackage ../applications/misc/bottles/fhsenv.nix { };
bottles-unwrapped = callPackage ../applications/misc/bottles { };
- buzztrax = callPackage ../applications/audio/buzztrax { };
-
- break-time = callPackage ../applications/misc/break-time { };
-
breezy = with python3Packages; toPythonApplication breezy;
- notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { };
-
- brig = callPackage ../applications/networking/brig { };
-
- bristol = callPackage ../applications/audio/bristol { };
-
- brlcad = callPackage ../applications/graphics/brlcad { };
-
- bjumblr = callPackage ../applications/audio/bjumblr { };
-
- bschaffl = callPackage ../applications/audio/bschaffl { };
-
- bsequencer = callPackage ../applications/audio/bsequencer { };
-
- bslizr = callPackage ../applications/audio/bslizr { };
-
- bshapr = callPackage ../applications/audio/bshapr { };
-
- bspwm = callPackage ../applications/window-managers/bspwm { };
-
- bvi = callPackage ../applications/editors/bvi { };
-
- bviplus = callPackage ../applications/editors/bviplus { };
-
- caerbannog = callPackage ../applications/misc/caerbannog { };
-
- cardo = callPackage ../data/fonts/cardo { };
-
cage = callPackage ../applications/window-managers/cage {
wlroots = wlroots_0_18;
};
@@ -28122,10 +13688,6 @@ with pkgs;
calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { };
- calcurse = callPackage ../applications/misc/calcurse { };
-
- calculix = callPackage ../applications/science/math/calculix { };
-
calibre = callPackage ../by-name/ca/calibre/package.nix {
podofo = podofo010;
};
@@ -28141,36 +13703,10 @@ with pkgs;
calicoctl
confd-calico;
- perkeep = callPackage ../applications/misc/perkeep { };
-
- canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };
-
- canto-daemon = callPackage ../applications/networking/feedreaders/canto-daemon { };
-
- caprine-bin = callPackage ../applications/networking/instant-messengers/caprine-bin { };
-
- carddav-util = callPackage ../tools/networking/carddav-util { };
-
- cardinal = callPackage ../applications/audio/cardinal { };
-
carla = libsForQt5.callPackage ../applications/audio/carla { };
- castor = callPackage ../applications/networking/browsers/castor { };
-
- catfs = callPackage ../os-specific/linux/catfs { };
-
- catgirl = callPackage ../applications/networking/irc/catgirl { };
-
- catimg = callPackage ../tools/misc/catimg { };
-
- catt = callPackage ../applications/video/catt { };
-
cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
- cbatticon = callPackage ../applications/misc/cbatticon { };
-
- cbc = callPackage ../applications/science/math/cbc { };
-
cbconvert-gui = cbconvert.gui;
cddiscid = callPackage ../applications/audio/cd-discid {
@@ -28184,30 +13720,14 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon;
};
- celeste = callPackage ../applications/networking/sync/celeste { };
-
- cyan = callPackage ../applications/graphics/cyan { };
-
- centerim = callPackage ../applications/networking/instant-messengers/centerim { };
-
- chatty = callPackage ../applications/networking/instant-messengers/chatty { };
-
- browsh = callPackage ../applications/networking/browsers/browsh { };
-
brotab = callPackage ../tools/misc/brotab {
python = python3;
};
- bookworm = callPackage ../applications/office/bookworm { };
-
- boops = callPackage ../applications/audio/boops { };
-
bumblebee-status = callPackage ../applications/window-managers/i3/bumblebee-status {
python = python3;
};
- cgif = callPackage ../tools/graphics/cgif { };
-
chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});
chuck = callPackage ../applications/audio/chuck {
@@ -28215,14 +13735,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport;
};
- cinelerra = callPackage ../applications/video/cinelerra { };
-
- cipher = callPackage ../applications/misc/cipher { };
-
- clapper = callPackage ../applications/video/clapper { };
-
- claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { };
-
cligh = python3Packages.callPackage ../development/tools/github/cligh { };
clight = callPackage ../applications/misc/clight { };
@@ -28233,144 +13745,57 @@ with pkgs;
clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { };
- clipmenu = callPackage ../applications/misc/clipmenu { };
-
- clipit = callPackage ../applications/misc/clipit { };
-
- clipqr = callPackage ../applications/misc/clipqr { };
-
- cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { };
-
- clp = callPackage ../applications/science/math/clp { };
-
- pokemon-colorscripts-mac = callPackage ../applications/misc/pokemon-colorscripts-mac { };
-
- cmctl = callPackage ../applications/networking/cluster/cmctl { };
-
cmus = callPackage ../applications/audio/cmus {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio VideoToolbox;
libjack = libjack2;
};
- cmusfm = callPackage ../applications/audio/cmusfm { };
-
cni = callPackage ../applications/networking/cluster/cni { };
cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix { };
- dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni { };
-
- multus-cni = callPackage ../applications/networking/cluster/multus-cni { };
-
- cntr = callPackage ../applications/virtualization/cntr { };
-
communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
- complete-alias = callPackage ../tools/misc/complete-alias { };
-
- completely = callPackage ../tools/misc/completely { };
-
confclerk = libsForQt5.callPackage ../applications/misc/confclerk { };
copyq = qt6Packages.callPackage ../applications/misc/copyq { };
- coreth = callPackage ../applications/networking/coreth { };
-
cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { };
- csa = callPackage ../applications/audio/csa { };
-
csound = callPackage ../applications/audio/csound {
inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AudioUnit CoreAudio CoreMIDI;
};
- csound-manual = callPackage ../applications/audio/csound/csound-manual { };
-
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };
- codeblocks = callPackage ../applications/editors/codeblocks { };
codeblocksFull = codeblocks.override { contribPlugins = true; };
cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; };
cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; };
cudatext = cudatext-qt;
- convos = callPackage ../applications/networking/irc/convos { };
-
comical = callPackage ../applications/graphics/comical {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- containerd = callPackage ../applications/virtualization/containerd { };
-
- container2wasm = callPackage ../development/tools/container2wasm { };
-
- convchain = callPackage ../tools/graphics/convchain { };
-
- cordless = callPackage ../applications/networking/instant-messengers/cordless { };
-
- coursera-dl = callPackage ../applications/misc/coursera-dl { };
-
- cozy-drive = callPackage ../applications/networking/cozy-drive { };
-
- cplay-ng = callPackage ../applications/audio/cplay-ng { };
-
cqrlog = callPackage ../applications/radio/cqrlog {
hamlib = hamlib_4;
};
- crun = callPackage ../applications/virtualization/crun { };
-
- csdp = callPackage ../applications/science/math/csdp { };
-
- csv2svg = callPackage ../tools/graphics/csv2svg { };
-
- ctop = callPackage ../tools/system/ctop { };
-
cubicsdr = callPackage ../applications/radio/cubicsdr {
inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;
};
- cum = callPackage ../applications/misc/cum { };
-
- cuneiform = callPackage ../tools/graphics/cuneiform { };
-
- curseradio = callPackage ../applications/audio/curseradio { };
-
- curtail = callPackage ../applications/graphics/curtail { };
-
cutecom = libsForQt5.callPackage ../tools/misc/cutecom { };
- cvs = callPackage ../applications/version-management/cvs { };
-
- cvsps = callPackage ../applications/version-management/cvsps { };
-
- cvsq = callPackage ../applications/version-management/cvsq { };
-
- cvs2svn = callPackage ../applications/version-management/cvs2svn { };
-
- cwm = callPackage ../applications/window-managers/cwm { };
-
- cyber = callPackage ../development/interpreters/cyber { };
-
- cyberduck = callPackage ../applications/networking/cyberduck { };
-
- cyclone = callPackage ../applications/audio/pd-plugins/cyclone { };
-
- daktilo = callPackage ../tools/misc/daktilo { };
-
darcs = haskell.lib.compose.disableCabalFlag "library"
(haskell.lib.compose.justStaticExecutables haskellPackages.darcs);
- darkman = callPackage ../applications/misc/darkman { };
-
darktable = callPackage ../by-name/da/darktable/package.nix {
lua = lua5_4;
pugixml = pugixml.override { shared = true; };
stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK llvmPackages_18.stdenv { darwinMinVersion = "10.14"; darwinSdkVersion = "11.0"; } else stdenv;
};
- das_watchdog = callPackage ../tools/system/das_watchdog { };
-
datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix {
pythonPackages = datadog-integrations-core { };
};
@@ -28380,10 +13805,6 @@ with pkgs;
extraIntegrations = extras;
};
- dayon = callPackage ../applications/networking/remote/dayon { };
-
- ddgr = callPackage ../applications/misc/ddgr { };
-
deadbeef = callPackage ../applications/audio/deadbeef { };
deadbeefPlugins = {
@@ -28407,26 +13828,10 @@ with pkgs;
dfilemanager = libsForQt5.callPackage ../applications/file-managers/dfilemanager { };
- dht = callPackage ../applications/networking/p2p/dht { };
-
- dia = callPackage ../applications/graphics/dia { };
-
- diebahn = callPackage ../applications/misc/diebahn { };
-
- digital = callPackage ../applications/science/electronics/digital { };
-
direwolf = callPackage ../applications/radio/direwolf {
hamlib = hamlib_4;
};
- dirt = callPackage ../applications/audio/dirt { };
-
- dit = callPackage ../applications/editors/dit { };
-
- djvulibre = callPackage ../applications/misc/djvulibre { };
-
- djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };
-
djview = libsForQt5.callPackage ../applications/graphics/djview { };
djview4 = djview;
@@ -28439,16 +13844,10 @@ with pkgs;
inherit (python3Packages) buildPythonApplication requests;
};
- dmrconfig = callPackage ../applications/radio/dmrconfig { };
-
dmtx-utils = callPackage ../tools/graphics/dmtx-utils {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- dnd-tools = callPackage ../applications/misc/dnd-tools { };
-
- dnglab = callPackage ../tools/graphics/dnglab { };
-
inherit (callPackage ../applications/virtualization/docker {})
docker_24 docker_25 docker_26 docker_27;
@@ -28459,35 +13858,11 @@ with pkgs;
docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { };
docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { };
- dockfmt = callPackage ../development/tools/dockfmt { };
-
- afterburn = callPackage ../tools/admin/afterburn { };
-
docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { };
docker-compose = callPackage ../applications/virtualization/docker/compose.nix { };
docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { };
- amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { };
-
- dk = callPackage ../applications/window-managers/dk { };
-
- docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { };
-
- dockstarter = callPackage ../tools/virtualization/dockstarter { };
-
- doodle = callPackage ../applications/search/doodle { };
-
- dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { };
-
- dracut = callPackage ../os-specific/linux/dracut { };
-
- dragonflydb = callPackage ../servers/nosql/dragonflydb { };
-
- dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { };
-
- drawing = callPackage ../applications/graphics/drawing { };
-
drawio = callPackage ../applications/graphics/drawio {
inherit (darwin) autoSignDarwinBinariesHook;
};
@@ -28504,33 +13879,15 @@ with pkgs;
droopy = python3Packages.callPackage ../applications/networking/droopy { };
- drumgizmo = callPackage ../applications/audio/drumgizmo { };
-
- dsf2flac = callPackage ../applications/audio/dsf2flac { };
-
dust = callPackage ../by-name/du/dust/package.nix {
inherit (darwin.apple_sdk_11_0.frameworks) AppKit;
};
- dutree = callPackage ../tools/misc/dutree { };
-
- devede = callPackage ../applications/video/devede { };
-
- denemo = callPackage ../applications/audio/denemo { };
-
dexed = darwin.apple_sdk_11_0.callPackage ../applications/audio/dexed {
inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit MetalKit DiscRecording CoreAudioKit;
inherit (darwin.apple_sdk_11_0.libs) simd;
};
- dvdauthor = callPackage ../applications/video/dvdauthor { };
-
- dvdbackup = callPackage ../applications/video/dvdbackup { };
-
- dvd-slideshow = callPackage ../applications/video/dvd-slideshow { };
-
- dyff = callPackage ../development/tools/dyff { };
-
dwl = callPackage ../by-name/dw/dwl/package.nix {
wlroots = wlroots_0_18;
};
@@ -28541,40 +13898,18 @@ with pkgs;
patches = config.dwm.patches or [];
};
- dwmblocks = callPackage ../applications/misc/dwmblocks { };
-
- dwmbar = callPackage ../applications/misc/dwmbar { };
-
dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { };
- emoji-picker = callPackage ../applications/misc/emoji-picker { };
-
- exploitdb = callPackage ../tools/security/exploitdb { };
-
evilwm = callPackage ../applications/window-managers/evilwm {
patches = config.evilwm.patches or [];
};
- dzen2 = callPackage ../applications/window-managers/dzen2 { };
-
- e16 = callPackage ../applications/window-managers/e16 { };
-
- eaglemode = callPackage ../applications/misc/eaglemode { };
-
- ebumeter = callPackage ../applications/audio/ebumeter { };
-
- echoip = callPackage ../servers/echoip { };
-
eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });
ecpdap = callPackage ../development/embedded/fpga/ecpdap {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
-
- oed = callPackage ../applications/editors/oed { };
-
electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
electrum = libsForQt5.callPackage ../applications/misc/electrum { };
@@ -28585,8 +13920,6 @@ with pkgs;
elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { };
- elfx86exts = callPackage ../applications/misc/elfx86exts { };
-
elinks = callPackage ../applications/networking/browsers/elinks {
autoreconfHook = buildPackages.autoreconfHook269;
};
@@ -28625,32 +13958,10 @@ with pkgs;
# If you turn this into "real" alias again, please add it to pkgs/top-level/packages-config.nix again too
emacsPackages = emacs.pkgs // { __recurseIntoDerivationForReleaseJobs = true; };
- emptty = callPackage ../applications/display-managers/emptty { };
-
- endeavour = callPackage ../applications/office/endeavour { };
-
- enhanced-ctorrent = callPackage ../applications/networking/p2p/enhanced-ctorrent { };
-
- eolie = callPackage ../applications/networking/browsers/eolie { };
-
- eos-installer = callPackage ../applications/misc/eos-installer { };
-
- epeg = callPackage ../applications/graphics/epeg { };
-
- epgstation = callPackage ../applications/video/epgstation { };
-
- ephemeral = callPackage ../applications/networking/browsers/ephemeral { };
-
epick = callPackage ../applications/graphics/epick {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- epr = callPackage ../applications/misc/epr { };
-
- eq10q = callPackage ../applications/audio/eq10q { };
-
- errbot = callPackage ../applications/networking/errbot { };
-
espeak-classic = callPackage ../applications/audio/espeak { };
espeak-ng = callPackage ../applications/audio/espeak-ng {
@@ -28660,38 +13971,12 @@ with pkgs;
espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
- espeakup = callPackage ../applications/accessibility/espeakup { };
-
espflash = callPackage ../by-name/es/espflash/package.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
};
- etebase-server = callPackage ../servers/etebase {};
-
- etesync-dav = callPackage ../applications/misc/etesync-dav { };
-
- etherape = callPackage ../applications/networking/sniffers/etherape { };
-
evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { };
- exaile = callPackage ../applications/audio/exaile { };
-
- exercism = callPackage ../applications/misc/exercism { };
-
- expenses = callPackage ../applications/misc/expenses { };
-
- furtherance = callPackage ../applications/misc/furtherance { };
-
- gigalixir = callPackage ../tools/misc/gigalixir { };
-
- go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { };
-
- go-motion = callPackage ../development/tools/go-motion { };
-
- go-musicfox = callPackage ../applications/audio/go-musicfox { };
-
- gpg-mdp = callPackage ../applications/misc/gpg-mdp { };
-
greenfoot = callPackage ../applications/editors/greenfoot {
openjdk = openjdk17.override {
enableJavaFX = true;
@@ -28699,16 +13984,10 @@ with pkgs;
};
};
- gspeech = callPackage ../applications/audio/gspeech { };
-
haruna = kdePackages.callPackage ../applications/video/haruna { };
hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { };
- helix = callPackage ../applications/editors/helix { };
-
- icesl = callPackage ../applications/misc/icesl { };
-
input-leap = qt6Packages.callPackage ../applications/misc/input-leap {
avahi = avahi.override { withLibdnssdCompat = true; };
};
@@ -28718,62 +13997,18 @@ with pkgs;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
- keepass-diff = callPackage ../applications/misc/keepass-diff { };
-
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 ]; };
- keepass-charactercopy = callPackage ../applications/misc/keepass-plugins/charactercopy { };
-
- keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { };
-
- keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { };
-
- keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { };
-
- keepass-keetraytotp = callPackage ../applications/misc/keepass-plugins/keetraytotp { };
-
- keepass-otpkeyprov = callPackage ../applications/misc/keepass-plugins/otpkeyprov { };
-
- keepass-qrcodeview = callPackage ../applications/misc/keepass-plugins/qrcodeview { };
-
- kerbrute = callPackage ../tools/security/kerbrute { };
-
- kvmtool = callPackage ../applications/virtualization/kvmtool { };
-
- exrtools = callPackage ../applications/graphics/exrtools { };
-
- f1viewer = callPackage ../applications/video/f1viewer { };
-
- falcoctl = callPackage ../applications/networking/cluster/falcoctl { };
-
- faircamp = callPackage ../applications/misc/faircamp { };
-
famistudio = darwin.apple_sdk_11_0.callPackage ../applications/audio/famistudio { };
- fasttext = callPackage ../applications/science/machine-learning/fasttext { };
-
- fbmenugen = callPackage ../applications/misc/fbmenugen { };
-
- fbpanel = callPackage ../applications/window-managers/fbpanel { };
-
fdr = libsForQt5.callPackage ../applications/science/programming/fdr { };
- feedbackd = callPackage ../applications/misc/feedbackd { };
-
- fehlstart = callPackage ../applications/misc/fehlstart { };
-
fetchmail = callPackage ../applications/misc/fetchmail { };
fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };
- ff2mpv = callPackage ../applications/misc/ff2mpv { };
-
- fff = callPackage ../applications/misc/fff { };
-
- fig2dev = callPackage ../applications/graphics/fig2dev { };
-
finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -28782,64 +14017,30 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- firewalld = callPackage ../applications/networking/firewalld { };
-
firewalld-gui = firewalld.override { withGui = true; };
flacon = libsForQt5.callPackage ../applications/audio/flacon { };
- flamp = callPackage ../applications/radio/flamp { };
-
fldigi = callPackage ../applications/radio/fldigi {
hamlib = hamlib_4;
};
- flink = callPackage ../applications/networking/cluster/flink { };
-
- fllog = callPackage ../applications/radio/fllog { };
-
- flmsg = callPackage ../applications/radio/flmsg { };
-
- flrig = callPackage ../applications/radio/flrig { };
-
- fluxus = callPackage ../applications/graphics/fluxus { };
-
- flwrap = callPackage ../applications/radio/flwrap { };
-
fluidsynth = callPackage ../applications/audio/fluidsynth {
inherit (darwin.apple_sdk.frameworks) AppKit AudioUnit CoreAudio CoreMIDI CoreServices;
};
fmit = libsForQt5.callPackage ../applications/audio/fmit { };
- fmsynth = callPackage ../applications/audio/fmsynth { };
-
fnc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/fnc { };
- focus = callPackage ../tools/X11/focus { };
-
- focus-stack = callPackage ../applications/graphics/focus-stack { };
-
focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { };
- foliate = callPackage ../applications/office/foliate { };
-
- fontfinder = callPackage ../applications/misc/fontfinder { };
-
- fontpreview = callPackage ../applications/misc/fontpreview { };
-
fossil = callPackage ../applications/version-management/fossil {
sqlite = sqlite.override { enableDeserialize = true; };
};
- freebayes = callPackage ../applications/science/biology/freebayes { };
-
- freewheeling = callPackage ../applications/audio/freewheeling { };
-
fritzing = qt6Packages.callPackage ../applications/science/electronics/fritzing { };
- fsv = callPackage ../applications/misc/fsv { };
-
ft2-clone = callPackage ../applications/audio/ft2-clone {
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa;
};
@@ -28860,29 +14061,9 @@ with pkgs;
gazelle-origin = python3Packages.callPackage ../tools/misc/gazelle-origin { };
- gcal = callPackage ../applications/misc/gcal { };
-
- gcstar = callPackage ../applications/misc/gcstar { };
-
geany = callPackage ../applications/editors/geany { };
geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { };
- geek-life = callPackage ../applications/misc/geek-life { };
-
- genact = callPackage ../applications/misc/genact { };
-
- genxword = callPackage ../applications/misc/genxword { };
-
- geoipupdate = callPackage ../applications/misc/geoipupdate { };
-
- glicol-cli = callPackage ../applications/audio/glicol-cli { };
-
- globe-cli = callPackage ../applications/misc/globe-cli { };
-
- gnmic = callPackage ../applications/networking/gnmic { };
-
- gnss-sdr = callPackage ../applications/radio/gnss-sdr { };
-
gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {
unwrapped = callPackage ../applications/radio/gnuradio {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
@@ -28967,24 +14148,12 @@ with pkgs;
goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { };
- gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
-
inherit (ocamlPackages) google-drive-ocamlfuse;
googler = callPackage ../applications/misc/googler {
python = python3;
};
- gopher = callPackage ../applications/networking/gopher/gopher { };
-
- gophernotes = callPackage ../applications/editors/gophernotes { };
-
- goxel = callPackage ../applications/graphics/goxel { };
-
- gpa = callPackage ../applications/misc/gpa { };
-
- gpx = callPackage ../applications/misc/gpx { };
-
gqrx = qt6Packages.callPackage ../applications/radio/gqrx { };
gqrx-portaudio = qt6Packages.callPackage ../applications/radio/gqrx {
portaudioSupport = true;
@@ -28995,20 +14164,6 @@ with pkgs;
pulseaudioSupport = false;
};
- gpx-viewer = callPackage ../applications/misc/gpx-viewer { };
-
- grepcidr = callPackage ../applications/search/grepcidr { };
-
- grepm = callPackage ../applications/search/grepm { };
-
- grip-search = callPackage ../tools/text/grip-search { };
-
- grip = callPackage ../applications/misc/grip { };
-
- gsimplecal = callPackage ../applications/misc/gsimplecal { };
-
- gthumb = callPackage ../applications/graphics/gthumb { };
-
guitarix = callPackage ../applications/audio/guitarix {
fftw = fftwSinglePrec;
};
@@ -29017,20 +14172,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- gjay = callPackage ../applications/audio/gjay { };
-
- stratovirt = callPackage ../applications/virtualization/stratovirt { };
-
- rhythmbox = callPackage ../applications/audio/rhythmbox { };
-
puddletag = libsForQt5.callPackage ../applications/audio/puddletag { };
- w_scan = callPackage ../applications/video/w_scan { };
-
- w_scan2 = callPackage ../applications/video/w_scan2 { };
-
- wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { };
-
welle-io = qt6Packages.callPackage ../applications/radio/welle-io { };
wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
@@ -29047,24 +14190,14 @@ with pkgs;
libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; };
};
- sngrep = callPackage ../applications/networking/sniffers/sngrep { };
-
- termshark = callPackage ../tools/networking/termshark { };
-
- fbida = callPackage ../applications/graphics/fbida { };
-
fclones = callPackage ../tools/misc/fclones { };
fclones-gui = darwin.apple_sdk_11_0.callPackage ../tools/misc/fclones/gui.nix { };
- fdupes = callPackage ../tools/misc/fdupes { };
-
feh = callPackage ../applications/graphics/feh {
imlib2 = imlib2Full;
};
- feishu = callPackage ../applications/networking/instant-messengers/feishu { };
-
filezilla = darwin.apple_sdk_11_0.callPackage ../applications/networking/ftp/filezilla {
inherit (darwin.apple_sdk_11_0.frameworks) CoreServices Security;
};
@@ -29147,22 +14280,10 @@ with pkgs;
firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { };
- flac = callPackage ../applications/audio/flac { };
-
- redoflacs = callPackage ../applications/audio/redoflacs { };
-
- flex-ncat = callPackage ../applications/radio/flex-ncat { };
-
- flex-ndax = callPackage ../applications/radio/flex-ndax { };
-
floorp-unwrapped = callPackage ../applications/networking/browsers/floorp { };
floorp = wrapFirefox floorp-unwrapped { };
- fomp = callPackage ../applications/audio/fomp { };
-
- formatter = callPackage ../applications/misc/formatter { };
-
formiko = with python3Packages; callPackage ../applications/editors/formiko {
inherit buildPythonApplication;
};
@@ -29171,10 +14292,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL;
};
- foxtrotgps = callPackage ../applications/misc/foxtrotgps { };
-
- fractal = callPackage ../applications/networking/instant-messengers/fractal { };
-
freedv = callPackage ../applications/radio/freedv {
inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia;
codec2 = codec2.override {
@@ -29189,15 +14306,10 @@ with pkgs;
freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };
- freepv = callPackage ../applications/graphics/freepv { };
-
- xfontsel = callPackage ../applications/misc/xfontsel { };
inherit (xorg) xlsfonts;
xrdp = callPackage ../applications/networking/remote/xrdp { };
- pulseaudio-module-xrdp = callPackage ../applications/networking/remote/xrdp/pulseaudio-module-xrdp { };
-
inherit
({
freerdp = callPackage ../applications/networking/remote/freerdp {
@@ -29215,20 +14327,6 @@ with pkgs;
freerdpUnstable = freerdp;
- g933-utils = callPackage ../tools/misc/g933-utils { };
-
- gavrasm = callPackage ../development/compilers/gavrasm { };
-
- gcalcli = callPackage ../applications/misc/gcalcli { };
-
- vcal = callPackage ../applications/misc/vcal { };
-
- gcolor3 = callPackage ../applications/graphics/gcolor3 { };
-
- get_iplayer = callPackage ../applications/misc/get_iplayer { };
-
- getxbook = callPackage ../applications/misc/getxbook { };
-
gimp = callPackage ../applications/graphics/gimp {
autoreconfHook = buildPackages.autoreconfHook269;
lcms = lcms2;
@@ -29245,17 +14343,8 @@ with pkgs;
gtk = gtk3;
};
- gitolite = callPackage ../applications/version-management/gitolite { };
-
- goffice = callPackage ../development/libraries/goffice { };
-
- gtkterm = callPackage ../tools/misc/gtkterm { };
-
gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; };
- gum = callPackage ../applications/misc/gum { };
- pop = callPackage ../applications/misc/pop { };
-
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
inherit miniupnpc swftools;
inherit (qt6) wrapQtAppsHook qtbase qtcharts;
@@ -29282,28 +14371,18 @@ with pkgs;
};
});
- jmusicbot = callPackage ../applications/audio/jmusicbot { };
-
- junction = callPackage ../applications/misc/junction { };
-
- lemonade = callPackage ../applications/misc/lemonade { };
-
librespot = callPackage ../applications/audio/librespot {
withALSA = stdenv.hostPlatform.isLinux;
withPulseAudio = config.pulseaudio or stdenv.hostPlatform.isLinux;
withPortAudio = stdenv.hostPlatform.isDarwin;
};
- limesctl = callPackage ../applications/misc/limesctl { };
-
linssid = libsForQt5.callPackage ../applications/networking/linssid { };
linvstmanager = qt5.callPackage ../applications/audio/linvstmanager { };
deadd-notification-center = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../applications/misc/deadd-notification-center { });
- losslessaudiochecker = callPackage ../applications/audio/losslessaudiochecker { };
-
m32edit = callPackage ../applications/audio/midas/m32edit.nix { };
manim = python3Packages.toPythonApplication python3Packages.manim;
@@ -29322,56 +14401,22 @@ with pkgs;
mindforger = libsForQt5.callPackage ../applications/editors/mindforger { };
- mi2ly = callPackage ../applications/audio/mi2ly { };
-
molsketch = libsForQt5.callPackage ../applications/editors/molsketch { };
- multiviewer-for-f1 = callPackage ../applications/video/multiviewer-for-f1 { };
-
- muzika = callPackage ../applications/audio/muzika { };
-
openutau = callPackage ../applications/audio/openutau { };
pattypan = callPackage ../applications/misc/pattypan {
jdk = jdk.override { enableJavaFX = true; };
};
- praat = callPackage ../applications/audio/praat { };
-
- rhvoice = callPackage ../applications/audio/rhvoice { };
-
- svox = callPackage ../applications/audio/svox { };
-
- genesys = callPackage ../applications/misc/genesys { };
-
- giada = callPackage ../applications/audio/giada { };
-
- giara = callPackage ../applications/networking/giara { };
-
- gitit = callPackage ../applications/misc/gitit { };
-
gkrellm = callPackage ../applications/misc/gkrellm {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- glow = callPackage ../applications/editors/glow { };
-
- glowing-bear = callPackage ../applications/networking/irc/glowing-bear { };
-
- gmu = callPackage ../applications/audio/gmu { };
-
- gnaural = callPackage ../applications/audio/gnaural { };
-
- gnumeric = callPackage ../applications/office/gnumeric { };
-
gnunet = callPackage ../applications/networking/p2p/gnunet { };
gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { };
- gocr = callPackage ../applications/graphics/gocr { };
-
- gobby = callPackage ../applications/editors/gobby { };
-
gphoto2 = callPackage ../applications/misc/gphoto2 { };
gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { };
@@ -29385,40 +14430,16 @@ with pkgs;
grisbi = callPackage ../applications/office/grisbi { gtk = gtk3; };
- gscreenshot = callPackage ../applications/graphics/gscreenshot { };
-
- guacamole-client = callPackage ../servers/guacamole-client { };
-
- guacamole-server = callPackage ../servers/guacamole-server { };
-
q4wine = libsForQt5.callPackage ../applications/misc/q4wine { };
qrencode = callPackage ../development/libraries/qrencode {
inherit (darwin) libobjc;
};
- geeqie = callPackage ../applications/graphics/geeqie { };
-
- gigedit = callPackage ../applications/audio/gigedit { };
-
- gnomecast = callPackage ../applications/video/gnomecast { };
-
- gnome-recipes = callPackage ../applications/misc/gnome-recipes { };
-
gollum = callPackage ../applications/misc/gollum { };
- gonic = callPackage ../servers/gonic { };
-
- goodvibes = callPackage ../applications/audio/goodvibes { };
-
googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
- go-graft = callPackage ../applications/networking/go-graft { };
-
- gostatic = callPackage ../applications/misc/gostatic { };
-
- gossa = callPackage ../applications/networking/gossa { };
-
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
gpsbabel-gui = gpsbabel.override {
@@ -29426,8 +14447,6 @@ with pkgs;
withDoc = true;
};
- gpsd = callPackage ../servers/gpsd { };
-
gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { };
gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { };
@@ -29440,10 +14459,6 @@ with pkgs;
gpxsee = gpxsee-qt5;
- gspell = callPackage ../development/libraries/gspell { };
-
- gst123 = callPackage ../applications/audio/gst123 { };
-
gtklock = callPackage ../tools/wayland/gtklock { };
gtklock-playerctl-module = callPackage ../tools/wayland/gtklock/playerctl-module.nix { };
@@ -29452,72 +14467,19 @@ with pkgs;
gtklock-userinfo-module = callPackage ../tools/wayland/gtklock/userinfo-module.nix { };
- gv = callPackage ../applications/misc/gv { };
-
guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { };
- gwc = callPackage ../applications/audio/gwc { };
-
- gxmessage = callPackage ../applications/misc/gxmessage { };
-
- gxmatcheq-lv2 = callPackage ../applications/audio/gxmatcheq-lv2 { };
-
- gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { };
-
hachoir = with python3Packages; toPythonApplication hachoir;
- hackrf = callPackage ../applications/radio/hackrf { };
-
- hacksaw = callPackage ../tools/misc/hacksaw { };
-
- hakuneko = callPackage ../tools/misc/hakuneko { };
-
- halp = callPackage ../tools/misc/halp { };
-
- manga-cli = callPackage ../tools/misc/manga-cli { };
-
- hamster = callPackage ../applications/misc/hamster { };
-
- hacpack = callPackage ../tools/compression/hacpack { };
-
- hashit = callPackage ../tools/misc/hashit { };
-
- hactool = callPackage ../tools/compression/hactool { };
-
- hdhomerun-config-gui = callPackage ../applications/video/hdhomerun-config-gui { };
-
- headlines = callPackage ../applications/networking/headlines { };
-
- hedgedoc-cli = callPackage ../tools/admin/hedgedoc-cli { };
-
heimer = libsForQt5.callPackage ../applications/misc/heimer { };
- hello-wayland = callPackage ../applications/graphics/hello-wayland { };
-
- hello-unfree = callPackage ../applications/misc/hello-unfree { };
-
- helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
-
- herbe = callPackage ../applications/misc/herbe { };
-
- herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
-
- hex-a-hop = callPackage ../games/hex-a-hop { };
-
- hexcurse = callPackage ../applications/editors/hexcurse { };
-
- hexdino = callPackage ../applications/editors/hexdino { };
-
hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { };
hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix {
conf = config.hydrogen-web.conf or { };
};
- hivelytracker = callPackage ../applications/audio/hivelytracker { };
-
hledger = haskell.lib.compose.justStaticExecutables haskellPackages.hledger;
- hledger-check-fancyassertions = callPackage ../applications/office/hledger-check-fancyassertions { };
hledger-iadd = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-iadd;
hledger-interest = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-interest;
hledger-ui = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-ui;
@@ -29527,8 +14489,6 @@ with pkgs;
haskellPackages.hledger-web;
hledger-utils = with python3.pkgs; toPythonApplication hledger-utils;
- hmm = callPackage ../applications/misc/hmm { };
-
hollywood = callPackage ../applications/misc/hollywood {
inherit (python3Packages) pygments;
};
@@ -29537,76 +14497,30 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- hover = callPackage ../development/tools/hover { };
-
hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { };
- howl = callPackage ../applications/editors/howl { };
-
- hdl-dump = callPackage ../tools/misc/hdl-dump { };
-
hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack;
- hpl = callPackage ../tools/misc/hpl { };
-
hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { };
- ht = callPackage ../applications/editors/ht { };
-
- xh = callPackage ../tools/networking/xh { };
-
- hubstaff = callPackage ../applications/misc/hubstaff { };
-
hue-cli = callPackage ../tools/networking/hue-cli { };
- hueadm = callPackage ../tools/misc/hueadm { };
-
hugin = callPackage ../applications/graphics/hugin {
wxGTK = wxGTK32;
};
huggle = libsForQt5.callPackage ../applications/misc/huggle { };
- ghosttohugo = callPackage ../applications/misc/ghosttohugo {};
-
- gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { };
-
- go-org = callPackage ../applications/misc/go-org { };
-
hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { };
- husky = callPackage ../development/tools/misc/husky { };
-
hydrogen = qt5.callPackage ../applications/audio/hydrogen { };
- hydroxide = callPackage ../applications/networking/hydroxide { };
-
hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { };
- hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { };
-
- hypnotix = callPackage ../applications/video/hypnotix { };
-
jackline = callPackage ../applications/networking/instant-messengers/jackline {
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
- jay = callPackage ../applications/window-managers/jay { };
-
- keyleds = callPackage ../applications/misc/keyleds { };
-
- keylight-controller-mschneider82 = callPackage ../applications/misc/keylight-controller-mschneider82 { };
-
- leftwm = callPackage ../applications/window-managers/leftwm { };
-
- levant = callPackage ../applications/networking/cluster/levant { };
-
- marker = callPackage ../applications/editors/marker { };
-
- matcha-rss-digest = callPackage ../applications/misc/matcha-rss-digest { };
-
- meek = callPackage ../tools/networking/meek { };
-
meerk40t = callPackage ../applications/misc/meerk40t { };
meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { };
@@ -29619,42 +14533,18 @@ with pkgs;
noson = libsForQt5.callPackage ../applications/audio/noson { };
- owl-compositor = callPackage ../applications/window-managers/owl { };
-
- p2pool = callPackage ../applications/misc/p2pool { };
-
pass2csv = python3Packages.callPackage ../tools/security/pass2csv { };
- pass-secret-service = callPackage ../applications/misc/pass-secret-service { };
-
- passky-desktop = callPackage ../applications/misc/passky-desktop { };
-
pinboard = with python3Packages; toPythonApplication pinboard;
pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup;
pixel2svg = python310Packages.callPackage ../tools/graphics/pixel2svg { };
- pixelfed = callPackage ../servers/web-apps/pixelfed { };
-
- pixelnuke = callPackage ../applications/graphics/pixelnuke { };
-
- pixeluvo = callPackage ../applications/graphics/pixeluvo { };
-
pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { };
- planner = callPackage ../applications/office/planner { };
-
- please-cli = callPackage ../applications/misc/please-cli { };
-
protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { };
- pokeget-rs = callPackage ../tools/misc/pokeget-rs { };
-
- popura = callPackage ../tools/networking/popura { };
-
- pureref = callPackage ../applications/graphics/pureref { };
-
inherit (callPackage ../applications/virtualization/singularity/packages.nix { })
apptainer
singularity
@@ -29662,54 +14552,16 @@ with pkgs;
singularity-overriden-nixos
;
- skate = callPackage ../applications/misc/skate { };
-
slack = callPackage ../applications/networking/instant-messengers/slack { };
- slack-cli = callPackage ../tools/networking/slack-cli { };
-
- slack-term = callPackage ../applications/networking/instant-messengers/slack-term { };
-
- sleep-on-lan = callPackage ../tools/networking/sleep-on-lan { };
-
- sonixd = callPackage ../applications/audio/sonixd { };
-
- sonobus = callPackage ../applications/audio/sonobus { };
-
sosreport = python3Packages.callPackage ../applications/logging/sosreport { };
- spectmorph = callPackage ../applications/audio/spectmorph { };
-
- smooth = callPackage ../development/libraries/smooth { };
-
- spectrwm = callPackage ../applications/window-managers/spectrwm { };
-
- spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { };
-
- srain = callPackage ../applications/networking/irc/srain { };
-
- super-productivity = callPackage ../applications/office/super-productivity { };
-
inherit (callPackages ../development/libraries/wlroots {})
wlroots_0_17
wlroots_0_18;
sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
- swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { };
-
- swaynag-battery = callPackage ../applications/misc/swaynag-battery { };
-
- tiramisu = callPackage ../applications/misc/tiramisu { };
-
- rlaunch = callPackage ../applications/misc/rlaunch { };
-
- remontoire = callPackage ../applications/misc/remontoire { };
-
- wayshot = callPackage ../tools/misc/wayshot { };
-
- waylevel = callPackage ../tools/misc/waylevel { };
-
i3 = callPackage ../applications/window-managers/i3 {
xcb-util-cursor = if stdenv.hostPlatform.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
};
@@ -29752,16 +14604,6 @@ with pkgs;
i3lock-fancy-rapid = callPackage ../applications/window-managers/i3/lock-fancy-rapid.nix { };
- i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { };
-
- betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { };
-
- multilockscreen = callPackage ../misc/screensavers/multilockscreen { };
-
- i3minator = callPackage ../tools/misc/i3minator { };
-
- i3nator = callPackage ../tools/misc/i3nator { };
-
i3status = callPackage ../applications/window-managers/i3/status.nix { };
i3status-rust = callPackage ../applications/window-managers/i3/status-rust.nix { };
@@ -29778,22 +14620,8 @@ with pkgs;
workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
- windowchef = callPackage ../applications/window-managers/windowchef { };
-
wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };
- wmfs = callPackage ../applications/window-managers/wmfs { };
-
- i810switch = callPackage ../os-specific/linux/i810switch { };
-
- ical2orgpy = callPackage ../tools/misc/ical2orgpy { };
-
- icon-library = callPackage ../applications/graphics/icon-library { };
-
- id3v2 = callPackage ../applications/audio/id3v2 { };
-
- ifenslave = callPackage ../os-specific/linux/ifenslave { };
-
ii = callPackage ../applications/networking/irc/ii {
stdenv = gccStdenv;
};
@@ -29821,12 +14649,6 @@ with pkgs;
inherit (darwin) autoSignDarwinBinariesHook;
};
- image-roll = callPackage ../applications/graphics/image-roll { };
-
- imagej = callPackage ../applications/graphics/imagej { };
-
- fiji = callPackage ../applications/graphics/fiji { };
-
imagemagick6_light = imagemagick6.override {
bzip2Support = false;
zlibSupport = false;
@@ -29888,26 +14710,14 @@ with pkgs;
ghostscriptSupport = true;
});
- imagination = callPackage ../applications/video/imagination { };
-
inherit (nodePackages) imapnotify;
- imdshift = callPackage ../tools/security/imdshift { };
-
img2pdf = with python3Packages; toPythonApplication img2pdf;
- imgcat = callPackage ../applications/graphics/imgcat { };
-
- img-cat = callPackage ../applications/graphics/img-cat { };
-
imgp = python3Packages.callPackage ../applications/graphics/imgp { };
- inframap = callPackage ../applications/networking/cluster/inframap { };
-
inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
- inklingreader = callPackage ../tools/misc/inklingreader { };
-
inkscape = callPackage ../applications/graphics/inkscape {
lcms = lcms2;
};
@@ -29918,10 +14728,6 @@ with pkgs;
inlyne = darwin.apple_sdk_11_0.callPackage ../applications/misc/inlyne { };
- inspectrum = callPackage ../applications/radio/inspectrum { };
-
- inputplug = callPackage ../tools/X11/inputplug { };
-
ion3 = callPackage ../applications/window-managers/ion-3 {
lua = lua5_1;
};
@@ -29931,24 +14737,10 @@ with pkgs;
lua5 = lua5_3;
};
- iptraf-ng = callPackage ../applications/networking/iptraf-ng { };
-
- irccloud = callPackage ../applications/networking/irc/irccloud { };
-
irssi = callPackage ../applications/networking/irc/irssi { };
- filebrowser = callPackage ../applications/networking/filebrowser { };
-
- fish-irssi = callPackage ../applications/networking/irc/irssi/fish { };
-
ir.lv2 = callPackage ../applications/audio/ir.lv2 { };
- istioctl = callPackage ../applications/networking/cluster/istioctl { };
-
- bip = callPackage ../applications/networking/irc/bip { };
-
- j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { };
-
jabcode = callPackage ../development/libraries/jabcode { };
jabcode-writer = callPackage ../development/libraries/jabcode {
@@ -29966,47 +14758,15 @@ with pkgs;
};
};
- jack_capture = callPackage ../applications/audio/jack-capture { };
-
- jack_oscrolloscope = callPackage ../applications/audio/jack-oscrolloscope { };
-
- jack-passthrough = callPackage ../applications/audio/jack-passthrough { };
-
- jack_rack = callPackage ../applications/audio/jack-rack { };
-
- jackmeter = callPackage ../applications/audio/jackmeter { };
-
jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
jackmix_jack1 = jackmix.override { jack = jack1; };
- jaeles = callPackage ../tools/security/jaeles { };
-
jalv-qt = jalv.override { useQt = true; };
jameica = callPackage ../applications/office/jameica {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- jamin = callPackage ../applications/audio/jamin { };
-
- japa = callPackage ../applications/audio/japa { };
-
- dupd = callPackage ../tools/misc/dupd { };
-
- jconvolver = callPackage ../applications/audio/jconvolver { };
-
- jdupes = callPackage ../tools/misc/jdupes { };
-
- jed = callPackage ../applications/editors/jed { };
-
- jedit = callPackage ../applications/editors/jedit { };
-
- jgmenu = callPackage ../applications/misc/jgmenu { };
-
- jitsi = callPackage ../applications/networking/instant-messengers/jitsi { };
-
- johnny = callPackage ../applications/misc/johnny { };
-
js8call = qt5.callPackage ../applications/radio/js8call { };
jwm = callPackage ../applications/window-managers/jwm { };
@@ -30021,70 +14781,32 @@ with pkgs;
;
k3s = k3s_1_31;
- k3sup = callPackage ../applications/networking/cluster/k3sup { };
-
- kail = callPackage ../tools/networking/kail { };
-
- kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { };
-
kapow = libsForQt5.callPackage ../applications/misc/kapow { };
- kbt = callPackage ../applications/misc/kbt { };
-
kchmviewer = libsForQt5.callPackage ../applications/misc/kchmviewer { };
- kappanhang = callPackage ../applications/radio/kappanhang { };
-
okteta = libsForQt5.callPackage ../applications/editors/okteta { };
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
- kbst = callPackage ../applications/networking/cluster/kbst { };
-
kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { };
- kde-gruvbox = callPackage ../data/themes/kde-gruvbox { };
-
kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };
- keet = callPackage ../applications/networking/instant-messengers/keet { };
-
- kepler = callPackage ../tools/security/kepler { };
-
- kepubify = callPackage ../tools/misc/kepubify { };
-
- kermit = callPackage ../tools/misc/kermit { };
-
kexi = libsForQt5.callPackage ../applications/office/kexi { };
- khronos = callPackage ../applications/office/khronos { };
-
- keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { };
-
- kfilt = callPackage ../applications/networking/cluster/kfilt { };
-
kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { };
- khal = callPackage ../applications/misc/khal { };
-
- khoj = callPackage ../servers/search/khoj { };
-
- khard = callPackage ../applications/misc/khard { };
-
kid3-cli = kid3.override { withCLI = true; withKDE = false; withQt = false; };
kid3-kde = kid3.override { withCLI = true; withKDE = true; withQt = false; };
kid3-qt = kid3.override { withCLI = true; withKDE = false; withQt = true; };
- kile = callPackage ../applications/editors/kile { };
-
kiwix = libsForQt5.callPackage ../applications/misc/kiwix { };
kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { };
- kickoff = callPackage ../applications/misc/kickoff { };
-
klayout = libsForQt5.callPackage ../applications/misc/klayout { };
klee = callPackage ../applications/science/logic/klee {
@@ -30097,38 +14819,14 @@ with pkgs;
kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
- kn = callPackage ../applications/networking/cluster/kn { };
-
- kns = callPackage ../applications/networking/cluster/kns { };
-
- kondo = callPackage ../applications/misc/kondo { };
-
kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { };
- kpt = callPackage ../applications/networking/cluster/kpt { };
-
- krabby = callPackage ../applications/misc/krabby { };
-
- kraft = callPackage ../applications/virtualization/kraft { };
-
krane = callPackage ../applications/networking/cluster/krane { };
krita = callPackage ../applications/graphics/krita/wrapper.nix { };
- ksuperkey = callPackage ../tools/X11/ksuperkey { };
-
ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { };
- kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { };
-
- kubedog = callPackage ../applications/networking/cluster/kubedog { };
-
- kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
-
- kubefirst = callPackage ../applications/networking/cluster/kubefirst { };
-
- kube-score = callPackage ../applications/networking/cluster/kube-score { };
-
kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod {
};
@@ -30136,68 +14834,18 @@ with pkgs;
kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
- kubevela = callPackage ../applications/networking/cluster/kubevela { };
-
kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { };
kubectl-convert = kubectl.convert;
- kubectl-view-secret = callPackage ../applications/networking/cluster/kubectl-view-secret { };
-
- kubernetes-metrics-server = callPackage ../applications/networking/cluster/kubernetes-metrics-server { };
-
- kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { };
-
- kubeseal = callPackage ../applications/networking/cluster/kubeseal { };
-
- kubestroyer = callPackage ../tools/security/kubestroyer { };
-
- kubernix = callPackage ../applications/networking/cluster/kubernix { };
-
- kubeconform = callPackage ../applications/networking/cluster/kubeconform { };
-
- kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { };
-
- kuttl = callPackage ../applications/networking/cluster/kuttl { };
-
- kubectl-cnpg = callPackage ../applications/networking/cluster/kubectl-cnpg { };
-
- kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };
-
- kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { };
-
- kubectl-klock = callPackage ../applications/networking/cluster/kubectl-klock { };
-
- kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { };
-
kubectl-view-allocations = callPackage ../applications/networking/cluster/kubectl-view-allocations {
inherit (darwin.apple_sdk.frameworks) Security;
};
- kubelogin = callPackage ../applications/networking/cluster/kubelogin { };
-
- kubevpn = callPackage ../applications/networking/cluster/kubevpn { };
-
- k9s = callPackage ../applications/networking/cluster/k9s { };
-
- kubecm = callPackage ../applications/networking/cluster/kubecm { };
-
- ktunnel = callPackage ../applications/networking/cluster/ktunnel { };
-
- ktop = callPackage ../applications/networking/cluster/ktop { };
-
- pinniped = callPackage ../applications/networking/cluster/pinniped { };
+ kubelogin-oidc = callPackage ../by-name/ku/kubelogin-oidc/package.nix { buildGoModule = buildGo123Module; };
kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { };
- pgo-client = callPackage ../applications/networking/cluster/pgo-client { };
-
- popeye = callPackage ../applications/networking/cluster/popeye { };
-
- kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { };
-
- fluxctl = callPackage ../applications/networking/cluster/fluxctl { };
-
linkerd = callPackage ../applications/networking/cluster/linkerd { };
linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { };
linkerd_stable = linkerd;
@@ -30221,14 +14869,6 @@ with pkgs;
pname = "kuma-dp";
};
- kile-wl = callPackage ../applications/misc/kile-wl { };
-
- kiln = callPackage ../applications/misc/kiln { };
-
- kubernetes-code-generator = callPackage ../development/tools/kubernetes-code-generator { };
-
- kubernetes-controller-tools = callPackage ../development/tools/kubernetes-controller-tools { };
-
kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { };
@@ -30237,30 +14877,12 @@ with pkgs;
kubernetes-helmPlugins = recurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { });
- chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { };
-
- helm-docs = callPackage ../applications/networking/cluster/helm-docs { };
-
- kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
-
- kubexit = callPackage ../applications/networking/cluster/kubexit { } ;
-
kup = libsForQt5.callPackage ../applications/misc/kup { };
- kupfer = callPackage ../applications/misc/kupfer { };
-
- kuro = callPackage ../applications/misc/kuro { };
-
timoni = callPackage ../applications/networking/cluster/timoni { };
kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { };
- lame = callPackage ../development/libraries/lame { };
-
- larswm = callPackage ../applications/window-managers/larswm { };
-
- lash = callPackage ../applications/audio/lash { };
-
ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { };
ladspaPlugins = callPackage ../applications/audio/ladspa-plugins {
@@ -30274,34 +14896,16 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL;
};
- caps = callPackage ../applications/audio/caps { };
-
- lbdb = callPackage ../tools/misc/lbdb { };
-
- lbry = callPackage ../applications/video/lbry { };
-
- lbzip2 = callPackage ../tools/compression/lbzip2 { };
-
- lci = callPackage ../applications/science/logic/lci { };
-
lemonbar = callPackage ../applications/window-managers/lemonbar { };
lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };
lenovo-legion = libsForQt5.callPackage ../os-specific/linux/lenovo-legion/app.nix { };
- legitify = callPackage ../development/tools/legitify { };
-
- lens = callPackage ../applications/networking/cluster/lens { };
-
leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };
libkiwix = callPackage ../applications/misc/kiwix/lib.nix { };
- libowfat = callPackage ../development/libraries/libowfat { };
-
- libowlevelzs = callPackage ../development/libraries/libowlevelzs { };
-
librecad = libsForQt5.callPackage ../applications/misc/librecad { };
libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { };
@@ -30373,78 +14977,30 @@ with pkgs;
libutp = callPackage ../applications/networking/p2p/libutp { };
libutp_3_4 = callPackage ../applications/networking/p2p/libutp/3.4.nix { };
- lifelines = callPackage ../applications/misc/lifelines { };
-
- liferea = callPackage ../applications/networking/newsreaders/liferea { };
-
- lightworks = callPackage ../applications/video/lightworks { };
-
- lingot = callPackage ../applications/audio/lingot { };
-
- litebrowser = callPackage ../applications/networking/browsers/litebrowser { };
-
littlegptracker = callPackage ../applications/audio/littlegptracker {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
ledger-web = callPackage ../applications/office/ledger-web { };
- ledger2beancount = callPackage ../tools/text/ledger2beancount { };
-
lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { };
lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- liblinphone = callPackage ../development/libraries/liblinphone { };
-
- links2 = callPackage ../applications/networking/browsers/links2 { };
-
linphone = libsForQt5.callPackage ../applications/networking/instant-messengers/linphone { };
- linuxsampler = callPackage ../applications/audio/linuxsampler { };
-
- llpp = callPackage ../applications/misc/llpp { };
-
- lls = callPackage ../applications/networking/lls { };
-
lmms = libsForQt5.callPackage ../applications/audio/lmms {
lame = null;
libsoundio = null;
portaudio = null;
};
- lokinet = callPackage ../applications/networking/p2p/lokinet { };
-
- losslesscut-bin = callPackage ../applications/video/losslesscut-bin { };
-
- loxodo = callPackage ../applications/misc/loxodo { };
-
- lrzsz = callPackage ../tools/misc/lrzsz { };
-
lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php82; };
- ltex-ls = callPackage ../tools/text/ltex-ls { };
-
luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };
- lxdvdrip = callPackage ../applications/video/lxdvdrip { };
-
- handlr = callPackage ../tools/misc/handlr { };
-
- jftui = callPackage ../applications/video/jftui { };
-
- lime = callPackage ../development/libraries/lime { };
-
- looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { };
-
- ltc-tools = callPackage ../applications/audio/ltc-tools { };
-
- lscolors = callPackage ../applications/misc/lscolors { };
-
- lswt = callPackage ../applications/misc/lswt { };
-
luddite = with python3Packages; toPythonApplication luddite;
goobook = with python3Packages; toPythonApplication goobook;
@@ -30453,35 +15009,19 @@ with pkgs;
lua = lua5_1;
};
- luppp = callPackage ../applications/audio/luppp { };
-
lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { };
lutris = callPackage ../applications/misc/lutris/fhsenv.nix { };
lutris-free = lutris.override {
steamSupport = false;
};
- lv2bm = callPackage ../applications/audio/lv2bm { };
-
lv2lint = callPackage ../applications/audio/lv2lint/default.nix { };
- lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { };
-
lxi-tools = callPackage ../tools/networking/lxi-tools { };
lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; };
- lynx = callPackage ../applications/networking/browsers/lynx { };
-
- lyrebird = callPackage ../applications/audio/lyrebird { };
-
lyx = libsForQt5.callPackage ../applications/misc/lyx { };
- m4acut = callPackage ../applications/audio/m4acut { };
-
- mac = callPackage ../development/libraries/mac { };
-
- macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { };
-
magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
magic-wormhole-rs = callPackage ../tools/networking/magic-wormhole-rs {
@@ -30501,40 +15041,18 @@ with pkgs;
shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { };
};
- makeself = callPackage ../applications/misc/makeself { };
-
mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { };
mapmap = libsForQt5.callPackage ../applications/video/mapmap { };
- marathonctl = callPackage ../tools/virtualization/marathonctl { };
-
- mark = callPackage ../tools/text/mark { };
-
- markets = callPackage ../applications/misc/markets { };
-
- markscribe = callPackage ../tools/text/markscribe { };
-
- magnetico = callPackage ../applications/networking/p2p/magnetico { };
-
mastodon-bot = nodePackages.mastodon-bot;
- matchbox = callPackage ../applications/window-managers/matchbox { };
-
matrix-commander = python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander { };
- matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { };
-
- iamb = callPackage ../applications/networking/instant-messengers/iamb { };
-
- mblaze = callPackage ../applications/networking/mailreaders/mblaze { };
-
mbrola = callPackage ../applications/audio/mbrola { };
mbrola-voices = callPackage ../applications/audio/mbrola/voices.nix { };
- mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
-
mdzk = callPackage ../applications/misc/mdzk {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -30543,28 +15061,12 @@ with pkgs;
mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { };
mediaelch-qt6 = qt6Packages.callPackage ../applications/misc/mediaelch { };
- mediathekview = callPackage ../applications/video/mediathekview { };
-
- meteo = callPackage ../applications/networking/weather/meteo { };
-
- meld = callPackage ../applications/version-management/meld { };
-
melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { };
- melody = callPackage ../tools/misc/melody { };
-
- meme-bingo-web = callPackage ../servers/web-apps/meme-bingo-web { };
-
- meme-image-generator = callPackage ../applications/graphics/meme-image-generator { };
-
- meme-suite = callPackage ../applications/science/biology/meme-suite { };
-
mendeley = libsForQt5.callPackage ../applications/office/mendeley {
gconf = gnome2.GConf;
};
- menumaker = callPackage ../applications/misc/menumaker { };
-
menyoki = callPackage ../applications/graphics/menyoki {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
@@ -30579,25 +15081,14 @@ with pkgs;
mercurialFull = mercurial.override { fullBuild = true; };
- mepo = callPackage ../applications/misc/mepo { };
-
meshcentral = callPackage ../tools/admin/meshcentral { };
meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };
- metadata-cleaner = callPackage ../applications/misc/metadata-cleaner { };
-
- metersLv2 = callPackage ../applications/audio/meters_lv2 { };
-
michabo = libsForQt5.callPackage ../applications/misc/michabo { };
- mid2key = callPackage ../applications/audio/mid2key { };
-
- midori-unwrapped = callPackage ../applications/networking/browsers/midori { };
midori = wrapFirefox midori-unwrapped { };
- mikmod = callPackage ../applications/audio/mikmod { };
-
miniaudicle = qt6Packages.callPackage ../applications/audio/miniaudicle { };
minidsp = callPackage ../applications/audio/minidsp {
@@ -30608,34 +15099,18 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- minigalaxy = callPackage ../applications/misc/minigalaxy { };
-
- minimodem = callPackage ../applications/radio/minimodem { };
-
- minidjvu = callPackage ../applications/graphics/minidjvu { };
-
minikube = callPackage ../applications/networking/cluster/minikube {
inherit (darwin.apple_sdk.frameworks) vmnet;
};
minitube = libsForQt5.callPackage ../applications/video/minitube { };
- mimic = callPackage ../applications/audio/mimic { };
-
- meh = callPackage ../applications/graphics/meh { };
-
mixxx = libsForQt5.callPackage ../applications/audio/mixxx { };
- mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
-
mldonkey = callPackage ../applications/networking/p2p/mldonkey {
ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
};
- mlvwm = callPackage ../applications/window-managers/mlvwm { };
-
- MMA = callPackage ../applications/audio/MMA { };
-
mmex = callPackage ../applications/office/mmex {
wxGTK32 = wxGTK32.override {
withWebKit = true;
@@ -30653,36 +15128,16 @@ with pkgs;
};
};
- mmsd = callPackage ../tools/networking/mmsd { };
-
- mmsd-tng = callPackage ../tools/networking/mmsd-tng { };
-
- mmtc = callPackage ../applications/audio/mmtc { };
-
- mnamer = callPackage ../applications/misc/mnamer { };
-
moc = callPackage ../applications/audio/moc {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- mod-arpeggiator-lv2 = callPackage ../applications/audio/mod-arpeggiator-lv2 { };
-
- mod-distortion = callPackage ../applications/audio/mod-distortion { };
-
- monitorcontrol = callPackage ../applications/misc/monitorcontrol { };
-
xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { };
xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { };
xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { };
- molot-lite = callPackage ../applications/audio/molot-lite { };
-
- monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
-
- monkeysphere = callPackage ../tools/security/monkeysphere { };
-
monotone = callPackage ../applications/version-management/monotone {
lua = lua5;
};
@@ -30697,12 +15152,6 @@ with pkgs;
moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };
- moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { };
-
- mooSpace = callPackage ../applications/audio/mooSpace { };
-
- mop = callPackage ../applications/misc/mop { };
-
mopidyPackages = (callPackages ../applications/audio/mopidy {
python = python3;
}) // { __attrsFailEvaluation = true; };
@@ -30731,24 +15180,8 @@ with pkgs;
mopidy-youtube
mopidy-ytmusic;
- monocypher = callPackage ../development/libraries/monocypher { };
-
- motif = callPackage ../development/libraries/motif { };
-
- mozjpeg = callPackage ../applications/graphics/mozjpeg { };
-
edgetx = libsForQt5.callPackage ../applications/misc/edgetx { };
- easytag = callPackage ../applications/audio/easytag { };
-
- mp3gain = callPackage ../applications/audio/mp3gain { };
-
- mp3splt = callPackage ../applications/audio/mp3splt { };
-
- mp3val = callPackage ../applications/audio/mp3val { };
-
- mpc123 = callPackage ../applications/audio/mpc123 { };
-
mpg123 = callPackage ../applications/audio/mpg123 {
inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox;
jack = libjack2;
@@ -30761,22 +15194,8 @@ with pkgs;
nbstripout = callPackage ../applications/version-management/nbstripout { };
- ncmpc = callPackage ../applications/audio/ncmpc { };
-
- ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
-
- pms = callPackage ../applications/audio/pms { };
-
pragha = libsForQt5.callPackage ../applications/audio/pragha { };
- river-tag-overlay = callPackage ../applications/misc/river-tag-overlay { };
-
- rofi-mpd = callPackage ../applications/audio/rofi-mpd { };
-
- rofi-bluetooth = callPackage ../applications/misc/rofi-bluetooth { };
-
- rofi-calc = callPackage ../applications/science/math/rofi-calc { };
-
rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
rofi-emoji-wayland = (
callPackage ../applications/misc/rofi-emoji {
@@ -30784,12 +15203,6 @@ with pkgs;
}
).v4;
- rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { };
-
- rofi-power-menu = callPackage ../applications/misc/rofi-power-menu { };
-
- rofi-pulse-select = callPackage ../applications/audio/rofi-pulse-select { };
-
rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw {
waylandSupport = false;
x11Support = false;
@@ -30803,37 +15216,11 @@ with pkgs;
x11Support = true;
};
- rofi-screenshot = callPackage ../applications/misc/rofi-screenshot { };
-
- rofi-top = callPackage ../applications/misc/rofi-top { };
-
- rofi-vpn = callPackage ../applications/networking/rofi-vpn { };
-
seamly2d = libsForQt5.callPackage ../applications/graphics/seamly2d { };
- ympd = callPackage ../applications/audio/ympd { };
-
# a somewhat more maintained fork of ympd
- mympd = callPackage ../applications/audio/mympd { };
-
- nload = callPackage ../applications/networking/nload { };
-
- nali = callPackage ../applications/networking/nali { };
-
- normalize = callPackage ../applications/audio/normalize { };
-
- norouter = callPackage ../tools/networking/norouter { };
-
- nqptp = callPackage ../tools/networking/nqptp { };
-
- mailspring = callPackage ../applications/networking/mailreaders/mailspring { };
-
memento = qt6Packages.callPackage ../applications/video/memento { };
- mm = callPackage ../applications/networking/instant-messengers/mm { };
-
- mm-common = callPackage ../development/libraries/mm-common { };
-
mpc-qt = qt6Packages.callPackage ../applications/video/mpc-qt { };
mplayer = callPackage ../applications/video/mplayer ({
@@ -30853,20 +15240,8 @@ with pkgs;
abseil-cpp = abseil-cpp_202401;
};
- mpvpaper = callPackage ../tools/wayland/mpvpaper { };
-
- open-in-mpv = callPackage ../applications/video/open-in-mpv { };
-
- mpv-shim-default-shaders = callPackage ../applications/video/mpv-shim-default-shaders { };
-
- mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
-
- mtpaint = callPackage ../applications/graphics/mtpaint { };
-
mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { };
- multimon-ng = callPackage ../applications/radio/multimon-ng { };
-
murmur = (callPackages ../applications/networking/mumble {
avahi = avahi-compat;
pulseSupport = config.pulseaudio or false;
@@ -30891,88 +15266,23 @@ with pkgs;
musescore = qt6.callPackage ../applications/audio/musescore { };
- mmh = callPackage ../applications/networking/mailreaders/mmh { };
- mutt = callPackage ../applications/networking/mailreaders/mutt { };
-
- mutt-wizard = callPackage ../tools/misc/mutt-wizard { };
-
- mutt-ics = callPackage ../tools/networking/mutt-ics { };
-
- mw = callPackage ../tools/text/mw { };
-
mwic = callPackage ../applications/misc/mwic {
pythonPackages = python3Packages;
};
neomutt = darwin.apple_sdk_11_0.callPackage ../applications/networking/mailreaders/neomutt { };
- neosay = callPackage ../applications/networking/instant-messengers/neosay { };
-
natron = libsForQt5.callPackage ../applications/video/natron { };
- natural-docs = callPackage ../applications/misc/natural-docs { };
-
- neocomp = callPackage ../applications/window-managers/neocomp { };
-
- nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { };
-
netmaker = callPackage ../applications/networking/netmaker {subPackages = ["."];};
netmaker-full = callPackage ../applications/networking/netmaker { };
- newsflash = callPackage ../applications/networking/feedreaders/newsflash { };
-
- nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { };
-
- nixos-shell = callPackage ../tools/virtualization/nixos-shell { };
-
- noaa-apt = callPackage ../applications/radio/noaa-apt { };
-
- node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { };
-
ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
- ninjas2 = callPackage ../applications/audio/ninjas2 { };
-
nootka = qt5.callPackage ../applications/audio/nootka { };
- novnc = callPackage ../applications/networking/novnc { };
-
- ns-usbloader = callPackage ../applications/misc/ns-usbloader { };
-
- nwg-bar = callPackage ../applications/misc/nwg-bar { };
-
- nwg-displays = callPackage ../applications/misc/nwg-displays { };
-
- nwg-dock = callPackage ../applications/misc/nwg-dock { };
-
- nwg-launchers = callPackage ../applications/misc/nwg-launchers { };
-
- nwg-look = callPackage ../applications/misc/nwg-look { };
-
- nwg-menu = callPackage ../applications/misc/nwg-menu { };
-
- nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { };
-
- ocm = callPackage ../applications/networking/cluster/ocm { };
-
- odo = callPackage ../applications/networking/cluster/odo { };
-
- odin2 = callPackage ../applications/audio/odin2 { };
-
- onmetal-image = callPackage ../tools/virtualization/onmetal-image { };
-
- opcr-policy = callPackage ../development/tools/opcr-policy { };
-
opcua-client-gui = libsForQt5.callPackage ../misc/opcua-client-gui { };
- open-policy-agent = callPackage ../development/tools/open-policy-agent { };
-
- openmm = callPackage ../development/libraries/science/chemistry/openmm { };
-
- openshift = callPackage ../applications/networking/cluster/openshift { };
-
- opsdroid = callPackage ../applications/networking/opsdroid { };
-
ostinato = libsForQt5.callPackage ../applications/networking/ostinato {
protobuf = protobuf_21;
};
@@ -30980,50 +15290,29 @@ with pkgs;
p4 = callPackage ../applications/version-management/p4 {
inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security;
};
- p4d = callPackage ../applications/version-management/p4d { };
p4v = qt6Packages.callPackage ../applications/version-management/p4v { };
- parson = callPackage ../development/libraries/parson { };
-
- partio = callPackage ../development/libraries/partio { };
-
pc-ble-driver = callPackage ../development/libraries/pc-ble-driver {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
pcmanfm-qt = lxqt.pcmanfm-qt;
- pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { };
-
pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { };
- pdfmm = callPackage ../applications/office/pdfmm { };
-
- pig = callPackage ../applications/networking/cluster/pig { };
-
- pijul = callPackage ../applications/version-management/pijul { };
-
pijuice = with python3Packages; toPythonApplication pijuice;
pinegrow6 = callPackage ../applications/editors/pinegrow { pinegrowVersion = "6"; };
pinegrow = callPackage ../applications/editors/pinegrow { };
- piper = callPackage ../os-specific/linux/piper { };
-
pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { };
- planify = callPackage ../applications/office/planify { };
-
- plank = callPackage ../applications/misc/plank { };
-
playonlinux = callPackage ../applications/misc/playonlinux
{ stdenv = stdenv_32bit; };
pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { };
- pluto = callPackage ../applications/networking/cluster/pluto { };
-
pnglatex = with python3Packages; toPythonApplication pnglatex;
polybarFull = polybar.override {
@@ -31036,33 +15325,15 @@ with pkgs;
i3Support = true;
};
- yambar-hyprland-wses = callPackage ../applications/misc/yambar-hyprland-wses { };
-
polyphone = qt6.callPackage ../applications/audio/polyphone { };
- psi-notify = callPackage ../applications/misc/psi-notify { };
-
- ptex = callPackage ../development/libraries/ptex { };
-
- qbec = callPackage ../applications/networking/cluster/qbec { };
-
- qemacs = callPackage ../applications/editors/qemacs { };
-
- ragnarwm = callPackage ../applications/window-managers/ragnarwm {};
-
- rime-cli = callPackage ../applications/office/rime-cli { };
-
roxctl = callPackage ../applications/networking/cluster/roxctl {
};
rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
- scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
-
scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { });
- shod = callPackage ../applications/window-managers/shod { };
-
shogun = callPackage ../applications/science/machine-learning/shogun {
protobuf = protobuf_21;
};
@@ -31071,40 +15342,12 @@ with pkgs;
softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { };
- songrec = callPackage ../applications/audio/songrec { };
-
- storj-uplink = callPackage ../applications/networking/sync/storj-uplink {};
-
- storrent = callPackage ../applications/networking/p2p/storrent { };
-
- speedread = callPackage ../applications/misc/speedread { };
-
- station = callPackage ../applications/networking/station { };
-
- stochas = callPackage ../applications/audio/stochas { };
-
- synapse = callPackage ../applications/misc/synapse { };
-
synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
- synfigstudio = callPackage ../applications/graphics/synfigstudio { };
-
- typora = callPackage ../applications/editors/typora { };
-
taxi-cli = with python3Packages; toPythonApplication taxi;
- tcping-go = callPackage ../applications/networking/tcping-go { };
-
- reproc = callPackage ../development/libraries/reproc { };
-
- sc68 = callPackage ../applications/audio/sc68 { };
-
- sidplayfp = callPackage ../applications/audio/sidplayfp { };
-
- sndpeek = callPackage ../applications/audio/sndpeek { };
-
mpop = callPackage ../applications/networking/mpop {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -31118,15 +15361,10 @@ with pkgs;
lua = lua5;
};
- maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };
-
- pdfdiff = callPackage ../applications/misc/pdfdiff { };
-
pdfsam-basic = callPackage ../applications/misc/pdfsam-basic {
jdk21 = openjdk21.override { enableJavaFX = true; };
};
- mupdf = callPackage ../applications/misc/mupdf { };
mupdf-headless = mupdf.override {
enableX11 = false;
enableGL = false;
@@ -31136,8 +15374,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- mystem = callPackage ../applications/misc/mystem { };
-
diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { };
diff-pdf = callPackage ../applications/misc/diff-pdf {
@@ -31145,46 +15381,18 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- diffuse = callPackage ../applications/misc/diffuse { };
-
- mlocate = callPackage ../tools/misc/mlocate { };
-
- mlxbf-bootctl = callPackage ../tools/misc/mlxbf-bootctl { };
-
- plocate = callPackage ../tools/misc/plocate { };
-
- mypaint = callPackage ../applications/graphics/mypaint { };
-
mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { };
mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };
mythtv = libsForQt5.callPackage ../applications/video/mythtv { };
- mle = callPackage ../applications/editors/mle { };
-
- namaka = callPackage ../development/tools/misc/namaka { };
-
nano = callPackage ../applications/editors/nano { };
- nanoblogger = callPackage ../applications/misc/nanoblogger { };
-
- nanorc = callPackage ../applications/editors/nano/nanorc { };
-
- netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
-
ncdu = callPackage ../tools/misc/ncdu { };
ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };
- ncview = callPackage ../tools/X11/ncview { } ;
-
- ne = callPackage ../applications/editors/ne { };
-
- nedit = callPackage ../applications/editors/nedit { };
-
- ngt = callPackage ../development/libraries/ngt { };
-
notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { };
notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
@@ -31204,20 +15412,10 @@ with pkgs;
addThumbnailer = true;
};
- notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { };
-
- nova-filters = callPackage ../applications/audio/nova-filters { };
-
- nvi = callPackage ../applications/editors/nvi { };
-
- nvpy = callPackage ../applications/editors/nvpy { };
-
gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- obs-cli = callPackage ../applications/misc/obs-cli { };
-
obs-studio = qt6Packages.callPackage ../applications/video/obs-studio {
ffmpeg = ffmpeg-full;
};
@@ -31225,28 +15423,12 @@ with pkgs;
obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };
- octoprint = callPackage ../applications/misc/octoprint { };
-
- oculante = callPackage ../applications/graphics/oculante { };
-
- ocr-a = callPackage ../data/fonts/ocr-a { };
-
- ocrad = callPackage ../applications/graphics/ocrad { };
-
- offrss = callPackage ../applications/networking/offrss { };
-
- ogmtools = callPackage ../applications/video/ogmtools { };
-
omegat = callPackage ../applications/misc/omegat.nix { };
- omxplayer = callPackage ../applications/video/omxplayer { };
-
inherit (callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui;
openambit = qt5.callPackage ../applications/misc/openambit { };
- openbox = callPackage ../applications/window-managers/openbox { };
-
openbox-menu = callPackage ../applications/misc/openbox-menu {
stdenv = gccStdenv;
};
@@ -31258,8 +15440,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit;
};
- openfx = callPackage ../development/libraries/openfx { };
-
openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio {
openexr = openexr_3;
};
@@ -31282,8 +15462,6 @@ with pkgs;
openscad = libsForQt5.callPackage ../applications/graphics/openscad { };
- open-stage-control = callPackage ../applications/audio/open-stage-control { };
-
opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client { };
opentoonz = libsForQt5.callPackage ../applications/graphics/opentoonz { };
@@ -31294,80 +15472,24 @@ with pkgs;
openvi = darwin.apple_sdk_11_0.callPackage ../applications/editors/openvi { };
- opera = callPackage ../applications/networking/browsers/opera { };
-
- oranda = callPackage ../applications/misc/oranda { };
-
- orca-c = callPackage ../applications/audio/orca-c { };
-
organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { };
- osm2xmap = callPackage ../applications/misc/osm2xmap { };
-
- osmctools = callPackage ../applications/misc/osmctools { };
-
- osmium-tool = callPackage ../applications/misc/osmium-tool { };
-
- osmtogeojson = callPackage ../applications/misc/osmtogeojson { };
-
- owamp = callPackage ../applications/networking/owamp { };
-
owofetch = callPackage ../tools/misc/owofetch {
inherit (darwin.apple_sdk.frameworks) Foundation DiskArbitration;
};
- vgmplay-libvgm = callPackage ../applications/audio/vgmplay-libvgm { };
-
- vgmtools = callPackage ../tools/audio/vgmtools { };
-
- vital = callPackage ../applications/audio/vital { };
-
vivaldi = callPackage ../applications/networking/browsers/vivaldi { };
vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix { };
libopenmpt = callPackage ../development/libraries/audio/libopenmpt { };
- libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { };
-
openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon;
- opusfile = callPackage ../applications/audio/opusfile { };
-
- opustags = callPackage ../applications/audio/opustags { };
-
- opusTools = callPackage ../applications/audio/opus-tools { };
-
orpie = callPackage ../applications/misc/orpie {
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
- osmo = callPackage ../applications/office/osmo { };
-
- osmo-bsc = callPackage ../servers/osmocom/osmo-bsc { };
-
- osmo-bts = callPackage ../servers/osmocom/osmo-bts { };
-
- osmo-ggsn = callPackage ../servers/osmocom/osmo-ggsn { };
-
- osmo-hlr = callPackage ../servers/osmocom/osmo-hlr { };
-
- osmo-hnbgw = callPackage ../servers/osmocom/osmo-hnbgw { };
-
- osmo-hnodeb = callPackage ../servers/osmocom/osmo-hnodeb { };
-
- osmo-iuh = callPackage ../servers/osmocom/osmo-iuh { };
-
- osmo-mgw = callPackage ../servers/osmocom/osmo-mgw { };
-
- osmo-msc = callPackage ../servers/osmocom/osmo-msc { };
-
- osmo-pcu = callPackage ../servers/osmocom/osmo-pcu { };
-
- osmo-sgsn = callPackage ../servers/osmocom/osmo-sgsn { };
-
- osmo-sip-connector = callPackage ../servers/osmocom/osmo-sip-connector { };
-
osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server {
protobuf = protobuf_21.override {
abseil-cpp = abseil-cpp_202103.override {
@@ -31378,20 +15500,6 @@ with pkgs;
palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { };
- paleta = callPackage ../applications/graphics/paleta { };
-
- pamix = callPackage ../applications/audio/pamix { };
-
- pamixer = callPackage ../applications/audio/pamixer { };
-
- ncpamixer = callPackage ../applications/audio/ncpamixer { };
-
- pan = callPackage ../applications/networking/newsreaders/pan { };
-
- panotools = callPackage ../applications/graphics/panotools { };
-
- paprefs = callPackage ../applications/audio/paprefs { };
-
pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { };
pantalaimon-headless = callPackage ../applications/networking/instant-messengers/pantalaimon {
@@ -31400,28 +15508,8 @@ with pkgs;
parsec-bin = callPackage ../applications/misc/parsec/bin.nix { };
- pavucontrol = callPackage ../applications/audio/pavucontrol { };
-
paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
- parlatype = callPackage ../applications/audio/parlatype { };
-
- packet-sd = callPackage ../development/tools/packet-sd { };
-
- metal-cli = callPackage ../development/tools/metal-cli { };
-
- pb_cli = callPackage ../tools/misc/pb_cli { };
-
- capture = callPackage ../tools/misc/capture { };
-
- pbrt = callPackage ../applications/graphics/pbrt { };
-
- pcloud = callPackage ../applications/networking/pcloud { };
-
- jpsxdec = callPackage ../tools/games/jpsxdec { };
-
- pdfslicer = callPackage ../applications/misc/pdfslicer { };
-
pekwm = callPackage ../by-name/pe/pekwm/package.nix {
awk = gawk;
grep = gnugrep;
@@ -31431,20 +15519,10 @@ with pkgs;
pencil = callPackage ../applications/graphics/pencil {
};
- pentestgpt = callPackage ../tools/security/pentestgpt { };
-
- perseus = callPackage ../applications/science/math/perseus { };
-
petrifoo = callPackage ../applications/audio/petrifoo {
inherit (gnome2) libgnomecanvas;
};
- pdfchain = callPackage ../tools/typesetting/pdfchain { };
-
- pdfcpu = callPackage ../applications/graphics/pdfcpu { };
- pdftk = callPackage ../tools/typesetting/pdftk { };
- pdfgrep = callPackage ../tools/typesetting/pdfgrep { };
-
pdfpc = callPackage ../applications/misc/pdfpc {
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav;
};
@@ -31453,20 +15531,10 @@ with pkgs;
stdenv = gccStdenv;
};
- peek = callPackage ../applications/video/peek { };
-
peertube = callPackage ../servers/peertube {
nodejs = nodejs_18;
};
- peroxide = callPackage ../applications/networking/peroxide { };
-
- pflask = callPackage ../os-specific/linux/pflask { };
-
- pfsshell = callPackage ../tools/misc/pfsshell { };
-
- phantomsocks = callPackage ../tools/networking/phantomsocks { };
-
photoqt = callPackage ../by-name/ph/photoqt/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
@@ -31475,52 +15543,20 @@ with pkgs;
phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };
- phrasendrescher = callPackage ../tools/security/phrasendrescher { };
-
- phrase-cli = callPackage ../tools/misc/phrase-cli { };
-
- phylactery = callPackage ../servers/web-apps/phylactery { };
-
- pianobar = callPackage ../applications/audio/pianobar { };
-
pianobooster = qt5.callPackage ../applications/audio/pianobooster { };
pianoteq = callPackage ../applications/audio/pianoteq { };
- picard = callPackage ../applications/audio/picard { };
-
- picoloop = callPackage ../applications/audio/picoloop { };
-
- picosnitch = callPackage ../tools/networking/picosnitch { };
-
pidginPackages = recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { });
inherit (pidginPackages) pidgin;
- pika-backup = callPackage ../applications/backup/pika-backup { };
-
- pur = callPackage ../development/tools/pur { };
-
- purpur = callPackage ../games/purpur { };
-
- pikopixel = callPackage ../applications/graphics/pikopixel { };
-
pithos = callPackage ../applications/audio/pithos {
pythonPackages = python3Packages;
};
pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { };
- pinfo = callPackage ../applications/misc/pinfo { };
-
- pinpoint = callPackage ../applications/office/pinpoint { };
-
- pistol = callPackage ../tools/misc/pistol { };
-
- piston-cli = callPackage ../tools/misc/piston-cli { };
-
- pizarra = callPackage ../applications/graphics/pizarra { };
-
plater = libsForQt5.callPackage ../applications/misc/plater { };
plexamp = callPackage ../applications/audio/plexamp { };
@@ -31531,101 +15567,43 @@ with pkgs;
plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
- plugdata = callPackage ../applications/audio/plugdata { };
-
- plugin-torture = callPackage ../applications/audio/plugin-torture { };
-
pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { };
- pokemonsay = callPackage ../tools/misc/pokemonsay { };
-
- polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { };
-
- polar-bookshelf1 = callPackage ../applications/misc/polar-bookshelf1 { };
-
- poezio = callPackage ../applications/networking/instant-messengers/poezio { };
-
- pommed_light = callPackage ../os-specific/linux/pommed-light { };
-
- polylith = callPackage ../development/tools/misc/polylith { };
-
- polymake = callPackage ../applications/science/math/polymake { };
-
pomodoro = callPackage ../applications/misc/pomodoro {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- ponymix = callPackage ../applications/audio/ponymix { };
-
pothos = libsForQt5.callPackage ../applications/radio/pothos { };
- potrace = callPackage ../applications/graphics/potrace { };
-
qiv = callPackage ../applications/graphics/qiv {
imlib2 = imlib2Full;
};
- premid = callPackage ../applications/misc/premid { };
-
processing = callPackage ../applications/graphics/processing {
jdk = jdk17;
};
# perhaps there are better apps for this task? It's how I had configured my preivous system.
# And I don't want to rewrite all rules
- procmail = callPackage ../applications/misc/procmail { };
-
profanity = callPackage ../applications/networking/instant-messengers/profanity ({
} // (config.profanity or {}));
- properties-cpp = callPackage ../development/libraries/properties-cpp { };
-
- proteus = callPackage ../applications/audio/proteus { };
-
- protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { };
-
protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { };
protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { };
protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { };
- ps2client = callPackage ../applications/networking/ps2client { };
-
- ps2eps = callPackage ../tools/typesetting/ps2eps { };
-
psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };
- psol = callPackage ../development/libraries/psol { };
-
- pstree = callPackage ../applications/misc/pstree { };
-
- pt2-clone = callPackage ../applications/audio/pt2-clone { };
-
- ptask = callPackage ../applications/misc/ptask { };
-
- pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { };
-
- pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { };
-
pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
puredata = callPackage ../applications/audio/puredata { };
puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };
- puremapping = callPackage ../applications/audio/pd-plugins/puremapping { };
-
pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { };
- pwdsafety = callPackage ../tools/security/pwdsafety { };
-
- pwvucontrol = callPackage ../applications/audio/pwvucontrol { };
-
- pyload-ng = callPackage ../applications/networking/pyload-ng {};
-
- pyrosimple = callPackage ../applications/networking/p2p/pyrosimple { };
-
qbittorrent = qt6Packages.callPackage ../applications/networking/p2p/qbittorrent {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -31684,8 +15662,6 @@ with pkgs;
qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
- qmidiarp = callPackage ../applications/audio/qmidiarp { };
-
qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { };
qmmp = qt6Packages.callPackage ../applications/audio/qmmp { };
@@ -31725,8 +15701,6 @@ with pkgs;
qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
- quantomatic = callPackage ../applications/science/physics/quantomatic { };
-
quassel = libsForQt5.callPackage ../applications/networking/irc/quassel {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
@@ -31744,12 +15718,6 @@ with pkgs;
tag = "-daemon-qt5";
};
- quill-qr = callPackage ../tools/security/quill-qr { };
-
- quirc = callPackage ../tools/graphics/quirc { };
-
- quisk = callPackage ../applications/radio/quisk { };
-
quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { };
quodlibet = callPackage ../applications/audio/quodlibet {
@@ -31807,28 +15775,12 @@ with pkgs;
fltk = fltk13;
};
- renoise = callPackage ../applications/audio/renoise { };
-
- redux = callPackage ../applications/audio/redux { };
-
- roomeqwizard = callPackage ../applications/audio/roomeqwizard { };
-
- radioboat = callPackage ../applications/audio/radioboat { };
-
radiotray-ng = callPackage ../applications/audio/radiotray-ng {
wxGTK = wxGTK32;
};
- raiseorlaunch = callPackage ../applications/misc/raiseorlaunch { };
-
rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { };
- rapidsvn = callPackage ../applications/version-management/rapidsvn { };
-
- ratmen = callPackage ../tools/X11/ratmen { };
-
- ratox = callPackage ../applications/networking/instant-messengers/ratox { };
-
rawtherapee = callPackage ../applications/graphics/rawtherapee {
fftw = fftwSinglePrec;
};
@@ -31837,63 +15789,35 @@ with pkgs;
rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { };
- rcs = callPackage ../applications/version-management/rcs { };
-
- rcshist = callPackage ../applications/version-management/rcshist { };
-
- rdesktop = callPackage ../applications/networking/remote/rdesktop { };
-
rdedup = callPackage ../tools/backup/rdedup {
inherit (darwin.apple_sdk.frameworks) Security;
};
- rdup = callPackage ../tools/backup/rdup { };
-
reaper = callPackage ../applications/audio/reaper {
jackLibrary = libjack2; # Another option is "pipewire.jack".
ffmpeg = ffmpeg_4-headless;
};
- recapp = callPackage ../applications/video/recapp { };
-
- recode = callPackage ../tools/text/recode { };
-
reddsaver = callPackage ../applications/misc/reddsaver {
inherit (darwin.apple_sdk.frameworks) Security;
};
rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { };
- remotebox = callPackage ../applications/virtualization/remotebox { };
-
restique = libsForQt5.callPackage ../applications/backup/restique { };
retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
- revanced-cli = callPackage ../applications/misc/revanced-cli { };
-
rgp = libsForQt5.callPackage ../development/tools/rgp { };
- ries = callPackage ../applications/science/math/ries { };
-
ripcord = if stdenv.hostPlatform.isLinux then
qt5.callPackage ../applications/networking/instant-messengers/ripcord { }
else
callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { };
- ripser = callPackage ../applications/science/math/ripser { };
-
- rkdeveloptool = callPackage ../misc/rkdeveloptool { };
-
- rkdeveloptool-pine64 = callPackage ../misc/rkdeveloptool-pine64 { };
-
- rke = callPackage ../applications/networking/cluster/rke { };
-
inherit (callPackage ../applications/networking/cluster/rke2 { }) rke2_stable rke2_latest rke2_testing;
rke2 = rke2_stable;
- rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { };
-
rofi-unwrapped = callPackage ../applications/misc/rofi { };
rofi = callPackage ../applications/misc/rofi/wrapper.nix { };
rofi-wayland-unwrapped = callPackage ../applications/misc/rofi/wayland.nix { };
@@ -31906,14 +15830,6 @@ with pkgs;
backend = "wayland";
};
- rofi-menugen = callPackage ../applications/misc/rofi-menugen { };
-
- rofi-systemd = callPackage ../tools/system/rofi-systemd { };
-
- rootlesskit = callPackage ../tools/virtualization/rootlesskit { };
-
- rsclock = callPackage ../applications/misc/rsclock { };
-
rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
jdk = jdk8;
};
@@ -31923,12 +15839,6 @@ with pkgs;
rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {});
rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix { };
- rtfm = callPackage ../applications/misc/rtfm { };
-
- rtl_433 = callPackage ../applications/radio/rtl_433 { };
-
- rtl-ais = callPackage ../applications/radio/rtl-ais { };
-
inherit (callPackages ../applications/radio/rtl-sdr { })
rtl-sdr-librtlsdr
rtl-sdr-osmocom
@@ -31936,151 +15846,41 @@ with pkgs;
rtl-sdr = rtl-sdr-blog;
- rubyripper = callPackage ../applications/audio/rubyripper { };
-
rucredstash = callPackage ../tools/security/rucredstash {
inherit (darwin.apple_sdk.frameworks) Security;
};
- runc = callPackage ../applications/virtualization/runc { };
-
- rust-traverse = callPackage ../applications/misc/rust-traverse { };
-
- rusty-psn = callPackage ../applications/misc/rusty-psn { };
-
rusty-psn-gui = rusty-psn.override { withGui = true; };
- rymcast = callPackage ../applications/audio/rymcast { };
-
rymdport = callPackage ../applications/networking/rymdport {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
- uade = callPackage ../applications/audio/uade { };
-
- sacc = callPackage ../applications/networking/gopher/sacc { };
-
savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan {};
sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
- sbagen = callPackage ../applications/misc/sbagen { };
-
scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { };
scantailor-universal = libsForQt5.callPackage ../applications/graphics/scantailor/universal.nix { };
- sc-im = callPackage ../applications/misc/sc-im { };
-
- scli = callPackage ../applications/misc/scli { };
-
scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };
scribus = scribus_1_5;
seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };
- seatd = callPackage ../applications/misc/seatd { };
-
- secrets-extractor = callPackage ../tools/security/secrets-extractor { };
-
- secretscanner = callPackage ../tools/security/secretscanner { };
-
- semiphemeral = callPackage ../tools/misc/semiphemeral { };
-
- semver = callPackage ../applications/misc/semver { };
-
- sent = callPackage ../applications/misc/sent { };
-
- seq24 = callPackage ../applications/audio/seq24 { };
-
seq66 = qt5.callPackage ../applications/audio/seq66 { };
- setbfree = callPackage ../applications/audio/setbfree { };
-
- sfizz = callPackage ../applications/audio/sfizz { };
-
- sfxr = callPackage ../applications/audio/sfxr { };
-
sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
- shadowfox = callPackage ../tools/networking/shadowfox { };
-
- shavee = callPackage ../applications/misc/shavee { };
-
- shfmt = callPackage ../tools/text/shfmt { };
-
- shipments = callPackage ../applications/misc/shipments { };
-
- shotgun = callPackage ../tools/graphics/shotgun { };
-
- shot-scraper = callPackage ../tools/graphics/shot-scraper { };
-
- shutter = callPackage ../applications/graphics/shutter { };
-
- sic-image-cli = callPackage ../tools/graphics/sic-image-cli { };
-
- siproxd = callPackage ../applications/networking/siproxd { };
-
- sish = callPackage ../tools/networking/sish { };
-
- slingshot = callPackage ../tools/misc/slingshot { };
-
- slop = callPackage ../tools/misc/slop { };
-
- slowhttptest = callPackage ../tools/security/slowhttptest { };
-
- slrn = callPackage ../applications/networking/newsreaders/slrn { };
-
- smartcrop = callPackage ../tools/graphics/smartcrop { };
-
- sniffnet = callPackage ../applications/networking/sniffnet { };
-
- sniproxy = callPackage ../applications/networking/sniproxy { };
-
- snixembed = callPackage ../applications/misc/snixembed { };
-
sommelier = callPackage ../applications/window-managers/sommelier { };
- sooperlooper = callPackage ../applications/audio/sooperlooper { };
-
- sops = callPackage ../tools/security/sops { };
-
- sorcer = callPackage ../applications/audio/sorcer { };
-
- sound-juicer = callPackage ../applications/audio/sound-juicer { };
-
- soundtracker = callPackage ../applications/audio/soundtracker { };
-
- spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { };
-
- spike = callPackage ../applications/virtualization/spike { };
-
- tensorman = callPackage ../tools/misc/tensorman { };
-
- spideroak = callPackage ../applications/networking/spideroak { };
-
spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { };
- spotify-tray = callPackage ../applications/misc/spotify-tray { };
-
- sptlrx = callPackage ../applications/audio/sptlrx { };
-
- sptk = callPackage ../development/libraries/sptk { };
-
squishyball = callPackage ../applications/audio/squishyball {
ncurses = ncurses5;
};
- stw = callPackage ../applications/misc/stw { };
-
- styx = callPackage ../applications/misc/styx { };
-
- sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { };
-
- tart = callPackage ../applications/virtualization/tart { };
-
- wavebox = callPackage ../applications/networking/instant-messengers/wavebox { };
-
sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
stag = callPackage ../applications/misc/stag {
@@ -32094,8 +15894,6 @@ with pkgs;
})
);
- swingsane = callPackage ../applications/graphics/swingsane { };
-
sxiv = callPackage ../applications/graphics/sxiv {
imlib2 = imlib2Full;
};
@@ -32104,26 +15902,16 @@ with pkgs;
imlib2 = imlib2Full;
};
- resilio-sync = callPackage ../applications/networking/resilio-sync { };
-
dropbox = callPackage ../applications/networking/dropbox { };
dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };
- synology-drive-client = callPackage ../applications/networking/synology-drive-client { };
-
- synology-cloud-sync-decryption-tool = callPackage ../applications/networking/synology-cloud-sync-decryption-tool { };
-
- litemdview = callPackage ../applications/graphics/litemdview { };
-
maestral = with python3Packages; toPythonApplication maestral;
maestral-gui = qt6Packages.callPackage ../applications/networking/maestral-qt { };
myfitnesspal = with python3Packages; toPythonApplication myfitnesspal;
- lemurs = callPackage ../applications/display-managers/lemurs { };
-
libstrangle = callPackage ../tools/X11/libstrangle {
stdenv = stdenv_32bit;
};
@@ -32132,24 +15920,12 @@ with pkgs;
lightdm_qt = lightdm.override { withQt5 = true; };
- lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { };
-
lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {
inherit (xfce) xfce4-dev-tools;
};
- lightdm-slick-greeter = callPackage ../applications/display-managers/lightdm-slick-greeter { };
-
- lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { };
-
- lightdm-mobile-greeter = callPackage ../applications/display-managers/lightdm-mobile-greeter { };
-
- lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { };
-
ly = callPackage ../applications/display-managers/ly { };
- slic3r = callPackage ../applications/misc/slic3r { };
-
curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };
curaengine = callPackage ../applications/misc/curaengine {
@@ -32161,12 +15937,6 @@ with pkgs;
curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
- peru = callPackage ../applications/version-management/peru { };
-
- pmidi = callPackage ../applications/audio/pmidi { };
-
- printrun = callPackage ../applications/misc/printrun { };
-
prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer {
# Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory
# on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds
@@ -32184,29 +15954,14 @@ with pkgs;
orca-slicer = callPackage ../applications/misc/bambu-studio/orca-slicer.nix {};
- snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { };
-
- robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
-
- routedns = callPackage ../tools/networking/routedns { };
-
skrooge = libsForQt5.callPackage ../applications/office/skrooge { };
smartdeblur = libsForQt5.callPackage ../applications/graphics/smartdeblur { };
- snapper = callPackage ../tools/misc/snapper { };
- snapper-gui = callPackage ../applications/misc/snapper-gui { };
-
snd = darwin.apple_sdk_11_0.callPackage ../applications/audio/snd {
inherit (darwin.apple_sdk_11_0.frameworks) CoreServices CoreMIDI;
};
- sharpsat-td = callPackage ../applications/science/logic/sharpsat-td { };
-
- shntool = callPackage ../applications/audio/shntool { };
-
- sipp = callPackage ../development/tools/misc/sipp { };
-
soci = callPackage ../development/libraries/soci { };
socialscan = with python3.pkgs; toPythonApplication socialscan;
@@ -32217,50 +15972,26 @@ with pkgs;
soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { };
- soundsource = callPackage ../applications/audio/soundsource { };
-
sox = callPackage ../applications/misc/audio/sox {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
};
- soxr = callPackage ../applications/misc/audio/soxr { };
-
spek = callPackage ../applications/audio/spek {
autoreconfHook = buildPackages.autoreconfHook269;
};
- spotify = callPackage ../applications/audio/spotify { };
-
- spotify-player = callPackage ../applications/audio/spotify-player { };
-
psst = callPackage ../applications/audio/psst { };
squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix {
audioBackend = "pulse";
};
- ltunify = callPackage ../tools/misc/ltunify { };
-
- ssrc = callPackage ../applications/audio/ssrc { };
-
- stalonetray = callPackage ../applications/window-managers/stalonetray { };
-
inherit (ocaml-ng.ocamlPackages) stog;
- stp = callPackage ../applications/science/logic/stp { };
-
- stretchly = callPackage ../applications/misc/stretchly { };
-
- stuffbin = callPackage ../tools/filesystems/stuffbin { };
-
- stumpish = callPackage ../applications/window-managers/stumpish { };
-
stumpwm = sbclPackages.stumpwm;
stumpwm-unwrapped = sbclPackages.stumpwm-unwrapped;
- sublime = callPackage ../applications/editors/sublime/2 { };
-
sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { });
sublime3 = sublime3Packages.sublime3;
@@ -32286,18 +16017,12 @@ with pkgs;
pythonBindings = true;
};
- subtitlr = callPackage ../applications/audio/subtitlr { };
-
- subunit = callPackage ../development/libraries/subunit { };
-
surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
surge = callPackage ../applications/audio/surge {
git = gitMinimal;
};
- surge-XT = callPackage ../applications/audio/surge-XT { };
-
survex = callPackage ../applications/misc/survex {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
@@ -32306,26 +16031,14 @@ with pkgs;
waylandSupport = true;
};
- svkbd = callPackage ../applications/accessibility/svkbd { };
-
- swaglyrics = callPackage ../tools/misc/swaglyrics { };
-
- swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
-
sylpheed = callPackage ../applications/networking/mailreaders/sylpheed {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- symbolic-preview = callPackage ../applications/graphics/symbolic-preview { };
-
- symlinks = callPackage ../tools/system/symlinks { };
-
syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
syncplay-nogui = syncplay.override { enableGUI = false; };
- syncterm = callPackage ../applications/terminal-emulators/syncterm { };
-
inherit (callPackages ../applications/networking/syncthing {
inherit (darwin) autoSignDarwinBinariesHook;
})
@@ -32364,100 +16077,27 @@ with pkgs;
tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho { };
- tagger = callPackage ../applications/audio/tagger { };
-
- tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs { };
-
- tailor-gui = callPackage ../os-specific/linux/tailor-gui { };
-
- taizen = callPackage ../applications/misc/taizen { };
-
- talosctl = callPackage ../applications/networking/cluster/talosctl { };
-
- talentedhack = callPackage ../applications/audio/talentedhack { };
-
- tambura = callPackage ../applications/audio/tambura { };
-
tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { };
- tanka = callPackage ../applications/networking/cluster/tanka { };
-
- teams = callPackage ../applications/networking/instant-messengers/teams { };
-
- teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { };
teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
taskjuggler = callPackage ../applications/misc/taskjuggler { };
- tabula-java = callPackage ../applications/misc/tabula-java { };
-
- tasknc = callPackage ../applications/misc/tasknc { };
-
- tasktimer = callPackage ../applications/misc/tasktimer { };
-
- taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { };
-
- dstask = callPackage ../applications/misc/dstask { };
-
- tasksh = callPackage ../applications/misc/tasksh { };
-
- taskserver = callPackage ../servers/misc/taskserver { };
-
- taskopen = callPackage ../applications/misc/taskopen { };
-
telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop {
stdenv = if stdenv.hostPlatform.isDarwin
then llvmPackages_19.stdenv
else stdenv;
};
- tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { };
-
tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { };
- telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { };
-
- telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze { };
-
- telepathy-logger = callPackage ../applications/networking/instant-messengers/telepathy/logger { };
-
- telepathy-mission-control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
-
- telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle { };
-
- tempo = callPackage ../servers/tracing/tempo { };
-
- temporal = callPackage ../applications/networking/cluster/temporal { };
-
- temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { };
-
- temporalite = callPackage ../applications/networking/cluster/temporalite { };
-
- tenacity = callPackage ../applications/audio/tenacity { };
-
- tendermint = callPackage ../tools/networking/tendermint { };
-
- termdbms = callPackage ../development/tools/database/termdbms { };
-
termdown = python3Packages.callPackage ../applications/misc/termdown { };
- termimage = callPackage ../tools/graphics/termimage { };
-
terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects ;
- terminal-notifier = callPackage ../applications/misc/terminal-notifier { };
-
- textplots = callPackage ../tools/graphics/textplots { };
-
- texture-synthesis = callPackage ../tools/graphics/texture-synthesis { };
-
texturepacker = qt6.callPackage ../applications/graphics/texturepacker { };
- termtosvg = callPackage ../tools/misc/termtosvg { };
-
- tessen = callPackage ../tools/security/tessen { };
-
inherit (callPackage ../applications/graphics/tesseract {
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
})
@@ -32466,18 +16106,6 @@ with pkgs;
tesseract5;
tesseract = tesseract5;
- tetraproc = callPackage ../applications/audio/tetraproc { };
-
- tev = callPackage ../applications/graphics/tev { };
-
- textual-paint = callPackage ../applications/graphics/textual-paint { };
-
- themechanger = callPackage ../applications/misc/themechanger { };
-
- thinkingRock = callPackage ../applications/misc/thinking-rock { };
-
- thokr = callPackage ../applications/misc/thokr { };
-
thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix {
callPackage = newScope {
inherit (rustPackages) cargo rustc;
@@ -32505,22 +16133,10 @@ with pkgs;
generated = import ../applications/networking/mailreaders/thunderbird-bin/release_sources.nix;
};
- thunderbolt = callPackage ../os-specific/linux/thunderbolt { };
-
- ticpp = callPackage ../development/libraries/ticpp { };
-
- ticker = callPackage ../applications/misc/ticker { };
-
- tickrs = callPackage ../applications/misc/tickrs { };
-
- tijolo = callPackage ../applications/editors/tijolo { };
-
timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
fftw = fftwSinglePrec;
};
- timelimit = callPackage ../tools/misc/timelimit { };
-
inherit
({
timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { };
@@ -32532,84 +16148,29 @@ with pkgs;
timeshift-minimal
;
- timewarrior = callPackage ../applications/misc/timewarrior { };
-
- timew-sync-server = callPackage ../applications/misc/timew-sync-server { };
-
- timg = callPackage ../tools/graphics/timg { };
-
timidity = callPackage ../tools/misc/timidity {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
inherit (darwin) libobjc;
};
- tint2 = callPackage ../applications/misc/tint2 { };
-
tiny = callPackage ../applications/networking/irc/tiny {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
tipp10 = qt6.callPackage ../applications/misc/tipp10 { };
- tkrev = callPackage ../applications/version-management/tkrev { };
-
- tla = callPackage ../applications/version-management/arch { };
-
- tlf = callPackage ../applications/radio/tlf { };
-
tlp = callPackage ../tools/misc/tlp {
inherit (linuxPackages) x86_energy_perf_policy;
};
- tmatrix = callPackage ../applications/misc/tmatrix { };
-
- tnef = callPackage ../applications/misc/tnef { };
-
- todiff = callPackage ../applications/misc/todiff { };
-
- todo-txt-cli = callPackage ../applications/office/todo.txt-cli { };
-
- todofi-sh = callPackage ../applications/office/todofi.sh { };
-
- todoman = callPackage ../applications/office/todoman { };
-
- tofi = callPackage ../applications/misc/tofi { };
-
- topydo = callPackage ../applications/misc/topydo { };
-
- torrential = callPackage ../applications/networking/p2p/torrential { };
-
torrenttools = callPackage ../tools/misc/torrenttools {
fmt = fmt_8;
};
- tortoisehg = callPackage ../applications/version-management/tortoisehg { };
-
- tone = callPackage ../applications/audio/tone { };
-
- tonelib-gfx = callPackage ../applications/audio/tonelib-gfx { };
-
- tonelib-jam = callPackage ../applications/audio/tonelib-jam { };
-
- tonelib-zoom = callPackage ../applications/audio/tonelib-zoom { };
-
- tonelib-metal = callPackage ../applications/audio/tonelib-metal { };
-
- tonelib-noisereducer = callPackage ../applications/audio/tonelib-noisereducer { };
-
tony = libsForQt5.callPackage ../applications/audio/tony { };
- toipe = callPackage ../applications/misc/toipe { };
-
- toxiproxy = callPackage ../development/tools/toxiproxy { };
-
- tqsl = callPackage ../applications/radio/tqsl { };
trustedqsl = tqsl; # Alias added 2019-02-10
- transcode = callPackage ../applications/audio/transcode { };
-
- transcribe = callPackage ../applications/audio/transcribe { };
-
libtransmission_3 = transmission_3.override {
installLib = true;
enableDaemon = false;
@@ -32635,95 +16196,51 @@ with pkgs;
transmission_4-qt6 = transmission_4.override { enableQt6 = true; };
transmission_4-qt = transmission_4-qt5;
- transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk { };
-
- transgui = callPackage ../applications/networking/p2p/transgui { };
-
traverso = libsForQt5.callPackage ../applications/audio/traverso { };
- trayer = callPackage ../applications/window-managers/trayer { };
-
tinywl = callPackage ../applications/window-managers/tinywl {
wlroots = wlroots_0_18;
};
tree-from-tags = callPackage ../applications/audio/tree-from-tags { };
- tdrop = callPackage ../applications/misc/tdrop { };
-
- tre-command = callPackage ../tools/system/tre-command { };
-
- tree = callPackage ../tools/system/tree { };
-
treesheets = callPackage ../applications/office/treesheets {
wxGTK = wxGTK32;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- tremc = callPackage ../applications/networking/p2p/tremc { };
-
- trillian-im = callPackage ../applications/networking/instant-messengers/trillian-im { };
-
trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
- ttyper = callPackage ../applications/misc/ttyper { };
-
- tuba = callPackage ../applications/misc/tuba { };
-
- tudu = callPackage ../applications/office/tudu { };
-
- tuna = callPackage ../os-specific/linux/tuna { };
-
tunefish = callPackage ../applications/audio/tunefish {
stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4
};
- tut = callPackage ../applications/misc/tut { };
-
tuxclocker = libsForQt5.callPackage ../applications/misc/tuxclocker {
tuxclocker-plugins = tuxclocker-plugins-with-unfree;
};
tuxclocker-without-unfree = libsForQt5.callPackage ../applications/misc/tuxclocker { };
- tuxedo-rs = callPackage ../os-specific/linux/tuxedo-rs { };
-
twmn = libsForQt5.callPackage ../applications/misc/twmn { };
- testssl = callPackage ../applications/networking/testssl { };
-
tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { };
t-rec = callPackage ../misc/t-rec {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
- ulauncher = callPackage ../applications/misc/ulauncher { };
-
twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };
- terminal-stocks = callPackage ../applications/misc/terminal-stocks { };
-
terminal-typeracer = callPackage ../applications/misc/terminal-typeracer {
inherit (darwin.apple_sdk.frameworks) Security;
};
- typer = callPackage ../applications/misc/typer { };
-
- typioca = callPackage ../applications/misc/typioca { };
-
ueberzug = with python3Packages; toPythonApplication ueberzug;
ueberzugpp = callPackage ../by-name/ue/ueberzugpp/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
- uefi-run = callPackage ../tools/virtualization/uefi-run { };
-
- umurmur = callPackage ../applications/networking/umurmur { };
-
- udocker = callPackage ../tools/virtualization/udocker { };
-
uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {});
uefitool = uefitoolPackages.new-engine;
@@ -32732,70 +16249,32 @@ with pkgs;
channel = "ungoogled-chromium";
});
- uni = callPackage ../applications/misc/uni { };
-
- unigine-valley = callPackage ../applications/graphics/unigine-valley { };
-
- unigine-heaven = callPackage ../applications/graphics/unigine-heaven { };
-
unigine-tropics = pkgsi686Linux.callPackage ../applications/graphics/unigine-tropics { };
unigine-sanctuary = pkgsi686Linux.callPackage ../applications/graphics/unigine-sanctuary { };
unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { };
- unpaper = callPackage ../tools/graphics/unpaper { };
-
- unison-ucm = callPackage ../development/compilers/unison { };
-
- upnp-router-control = callPackage ../applications/networking/upnp-router-control { };
-
- urh = callPackage ../applications/radio/urh { };
-
- uroboros = callPackage ../tools/system/uroboros { };
-
uuagc = haskell.lib.compose.justStaticExecutables haskellPackages.uuagc;
- uucp = callPackage ../tools/misc/uucp { };
-
- uvccapture = callPackage ../applications/video/uvccapture { };
-
- uwimap = callPackage ../tools/networking/uwimap { };
-
- utm = callPackage ../os-specific/darwin/utm { };
-
- utox = callPackage ../applications/networking/instant-messengers/utox { };
-
valentina = libsForQt5.callPackage ../applications/misc/valentina { };
- vbindiff = callPackage ../applications/editors/vbindiff { };
-
vcprompt = callPackage ../applications/version-management/vcprompt {
autoconf = buildPackages.autoconf269;
};
- vcs = callPackage ../applications/video/vcs { };
-
- vcv-rack = callPackage ../applications/audio/vcv-rack { };
-
vdirsyncer = with python3Packages; toPythonApplication vdirsyncer;
- vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
-
vengi-tools = darwin.apple_sdk_11_0.callPackage ../applications/graphics/vengi-tools {
inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL;
};
- verbiste = callPackage ../applications/misc/verbiste { };
-
veusz = libsForQt5.callPackage ../applications/graphics/veusz { };
vim = vimUtils.makeCustomizable (callPackage ../applications/editors/vim {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
});
- vimiv-qt = callPackage ../applications/graphics/vimiv-qt { };
-
macvim = let
macvimUtils = callPackage ../applications/editors/vim/macvim-configurable.nix { };
in macvimUtils.makeCustomizable (callPackage ../applications/editors/vim/macvim.nix {
@@ -32823,16 +16302,10 @@ with pkgs;
vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
- vimv = callPackage ../tools/misc/vimv { };
-
- vimv-rs = callPackage ../tools/misc/vimv-rs { };
-
qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { };
vimgolf = callPackage ../games/vimgolf { };
- vimpc = callPackage ../applications/audio/vimpc { };
-
# this is a lower-level alternative to wrapNeovim conceived to handle
# more usecases when wrapping neovim. The interface is being actively worked on
# so expect breakage. use wrapNeovim instead if you want a stable alternative
@@ -32851,16 +16324,10 @@ with pkgs;
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
- virter = callPackage ../applications/virtualization/virter { };
-
- virt-viewer = callPackage ../applications/virtualization/virt-viewer { };
-
virt-top = callPackage ../applications/virtualization/virt-top {
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
- virt-what = callPackage ../applications/virtualization/virt-what { };
-
virt-manager = callPackage ../applications/virtualization/virt-manager {
system-libvirt = libvirt;
};
@@ -32869,8 +16336,6 @@ with pkgs;
qtermwidget = lxqt.qtermwidget_1_4;
};
- virtual-ans = callPackage ../applications/audio/virtual-ans { };
-
virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
stdenv = stdenv_32bit;
inherit (gnome2) libIDL;
@@ -32934,13 +16399,8 @@ with pkgs;
else null;
};
- uvcdynctrl = callPackage ../os-specific/linux/uvcdynctrl { };
-
- viper4linux = callPackage ../applications/audio/viper4linux { };
viper4linux-gui = libsForQt5.callPackage ../applications/audio/viper4linux-gui { };
- vkeybd = callPackage ../applications/audio/vkeybd { };
-
vlc-bin-universal = vlc-bin.override { variant = "universal"; };
libvlc = vlc.override {
@@ -32952,22 +16412,10 @@ with pkgs;
vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { };
- vmware-workstation = callPackage ../applications/virtualization/vmware-workstation { };
-
- vocproc = callPackage ../applications/audio/vocproc { };
-
- vnstat = callPackage ../applications/networking/vnstat { };
-
- vocal = callPackage ../applications/audio/vocal { };
-
- volnoti = callPackage ../applications/misc/volnoti { };
-
vorbis-tools = callPackage ../applications/audio/vorbis-tools {
autoreconfHook = buildPackages.autoreconfHook269;
};
- vpv = callPackage ../applications/graphics/vpv { };
-
vscode = callPackage ../applications/editors/vscode/vscode.nix { };
vscode-fhs = vscode.fhs;
vscode-fhsWithPackages = vscode.fhsWithPackages;
@@ -32996,25 +16444,13 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security;
};
- vue = callPackage ../applications/misc/vue { };
-
vuze = callPackage ../applications/networking/p2p/vuze {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
- vwm = callPackage ../applications/window-managers/vwm { };
-
- wad = callPackage ../tools/security/wad { };
-
- wafw00f = callPackage ../tools/security/wafw00f { };
-
whispers = with python3Packages; toPythonApplication whispers;
- whisper-ctranslate2 = callPackage ../tools/audio/whisper-ctranslate2 { };
-
- waon = callPackage ../applications/audio/waon { };
-
warp = callPackage ../applications/networking/warp {
inherit (darwin.apple_sdk.frameworks) Security Foundation;
};
@@ -33023,14 +16459,6 @@ with pkgs;
buildGoModule = buildGo122Module;
};
- warpd = callPackage ../applications/misc/warpd { };
-
- watershot = callPackage ../applications/misc/watershot { };
-
- waypaper = callPackage ../applications/misc/waypaper { };
-
- w3m = callPackage ../applications/networking/browsers/w3m { };
-
# Should always be the version with the most features
w3m-full = w3m;
@@ -33054,14 +16482,6 @@ with pkgs;
imlib2 = imlib2-nox;
};
- watchmate = callPackage ../applications/misc/watchmate { };
-
- watson = callPackage ../applications/office/watson { };
-
- wapiti = callPackage ../tools/security/wapiti { };
-
- weave-gitops = callPackage ../applications/networking/cluster/weave-gitops { };
-
wayfire = callPackage ../applications/window-managers/wayfire/default.nix {
wlroots = wlroots_0_17;
};
@@ -33074,30 +16494,18 @@ with pkgs;
plugins = with wayfirePlugins; [ wcm wf-shell ];
};
- waypipe = callPackage ../applications/networking/remote/waypipe { };
-
- wayv = callPackage ../tools/X11/wayv { };
-
- wayvnc = callPackage ../applications/networking/remote/wayvnc { };
-
- webanalyze = callPackage ../tools/security/webanalyze { };
-
webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { };
webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_32; };
webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_31; };
- webex = callPackage ../applications/networking/instant-messengers/webex { };
-
webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {
stdenv = if stdenv.cc.isClang then gccStdenv else stdenv;
};
webssh = with python3Packages; toPythonApplication webssh;
- webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { };
-
wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };
weechat-unwrapped = callPackage ../applications/networking/irc/weechat {
@@ -33128,56 +16536,20 @@ with pkgs;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
- weston = callPackage ../applications/window-managers/weston { };
-
wgnord = callPackage ../applications/networking/wgnord/default.nix { };
whalebird = callPackage ../applications/misc/whalebird {
electron = electron_27;
};
- windowlab = callPackage ../applications/window-managers/windowlab { };
-
inherit (windowmaker) dockapps;
- wily = callPackage ../applications/editors/wily { };
-
- wings = callPackage ../applications/graphics/wings { };
-
- wlc = callPackage ../tools/misc/wlc { };
-
- wlclock = callPackage ../applications/misc/wlclock { };
-
- wlcs = callPackage ../development/tools/wlcs { };
-
- wllvm = callPackage ../development/tools/wllvm { };
-
- wmname = callPackage ../applications/misc/wmname { };
-
- wmctrl = callPackage ../tools/X11/wmctrl { };
-
- wmderland = callPackage ../applications/window-managers/wmderland { };
-
- wmderlandc = callPackage ../applications/window-managers/wmderlandc { };
-
- wmii = callPackage ../applications/window-managers/wmii { };
-
- wofi = callPackage ../applications/misc/wofi { };
-
wofi-pass = callPackage ../../pkgs/tools/security/pass/wofi-pass.nix { };
- wofi-emoji = callPackage ../applications/misc/wofi-emoji { };
-
- cl-wordle = callPackage ../games/cl-wordle { };
-
- wordbook = callPackage ../applications/misc/wordbook { };
-
wordnet = callPackage ../applications/misc/wordnet {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- wordgrinder = callPackage ../applications/office/wordgrinder { };
-
workrave = callPackage ../applications/misc/workrave {
inherit (python3Packages) jinja2;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
@@ -33194,8 +16566,6 @@ with pkgs;
wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { };
- wp4nix = callPackage ../development/tools/wp4nix { };
-
wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
wxhexeditor = callPackage ../applications/editors/wxhexeditor {
@@ -33208,46 +16578,16 @@ with pkgs;
autoconf = buildPackages.autoconf269;
};
- x11vnc = callPackage ../tools/X11/x11vnc { };
-
- x11spice = callPackage ../tools/X11/x11spice { };
-
x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
- x2goserver = callPackage ../applications/networking/remote/x2goserver { };
-
- x2vnc = callPackage ../tools/X11/x2vnc { };
-
x32edit = callPackage ../applications/audio/midas/x32edit.nix { };
- x42-avldrums = callPackage ../applications/audio/x42-avldrums { };
-
- x42-gmsynth = callPackage ../applications/audio/x42-gmsynth { };
-
- x42-plugins = callPackage ../applications/audio/x42-plugins { };
-
- xannotate = callPackage ../tools/X11/xannotate { };
-
xaos = libsForQt5.callPackage ../applications/graphics/xaos { };
- xastir = callPackage ../applications/misc/xastir { };
-
- xautomation = callPackage ../tools/X11/xautomation { };
-
- xawtv = callPackage ../applications/video/xawtv { };
-
- xbattbar = callPackage ../applications/misc/xbattbar { };
-
- xbindkeys = callPackage ../tools/X11/xbindkeys { };
-
xbindkeys-config = callPackage ../tools/X11/xbindkeys-config {
gtk = gtk2;
};
- xborders = callPackage ../tools/X11/xborders { };
-
- xxh = callPackage ../tools/networking/xxh { };
-
kodiPackages = recurseIntoAttrs (kodi.packages);
kodi = callPackage ../applications/video/kodi {
@@ -33267,64 +16607,18 @@ with pkgs;
gbmSupport = true;
};
- kodi-cli = callPackage ../tools/misc/kodi-cli { };
-
xca = qt6Packages.callPackage ../applications/misc/xca { };
- xcalib = callPackage ../tools/X11/xcalib { };
-
- xcape = callPackage ../tools/X11/xcape { };
-
- xcat = callPackage ../tools/security/xcat { };
-
- xchainkeys = callPackage ../tools/X11/xchainkeys { };
-
inherit (xorg) xcompmgr;
- x-create-mouse-void = callPackage ../applications/window-managers/x-create-mouse-void { };
-
- xd = callPackage ../applications/networking/p2p/xd { };
-
- xdaliclock = callPackage ../tools/misc/xdaliclock { };
-
- xdg-dbus-proxy = callPackage ../development/libraries/xdg-dbus-proxy { };
-
xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
- xdg-desktop-portal-gnome = callPackage ../development/libraries/xdg-desktop-portal-gnome { };
-
- xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };
-
xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland {
inherit (qt6) qtbase qttools qtwayland wrapQtAppsHook;
};
- xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { };
-
- xdg-desktop-portal-xapp = callPackage ../development/libraries/xdg-desktop-portal-xapp { };
-
- xdg-utils = callPackage ../tools/X11/xdg-utils {};
-
- xdgmenumaker = callPackage ../applications/misc/xdgmenumaker { };
-
- xdotool = callPackage ../tools/X11/xdotool { };
-
buildXenPackage = callPackage ../build-support/xen { };
- xkbset = callPackage ../tools/X11/xkbset { };
-
- xkbmon = callPackage ../applications/misc/xkbmon { };
-
- win-spice = callPackage ../applications/virtualization/driver/win-spice { };
-
- xfig = callPackage ../applications/graphics/xfig { };
-
- xfractint = callPackage ../applications/graphics/xfractint { };
-
- xmind = callPackage ../applications/misc/xmind { };
-
- xneur = callPackage ../applications/misc/xneur { };
-
gxneur = callPackage ../applications/misc/gxneur {
inherit (gnome2) libglade GConf;
};
@@ -33341,16 +16635,6 @@ with pkgs;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
- xplugd = callPackage ../tools/X11/xplugd { };
-
- xkb-switch = callPackage ../tools/X11/xkb-switch { };
-
- xkb-switch-i3 = callPackage ../tools/X11/xkb-switch-i3 { };
-
- xkblayout-state = callPackage ../applications/misc/xkblayout-state { };
-
- xlife = callPackage ../applications/graphics/xlife { };
-
xmobar = haskellPackages.xmobar.bin;
xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix {
@@ -33374,10 +16658,6 @@ with pkgs;
desktopSupport = "xfce4";
};
- xmountains = callPackage ../applications/graphics/xmountains { };
-
- xmppc = callPackage ../applications/networking/instant-messengers/xmppc { };
-
libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
xpra = callPackage ../tools/X11/xpra { };
@@ -33387,38 +16667,10 @@ with pkgs;
};
libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
- xrectsel = callPackage ../tools/X11/xrectsel { };
-
- xrestop = callPackage ../tools/X11/xrestop { };
-
xsd = callPackage ../development/libraries/xsd {
stdenv = gcc9Stdenv;
};
- xscope = callPackage ../applications/misc/xscope { };
-
- xsubfind3r = callPackage ../tools/security/xsubfind3r { };
-
- xsuspender = callPackage ../applications/misc/xsuspender { };
-
- xss-lock = callPackage ../misc/screensavers/xss-lock { };
-
- xloadimage = callPackage ../tools/X11/xloadimage { };
-
- xssproxy = callPackage ../misc/screensavers/xssproxy { };
-
- xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { };
-
- xtrace = callPackage ../tools/X11/xtrace { };
-
- xtruss = callPackage ../tools/X11/xtruss { };
-
- xtuner = callPackage ../applications/audio/xtuner { };
-
- xmacro = callPackage ../tools/X11/xmacro { };
-
- xmenu = callPackage ../applications/misc/xmenu { };
-
xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -33427,44 +16679,16 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
};
- xnee = callPackage ../tools/X11/xnee { };
-
- xnotify = callPackage ../tools/X11/xnotify { };
-
- xpano = callPackage ../applications/graphics/xpano { };
-
- xv = callPackage ../applications/graphics/xv { };
-
xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
- xzgv = callPackage ../applications/graphics/xzgv { };
-
yabar = callPackage ../applications/window-managers/yabar { };
yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { };
- yarp = callPackage ../applications/science/robotics/yarp { };
-
- yate = callPackage ../applications/misc/yate { };
-
- yaup = callPackage ../applications/networking/yaup { };
-
ydiff = with python3.pkgs; toPythonApplication ydiff;
- ydict = callPackage ../applications/misc/ydict { };
-
- yed = callPackage ../applications/graphics/yed { };
-
- yeetgif = callPackage ../applications/graphics/yeetgif { };
-
- yelp-tools = callPackage ../development/misc/yelp-tools { };
-
- yewtube = callPackage ../applications/misc/yewtube { };
-
yokadi = python3Packages.callPackage ../applications/misc/yokadi { };
- yoshimi = callPackage ../applications/audio/yoshimi { };
-
your-editor = callPackage ../applications/editors/your-editor { stdenv = gccStdenv; };
youtube-dl = with python3Packages; toPythonApplication youtube-dl;
@@ -33487,47 +16711,19 @@ with pkgs;
youtube-viewer = perlPackages.WWWYoutubeViewer;
- ytalk = callPackage ../applications/networking/instant-messengers/ytalk { };
-
- ytarchive = callPackage ../tools/misc/ytarchive { };
-
- ytcast = callPackage ../tools/misc/ytcast { };
-
- ytcc = callPackage ../tools/networking/ytcc { };
-
- ytmdl = callPackage ../tools/misc/ytmdl { };
-
yuview = libsForQt5.yuview;
- zam-plugins = callPackage ../applications/audio/zam-plugins { };
-
zammad = callPackage ../applications/networking/misc/zammad { };
- zarf = callPackage ../applications/networking/cluster/zarf { };
-
zathuraPkgs = callPackage ../applications/misc/zathura { };
zathura = zathuraPkgs.zathuraWrapper;
- zdns = callPackage ../tools/security/zdns { };
-
- zerobin = callPackage ../applications/networking/zerobin { };
-
- zeroc-ice = callPackage ../development/libraries/zeroc-ice { };
-
zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };
- zeronet = callPackage ../applications/networking/p2p/zeronet { };
-
- zeronet-conservancy = callPackage ../applications/networking/p2p/zeronet-conservancy { };
-
zexy = callPackage ../applications/audio/pd-plugins/zexy {
autoconf = buildPackages.autoconf269;
};
- zgrab2 = callPackage ../tools/security/zgrab2 { };
-
- zgrviewer = callPackage ../applications/graphics/zgrviewer { };
-
zgv = callPackage ../applications/graphics/zgv {
# Enable the below line for terminal display. Note
# that it requires sixel graphics compatible terminals like mlterm
@@ -33535,28 +16731,10 @@ with pkgs;
SDL = SDL_sixel;
};
- zim = callPackage ../applications/office/zim { };
-
- zine = callPackage ../applications/misc/zine { };
-
- zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { };
-
- zita-at1 = callPackage ../applications/audio/zita-at1 { };
-
- zita-njbridge = callPackage ../applications/audio/zita-njbridge { };
-
- zotero = callPackage ../applications/office/zotero { };
-
zotero_7 = pkgs.zotero-beta;
- zscroll = callPackage ../applications/misc/zscroll { };
-
zsteg = callPackage ../tools/security/zsteg { };
- zx = callPackage ../tools/system/zx { };
-
- zxfer = callPackage ../applications/system/zxfer { };
-
zynaddsubfx = callPackage ../applications/audio/zynaddsubfx {
guiModule = "zest";
fftw = fftwSinglePrec;
@@ -33579,12 +16757,6 @@ with pkgs;
withGui = false;
};
- aperture = callPackage ../applications/blockchains/aperture { };
-
- backdown = callPackage ../tools/misc/backdown { };
-
- balanceofsatoshis = callPackage ../tools/misc/balanceofsatoshis { };
-
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
withGui = true;
@@ -33601,16 +16773,6 @@ with pkgs;
inherit (darwin) autoSignDarwinBinariesHook;
};
- btcd = callPackage ../applications/blockchains/btcd { };
-
- cgminer = callPackage ../applications/blockchains/cgminer { };
-
- clboss = callPackage ../applications/blockchains/clboss { };
-
- clightning = callPackage ../applications/blockchains/clightning { };
-
- besu = callPackage ../applications/blockchains/besu { };
-
bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc {
withGui = true;
protobuf = protobuf_21;
@@ -33627,12 +16789,6 @@ with pkgs;
cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
- dcrctl = callPackage ../applications/blockchains/dcrctl { };
- dcrd = callPackage ../applications/blockchains/dcrd { };
- dcrwallet = callPackage ../applications/blockchains/dcrwallet { };
-
- eclair = callPackage ../applications/blockchains/eclair { };
-
electrs = callPackage ../applications/blockchains/electrs {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -33655,12 +16811,6 @@ with pkgs;
};
};
- ergo = callPackage ../applications/blockchains/ergo { };
-
- erigon = callPackage ../applications/blockchains/erigon { };
-
- faraday = callPackage ../applications/blockchains/faraday { };
-
fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { };
go-ethereum = callPackage ../by-name/go/go-ethereum/package.nix {
@@ -33668,8 +16818,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- go-exploitdb = callPackage ../tools/security/go-exploitdb { };
-
gridcoin-research = libsForQt5.callPackage ../applications/blockchains/gridcoin-research {
boost = boost179;
};
@@ -33686,30 +16834,12 @@ with pkgs;
ledger-agent = with python3Packages; toPythonApplication ledger-agent;
- ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { };
-
- lightning-loop = callPackage ../applications/blockchains/lightning-loop { };
-
- lightning-pool = callPackage ../applications/blockchains/lightning-pool { };
-
litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin {
inherit (darwin.apple_sdk.frameworks) AppKit;
boost = pkgs.boost177;
};
litecoind = litecoin.override { withGui = false; };
- livedl = callPackage ../tools/misc/livedl { };
-
- lnd = callPackage ../applications/blockchains/lnd { };
-
- lndconnect = callPackage ../applications/blockchains/lndconnect { };
-
- lndinit = callPackage ../applications/blockchains/lndinit { };
-
- lndhub-go = callPackage ../applications/blockchains/lndhub-go { };
-
- lndmanage = callPackage ../applications/blockchains/lndmanage { };
-
monero-cli = callPackage ../applications/blockchains/monero-cli {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit;
};
@@ -33724,36 +16854,18 @@ with pkgs;
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };
- namecoind = callPackage ../applications/blockchains/namecoin { };
-
- nbxplorer = callPackage ../applications/blockchains/nbxplorer { };
-
pycoin = with python3Packages; toPythonApplication pycoin;
- stellar-core = callPackage ../applications/blockchains/stellar-core { };
-
- sumokoin = callPackage ../applications/blockchains/sumokoin { };
-
solana-validator = callPackage ../applications/blockchains/solana-validator { };
snarkos = callPackage ../applications/blockchains/snarkos {
inherit (darwin.apple_sdk.frameworks) Security;
};
- taproot-assets = callPackage ../applications/blockchains/taproot-assets { };
-
inherit (callPackages ../applications/blockchains/teos { })
teos
teos-watchtower-plugin;
- terra-station = callPackage ../applications/blockchains/terra-station { };
-
- tessera = callPackage ../applications/blockchains/tessera { };
-
- ton = callPackage ../applications/blockchains/ton { };
-
- torq = callPackage ../applications/blockchains/torq { };
-
vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin {
withGui = true;
};
@@ -33761,33 +16873,17 @@ with pkgs;
withGui = false;
};
- wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { };
-
- wasabibackend = callPackage ../applications/blockchains/wasabibackend { };
-
- wownero = callPackage ../applications/blockchains/wownero { };
-
zcash = callPackage ../applications/blockchains/zcash {
inherit (darwin.apple_sdk.frameworks) Security;
stdenv = llvmPackages_14.stdenv;
};
- zecwallet-lite = callPackage ../applications/blockchains/zecwallet-lite { };
-
- lightwalletd = callPackage ../applications/blockchains/lightwalletd { };
-
polkadot = callPackage ../applications/blockchains/polkadot {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- particl-core = callPackage ../applications/blockchains/particl-core { };
-
- quorum = callPackage ../applications/blockchains/quorum { };
-
samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { };
- scaleft = callPackage ../applications/networking/scaleft { };
-
beancount = with python3.pkgs; toPythonApplication beancount;
beancount-black = with python3.pkgs; toPythonApplication beancount-black;
@@ -33804,24 +16900,14 @@ with pkgs;
cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { };
cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { };
- conceal = callPackage ../applications/misc/conceal { };
-
- conmon = callPackage ../applications/virtualization/conmon { };
-
- conmon-rs = callPackage ../applications/virtualization/conmon-rs { };
-
drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { };
eureka-ideas = callPackage ../applications/misc/eureka-ideas {
inherit (darwin.apple_sdk.frameworks) Security;
};
- nux = callPackage ../tools/misc/nux { };
-
phonemizer = with python3Packages; toPythonApplication phonemizer;
- tts = callPackage ../tools/audio/tts { };
-
wyoming-faster-whisper = callPackage ../tools/audio/wyoming/faster-whisper.nix { };
wyoming-openwakeword = callPackage ../tools/audio/wyoming/openwakeword.nix { };
@@ -33834,45 +16920,13 @@ with pkgs;
_2048-cli-curses = callPackage ../games/2048-cli { ui = "curses"; };
_2048-cli-terminal = callPackage ../games/2048-cli { ui = "terminal"; };
- _2048-in-terminal = callPackage ../games/2048-in-terminal { };
-
- _20kly = callPackage ../games/20kly { };
-
_90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; };
- among-sus = callPackage ../games/among-sus { };
-
- antsimulator = callPackage ../games/antsimulator { };
-
- augustus = callPackage ../games/augustus { };
-
- ballerburg = callPackage ../games/ballerburg { } ;
-
- colobot = callPackage ../games/colobot { };
-
- corsix-th = callPackage ../games/corsix-th { };
-
- enigma = callPackage ../games/enigma { };
-
- everspace = callPackage ../games/everspace { };
-
- ezquake = callPackage ../games/ezquake { };
-
- freedroid = callPackage ../games/freedroid { };
-
- freedroidrpg = callPackage ../games/freedroidrpg { };
-
- freenukum = callPackage ../games/freenukum { };
-
inherit (callPackages ../games/fteqw {})
fteqw
fteqw-dedicated
fteqcc;
- gamepad-tool = callPackage ../games/gamepad-tool { };
-
- gotypist = callPackage ../games/gotypist { };
-
heroic-unwrapped = callPackage ../games/heroic {
# Match the version used by the upstream package.
electron = electron_31;
@@ -33880,44 +16934,18 @@ with pkgs;
heroic = callPackage ../games/heroic/fhsenv.nix { };
- julius = callPackage ../games/julius { };
-
- jumpnbump = callPackage ../games/jumpnbump { };
-
- katawa-shoujo = callPackage ../games/katawa-shoujo { };
-
- keeperrl = callPackage ../games/keeperrl { };
-
- shipwright = callPackage ../games/shipwright { };
-
wipeout-rewrite = callPackage ../games/wipeout-rewrite {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
### GAMES/DOOM-PORTS
- dhewm3 = callPackage ../games/doom-ports/dhewm3 { };
-
doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { };
doomrunner = qt5.callPackage ../games/doom-ports/doomrunner { };
- chocolate-doom = callPackage ../games/doom-ports/chocolate-doom { };
-
- crispy-doom = callPackage ../games/doom-ports/crispy-doom { };
-
- eureka-editor = callPackage ../games/doom-ports/eureka-editor { };
-
enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { };
- eternity = callPackage ../games/doom-ports/eternity-engine { };
-
- odamex = callPackage ../games/doom-ports/odamex { };
-
- prboom-plus = callPackage ../games/doom-ports/prboom-plus { };
-
- rbdoom-3-bfg = callPackage ../games/doom-ports/rbdoom-3-bfg { };
-
slade = callPackage ../games/doom-ports/slade {
wxGTK = (wxGTK32.overrideAttrs {
patches = [
@@ -33968,30 +16996,10 @@ with pkgs;
zdoom = callPackage ../games/doom-ports/zdoom { };
- maelstrom = callPackage ../games/maelstrom { };
-
- mar1d = callPackage ../games/mar1d { } ;
-
- oh-my-git = callPackage ../games/oh-my-git { };
-
- opendune = callPackage ../games/opendune { };
-
- openrct2 = callPackage ../games/openrct2 { };
-
- opensearch = callPackage ../servers/search/opensearch { };
-
pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };
qgo = libsForQt5.callPackage ../games/qgo { };
- rotp = callPackage ../games/rotp { };
-
- rpg-cli = callPackage ../games/rpg-cli { };
-
- runelite = callPackage ../games/runelite { };
-
- runescape = callPackage ../games/runescape-launcher { };
-
sm64ex = callPackage ../games/sm64ex {
branch = "sm64ex";
};
@@ -34000,33 +17008,9 @@ with pkgs;
branch = "sm64ex-coop";
};
- snipes = callPackage ../games/snipes { };
-
- unvanquished = callPackage ../games/unvanquished { };
-
- xbill = callPackage ../games/xbill { };
-
- xmage = callPackage ../games/xmage { };
-
- abbaye-des-morts = callPackage ../games/abbaye-des-morts { };
-
- abuse = callPackage ../games/abuse { };
-
- airshipper = callPackage ../games/airshipper { };
-
- airstrike = callPackage ../games/airstrike { };
-
- alienarena = callPackage ../games/alienarena { };
-
amoeba = callPackage ../games/amoeba { };
amoeba-data = callPackage ../games/amoeba/data.nix { };
- andyetitmoves = callPackage ../games/andyetitmoves { };
-
- angband = callPackage ../games/angband { };
-
- animatch = callPackage ../games/animatch { };
-
anki = callPackage ../games/anki {
inherit (darwin.apple_sdk.frameworks) AVKit CoreAudio;
};
@@ -34037,8 +17021,6 @@ with pkgs;
armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; };
- arena = callPackage ../games/arena { };
-
art = callPackage ../by-name/ar/art/package.nix {
fftw = fftwSinglePrec;
};
@@ -34050,18 +17032,6 @@ with pkgs;
physfs = physfs_2;
};
- assaultcube = callPackage ../games/assaultcube { };
-
- astromenace = callPackage ../games/astromenace { };
-
- atanks = callPackage ../games/atanks { };
-
- azimuth = callPackage ../games/azimuth { };
-
- banner = callPackage ../games/banner { };
-
- bastet = callPackage ../games/bastet { };
-
beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix { };
beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { };
@@ -34070,20 +17040,6 @@ with pkgs;
inherit (perlPackages) PathTiny;
};
- blackshades = callPackage ../games/blackshades { };
-
- blobby = callPackage ../games/blobby { };
-
- blobwars = callPackage ../games/blobwars { };
-
- boohu = callPackage ../games/boohu { };
-
- braincurses = callPackage ../games/braincurses { };
-
- brutalmaze = callPackage ../games/brutalmaze { };
-
- bsdgames = callPackage ../games/bsdgames { };
-
bugdom = callPackage ../games/bugdom {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL;
@@ -34099,32 +17055,16 @@ with pkgs;
cataclysm-dda-git = cataclysmDDA.git.tiles;
- cbonsai = callPackage ../games/cbonsai { };
-
- cdogs-sdl = callPackage ../games/cdogs-sdl { };
-
- cgoban = callPackage ../games/cgoban { };
-
- chessdb = callPackage ../games/chessdb { };
-
chessx = libsForQt5.callPackage ../games/chessx { };
chiaki = libsForQt5.callPackage ../games/chiaki { };
chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
- clonehero = callPackage ../games/clonehero { };
-
- vintagestory = callPackage ../games/vintagestory { };
-
- ckan = callPackage ../games/ckan { };
-
cockatrice = libsForQt5.callPackage ../games/cockatrice {
protobuf = protobuf_21;
};
- commandergenius = callPackage ../games/commandergenius { };
-
construoBase = lowPrio (callPackage ../games/construo {
libGL = null;
libGLU = null;
@@ -34135,8 +17075,6 @@ with pkgs;
inherit libGL libGLU libglut;
};
- crack_attack = callPackage ../games/crack-attack { };
-
crawlTiles = callPackage ../games/crawl {
tileMode = true;
};
@@ -34146,8 +17084,6 @@ with pkgs;
inherit (import ../games/crossfire pkgs)
crossfire-server crossfire-arch crossfire-maps crossfire-client;
- crrcsim = callPackage ../games/crrcsim { };
-
curseofwar = callPackage ../games/curseofwar { SDL = null; };
curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
@@ -34155,10 +17091,6 @@ with pkgs;
cutemaze = qt6Packages.callPackage ../games/cutemaze { };
- cuyo = callPackage ../games/cuyo { };
-
- darkplaces = callPackage ../games/darkplaces { };
-
deliantra-server = callPackage ../games/deliantra/server.nix {
# perl538 defines 'struct object' in sv.h. many conflicts result
perl = perl540;
@@ -34173,8 +17105,6 @@ with pkgs;
};
ddnet-server = ddnet.override { buildClient = false; };
- ddns-go = callPackage ../tools/networking/ddns-go { };
-
devilutionx = callPackage ../games/devilutionx {
fmt = fmt_9;
SDL2 = SDL2.override {
@@ -34182,8 +17112,6 @@ with pkgs;
};
};
- domination = callPackage ../games/domination { };
-
duckmarines = callPackage ../games/duckmarines { love = love_0_10; };
dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { });
@@ -34206,18 +17134,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation AudioUnit AudioToolbox;
};
- ecwolf = callPackage ../games/ecwolf { };
-
- egoboo = callPackage ../games/egoboo { };
-
- eidolon = callPackage ../games/eidolon { };
-
- endgame-singularity = callPackage ../games/endgame-singularity { };
-
- endless-sky = callPackage ../games/endless-sky { };
-
- extremetuxracer = callPackage ../games/extremetuxracer { };
-
exult = callPackage ../games/exult {
inherit (darwin.apple_sdk.frameworks) AudioUnit;
};
@@ -34251,24 +17167,12 @@ with pkgs;
factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { };
- fairymax = callPackage ../games/fairymax { };
-
ferium = callPackage ../games/ferium {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
- fheroes2 = callPackage ../games/fheroes2 { };
-
- fish-fillets-ng = callPackage ../games/fish-fillets-ng { };
-
- jumpy = callPackage ../games/jumpy { };
-
flightgear = libsForQt5.callPackage ../games/flightgear { };
- flock = callPackage ../development/tools/flock { };
-
- forge-mtg = callPackage ../games/forge-mtg { };
-
freecad-wayland = freecad.override { withWayland = true; };
freeciv = callPackage ../games/freeciv {
@@ -34291,114 +17195,36 @@ with pkgs;
freeciv_gtk = freeciv;
- freedink = callPackage ../games/freedink { };
-
- freeorion = callPackage ../games/freeorion { };
-
- freesweep = callPackage ../games/freesweep { };
-
- frotz = callPackage ../games/frotz { };
-
- frogatto = callPackage ../games/frogatto { };
-
- fsg = callPackage ../games/fsg { };
-
- gambit-chess = callPackage ../games/gambit { };
-
garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
- gargoyle = callPackage ../games/gargoyle { };
-
- gav = callPackage ../games/gav { };
-
gcompris = libsForQt5.callPackage ../games/gcompris { };
- gemrb = callPackage ../games/gemrb { };
-
- gimx = callPackage ../games/gimx { };
-
- gl117 = callPackage ../games/gl-117 { };
-
- globulation2 = callPackage ../games/globulation { };
-
- gltron = callPackage ../games/gltron { };
-
gl-gsync-demo = callPackage ../games/gl-gsync-demo {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
};
- gmad = callPackage ../games/gmad { };
-
- gnonograms = callPackage ../games/gnonograms { };
-
- gnubg = callPackage ../games/gnubg { };
-
- gnuchess = callPackage ../games/gnuchess { };
-
- gnugo = callPackage ../games/gnugo { };
-
- gnujump = callPackage ../games/gnujump { };
-
- gnushogi = callPackage ../games/gnushogi { };
-
gogdl = python3Packages.callPackage ../games/gogdl { };
- gogui = callPackage ../games/gogui { };
-
gscrabble = python3Packages.callPackage ../games/gscrabble { };
gshogi = python3Packages.callPackage ../games/gshogi { };
qtads = qt5.callPackage ../games/qtads { };
- graphwar = callPackage ../games/graphwar { };
-
- gtypist = callPackage ../games/gtypist { };
-
- harmonist = callPackage ../games/harmonist { };
-
- hase = callPackage ../games/hase { };
-
hedgewars = libsForQt5.callPackage ../games/hedgewars { };
- hikounomizu = callPackage ../games/hikounomizu { };
-
- hmcl = callPackage ../games/hmcl { };
-
- hyperrogue = callPackage ../games/hyperrogue { };
-
ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
- icbm3d = callPackage ../games/icbm3d { };
-
- infra = callPackage ../tools/admin/infra { };
-
- infra-arcana = callPackage ../games/infra-arcana { };
-
- ingen = callPackage ../applications/audio/ingen { };
-
- ideogram = callPackage ../applications/graphics/ideogram { };
-
instaloader = python3Packages.callPackage ../tools/misc/instaloader { };
- instead = callPackage ../games/instead { };
-
iortcw = callPackage ../games/iortcw { };
# used as base package for iortcw forks
iortcw_sp = callPackage ../games/iortcw/sp.nix { };
- ironwail = callPackage ../games/ironwail { };
-
- ivan = callPackage ../games/ivan { };
-
ja2-stracciatella = callPackage ../games/ja2-stracciatella {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
- jfsw = callPackage ../games/jfsw { };
-
- katago = callPackage ../games/katago { };
-
katagoWithCuda = katago.override {
backend = "cuda";
cudaPackages = cudaPackages_12;
@@ -34413,18 +17239,12 @@ with pkgs;
cudaPackages = cudaPackages_12;
};
- klavaro = callPackage ../games/klavaro { };
-
- kobodeluxe = callPackage ../games/kobodeluxe { };
-
koboredux = callPackage ../games/koboredux { };
koboredux-free = callPackage ../games/koboredux {
useProprietaryAssets = false;
};
- koules = callPackage ../games/koules { };
-
ldmud = callPackage ../games/ldmud { };
ldmud-full = callPackage ../games/ldmud {
@@ -34441,12 +17261,6 @@ with pkgs;
legendary-gl = python3Packages.callPackage ../games/legendary-gl { };
- left4gore-bin = callPackage ../games/left4gore { };
-
- liberal-crime-squad = callPackage ../games/liberal-crime-squad { };
-
- liberation-circuit = callPackage ../games/liberation-circuit { };
-
lincity = callPackage ../games/lincity { };
lincity_ng = callPackage ../games/lincity/ng.nix {
@@ -34461,8 +17275,6 @@ with pkgs;
liquidwar5 = callPackage ../games/liquidwar/5.nix {
};
- lugaru = callPackage ../games/lugaru { };
-
macopix = callPackage ../games/macopix {
gtk = gtk2;
};
@@ -34475,20 +17287,8 @@ with pkgs;
openjfx = openjfx21;
};
- mari0 = callPackage ../games/mari0 { };
-
manaplus = callPackage ../games/manaplus { stdenv = gcc11Stdenv; };
- marble-marcher-ce = callPackage ../games/marble-marcher-ce { };
-
- mars = callPackage ../games/mars { };
-
- mchprs = callPackage ../games/mchprs { };
-
- megaglest = callPackage ../games/megaglest { };
-
- methane = callPackage ../games/methane { };
-
mindustry = callPackage ../games/mindustry { };
mindustry-wayland = callPackage ../games/mindustry {
enableWayland = true;
@@ -34501,15 +17301,9 @@ with pkgs;
minecraft = callPackage ../games/minecraft { };
- minecraft-server-hibernation = callPackage ../tools/games/minecraft/minecraft-server-hibernation { };
-
minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; };
minecraft-server = minecraftServers.vanilla; # backwards compatibility
- minesweep-rs = callPackage ../games/minesweep-rs { };
-
- moon-buggy = callPackage ../games/moon-buggy { };
-
minetest = callPackage ../games/minetest {
inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel;
};
@@ -34532,14 +17326,6 @@ with pkgs;
blightmud-tts = callPackage ../games/blightmud { withTTS = true; };
- n2048 = callPackage ../games/n2048 { };
-
- naev = callPackage ../games/naev { };
-
- nanosaur = callPackage ../games/nanosaur { };
-
- nanosaur2 = callPackage ../games/nanosaur2 { };
-
nethack = callPackage ../games/nethack { };
nethack-qt = callPackage ../games/nethack {
@@ -34549,39 +17335,13 @@ with pkgs;
nethack-x11 = callPackage ../games/nethack { x11Mode = true; };
- netris = callPackage ../games/netris { };
-
- neverball = callPackage ../games/neverball { };
-
- nexuiz = callPackage ../games/nexuiz { };
-
nile = python3Packages.callPackage ../games/nile { };
- ninvaders = callPackage ../games/ninvaders { };
-
- njam = callPackage ../games/njam { };
-
npush = callPackage ../games/npush { };
run-npush = callPackage ../games/npush/run.nix { };
- newtonwars = callPackage ../games/newtonwars { };
-
- nsnake = callPackage ../games/nsnake { };
-
- nudoku = callPackage ../games/nudoku { };
-
oilrush = callPackage ../games/oilrush { };
- openarena = callPackage ../games/openarena { };
-
- opendungeons = callPackage ../games/opendungeons { };
-
- openlierox = callPackage ../games/openlierox { };
-
- openclonk = callPackage ../games/openclonk { };
-
- openjk = callPackage ../games/openjk { };
-
openloco = pkgsi686Linux.callPackage ../games/openloco { };
openmw = libsForQt5.callPackage ../games/openmw {
@@ -34590,16 +17350,6 @@ with pkgs;
openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };
- opensoldat = callPackage ../games/opensoldat { };
-
- portmod = callPackage ../games/portmod { };
-
- tr-patcher = callPackage ../games/tr-patcher { };
-
- tes3cmd = callPackage ../games/tes3cmd { };
-
- otto-matic = callPackage ../games/otto-matic { };
-
openraPackages_2019 = import ../games/openra_2019 {
inherit lib;
pkgs = pkgs.__splicedPackages;
@@ -34632,8 +17382,6 @@ with pkgs;
openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { };
openttd-nml = callPackage ../games/openttd/nml.nix { };
- opentyrian = callPackage ../games/opentyrian { };
-
openxcom = callPackage ../games/openxcom { SDL = SDL_compat; };
openxray = callPackage ../games/openxray {
@@ -34644,8 +17392,6 @@ with pkgs;
orthorobot = callPackage ../games/orthorobot { love = love_0_10; };
- pacvim = callPackage ../games/pacvim { };
-
papermcServers = callPackages ../games/papermc { };
papermc = papermcServers.papermc;
@@ -34654,20 +17400,6 @@ with pkgs;
pentobi = libsForQt5.callPackage ../games/pentobi { };
- pinball = callPackage ../games/pinball { };
-
- pingus = callPackage ../games/pingus { };
-
- pioneer = callPackage ../games/pioneer { };
-
- pioneers = callPackage ../games/pioneers { };
-
- planetary_annihilation = callPackage ../games/planetaryannihilation { };
-
- principia = callPackage ../games/principia { };
-
- pong3d = callPackage ../games/pong3d { };
-
pokerth = libsForQt5.callPackage ../games/pokerth {
protobuf = protobuf_21;
};
@@ -34677,14 +17409,8 @@ with pkgs;
protobuf = protobuf_21;
};
- pokete = callPackage ../games/pokete { };
-
- powermanga = callPackage ../games/powermanga { };
-
pysolfc = python3Packages.callPackage ../games/pysolfc { };
- qqwing = callPackage ../games/qqwing { };
-
quake3wrapper = callPackage ../games/quake3/wrapper { };
quake3demo = quake3wrapper {
@@ -34704,45 +17430,16 @@ with pkgs;
};
vkquake = callPackage ../games/quakespasm/vulkan.nix { };
- ioquake3 = callPackage ../games/quake3/ioquake { };
- quake3e = callPackage ../games/quake3/quake3e { };
-
- quantumminigolf = callPackage ../games/quantumminigolf { };
-
- r2mod_cli = callPackage ../games/r2mod_cli { };
-
- r2modman = callPackage ../games/r2modman { };
-
- racer = callPackage ../games/racer { };
-
- randtype = callPackage ../games/randtype { };
-
- raylib-games = callPackage ../games/raylib-games { };
-
- redeclipse = callPackage ../games/redeclipse { };
-
- rftg = callPackage ../games/rftg { };
-
- rigsofrods-bin = callPackage ../games/rigsofrods-bin { };
-
- riko4 = callPackage ../games/riko4 { };
-
- rili = callPackage ../games/rili { };
-
rogue = callPackage ../games/rogue {
ncurses = ncurses5;
};
- rocksndiamonds = callPackage ../games/rocksndiamonds { };
-
rott = callPackage ../games/rott { SDL = SDL_compat; };
rott-shareware = rott.override {
buildShareware = true;
};
- rrootage = callPackage ../games/rrootage { };
-
space-cadet-pinball = callPackage ../games/space-cadet-pinball {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -34751,10 +17448,6 @@ with pkgs;
openjdk = openjdk8;
};
- scid = callPackage ../games/scid { };
-
- scid-vs-pc = callPackage ../games/scid-vs-pc { };
-
scummvm = callPackage ../games/scummvm {
inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit;
};
@@ -34767,14 +17460,6 @@ with pkgs;
flight-of-the-amazon-queen
lure-of-the-temptress;
- scorched3d = callPackage ../games/scorched3d { };
-
- scrolls = callPackage ../games/scrolls { };
-
- service-wrapper = callPackage ../os-specific/linux/service-wrapper { };
-
- sfrotz = callPackage ../games/sfrotz { };
-
sgt-puzzles = callPackage ../games/sgt-puzzles { };
sgt-puzzles-mobile = callPackage ../games/sgt-puzzles {
@@ -34788,20 +17473,9 @@ with pkgs;
summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon { };
shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon { };
- shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { };
-
- sienna = callPackage ../games/sienna { };
-
- sil = callPackage ../games/sil { };
-
- sil-q = callPackage ../games/sil-q { };
-
- simutrans = callPackage ../games/simutrans { };
# get binaries without data built by Hydra
simutrans_binaries = lowPrio simutrans.binaries;
- snake4 = callPackage ../games/snake4 { };
-
soi = callPackage ../games/soi {
lua = lua5_1;
};
@@ -34810,25 +17484,13 @@ with pkgs;
solarus = libsForQt5.callPackage ../games/solarus { };
solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { };
- sollya = callPackage ../development/interpreters/sollya { };
-
- solicurses = callPackage ../games/solicurses { };
-
# You still can override by passing more arguments.
- space-orbit = callPackage ../games/space-orbit { };
-
space-station-14-launcher = callPackage ../games/space-station-14-launcher { };
spring = callPackage ../games/spring { asciidoc = asciidoc-full; };
springLobby = callPackage ../games/spring/springlobby.nix { };
- ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { };
-
- stardust = callPackage ../games/stardust { };
-
- stockfish = callPackage ../games/stockfish { };
-
steam-run = steam.run;
# This exists so Hydra tries to build all of Steam's dependencies.
@@ -34836,10 +17498,6 @@ with pkgs;
steam-run-free = steam-fhsenv-without-steam.run;
- steam-tui = callPackage ../games/steam-tui { };
-
- steam-acf = callPackage ../tools/games/steam-acf { };
-
steamback = python311.pkgs.callPackage ../tools/games/steamback { };
protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
@@ -34849,35 +17507,15 @@ with pkgs;
protonup-ng = with python3Packages; toPythonApplication protonup-ng;
- steam-rom-manager = callPackage ../tools/games/steam-rom-manager { };
-
- sdlpop = callPackage ../games/sdlpop { };
-
- stepmania = callPackage ../games/stepmania { };
-
- stone-kingdoms = callPackage ../games/stone-kingdoms { };
-
- stt = callPackage ../tools/audio/stt { };
-
stuntrally = callPackage ../games/stuntrally
{ };
- superTux = callPackage ../games/supertux { };
-
superTuxKart = darwin.apple_sdk_11_0.callPackage ../games/super-tux-kart {
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit OpenAL IOBluetooth;
};
synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { };
- snis = callPackage ../games/snis { };
-
- system-syzygy = callPackage ../games/system-syzygy { };
-
- t4kcommon = callPackage ../games/t4kcommon { };
-
- tcl2048 = callPackage ../games/tcl2048 { };
-
the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix {
lua = lua5_2;
inherit (darwin.apple_sdk.frameworks) Cocoa;
@@ -34885,12 +17523,6 @@ with pkgs;
tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };
- tbls = callPackage ../tools/misc/tbls { };
-
- tecnoballz = callPackage ../games/tecnoballz { };
-
- teetertorture = callPackage ../games/teetertorture { };
-
teeworlds = callPackage ../games/teeworlds {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -34900,109 +17532,41 @@ with pkgs;
modules = with nginxModules; [ rtmp dav moreheaders modsecurity ];
};
- tennix = callPackage ../games/tennix { };
-
- terraria-server = callPackage ../games/terraria-server { };
-
tibia = pkgsi686Linux.callPackage ../games/tibia { };
- tintin = callPackage ../games/tintin { };
-
- tinyfugue = callPackage ../games/tinyfugue { };
-
- titanion = callPackage ../games/titanion { };
-
- tome2 = callPackage ../games/tome2 { };
-
- tome4 = callPackage ../games/tome4 { };
-
toppler = callPackage ../games/toppler {
SDL2_image = SDL2_image_2_0;
};
- torus-trooper = callPackage ../games/torus-trooper { };
-
- trackballs = callPackage ../games/trackballs { };
-
- try = callPackage ../tools/admin/try { };
-
- tumiki-fighters = callPackage ../games/tumiki-fighters { };
-
- tuxpaint = callPackage ../games/tuxpaint { };
-
- tuxtype = callPackage ../games/tuxtype { };
-
speed_dreams = callPackage ../games/speed-dreams {
# Torcs wants to make shared libraries linked with plib libraries (it provides static).
# i686 is the only platform I know than can do that linking without plib built with -fPIC
libpng = libpng12;
};
- torcs = callPackage ../games/torcs { };
-
- trigger = callPackage ../games/trigger { };
-
- typespeed = callPackage ../games/typespeed { };
-
- u2ps = callPackage ../tools/text/u2ps { };
-
- uchess = callPackage ../games/uchess { };
-
- ufoai = callPackage ../games/ufoai { };
-
- uhexen2 = callPackage ../games/uhexen2 { };
-
- ultimatestunts = callPackage ../games/ultimatestunts { };
-
ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { };
ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
- ultrastardx = callPackage ../games/ultrastardx { };
-
- umoria = callPackage ../games/umoria { };
-
- unnethack = callPackage ../games/unnethack { };
-
- uqm = callPackage ../games/uqm { };
-
- urbanterror = callPackage ../games/urbanterror { };
-
ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
ut2004Packages = dontRecurseIntoAttrs (callPackage ../games/ut2004 { });
ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
- vassal = callPackage ../games/vassal { };
-
- vdrift = callPackage ../games/vdrift { };
-
# To ensure vdrift's code is built on hydra
vdrift-bin = vdrift.bin;
- vectoroids = callPackage ../games/vectoroids { };
-
vessel = pkgsi686Linux.callPackage ../games/vessel { };
- vitetris = callPackage ../games/vitetris { };
-
- voxelands = callPackage ../games/voxelands { };
-
vvvvvv = callPackage ../by-name/vv/vvvvvv/package.nix {
inherit (darwin.apple_sdk.frameworks) Foundation IOKit;
};
- wargus = callPackage ../games/wargus { };
-
- warmux = callPackage ../games/warmux { };
-
warsow-engine = callPackage ../games/warsow/engine.nix { };
warsow = callPackage ../games/warsow { };
- warzone2100 = callPackage ../games/warzone2100 { };
-
wesnoth = callPackage ../games/wesnoth {
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
# wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
@@ -35015,27 +17579,6 @@ with pkgs;
wesnoth-dev = wesnoth;
- widelands = callPackage ../games/widelands { };
-
- wolfstoneextract = callPackage ../games/wolfstoneextract { };
-
- worldofgoo = callPackage ../games/worldofgoo { };
-
- xboard = callPackage ../games/xboard { };
-
- xbomb = callPackage ../games/xbomb { };
-
- xconq = callPackage ../games/xconq { };
-
- xcowsay = callPackage ../games/xcowsay { };
-
- xgalagapp = callPackage ../games/xgalaga++ { };
-
- xjump = callPackage ../games/xjump { };
-
- xmoto = callPackage ../games/xmoto { };
-
-
inherit (callPackage ../games/xonotic { })
xonotic-data
xonotic;
@@ -35060,16 +17603,6 @@ with pkgs;
bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { };
bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { };
- xskat = callPackage ../games/xskat { };
-
- xsnow = callPackage ../games/xsnow { };
-
- xsok = callPackage ../games/xsok { };
-
- xsokoban = callPackage ../games/xsokoban { };
-
- xtris = callPackage ../games/xtris { };
-
inherit (callPackage ../games/quake2/yquake2 {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
})
@@ -35079,14 +17612,6 @@ with pkgs;
yquake2-the-reckoning
yquake2-all-games;
- zaz = callPackage ../games/zaz { };
-
- zod = callPackage ../games/zod { };
-
- zoom = callPackage ../games/zoom { };
-
- keen4 = callPackage ../games/keen4 { };
-
zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad {
wxGTK = wxGTK32;
fmt = fmt_9;
@@ -35094,20 +17619,6 @@ with pkgs;
zeroad = zeroadPackages.zeroad;
- _7kaa = callPackage ../games/7kaa { };
-
- hhexen = callPackage ../games/hhexen { };
-
- hheretic = callPackage ../games/hheretic { };
-
- wyvern = callPackage ../games/wyvern { };
-
- hsetroot = callPackage ../tools/X11/hsetroot { };
-
- imwheel = callPackage ../tools/X11/imwheel { };
-
- kakasi = callPackage ../tools/text/kakasi { };
-
### DESKTOP ENVIRONMENTS
arcan-wrapped = arcan.wrapper.override { };
@@ -35133,8 +17644,6 @@ with pkgs;
appls = [ prio ];
};
- cdesktopenv = callPackage ../desktops/cdesktopenv { };
-
cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });
@@ -35166,15 +17675,9 @@ with pkgs;
gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { };
- gnome-bluetooth_1_0 = callPackage ../by-name/gn/gnome-bluetooth/1.0 { };
-
- gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { };
-
gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { };
# Using 43 to match Mutter used in Pantheon
- gnome-settings-daemon43 = callPackage ../by-name/gn/gnome-settings-daemon/43 { };
-
gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { });
lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { });
@@ -35204,18 +17707,12 @@ with pkgs;
mate = recurseIntoAttrs (callPackage ../desktops/mate { });
# Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided
- mutter43 = callPackage ../by-name/mu/mutter/43 { };
-
pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
- wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };
-
rox-filer = callPackage ../desktops/rox/rox-filer {
gtk = gtk2;
};
- surf-display = callPackage ../desktops/surf-display { };
-
xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
@@ -35234,24 +17731,14 @@ with pkgs;
latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { };
- xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
-
### SCIENCE/CHEMISTY
- apbs = callPackage ../applications/science/chemistry/apbs { };
-
avogadrolibs = libsForQt5.callPackage ../development/libraries/science/chemistry/avogadrolibs { };
molequeue = libsForQt5.callPackage ../development/libraries/science/chemistry/molequeue { };
avogadro2 = libsForQt5.callPackage ../applications/science/chemistry/avogadro2 { };
- d-seams = callPackage ../applications/science/chemistry/d-seams { };
-
- ergoscf = callPackage ../applications/science/chemistry/ergoscf { };
-
- gwyddion = callPackage ../applications/science/chemistry/gwyddion { };
-
jmol = callPackage ../applications/science/chemistry/jmol {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
@@ -35260,23 +17747,13 @@ with pkgs;
molbar = with python3Packages; toPythonApplication molbar;
- molden = callPackage ../applications/science/chemistry/molden { };
-
- mopac = callPackage ../applications/science/chemistry/mopac { };
-
nwchem = callPackage ../applications/science/chemistry/nwchem {
blas = blas-ilp64;
lapack = lapack-ilp64;
};
- octopus = callPackage ../applications/science/chemistry/octopus { };
-
autodock-vina = callPackage ../applications/science/chemistry/autodock-vina { };
- dkh = callPackage ../applications/science/chemistry/dkh { };
-
- openmolcas = callPackage ../applications/science/chemistry/openmolcas { };
-
pdb2pqr = with python3Packages; toPythonApplication pdb2pqr;
pymol = callPackage ../applications/science/chemistry/pymol {
@@ -35291,267 +17768,83 @@ with pkgs;
siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; };
- wxmacmolplt = callPackage ../applications/science/chemistry/wxmacmolplt { };
-
### SCIENCE/GEOMETRY
- gama = callPackage ../applications/science/geometry/gama { };
-
tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+
tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT
### SCIENCE/BENCHMARK
- papi = callPackage ../development/libraries/science/benchmark/papi { };
-
### SCIENCE/BIOLOGY
- alliance = callPackage ../applications/science/electronics/alliance { };
-
- angsd = callPackage ../applications/science/biology/angsd { };
-
ants = callPackage ../applications/science/biology/ants {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- aragorn = callPackage ../applications/science/biology/aragorn { };
-
- astral = callPackage ../applications/science/biology/astral { };
-
- archimedes = callPackage ../applications/science/electronics/archimedes { };
-
- bamtools = callPackage ../applications/science/biology/bamtools { };
-
- bayescan = callPackage ../applications/science/biology/bayescan { };
-
- bedops = callPackage ../applications/science/biology/bedops { };
-
- bedtools = callPackage ../applications/science/biology/bedtools { };
-
- bcftools = callPackage ../applications/science/biology/bcftools { };
-
- bftools = callPackage ../applications/science/biology/bftools { };
-
- bioawk = callPackage ../applications/science/biology/bioawk { };
-
blast = callPackage ../applications/science/biology/blast {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
blast-bin = callPackage ../applications/science/biology/blast/bin.nix { };
- bpp-core = callPackage ../development/libraries/science/biology/bpp-core { };
-
- bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { };
-
- bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { };
-
- bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { };
-
- bppsuite = callPackage ../applications/science/biology/bppsuite { };
-
cd-hit = callPackage ../applications/science/biology/cd-hit {
inherit (llvmPackages) openmp;
};
- ciftilib = callPackage ../development/libraries/science/biology/ciftilib { };
-
- cmtk = callPackage ../applications/science/biology/cmtk { };
-
- clustal-omega = callPackage ../applications/science/biology/clustal-omega { };
-
- conglomerate = callPackage ../applications/science/biology/conglomerate { };
-
- dalfox = callPackage ../tools/security/dalfox { };
-
- davtest = callPackage ../tools/security/davtest { };
-
- dcm2niix = callPackage ../applications/science/biology/dcm2niix { };
-
deepdiff = with python3Packages; toPythonApplication deepdiff;
- deepsea = callPackage ../tools/security/deepsea { };
-
deepsecrets = callPackage ../tools/security/deepsecrets {
python3 = python311;
};
- deeptools = callPackage ../applications/science/biology/deeptools { };
-
deep-translator = with python3Packages; toPythonApplication deep-translator;
- delly = callPackage ../applications/science/biology/delly { };
-
- diamond = callPackage ../applications/science/biology/diamond { };
-
- dssp = callPackage ../applications/science/biology/dssp { };
-
- ecopcr = callPackage ../applications/science/biology/ecopcr { };
-
- eggnog-mapper = callPackage ../applications/science/biology/eggnog-mapper { };
-
- emboss = callPackage ../applications/science/biology/emboss { };
-
- est-sfs = callPackage ../applications/science/biology/est-sfs { };
-
- ezminc = callPackage ../applications/science/biology/EZminc { };
-
- exonerate = callPackage ../applications/science/biology/exonerate { };
-
- fastp = callPackage ../applications/science/biology/fastp { };
-
- flywheel-cli = callPackage ../applications/science/biology/flywheel-cli { };
-
hh-suite = callPackage ../applications/science/biology/hh-suite {
inherit (llvmPackages) openmp;
};
- hisat2 = callPackage ../applications/science/biology/hisat2 { };
-
- htslib = callPackage ../development/libraries/science/biology/htslib { };
-
- igv = callPackage ../applications/science/biology/igv { };
-
- inormalize = callPackage ../applications/science/biology/inormalize { };
-
- iqtree = callPackage ../applications/science/biology/iqtree { };
-
- itsx = callPackage ../applications/science/biology/itsx { };
-
iv = callPackage ../applications/science/biology/iv {
neuron-version = neuron.version;
};
- kalign = callPackage ../applications/science/biology/kalign { };
-
kallisto = callPackage ../applications/science/biology/kallisto {
autoconf = buildPackages.autoconf269;
};
- kasmweb = callPackage ../servers/web-apps/kasmweb { };
-
- kssd = callPackage ../applications/science/biology/kssd { };
-
- last = callPackage ../applications/science/biology/last { };
-
- macse = callPackage ../applications/science/biology/macse { };
-
- macs2 = callPackage ../applications/science/biology/macs2 { };
-
- mafft = callPackage ../applications/science/biology/mafft { };
-
- migrate = callPackage ../applications/science/biology/migrate { };
-
- minia = callPackage ../applications/science/biology/minia { };
-
mirtk = callPackage ../development/libraries/science/biology/mirtk { itk = itk_5_2; };
- muscle = callPackage ../applications/science/biology/muscle { };
-
- n3 = callPackage ../applications/science/biology/N3 { };
-
nest = callPackage ../applications/science/biology/nest { };
nest-mpi = callPackage ../applications/science/biology/nest { withMpi = true; };
- neuron = callPackage ../applications/science/biology/neuron { };
-
neuron-mpi = neuron.override {useMpi = true; };
neuron-full = neuron-mpi.override { useCore = true; useRx3d = true; };
- mrbayes = callPackage ../applications/science/biology/mrbayes { };
-
mrtrix = callPackage ../applications/science/biology/mrtrix { python = python3; };
- megahit = callPackage ../applications/science/biology/megahit { };
-
- messer-slim = callPackage ../applications/science/biology/messer-slim { };
-
minc_tools = callPackage ../applications/science/biology/minc-tools {
inherit (perlPackages) perl TextFormat;
};
- minc_widgets = callPackage ../applications/science/biology/minc-widgets { };
-
- mni_autoreg = callPackage ../applications/science/biology/mni_autoreg { };
-
- minimap2 = callPackage ../applications/science/biology/minimap2 { };
-
mmseqs2 = callPackage ../applications/science/biology/mmseqs2 {
inherit (llvmPackages) openmp;
};
- niftyreg = callPackage ../applications/science/biology/niftyreg { };
-
- niftyseg = callPackage ../applications/science/biology/niftyseg { };
-
- manta = callPackage ../applications/science/biology/manta { };
-
obitools3 = callPackage ../applications/science/biology/obitools/obitools3.nix { };
- octopus-caller = callPackage ../applications/science/biology/octopus { };
-
- paml = callPackage ../applications/science/biology/paml { };
-
- picard-tools = callPackage ../applications/science/biology/picard-tools { };
-
- platypus = callPackage ../applications/science/biology/platypus { };
-
- plink-ng = callPackage ../applications/science/biology/plink-ng { };
-
- prodigal = callPackage ../applications/science/biology/prodigal { };
-
- quast = callPackage ../applications/science/biology/quast { };
-
- raxml = callPackage ../applications/science/biology/raxml { };
-
raxml-mpi = raxml.override { useMpi = true; };
- sambamba = callPackage ../applications/science/biology/sambamba { };
-
- samblaster = callPackage ../applications/science/biology/samblaster { };
-
samtools = callPackage ../applications/science/biology/samtools { };
samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix {
stdenv = gccStdenv;
};
- seqtk = callPackage ../applications/science/biology/seqtk { };
-
- seqkit = callPackage ../applications/science/biology/seqkit { };
-
- snpeff = callPackage ../applications/science/biology/snpeff { };
-
- somafm-cli = callPackage ../tools/misc/somafm-cli { };
-
- somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { };
-
- sortmerna = callPackage ../applications/science/biology/sortmerna { };
-
- stacks = callPackage ../applications/science/biology/stacks { };
-
- star = callPackage ../applications/science/biology/star { };
-
- strelka = callPackage ../applications/science/biology/strelka { };
-
inherit (callPackages ../applications/science/biology/sumatools {})
sumalibs
sumaclust
sumatra;
- seaview = callPackage ../applications/science/biology/seaview { };
-
- svaba = callPackage ../applications/science/biology/svaba { };
-
- tebreak = callPackage ../applications/science/biology/tebreak { };
-
- treemix = callPackage ../applications/science/biology/treemix { };
-
- trf = callPackage ../applications/science/biology/trf { };
-
- trimal = callPackage ../applications/science/biology/trimal { };
-
trimmomatic = callPackage ../applications/science/biology/trimmomatic {
jdk = pkgs.jdk11_headless;
# Reduce closure size
@@ -35563,97 +17856,28 @@ with pkgs;
truvari = callPackage ../applications/science/biology/truvari { };
- varscan = callPackage ../applications/science/biology/varscan { };
-
- whisper = callPackage ../applications/science/biology/whisper { };
-
- xenomapper = callPackage ../applications/science/biology/xenomapper { };
-
- hmmer = callPackage ../applications/science/biology/hmmer { };
-
- bwa = callPackage ../applications/science/biology/bwa { };
-
- bwa-mem2 = callPackage ../applications/science/biology/bwa-mem2 { };
-
### SCIENCE/MACHINE LEARNING
- nengo-gui = callPackage ../applications/science/machine-learning/nengo-gui { };
-
sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { };
streamlit = with python3Packages; toPythonApplication streamlit;
- uarmsolver = callPackage ../applications/science/machine-learning/uarmsolver { };
-
### SCIENCE/MATH
- almonds = callPackage ../applications/science/math/almonds { };
-
- adolc = callPackage ../applications/science/math/adolc { };
-
- amd-blis = callPackage ../development/libraries/science/math/amd-blis { };
-
- amd-libflame = callPackage ../development/libraries/science/math/amd-libflame { };
-
- arpack = callPackage ../development/libraries/science/math/arpack { };
-
- blas = callPackage ../build-support/alternatives/blas { };
-
blas-ilp64 = blas.override { isILP64 = true; };
- blas-reference = callPackage ../development/libraries/science/math/blas { };
-
- bonmin = callPackage ../development/libraries/science/math/bonmin { };
-
- brial = callPackage ../development/libraries/science/math/brial { };
-
cantor = libsForQt5.cantor;
clblas = callPackage ../development/libraries/science/math/clblas {
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL;
};
- clblast = callPackage ../development/libraries/science/math/clblast { };
-
- cliquer = callPackage ../development/libraries/science/math/cliquer { };
-
- coin-utils = callPackage ../development/libraries/science/math/coin-utils { };
-
- ecos = callPackage ../development/libraries/science/math/ecos { };
-
- getdp = callPackage ../applications/science/math/getdp { };
-
- gurobi = callPackage ../applications/science/math/gurobi { };
-
- jags = callPackage ../applications/science/math/jags { };
-
labplot = libsForQt5.callPackage ../applications/science/math/labplot { };
- lapack = callPackage ../build-support/alternatives/lapack { };
-
lapack-ilp64 = lapack.override { isILP64 = true; };
- lapack-reference = callPackage ../development/libraries/science/math/liblapack { };
liblapack = lapack-reference;
- libamplsolver = callPackage ../development/libraries/science/math/libamplsolver { };
-
- libbraiding = callPackage ../development/libraries/science/math/libbraiding { };
-
- libhomfly = callPackage ../development/libraries/science/math/libhomfly { };
-
- liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
-
- lrs = callPackage ../development/libraries/science/math/lrs { };
-
- m4ri = callPackage ../development/libraries/science/math/m4ri { };
-
- m4rie = callPackage ../development/libraries/science/math/m4rie { };
-
- mkl = callPackage ../development/libraries/science/math/mkl { };
-
- nasc = callPackage ../applications/science/math/nasc { };
-
nota = haskellPackages.callPackage ../applications/science/math/nota { };
notus-scanner = with python3Packages; toPythonApplication notus-scanner;
@@ -35666,22 +17890,6 @@ with pkgs;
# standard BLAS and LAPACK.
openblasCompat = openblas.override { blas64 = false; };
- openlibm = callPackage ../development/libraries/science/math/openlibm { };
-
- openspecfun = callPackage ../development/libraries/science/math/openspecfun { };
-
- planarity = callPackage ../development/libraries/science/math/planarity { };
-
- scalapack = callPackage ../development/libraries/science/math/scalapack { };
-
- rankwidth = callPackage ../development/libraries/science/math/rankwidth { };
-
- lcalc = callPackage ../development/libraries/science/math/lcalc { };
-
- lrcalc = callPackage ../applications/science/math/lrcalc { };
-
- lie = callPackage ../applications/science/math/LiE { };
-
inherit (callPackage ../development/libraries/science/math/magma { }) magma magma_2_7_2 magma_2_6_2;
magma-cuda = magma.override {
@@ -35698,8 +17906,6 @@ with pkgs;
rocmSupport = true;
};
- clmagma = callPackage ../development/libraries/science/math/clmagma { };
-
mathematica = callPackage ../applications/science/math/mathematica { };
mathematica-webdoc = callPackage ../applications/science/math/mathematica {
@@ -35715,12 +17921,6 @@ with pkgs;
cudaSupport = true;
};
- metis = callPackage ../development/libraries/science/math/metis { };
-
- nauty = callPackage ../applications/science/math/nauty { };
-
- osi = callPackage ../development/libraries/science/math/osi { };
-
or-tools = callPackage ../development/libraries/science/math/or-tools {
inherit (darwin) DarwinTools;
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
@@ -35734,8 +17934,6 @@ with pkgs;
};
};
- rubiks = callPackage ../development/libraries/science/math/rubiks { };
-
p4est-sc = callPackage ../development/libraries/science/math/p4est-sc {
p4est-sc-debugEnable = false;
};
@@ -35748,15 +17946,8 @@ with pkgs;
p4est-sc = p4est-sc-dbg;
};
- QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { };
-
- sage = callPackage ../applications/science/math/sage { };
sageWithDoc = sage.override { withDoc = true; };
- sagetex = callPackage ../misc/sagetex { };
-
- subread = callPackage ../applications/science/biology/subread { };
-
suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse/4.4.nix { };
suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {
@@ -35764,14 +17955,6 @@ with pkgs;
};
suitesparse = suitesparse_5_3;
- suitesparse-graphblas = callPackage ../development/libraries/science/math/suitesparse-graphblas { };
-
- superlu = callPackage ../development/libraries/science/math/superlu { };
-
- symmetrica = callPackage ../applications/science/math/symmetrica { };
-
- sympow = callPackage ../development/libraries/science/math/sympow { };
-
trilinos = callPackage ../development/libraries/science/math/trilinos { };
trilinos-mpi = callPackage ../development/libraries/science/math/trilinos { withMPI = true; };
@@ -35782,18 +17965,8 @@ with pkgs;
wolfram-notebook = callPackage ../applications/science/math/wolfram-engine/notebook.nix { };
- ipopt = callPackage ../development/libraries/science/math/ipopt { };
-
- gmsh = callPackage ../applications/science/math/gmsh { };
-
- wcpg = callPackage ../development/libraries/science/math/wcpg { };
-
- zn_poly = callPackage ../development/libraries/science/math/zn_poly { };
-
### SCIENCE/MOLECULAR-DYNAMICS
- dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { };
-
gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
singlePrec = true;
fftw = fftwSinglePrec;
@@ -35831,69 +18004,23 @@ with pkgs;
### SCIENCE/MEDICINE
- dcmtk = callPackage ../applications/science/medicine/dcmtk { };
-
- xmedcon = callPackage ../applications/science/medicine/xmedcon { };
-
### SCIENCE/PHYSICS
- dawn = callPackage ../applications/science/physics/dawn { };
-
- dawncut = callPackage ../applications/science/physics/dawncut { };
-
- elmerfem = callPackage ../applications/science/physics/elmerfem { };
-
- fasthenry = callPackage ../applications/science/physics/fasthenry { };
-
mcfm = callPackage ../applications/science/physics/MCFM {
stdenv = gccStdenv;
lhapdf = lhapdf.override { stdenv = gccStdenv; python = null; };
};
- nnpdf = callPackage ../applications/science/physics/nnpdf { };
-
- professor = callPackage ../applications/science/physics/professor { };
-
- sacrifice = callPackage ../applications/science/physics/sacrifice { };
-
- sherpa = callPackage ../applications/science/physics/sherpa { };
-
- shtns = callPackage ../applications/science/physics/shtns { };
-
- xfitter = callPackage ../applications/science/physics/xfitter { };
-
xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };
- xnec2c = callPackage ../applications/science/physics/xnec2c { };
-
### SCIENCE/PROGRAMMING
- dafny = callPackage ../applications/science/logic/dafny { };
-
- groove = callPackage ../applications/science/programming/groove { };
-
- plm = callPackage ../applications/science/programming/plm { };
-
### SCIENCE/LOGIC
- abc-verifier = callPackage ../applications/science/logic/abc { };
-
abella = callPackage ../applications/science/logic/abella {
ocamlPackages = ocaml-ng.ocamlPackages_4_12;
};
- acgtk = callPackage ../applications/science/logic/acgtk { };
-
- alt-ergo = callPackage ../applications/science/logic/alt-ergo { };
-
- aspino = callPackage ../applications/science/logic/aspino { };
-
- beluga = callPackage ../applications/science/logic/beluga { };
-
- cbmc = callPackage ../applications/science/logic/cbmc { };
-
- cadical = callPackage ../applications/science/logic/cadical { };
-
inherit (callPackage ./coq-packages.nix {
inherit (ocaml-ng)
ocamlPackages_4_05
@@ -35922,14 +18049,8 @@ with pkgs;
coqPackages coq
;
- coq2html = callPackage ../tools/typesetting/coq2html { };
-
coq-kernel = callPackage ../applications/editors/jupyter-kernels/coq { };
- cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
-
- crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { };
-
cubicle = callPackage ../applications/science/logic/cubicle {
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
@@ -35938,14 +18059,10 @@ with pkgs;
gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; });
stdenv = gccStdenv;
};
- cvc4 = callPackage ../applications/science/logic/cvc4 { };
-
cvc5 = callPackage ../applications/science/logic/cvc5 {
cadical = pkgs.cadical.override { version = "2.0.0"; };
};
- drat-trim = callPackage ../applications/science/logic/drat-trim { };
-
ekrhyper = callPackage ../applications/science/logic/ekrhyper {
ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
};
@@ -35954,38 +18071,15 @@ with pkgs;
eprover-ho = callPackage ../applications/science/logic/eprover { enableHO = true; };
- formula = callPackage ../applications/science/logic/formula { };
-
- gappa = callPackage ../applications/science/logic/gappa { };
-
- gfan = callPackage ../applications/science/math/gfan { };
-
- giac = callPackage ../applications/science/math/giac { };
giac-with-xcas = giac.override { enableGUI = true; };
- ginac = callPackage ../applications/science/math/ginac { };
-
glucose = callPackage ../applications/science/logic/glucose { };
glucose-syrup = callPackage ../applications/science/logic/glucose {
enableUnfree = true;
};
- hol = callPackage ../applications/science/logic/hol { };
-
inherit (ocamlPackages) hol_light;
- holehe = callPackage ../tools/security/holehe { };
-
- hologram = callPackage ../tools/security/hologram { };
-
- honeytrap = callPackage ../tools/security/honeytrap { };
-
- kissat = callPackage ../applications/science/logic/kissat { };
-
- tini = callPackage ../applications/virtualization/tini { };
-
- ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { };
-
isabelle = callPackage ../by-name/is/isabelle/package.nix {
polyml = polyml.overrideAttrs {
pname = "polyml-for-isabelle";
@@ -36004,19 +18098,9 @@ with pkgs;
};
isabelle-components = recurseIntoAttrs (callPackage ../by-name/is/isabelle/components { });
- iprover = callPackage ../applications/science/logic/iprover { };
-
- key = callPackage ../applications/science/logic/key { };
-
- keymapviz = callPackage ../tools/misc/keymapviz { };
-
killport = darwin.apple_sdk_11_0.callPackage ../tools/misc/killport { };
- lean = callPackage ../applications/science/logic/lean { };
- lean2 = callPackage ../applications/science/logic/lean2 { };
- lean4 = callPackage ../applications/science/logic/lean4 { };
lean3 = lean;
- elan = callPackage ../applications/science/logic/elan { };
mathlibtools = with python3Packages; toPythonApplication mathlibtools;
leo2 = callPackage ../applications/science/logic/leo2
@@ -36024,48 +18108,14 @@ with pkgs;
leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix { };
- logisim = callPackage ../applications/science/logic/logisim { };
-
- logisim-evolution = callPackage ../applications/science/logic/logisim-evolution { };
-
- ltl2ba = callPackage ../applications/science/logic/ltl2ba { };
-
- metis-prover = callPackage ../applications/science/logic/metis-prover { };
-
- mcrl2 = callPackage ../applications/science/logic/mcrl2 { };
-
- minisat = callPackage ../applications/science/logic/minisat { };
-
- monosat = callPackage ../applications/science/logic/monosat { };
-
- msat = callPackage ../applications/science/logic/msat { };
-
- nusmv = callPackage ../applications/science/logic/nusmv { };
-
- nuXmv = callPackage ../applications/science/logic/nuXmv { };
-
- opensmt = callPackage ../applications/science/logic/opensmt { };
-
- ott = callPackage ../applications/science/logic/ott { };
-
- picosat = callPackage ../applications/science/logic/picosat { };
-
- libpoly = callPackage ../applications/science/logic/poly { };
-
prooftree = callPackage ../applications/science/logic/prooftree {
ocamlPackages = ocaml-ng.ocamlPackages_4_12;
};
- prover9 = callPackage ../applications/science/logic/prover9 { };
-
- proverif = callPackage ../applications/science/logic/proverif { };
-
satallax = callPackage ../applications/science/logic/satallax {
inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
};
- saw-tools = callPackage ../applications/science/logic/saw-tools { };
-
spass = callPackage ../applications/science/logic/spass {
stdenv = gccStdenv;
};
@@ -36074,16 +18124,6 @@ with pkgs;
ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
};
- tptp = callPackage ../applications/science/logic/tptp { };
-
- celf = callPackage ../applications/science/logic/celf { };
-
- fast-downward = callPackage ../applications/science/logic/fast-downward { };
-
- twelf = callPackage ../applications/science/logic/twelf { };
-
- verifast = callPackage ../applications/science/logic/verifast { };
-
veriT = callPackage ../applications/science/logic/verit {
stdenv = gccStdenv;
};
@@ -36092,10 +18132,6 @@ with pkgs;
coqPackages = coqPackages_8_18;
};
- wayback-machine-archiver = callPackage ../tools/misc/wayback-machine-archiver { };
-
- workcraft = callPackage ../applications/science/logic/workcraft { };
-
yices = callPackage ../applications/science/logic/yices {
gmp-static = gmp.override { withStatic = true; };
};
@@ -36110,8 +18146,6 @@ with pkgs;
z3 = z3_4_8;
z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix { };
- zchaff = callPackage ../applications/science/logic/zchaff { };
-
tlaplus = callPackage ../applications/science/logic/tlaplus {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
@@ -36121,36 +18155,12 @@ with pkgs;
};
tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix { };
- aiger = callPackage ../applications/science/logic/aiger { };
-
avy = callPackage ../applications/science/logic/avy { };
- btor2tools = callPackage ../applications/science/logic/btor2tools { };
-
- boolector = callPackage ../applications/science/logic/boolector { };
-
- bitwuzla = callPackage ../applications/science/logic/bitwuzla { };
-
- symfpu = callPackage ../applications/science/logic/symfpu { };
-
- uhdm = callPackage ../applications/science/logic/uhdm { };
-
- surelog = callPackage ../applications/science/logic/surelog { };
-
- mcy = callPackage ../applications/science/logic/mcy { };
-
- lingeling = callPackage ../applications/science/logic/lingeling { };
-
### SCIENCE / ENGINEERING
- brmodelo = callPackage ../applications/science/engineering/brmodelo { };
-
- jflap = callPackage ../applications/science/engineering/jflap { };
-
### SCIENCE / ELECTRONICS
- adms = callPackage ../applications/science/electronics/adms { };
-
appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { };
inherit (libsForQt5.callPackage ../applications/science/electronics/simulide { })
@@ -36162,38 +18172,18 @@ with pkgs;
caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };
- csxcad = callPackage ../applications/science/electronics/csxcad { };
-
degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
- diylc = callPackage ../applications/science/electronics/diylc { };
-
flatcam = python39.pkgs.callPackage ../applications/science/electronics/flatcam { };
- flopoco = callPackage ../applications/science/electronics/flopoco { };
-
- fparser = callPackage ../applications/science/electronics/fparser { };
-
geda = callPackage ../applications/science/electronics/geda {
guile = guile_2_2;
};
- gedit = callPackage ../applications/editors/gedit { };
-
gerbv = callPackage ../applications/science/electronics/gerbv {
cairo = cairo.override { x11Support = true; };
};
- gtkwave = callPackage ../applications/science/electronics/gtkwave { };
-
- hyp2mat = callPackage ../applications/science/electronics/hyp2mat { };
-
- fped = callPackage ../applications/science/electronics/fped { };
-
- gaw = callPackage ../applications/science/electronics/gaw { };
-
- horizon-eda = callPackage ../applications/science/electronics/horizon-eda { };
-
# this is a wrapper for kicad.base and kicad.libraries
kicad = callPackage ../applications/science/electronics/kicad { };
# this is the same but without the (sizable) 3D models library
@@ -36231,16 +18221,8 @@ with pkgs;
openroad = libsForQt5.callPackage ../applications/science/electronics/openroad { };
- openboardview = callPackage ../applications/science/electronics/openboardview { };
-
- pcb = callPackage ../applications/science/electronics/pcb { };
-
qucs-s = qt6Packages.callPackage ../applications/science/electronics/qucs-s { };
- xcircuit = callPackage ../applications/science/electronics/xcircuit { };
-
- xoscope = callPackage ../applications/science/electronics/xoscope { };
-
xyce = callPackage ../applications/science/electronics/xyce { };
xyce-parallel = callPackage ../applications/science/electronics/xyce {
@@ -36260,18 +18242,6 @@ with pkgs;
caffeWithCuda = caffe.override { cudaSupport = true; };
- caffeine-ng = callPackage ../tools/X11/caffeine-ng { };
-
- ecm = callPackage ../applications/science/math/ecm { };
-
- eukleides = callPackage ../applications/science/math/eukleides { };
-
- form = callPackage ../applications/science/math/form { };
-
- fricas = callPackage ../applications/science/math/fricas { };
-
- gap = callPackage ../applications/science/math/gap { };
-
gap-minimal = lowPrio (gap.override { packageSet = "minimal"; });
gap-full = lowPrio (gap.override { packageSet = "full"; });
@@ -36299,46 +18269,12 @@ with pkgs;
pari = callPackage ../applications/science/math/pari { };
gp2c = callPackage ../applications/science/math/pari/gp2c.nix { };
- palp = callPackage ../applications/science/math/palp { };
-
- ratpoints = callPackage ../applications/science/math/ratpoints { };
-
- calc = callPackage ../applications/science/math/calc { };
-
- pcalc = callPackage ../applications/science/math/pcalc { };
-
- programmer-calculator = callPackage ../applications/science/math/programmer-calculator { };
-
- bcal = callPackage ../applications/science/math/bcal { };
-
- pagsuite = callPackage ../applications/science/math/pagsuite { };
-
- pspp = callPackage ../applications/science/math/pspp { };
-
raspa = callPackage ../applications/science/molecular-dynamics/raspa { };
raspa-data = callPackage ../applications/science/molecular-dynamics/raspa/data.nix { };
- ssw = callPackage ../applications/misc/ssw { };
-
- pynac = callPackage ../applications/science/math/pynac { };
-
- scalp = callPackage ../applications/science/math/scalp { };
-
- singular = callPackage ../applications/science/math/singular { };
-
- scilab-bin = callPackage ../applications/science/math/scilab-bin { };
-
- scilla = callPackage ../tools/security/scilla { };
-
- mininet = callPackage ../tools/virtualization/mininet { };
-
- msieve = callPackage ../applications/science/math/msieve { };
-
weka = callPackage ../applications/science/math/weka { jre = openjdk11; };
- yad = callPackage ../tools/misc/yad { };
-
yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
yacas-gui = yacas.override {
@@ -36373,16 +18309,8 @@ with pkgs;
cudaSupport = true;
};
- fityk = callPackage ../applications/science/misc/fityk { };
-
- galario = callPackage ../development/libraries/galario { };
-
- gildas = callPackage ../applications/science/astronomy/gildas { };
-
gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };
- gravit = callPackage ../applications/science/astronomy/gravit { };
-
golly = callPackage ../applications/science/misc/golly {
wxGTK = wxGTK32.overrideAttrs (x: {
configureFlags = x.configureFlags ++ [
@@ -36398,8 +18326,6 @@ with pkgs;
inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
};
- netlogo = callPackage ../applications/science/misc/netlogo { };
-
nextinspace = python3Packages.callPackage ../applications/science/misc/nextinspace { };
ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
@@ -36413,75 +18339,36 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
});
- rinetd = callPackage ../servers/rinetd { };
-
rink = callPackage ../applications/science/misc/rink {
inherit (darwin.apple_sdk.frameworks) Security;
};
- simgrid = callPackage ../applications/science/misc/simgrid { };
-
- sumo = callPackage ../applications/science/networking/sumo { };
-
spyder = with python3.pkgs; toPythonApplication spyder;
- spyre = callPackage ../tools/security/spyre { };
-
- sq = callPackage ../development/tools/sq { };
-
stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { };
stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { };
- astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { };
-
tulip = libsForQt5.callPackage ../applications/science/misc/tulip { };
vite = libsForQt5.callPackage ../applications/science/misc/vite { };
- xearth = callPackage ../applications/science/astronomy/xearth { };
- xplanet = callPackage ../applications/science/astronomy/xplanet { };
-
### SCIENCE / PHYSICS
- apfelgrid = callPackage ../development/libraries/physics/apfelgrid { };
-
- apfel = callPackage ../development/libraries/physics/apfel { };
-
applgrid = callPackage ../development/libraries/physics/applgrid {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- hoppet = callPackage ../development/libraries/physics/hoppet { };
-
- fastjet = callPackage ../development/libraries/physics/fastjet { };
-
- fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { };
-
- fastnlo-toolkit = callPackage ../development/libraries/physics/fastnlo-toolkit { };
-
geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };
- cernlib = callPackage ../development/libraries/physics/cernlib { };
-
- clhep = callPackage ../development/libraries/physics/clhep { };
-
- hepmc2 = callPackage ../development/libraries/physics/hepmc2 { };
-
hepmc3 = callPackage ../development/libraries/physics/hepmc3 {
python = null;
};
- herwig = callPackage ../development/libraries/physics/herwig { };
-
lhapdf = callPackage ../development/libraries/physics/lhapdf {
python = python3;
};
- mela = callPackage ../development/libraries/physics/mela { };
-
- nlojet = callPackage ../development/libraries/physics/nlojet { };
-
pythia = callPackage ../development/libraries/physics/pythia {
hepmc = hepmc2;
};
@@ -36490,8 +18377,6 @@ with pkgs;
imagemagick = graphicsmagick-imagemagick-compat;
};
- thepeg = callPackage ../development/libraries/physics/thepeg { };
-
yoda = callPackage ../development/libraries/physics/yoda {
python = python3;
};
@@ -36499,127 +18384,42 @@ with pkgs;
withRootSupport = true;
});
- qcdnum = callPackage ../development/libraries/physics/qcdnum { };
-
### SCIENCE/ROBOTICS
apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
- betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { };
-
- emuflight-configurator = callPackage ../applications/science/robotics/emuflight-configurator { };
-
- inav-configurator = callPackage ../applications/science/robotics/inav-configurator { };
-
- mission-planner = callPackage ../applications/science/robotics/mission-planner { };
-
### MISC
- acpilight = callPackage ../misc/acpilight { };
-
- alpnpass = callPackage ../applications/networking/alpnpass { };
-
- amdctl = callPackage ../os-specific/linux/amdctl { };
-
android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { };
antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
- atlantis = callPackage ../applications/networking/cluster/atlantis { };
-
- atmos = callPackage ../applications/networking/cluster/atmos { };
-
- aiac = callPackage ../applications/networking/cluster/aiac { };
-
- fn-cli = callPackage ../applications/networking/cluster/fn-cli { };
-
- argononed = callPackage ../misc/drivers/argononed { };
-
autotiling = python3Packages.callPackage ../misc/autotiling { };
- autotiling-rs = callPackage ../misc/autotiling-rs { };
-
avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { };
- boatswain = callPackage ../applications/misc/boatswain { };
-
- beep = callPackage ../misc/beep { };
-
- bees = callPackage ../tools/filesystems/bees { };
-
- blahaj = callPackage ../tools/misc/blahaj { };
-
- bootil = callPackage ../development/libraries/bootil { };
-
brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { };
- brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper { };
-
- brightnessctl = callPackage ../misc/brightnessctl { };
-
calaos_installer = libsForQt5.callPackage ../misc/calaos/installer { };
- click = callPackage ../applications/networking/cluster/click { };
-
clinfo = callPackage ../tools/system/clinfo {
inherit (darwin.apple_sdk.frameworks) OpenCL;
};
- clpeak = callPackage ../tools/misc/clpeak { };
-
cups = callPackage ../misc/cups { };
cups-filters = callPackage ../misc/cups/filters.nix { };
cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { };
- cups-kyocera = callPackage ../misc/cups/drivers/kyocera { };
-
- cups-kyocera-ecosys-m2x35-40-p2x35-40dnw = callPackage ../misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw { };
-
- cups-kyocera-ecosys-m552x-p502x = callPackage ../misc/cups/drivers/kyocera-ecosys-m552x-p502x { };
-
- cups-kyodialog = callPackage ../misc/cups/drivers/kyodialog { };
-
- cups-dymo = callPackage ../misc/cups/drivers/dymo { };
-
- cups-pdf-to-pdf = callPackage ../misc/cups/drivers/cups-pdf-to-pdf { };
-
- cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio { };
-
- cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { };
-
- colort = callPackage ../applications/misc/colort { };
-
- terminal-parrot = callPackage ../applications/misc/terminal-parrot { };
-
- djenrandom = callPackage ../tools/misc/djenrandom { };
-
epsonscan2 = pkgs.libsForQt5.callPackage ../misc/drivers/epsonscan2 { };
- epson-alc1100 = callPackage ../misc/drivers/epson-alc1100 { };
-
- epson-escpr = callPackage ../misc/drivers/epson-escpr { };
- epson-escpr2 = callPackage ../misc/drivers/epson-escpr2 { };
-
- epson_201207w = callPackage ../misc/drivers/epson_201207w { };
-
- epson-201401w = callPackage ../misc/drivers/epson-201401w { };
-
- epson-201106w = callPackage ../misc/drivers/epson-201106w { };
-
- epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { };
-
foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; };
gutenprint = callPackage ../misc/drivers/gutenprint { };
gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { };
- carps-cups = callPackage ../misc/cups/drivers/carps-cups { };
-
- cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
-
dcp375cwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp375cw { }).driver;
dcp375cw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp375cw { }).cupswrapper;
@@ -36640,45 +18440,11 @@ with pkgs;
cups-brother-hll3230cdw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll3230cdw { };
- cups-brother-hll2350dw = callPackage ../misc/cups/drivers/hll2350dw { };
-
- cups-brother-mfcl2750dw = callPackage ../misc/cups/drivers/mfcl2750dw { };
-
- cups-drv-rastertosag-gdi = callPackage ../misc/cups/drivers/cups-drv-rastertosag-gdi { };
-
# this driver ships with pre-compiled 32-bit binary libraries
cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { };
- cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { };
-
- cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { };
-
depotdownloader = callPackage ../tools/misc/depotdownloader { };
- dbacl = callPackage ../tools/misc/dbacl { };
-
- dell-530cdn = callPackage ../misc/drivers/dell-530cdn { };
-
- dockutil = callPackage ../os-specific/darwin/dockutil { };
-
- eiciel = callPackage ../tools/filesystems/eiciel { };
-
- dpkg = callPackage ../tools/package-management/dpkg { };
-
- dumb = callPackage ../misc/dumb { };
-
- dump = callPackage ../tools/backup/dump { };
-
- ec2stepshell = callPackage ../tools/security/ec2stepshell { };
-
- ecdsatool = callPackage ../tools/security/ecdsatool { };
-
- electricsheep = callPackage ../misc/screensavers/electricsheep { };
-
- aapt = callPackage ../development/tools/aapt { };
-
- glee = callPackage ../tools/graphics/glee { };
-
faust = res.faust2;
faust2 = callPackage ../applications/audio/faust/faust2.nix { };
@@ -36705,31 +18471,15 @@ with pkgs;
faustlive = callPackage ../applications/audio/faust/faustlive.nix { };
- faustPhysicalModeling = callPackage ../applications/audio/faustPhysicalModeling { };
-
flashprint = libsForQt5.callPackage ../applications/misc/flashprint { };
- flockit = callPackage ../tools/backup/flockit { };
-
fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { };
- fbmark = callPackage ../tools/misc/fbmark { };
-
- foma = callPackage ../tools/misc/foma { };
-
- foo2zjs = callPackage ../misc/drivers/foo2zjs { };
-
- foomatic-filters = callPackage ../misc/drivers/foomatic-filters { };
-
gajim = callPackage ../applications/networking/instant-messengers/gajim {
inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
};
- gammu = callPackage ../applications/misc/gammu { };
-
- ghostscript = callPackage ../misc/ghostscript { };
-
ghostscriptX = ghostscript.override {
cupsSupport = true;
x11Support = true;
@@ -36740,17 +18490,11 @@ with pkgs;
x11Support = false;
};
- glava = callPackage ../applications/misc/glava { };
-
gnuk = callPackage ../misc/gnuk {
gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
};
- go365 = callPackage ../tools/security/go365 { };
-
- gobuster = callPackage ../tools/security/gobuster { };
-
gotestwaf = callPackage ../tools/security/gotestwaf {
buildGoModule = buildGo123Module;
};
@@ -36763,34 +18507,18 @@ with pkgs;
buildGoModule = buildGo123Module;
};
- guetzli = callPackage ../applications/graphics/guetzli { };
-
- gummi = callPackage ../applications/misc/gummi { };
-
- hashpump = callPackage ../tools/misc/hashpump { };
-
- hck = callPackage ../tools/text/hck { };
-
helmfile = callPackage ../applications/networking/cluster/helmfile { };
helmfile-wrapped = callPackage ../applications/networking/cluster/helmfile {
inherit (kubernetes-helm-wrapped.passthru) pluginsDir;
};
- helm-dashboard = callPackage ../applications/networking/cluster/helm-dashboard { };
-
- helmsman = callPackage ../applications/networking/cluster/helmsman { };
-
- hplip = callPackage ../misc/drivers/hplip { };
-
hplipWithPlugin = hplip.override { withPlugin = true; };
hyperfine = callPackage ../tools/misc/hyperfine {
inherit (darwin.apple_sdk.frameworks) Security;
};
- webcat = callPackage ../tools/misc/webcat { };
-
websocat = callPackage ../tools/misc/websocat {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -36807,28 +18535,14 @@ with pkgs;
utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { };
- colima = callPackage ../applications/virtualization/colima { };
-
lima = callPackage ../applications/virtualization/lima {
inherit (darwin) sigtool;
};
lima-bin = callPackage ../applications/virtualization/lima/bin.nix { };
- logtop = callPackage ../tools/misc/logtop { };
-
- imaginer = callPackage ../applications/misc/imaginer { };
-
- igraph = callPackage ../development/libraries/igraph { };
-
- igprof = callPackage ../development/tools/misc/igprof { };
-
- illum = callPackage ../tools/system/illum { };
-
image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; };
- infnoise = callPackage ../misc/drivers/infnoise { };
-
itamae = callPackage ../tools/admin/itamae { };
# using the new configuration style proposal which is unstable
@@ -36850,28 +18564,10 @@ with pkgs;
jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { };
jack_autoconnect = jack-autoconnect;
- jacktrip = callPackage ../applications/audio/jacktrip { };
-
j2cli = with python311Packages; toPythonApplication j2cli;
- jq-lsp = callPackage ../development/tools/language-servers/jq-lsp { };
-
- jquake = callPackage ../applications/misc/jquake { };
-
- jstest-gtk = callPackage ../tools/misc/jstest-gtk { };
-
- k40-whisperer = callPackage ../applications/misc/k40-whisperer { };
-
- keynav = callPackage ../tools/X11/keynav { };
-
- gnome-console = callPackage ../applications/terminal-emulators/gnome-console { };
-
- kmon = callPackage ../tools/system/kmon { };
-
kmonad = haskellPackages.kmonad.bin;
- kompose = callPackage ../applications/networking/cluster/kompose { };
-
kompute = callPackage ../development/libraries/kompute {
fmt = fmt_8;
};
@@ -36889,8 +18585,6 @@ with pkgs;
;
kops = kops_1_29;
- lguf-brightness = callPackage ../misc/lguf-brightness { };
-
lighthouse = darwin.apple_sdk_11_0.callPackage ../applications/blockchains/lighthouse {
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security SystemConfiguration;
};
@@ -36910,46 +18604,16 @@ with pkgs;
openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
- loop = callPackage ../tools/misc/loop { };
-
mailcore2 = callPackage ../development/libraries/mailcore2 {
icu = icu71;
};
- mamba = callPackage ../applications/audio/mamba { };
-
- mas = callPackage ../os-specific/darwin/mas { };
-
- micromamba = callPackage ../tools/package-management/micromamba { };
-
- moltengamepad = callPackage ../misc/drivers/moltengamepad { };
-
- openzwave = callPackage ../development/libraries/openzwave { };
-
mongoc = darwin.apple_sdk_11_0.callPackage ../development/libraries/mongoc { };
mongocxx = callPackage ../development/libraries/mongocxx/default.nix { };
- mongoose = callPackage ../development/libraries/science/math/mongoose { };
-
- morph = callPackage ../tools/package-management/morph { };
-
muse = libsForQt5.callPackage ../applications/audio/muse { };
- museeks = callPackage ../applications/audio/museeks { };
-
- mynewt-newt = callPackage ../tools/package-management/mynewt-newt { };
-
- mynewt-newtmgr = callPackage ../tools/misc/mynewt-newtmgr { };
-
- mysides = callPackage ../os-specific/darwin/mysides { };
-
- narrowlink = callPackage ../tools/networking/narrowlink { };
-
- neo = callPackage ../applications/misc/neo { };
-
- networkd-dispatcher = callPackage ../tools/networking/networkd-dispatcher { };
-
nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix {
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
@@ -37074,22 +18738,10 @@ with pkgs;
(import ../../nixos/lib/make-options-doc)
({ inherit pkgs lib; } // attrs);
- nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { };
-
- nixos-render-docs = callPackage ../tools/nix/nixos-render-docs { };
-
- nixdoc = callPackage ../tools/nix/nixdoc { };
-
- dnadd = callPackage ../tools/nix/dnadd { };
-
nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
nix = nixVersions.nix_2_24;
};
- nix-doc = callPackage ../tools/package-management/nix-doc { };
-
- nix-bundle = callPackage ../tools/package-management/nix-bundle { };
-
nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;
nix-deploy = haskell.lib.compose.justStaticExecutables haskellPackages.nix-deploy;
nix-derivation = haskell.lib.compose.justStaticExecutables haskellPackages.nix-derivation;
@@ -37102,8 +18754,6 @@ with pkgs;
nix-info = callPackage ../tools/nix/info { };
nix-info-tested = nix-info.override { doCheck = true; };
- nix-init = callPackage ../tools/nix/nix-init { };
-
nix-index-unwrapped = callPackage ../tools/package-management/nix-index {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -37111,16 +18761,12 @@ with pkgs;
nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter);
- nix-melt = callPackage ../tools/nix/nix-melt { };
-
nixos-option = callPackage ../tools/nix/nixos-option {
nix = nixVersions.nix_2_18;
};
nix-pin = callPackage ../tools/package-management/nix-pin { };
- nix-prefetch = callPackage ../tools/package-management/nix-prefetch { };
-
nix-prefetch-github = with python3Packages;
toPythonApplication nix-prefetch-github;
@@ -37132,84 +18778,40 @@ with pkgs;
nix-prefetch-svn
nix-prefetch-scripts;
- nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { };
-
nix-update-source = callPackage ../tools/package-management/nix-update-source { };
- nix-script = callPackage ../tools/nix/nix-script { };
-
nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree);
- nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { };
-
- nix-serve = callPackage ../tools/package-management/nix-serve { };
-
nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng;
nix-visualize = python3.pkgs.callPackage ../tools/package-management/nix-visualize { };
- alejandra = callPackage ../tools/nix/alejandra { };
-
nixci = callPackage ../tools/nix/nixci {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration IOKit;
};
nixfmt-classic = haskellPackages.nixfmt.bin;
- nixpkgs-hammering = callPackage ../tools/nix/nixpkgs-hammering { };
-
- nixpkgs-lint-community = callPackage ../tools/nix/nixpkgs-lint { };
-
nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { };
- rnix-hashes = callPackage ../tools/nix/rnix-hashes { };
-
nixos-artwork = callPackage ../data/misc/nixos-artwork { };
nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };
nixos-grub2-theme = callPackage ../data/misc/nixos-artwork/grub2-theme.nix { };
- nixos-bgrt-plymouth = callPackage ../data/themes/nixos-bgrt-plymouth { };
-
- nixos-container = callPackage ../tools/virtualization/nixos-container { };
-
- nixos-generators = callPackage ../tools/nix/nixos-generators { };
-
nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { };
- extra-container = callPackage ../tools/virtualization/extra-container { };
-
- norwester-font = callPackage ../data/fonts/norwester { };
-
- nut = callPackage ../applications/misc/nut { };
-
- nsncd = callPackage ../os-specific/linux/nsncd { };
-
- nvd = callPackage ../tools/package-management/nvd { };
-
disnix = callPackage ../tools/package-management/disnix { };
dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {
inherit (python3Packages) supervisor;
});
- dydisnix = callPackage ../tools/package-management/disnix/dydisnix { };
-
- disnixos = callPackage ../tools/package-management/disnix/disnixos { };
-
DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService {
jdk = jdk8;
};
- i3a = callPackage ../misc/i3a { };
-
lice = python3Packages.callPackage ../tools/misc/lice { };
- m33-linux = callPackage ../misc/drivers/m33-linux { };
-
- mnemonicode = callPackage ../misc/mnemonicode { };
-
- moonfire-nvr = callPackage ../misc/moonfire-nvr { };
-
mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql80; in {
gdal = gdal.override {
libmysqlclient = mysql;
@@ -37218,60 +18820,24 @@ with pkgs;
pcre = pcre-cpp;
});
- r128gain = callPackage ../applications/audio/r128gain { };
-
resp-app = libsForQt5.callPackage ../applications/misc/resp-app { };
- responder = callPackage ../tools/security/responder { };
-
- resumed = callPackage ../applications/misc/resumed { };
-
- robin-map = callPackage ../development/libraries/robin-map { };
-
- robo3t = callPackage ../applications/misc/robo3t { };
-
- rucksack = callPackage ../development/tools/rucksack { };
-
- sam-ba = callPackage ../tools/misc/sam-ba { };
-
- sndio = callPackage ../misc/sndio { };
-
- sticky = callPackage ../applications/misc/sticky { };
-
stork = darwin.apple_sdk_11_0.callPackage ../applications/misc/stork {
inherit (darwin.apple_sdk_11_0.frameworks) Security;
};
- superd = callPackage ../misc/superd { };
-
- oclgrind = callPackage ../development/tools/analysis/oclgrind { };
-
- opkg = callPackage ../tools/package-management/opkg { };
-
- opkg-utils = callPackage ../tools/package-management/opkg-utils { };
-
- pgmanage = callPackage ../applications/misc/pgmanage { };
-
pgadmin4 = callPackage ../tools/admin/pgadmin { };
pgadmin4-desktopmode = callPackage ../tools/admin/pgadmin { server-mode = false; };
pgmodeler = qt6Packages.callPackage ../applications/misc/pgmodeler { };
- physlock = callPackage ../misc/screensavers/physlock { };
-
pjsip = darwin.apple_sdk_11_0.callPackage ../applications/networking/pjsip {
inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreFoundation Security;
};
- pounce = callPackage ../servers/pounce { };
-
pt = callPackage ../applications/misc/pt { };
- protocol = callPackage ../applications/networking/protocol { };
-
- pykms = callPackage ../tools/networking/pykms { };
-
pyupgrade = with python3Packages; toPythonApplication pyupgrade;
pwntools = with python3Packages; toPythonApplication pwntools;
@@ -37291,82 +18857,24 @@ with pkgs;
qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };
- qdl = callPackage ../tools/misc/qdl { };
-
- qperf = callPackage ../os-specific/linux/qperf { };
-
qzdl = libsForQt5.callPackage ../games/qzdl { };
rates = callPackage ../tools/misc/rates {
inherit (darwin.apple_sdk.frameworks) Security;
};
- rars = callPackage ../development/tools/rars { };
-
- rargs = callPackage ../tools/misc/rargs { };
-
- rancher = callPackage ../applications/networking/cluster/rancher { };
-
- rauc = callPackage ../tools/misc/rauc { };
-
rbspy = darwin.apple_sdk_11_0.callPackage ../development/tools/rbspy { };
- redprl = callPackage ../applications/science/logic/redprl { };
-
- renderizer = callPackage ../development/tools/renderizer { };
-
- rfc = callPackage ../tools/misc/rfc { };
-
- rfc-bibtex = callPackage ../tools/typesetting/rfc-bibtex { };
-
pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker {
inherit glib gtk3 gobject-introspection wrapGAppsHook3;
};
- rpl = callPackage ../tools/text/rpl { };
-
- ricty = callPackage ../data/fonts/ricty { };
-
- rivalcfg = callPackage ../misc/rivalcfg { };
-
- roadrunner = callPackage ../servers/roadrunner { };
-
- rmfuse = callPackage ../tools/filesystems/rmfuse { };
-
- rmount = callPackage ../tools/filesystems/rmount { };
-
romdirfs = callPackage ../tools/filesystems/romdirfs {
stdenv = gccStdenv;
};
- rss-glx = callPackage ../misc/screensavers/rss-glx { };
-
- run-scaled = callPackage ../tools/X11/run-scaled { };
-
- runiq = callPackage ../tools/text/runiq { };
-
- runit = callPackage ../tools/system/runit { };
-
- runitor = callPackage ../tools/system/runitor { };
-
- refmt = callPackage ../development/tools/refmt { };
-
- spectra = callPackage ../development/libraries/spectra { };
-
- spectrojack = callPackage ../applications/audio/spectrojack { };
-
- sift = callPackage ../tools/text/sift { };
-
xdragon = lowPrio (callPackage ../tools/X11/xdragon { });
- xlockmore = callPackage ../misc/screensavers/xlockmore { };
-
- xq = callPackage ../tools/misc/xq { };
-
- xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { };
-
- sailsd = callPackage ../misc/sailsd { };
-
sail-riscv-rv32 = callPackage ../applications/virtualization/sail-riscv {
arch = "RV32";
};
@@ -37375,50 +18883,18 @@ with pkgs;
arch = "RV64";
};
- shc = callPackage ../tools/security/shc { };
-
- shellz = callPackage ../tools/security/shellz { };
-
- tableplus = callPackage ../applications/misc/tableplus { };
-
timeloop = pkgs.darwin.apple_sdk_11_0.callPackage ../applications/science/computer-architecture/timeloop { };
- canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { };
-
- mfc465cncupswrapper = callPackage ../misc/cups/drivers/brother/mfc465cncupswrapper { };
- mfc465cnlpr = callPackage ../misc/cups/drivers/brother/mfc465cnlpr { };
-
- mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { };
mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { };
- mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { };
mfcj6510dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj6510dwlpr { };
- mfcl2700dncupswrapper = callPackage ../misc/cups/drivers/mfcl2700dncupswrapper { };
mfcl2700dnlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcl2700dnlpr { };
- mfcl2720dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2720dwcupswrapper { };
- mfcl2720dwlpr = callPackage ../misc/cups/drivers/mfcl2720dwlpr { };
-
- mfcl2740dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2740dwcupswrapper { };
- mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { };
-
# This driver is only available as a 32 bit proprietary binary driver
mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver;
mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper;
- cups-brother-hll2375dw = callPackage ../misc/cups/drivers/brother/hll2375dw { };
-
- mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { };
- mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { };
-
- mfc5890cncupswrapper = callPackage ../misc/cups/drivers/mfc5890cncupswrapper { };
- mfc5890cnlpr = callPackage ../misc/cups/drivers/mfc5890cnlpr { };
-
- mfc9140cdncupswrapper = callPackage ../misc/cups/drivers/mfc9140cdncupswrapper { };
- mfc9140cdnlpr = callPackage ../misc/cups/drivers/mfc9140cdnlpr { };
-
- samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36 { };
samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { };
samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17;
@@ -37427,28 +18903,10 @@ with pkgs;
sane-drivers = callPackage ../applications/graphics/sane/drivers.nix { };
- senv = callPackage ../applications/misc/senv { };
-
- brlaser = callPackage ../misc/cups/drivers/brlaser { };
-
- fflinuxprint = callPackage ../misc/cups/drivers/fflinuxprint { };
-
- fxlinuxprint = callPackage ../misc/cups/drivers/fxlinuxprint { };
-
- brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { };
-
- brscan5 = callPackage ../applications/graphics/sane/backends/brscan5 { };
-
- dsseries = callPackage ../applications/graphics/sane/backends/dsseries { };
-
- sane-airscan = callPackage ../applications/graphics/sane/backends/airscan { };
-
mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };
sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };
- sanoid = callPackage ../tools/backup/sanoid { };
-
satysfi = callPackage ../tools/typesetting/satysfi {
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
@@ -37457,27 +18915,12 @@ with pkgs;
inherit libusb1; # Shadow python.pkgs.libusb1.
};
- sct = callPackage ../tools/X11/sct { };
-
- seafile-shared = callPackage ../misc/seafile-shared { };
-
- ser2net = callPackage ../servers/ser2net { };
-
- serviio = callPackage ../servers/serviio { };
- selinux-python = callPackage ../os-specific/linux/selinux-python { };
-
slock = callPackage ../misc/screensavers/slock {
conf = config.slock.conf or null;
};
- smokeping = callPackage ../tools/networking/smokeping { };
-
- snapraid = callPackage ../tools/filesystems/snapraid { };
-
snscrape = with python3Packages; toPythonApplication snscrape;
- soundmodem = callPackage ../applications/radio/soundmodem { };
-
sourceAndTags = callPackage ../misc/source-and-tags {
hasktags = haskellPackages.hasktags;
};
@@ -37486,34 +18929,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { };
-
- spnavcfg = callPackage ../applications/misc/spnavcfg { };
-
- splix = callPackage ../misc/cups/drivers/splix { };
-
- steamcontroller = callPackage ../misc/drivers/steamcontroller { };
-
- stepreduce = callPackage ../applications/misc/stepreduce { };
-
- streamripper = callPackage ../applications/audio/streamripper { };
-
- sqsh = callPackage ../development/tools/sqsh { };
-
- sysz = callPackage ../tools/misc/sysz { };
-
- go-swag = callPackage ../development/tools/go-swag { };
-
- go-swagger = callPackage ../development/tools/go-swagger { };
-
- jx = callPackage ../applications/networking/cluster/jx { };
-
- tagref = callPackage ../tools/misc/tagref { };
-
- tcat = callPackage ../tools/misc/tcat { };
-
- tell-me-your-secrets = callPackage ../tools/security/tell-me-your-secrets { };
-
tellico = libsForQt5.callPackage ../applications/misc/tellico { };
termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py { };
@@ -37532,94 +18947,26 @@ with pkgs;
terraforming = callPackage ../applications/networking/cluster/terraforming { };
- terraform-backend-git = callPackage ../applications/networking/cluster/terraform-backend-git { };
-
- terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory { };
-
terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { };
- tfautomv = callPackage ../applications/networking/cluster/tfautomv { };
-
- terranix = callPackage ../applications/networking/cluster/terranix { };
-
terraspace = callPackage ../applications/networking/cluster/terraspace { };
- tf-summarize = callPackage ../applications/networking/cluster/tf-summarize { };
-
- tfswitch = callPackage ../applications/networking/cluster/tfswitch { };
-
tftui = python3Packages.callPackage ../applications/networking/cluster/tftui { };
- tfupdate = callPackage ../applications/networking/cluster/tfupdate { };
-
- tgswitch = callPackage ../applications/networking/cluster/tgswitch { };
-
- tilt = callPackage ../applications/networking/cluster/tilt { };
-
- timeular = callPackage ../applications/office/timeular { };
-
- tewi-font = callPackage ../data/fonts/tewi { };
-
- sshportal = callPackage ../servers/sshportal { };
-
- ssh-audit = callPackage ../tools/security/ssh-audit { };
-
- ssh-tools = callPackage ../applications/misc/ssh-tools { };
-
- thermald = callPackage ../tools/system/thermald { };
-
- therion = callPackage ../applications/misc/therion { };
-
- throttled = callPackage ../tools/system/throttled { };
-
- thinkfan = callPackage ../tools/system/thinkfan { };
-
touchosc = callPackage ../applications/audio/touchosc { };
- tp-auto-kbbl = callPackage ../tools/system/tp-auto-kbbl { };
-
- turtle-build = callPackage ../development/tools/build-managers/turtle-build { };
-
- tusk = callPackage ../applications/office/tusk { };
-
trufflehog = callPackage ../tools/security/trufflehog {
buildGoModule = buildGo123Module;
};
- tunnelx = callPackage ../applications/gis/tunnelx { };
-
- tvbrowser = callPackage ../applications/misc/tvbrowser { };
-
- uacme = callPackage ../tools/admin/uacme { };
-
- ufiformat = callPackage ../tools/system/ufiformat { };
-
- ums = callPackage ../servers/ums { };
-
unityhub = callPackage ../development/tools/unityhub { };
- upspin = callPackage ../tools/filesystems/upspin { };
-
urbit = callPackage ../misc/urbit { };
- usb-reset = callPackage ../applications/misc/usb-reset { };
-
- utf8cpp = callPackage ../development/libraries/utf8cpp { };
-
- utf8proc = callPackage ../development/libraries/utf8proc { };
-
- unicode-paracode = callPackage ../tools/misc/unicode { };
-
unixcw = libsForQt5.callPackage ../applications/radio/unixcw { };
- vault-medusa = callPackage ../tools/security/vault-medusa { };
-
- vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { };
-
vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;
- vazir-code-font = callPackage ../data/fonts/vazir-code-font { };
-
vaultwarden = callPackage ../tools/security/vaultwarden {
inherit (darwin.apple_sdk.frameworks) Security CoreServices SystemConfiguration;
};
@@ -37627,37 +18974,20 @@ with pkgs;
vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; };
vaultwarden-postgresql = vaultwarden.override { dbBackend = "postgresql"; };
- vazir-fonts = callPackage ../data/fonts/vazir-fonts { };
-
veilid = darwin.apple_sdk_11_0.callPackage ../tools/networking/veilid {
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
- vhs = callPackage ../applications/misc/vhs { };
-
- viennarna = callPackage ../applications/science/molecular-dynamics/viennarna { };
-
- viewnior = callPackage ../applications/graphics/viewnior { };
-
vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { };
vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { });
- vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { };
vimb = wrapFirefox vimb-unwrapped { };
vips = callPackage ../by-name/vi/vips/package.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
};
- vipsdisp = callPackage ../applications/graphics/vipsdisp { };
-
- nip2 = callPackage ../tools/graphics/nip2 { };
-
- virglrenderer = callPackage ../development/libraries/virglrenderer { };
-
- vivid = callPackage ../tools/misc/vivid { };
-
vivisect = with python3Packages; toPythonApplication (vivisect.override { withGui = true; });
vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen {
@@ -37668,39 +18998,22 @@ with pkgs;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly;
};
- vsc-leetcode-cli = callPackage ../tools/misc/vsc-leetcode-cli { };
-
- vsh = callPackage ../tools/misc/vsh { };
-
- vttest = callPackage ../tools/misc/vttest { };
-
wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };
wamr = darwin.apple_sdk_11_0.callPackage ../development/interpreters/wamr { };
wasmer = callPackage ../development/interpreters/wasmer {
llvmPackages = llvmPackages_18;
- inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security;
};
wavm = callPackage ../development/interpreters/wavm {
llvmPackages = llvmPackages_12;
};
- wasm-pack = callPackage ../development/tools/wasm-pack { };
-
- wasynth = callPackage ../development/tools/wasynth { };
-
- wavegain = callPackage ../applications/audio/wavegain { };
-
- wcalc = callPackage ../applications/misc/wcalc { };
-
webkit2-sharp = callPackage ../development/libraries/webkit2-sharp {
webkitgtk = webkitgtk_4_0;
};
- websocketd = callPackage ../applications/networking/websocketd { };
-
wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { };
wikicurses = callPackage ../applications/misc/wikicurses {
@@ -37738,16 +19051,6 @@ with pkgs;
wineRelease = "wayland";
});
- wineasio = callPackage ../applications/emulators/wineasio { };
-
- wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { };
-
- wmutils-core = callPackage ../tools/X11/wmutils-core { };
-
- wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { };
-
- wmutils-opt = callPackage ../tools/X11/wmutils-opt { };
-
inherit (callPackage ../servers/web-apps/wordpress {})
wordpress wordpress_6_5 wordpress_6_6;
@@ -37757,8 +19060,6 @@ with pkgs;
languages = lib.importJSON ../servers/web-apps/wordpress/packages/languages.json;
});
- wprecon = callPackage ../tools/security/wprecon { };
-
wraith = callPackage ../applications/networking/irc/wraith {
openssl = openssl_1_1;
};
@@ -37775,44 +19076,12 @@ with pkgs;
inherit (darwin.stubs) setfile;
};
- x11idle = callPackage ../tools/misc/x11idle { };
-
- x11docker = callPackage ../applications/virtualization/x11docker { };
-
- x2x = callPackage ../tools/X11/x2x { };
-
- xboxdrv = callPackage ../misc/drivers/xboxdrv { };
-
- xorex = callPackage ../tools/security/xorex { };
-
- xbps = callPackage ../tools/package-management/xbps { };
-
- xcftools = callPackage ../tools/graphics/xcftools { };
-
xhyve = callPackage ../applications/virtualization/xhyve {
inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin) libobjc;
};
- xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { };
-
- xlayoutdisplay = callPackage ../tools/X11/xlayoutdisplay { };
-
- xlibinput-calibrator = callPackage ../tools/inputmethods/xlibinput_calibrator { };
-
- xlog = callPackage ../applications/radio/xlog { };
-
- xmagnify = callPackage ../tools/X11/xmagnify { };
-
- xosd = callPackage ../misc/xosd { };
-
- xow_dongle-firmware = callPackage ../os-specific/linux/firmware/xow_dongle-firmware { };
-
- xpad = callPackage ../applications/misc/xpad { };
-
- xpipe = callPackage ../applications/networking/xpipe { };
-
xsane = callPackage ../applications/graphics/sane/xsane.nix { };
xsw = callPackage ../applications/misc/xsw {
@@ -37822,48 +19091,14 @@ with pkgs;
SDL = SDL_sixel;
};
- xteddy = callPackage ../applications/misc/xteddy { };
-
- xva-img = callPackage ../tools/virtualization/xva-img { };
-
- xzoom = callPackage ../tools/X11/xzoom { };
-
yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { };
- yadm = callPackage ../applications/version-management/yadm { };
-
- yai = callPackage ../tools/misc/yai { };
-
yamale = with python3Packages; toPythonApplication yamale;
- yamdi = callPackage ../tools/video/yamdi { };
-
- yandex-browser = callPackage ../applications/networking/browsers/yandex-browser { };
-
yandex-browser-beta = yandex-browser.override { edition = "beta"; };
yandex-browser-corporate = yandex-browser.override { edition = "corporate"; };
- yandex-disk = callPackage ../tools/filesystems/yandex-disk { };
-
- yara = callPackage ../tools/security/yara { };
-
- yaralyzer = callPackage ../tools/security/yaralyzer { };
-
- yarGen = callPackage ../tools/security/yarGen { };
-
- yersinia = callPackage ../tools/security/yersinia { };
-
- yatas = callPackage ../tools/security/yatas { };
-
- yaxg = callPackage ../tools/graphics/yaxg { };
-
- zap = callPackage ../tools/networking/zap { };
-
- zigbee2mqtt = callPackage ../servers/zigbee2mqtt { };
-
- zopfli = callPackage ../tools/compression/zopfli { };
-
myEnvFun = callPackage ../misc/my-env {
inherit (stdenv) mkDerivation;
};
@@ -37874,14 +19109,8 @@ with pkgs;
callPackage ../applications/networking/znc/modules.nix { }
);
- zoneminder = callPackage ../servers/zoneminder { };
-
zrok = callPackage ../tools/networking/zrok { };
- xcp = callPackage ../tools/misc/xcp { };
-
- zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { };
-
bullet = callPackage ../development/libraries/bullet {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
};
@@ -37890,8 +19119,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
};
- spdlog = callPackage ../development/libraries/spdlog { };
-
dart = callPackage ../development/compilers/dart { };
pub2nix = recurseIntoAttrs (callPackage ../build-support/dart/pub2nix { });
@@ -37904,8 +19131,6 @@ with pkgs;
httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { };
- mg = callPackage ../applications/editors/mg { };
-
# Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906)
discord = import ../applications/networking/instant-messengers/discord {
inherit lib stdenv;
@@ -37938,74 +19163,32 @@ with pkgs;
golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { };
- golden-cheetah-bin = callPackage ../applications/misc/golden-cheetah-bin {};
-
- linkchecker = callPackage ../tools/networking/linkchecker { };
-
tomb = callPackage ../by-name/to/tomb/package.nix {
pinentry = pinentry-curses;
};
- sccache = callPackage ../development/tools/misc/sccache { };
-
- scip = callPackage ../development/tools/misc/scip { };
-
- scriptisto = callPackage ../development/tools/misc/scriptisto { };
-
- sequeler = callPackage ../applications/misc/sequeler { };
-
- sequelpro = callPackage ../applications/misc/sequelpro { };
-
serial-studio = libsForQt5.callPackage ../applications/misc/serial-studio { };
- snowsql = callPackage ../applications/misc/snowsql { };
-
- sidequest = callPackage ../applications/misc/sidequest { };
-
maphosts = callPackage ../tools/networking/maphosts { };
- zimg = callPackage ../development/libraries/zimg { };
-
- wtf = callPackage ../applications/misc/wtf { };
-
tora = libsForQt5.callPackage ../development/tools/tora { };
- xrq = callPackage ../applications/misc/xrq { };
-
nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };
nitrokey-app2 = qt6Packages.callPackage ../tools/security/nitrokey-app2 { };
- fpm2 = callPackage ../tools/security/fpm2 { };
-
hy = with python3Packages; toPythonApplication hy;
- wmic-bin = callPackage ../servers/monitoring/wmic-bin { };
-
ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { };
vdr = callPackage ../applications/video/vdr { };
vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { });
wrapVdr = callPackage ../applications/video/vdr/wrapper.nix { };
- chrome-export = callPackage ../tools/misc/chrome-export { };
-
chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing { };
linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { };
- hss = callPackage ../tools/networking/hss { };
-
- undaemonize = callPackage ../tools/system/undaemonize { };
-
- houdini = callPackage ../applications/misc/houdini { };
-
- openring = callPackage ../applications/misc/openring { };
-
- openrisk = callPackage ../tools/security/openrisk { };
-
- openvino = callPackage ../development/libraries/openvino { };
-
phonetisaurus = callPackage ../development/libraries/phonetisaurus {
# https://github.com/AdolfVonKleist/Phonetisaurus/issues/70
openfst = openfst.overrideAttrs rec {
@@ -38025,39 +19208,14 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
- dnstake = callPackage ../tools/networking/dnstake { };
-
dnstracer = callPackage ../tools/networking/dnstracer {
inherit (darwin) libresolv;
};
- dnstwist = callPackage ../tools/networking/dnstwist { };
-
- dsniff = callPackage ../tools/networking/dsniff { };
-
- wal-g = callPackage ../tools/backup/wal-g { };
-
- tlwg = callPackage ../data/fonts/tlwg { };
-
- tt2020 = callPackage ../data/fonts/tt2020 { };
-
- simplehttp2server = callPackage ../servers/simplehttp2server { };
-
- simple-http-server = callPackage ../servers/simple-http-server { };
-
diceware = with python3Packages; toPythonApplication diceware;
xml2rfc = with python3Packages; toPythonApplication xml2rfc;
- mmark = callPackage ../tools/typesetting/mmark { };
-
- wire-desktop = callPackage ../applications/networking/instant-messengers/wire-desktop { };
-
- wireworld = callPackage ../games/wireworld { };
-
-
- teseq = callPackage ../applications/misc/teseq { };
-
ape = callPackage ../applications/misc/ape { };
attemptoClex = callPackage ../applications/misc/ape/clex.nix { };
apeClex = callPackage ../applications/misc/ape/apeclex.nix { };
@@ -38080,28 +19238,18 @@ with pkgs;
openbsd = callPackage ../os-specific/bsd/openbsd { };
- powershell = callPackage ../shells/powershell { };
-
doing = callPackage ../applications/misc/doing { };
- undervolt = callPackage ../os-specific/linux/undervolt { };
-
alibuild = callPackage ../development/tools/build-managers/alibuild {
python = python3;
};
- tsukae = callPackage ../applications/misc/tsukae { };
-
- tsung = callPackage ../applications/networking/tsung { };
-
bcompare = libsForQt5.callPackage ../applications/version-management/bcompare { };
xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver;
xp-pen-g430-driver = libsForQt5.xp-pen-g430-driver;
- new-session-manager = callPackage ../applications/audio/new-session-manager { };
-
newlib = callPackage ../development/misc/newlib {
stdenv = stdenvNoLibc;
};
@@ -38117,92 +19265,30 @@ with pkgs;
wfuzz = with python3Packages; toPythonApplication wfuzz;
- wmenu = callPackage ../applications/misc/wmenu { };
-
- bemenu = callPackage ../applications/misc/bemenu { };
-
- dapper = callPackage ../development/tools/dapper { };
-
- k3d = callPackage ../applications/networking/cluster/k3d { };
-
- zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots { };
-
zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
- zfxtop = callPackage ../tools/system/zfxtop { };
-
- zrepl = callPackage ../tools/backup/zrepl { };
-
- uhubctl = callPackage ../tools/misc/uhubctl { };
-
kodelife = callPackage ../applications/graphics/kodelife {
inherit (gst_all_1) gstreamer gst-plugins-base;
};
- bunnyfetch = callPackage ../tools/misc/bunnyfetch { };
-
- _3proxy = callPackage ../applications/networking/3proxy { };
-
weasis = callPackage ../by-name/we/weasis/package.nix {
jre = jdk21;
};
- webwormhole = callPackage ../tools/networking/webwormhole { };
-
- wifi-password = callPackage ../os-specific/darwin/wifi-password { };
-
- qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen { };
-
sieveshell = with python3.pkgs; toPythonApplication managesieve;
sunshine = callPackage ../servers/sunshine { };
- sentencepiece = callPackage ../development/libraries/sentencepiece { };
-
- kaf = callPackage ../development/tools/kaf { };
-
- kcli = callPackage ../development/tools/kcli { };
-
- pxlib = callPackage ../development/libraries/pxlib { };
-
- pxview = callPackage ../development/tools/pxview { };
-
- unstick = callPackage ../os-specific/linux/unstick { };
-
- quartus-prime-lite = callPackage ../applications/editors/quartus-prime { };
-
- usb-blaster-udev-rules = callPackage ../os-specific/linux/usb-blaster-udev-rules { };
-
- go-license-detector = callPackage ../development/tools/misc/go-license-detector { };
-
- hashdeep = callPackage ../tools/security/hashdeep { };
-
- pdf-parser = callPackage ../tools/misc/pdf-parser { };
-
- fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher { };
-
- btcdeb = callPackage ../applications/blockchains/btcdeb { };
-
jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
# TODO: remove once `udev` is `systemdMinimal` everywhere.
udev = systemdMinimal;
jack = libjack2;
};
- jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };
-
- zenstates = callPackage ../os-specific/linux/zenstates { };
-
- ryzenadj = callPackage ../os-specific/linux/ryzenadj { };
-
gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };
- zalgo = callPackage ../tools/misc/zalgo { };
-
inherit (callPackage ../applications/misc/zettlr { }) zettlr;
- unpoller = callPackage ../servers/monitoring/unpoller { };
-
fac-build = callPackage ../development/tools/build-managers/fac {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -38213,130 +19299,40 @@ with pkgs;
wlroots = wlroots_0_17;
};
- psftools = callPackage ../os-specific/linux/psftools { };
-
- lc3tools = callPackage ../development/tools/lc3tools { };
-
ldid = callPackage ../development/tools/ldid {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
- xcolor = callPackage ../tools/graphics/xcolor { };
-
- xcfun = callPackage ../development/libraries/science/chemistry/xcfun { };
-
- xsos = callPackage ../os-specific/linux/xsos { };
-
- xmcp = callPackage ../tools/X11/xmcp { };
-
- ymuse = callPackage ../applications/audio/ymuse { };
-
- zeyple = callPackage ../misc/zeyple { };
-
- zk = callPackage ../applications/office/zk { };
-
- zktree = callPackage ../applications/misc/zktree { };
-
zram-generator = callPackage ../tools/system/zram-generator { };
zrythm = callPackage ../applications/audio/zrythm {
inherit (plasma5Packages) breeze-icons;
};
- zthrottle = callPackage ../tools/misc/zthrottle { };
-
honeymarker = callPackage ../servers/tracing/honeycomb/honeymarker { };
honeytail = callPackage ../servers/tracing/honeycomb/honeytail { };
honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { };
- mictray = callPackage ../tools/audio/mictray { };
-
swift-corelibs-libdispatch = swiftPackages.Dispatch;
- swaysettings = callPackage ../applications/misc/swaysettings { };
-
aitrack = libsForQt5.callPackage ../applications/misc/aitrack { };
widevine-cdm = callPackage ../applications/networking/browsers/misc/widevine-cdm.nix { };
- alsa-scarlett-gui = callPackage ../applications/audio/alsa-scarlett-gui { };
-
- flac2all = callPackage ../applications/audio/flac2all { };
-
- tuner = callPackage ../applications/audio/tuner { };
-
tidal-dl = python3Packages.callPackage ../tools/audio/tidal-dl { };
- locate-dominating-file = callPackage ../tools/misc/locate-dominating-file { };
-
- jfrog-cli = callPackage ../tools/misc/jfrog-cli { };
-
- ov = callPackage ../tools/text/ov { };
-
- deface = callPackage ../applications/video/deface { };
-
tubekit = callPackage ../applications/networking/cluster/tubekit/wrapper.nix { };
tubekit-unwrapped = callPackage ../applications/networking/cluster/tubekit { };
- tuic = callPackage ../tools/networking/tuic { };
-
- resgate = callPackage ../servers/resgate { };
-
- oversteer = callPackage ../applications/misc/oversteer { };
-
- volantes-cursors = callPackage ../data/icons/volantes-cursors { };
-
- gnss-share = callPackage ../servers/gnss-share { };
-
- ali = callPackage ../tools/networking/ali { };
-
- udict = callPackage ../applications/misc/udict { };
-
duden = python3Packages.toPythonApplication python3Packages.duden;
- zf = callPackage ../tools/misc/zf { };
-
- isolate = callPackage ../tools/security/isolate { };
-
- dtool = callPackage ../tools/misc/dtool { };
-
tremotesf = libsForQt5.callPackage ../applications/networking/p2p/tremotesf { };
- reindeer = callPackage ../development/tools/reindeer { };
-
- charasay = callPackage ../tools/misc/charasay { };
-
- libvoikko = callPackage ../development/libraries/libvoikko { };
-
- hfst = callPackage ../development/libraries/hfst { };
-
- omorfi = callPackage ../development/libraries/omorfi { };
-
- hfst-ospell = callPackage ../development/libraries/hfst-ospell { };
-
- waylyrics = callPackage ../applications/audio/waylyrics { };
-
- gitrs = callPackage ../tools/misc/gitrs { };
-
- dict-cc-py = callPackage ../applications/misc/dict-cc-py { };
-
- wpm = callPackage ../applications/misc/wpm { };
-
- weggli = callPackage ../tools/security/weggli { };
-
yazi-unwrapped = callPackage ../by-name/ya/yazi-unwrapped/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation; };
- ssl-proxy = callPackage ../tools/networking/ssl-proxy { };
-
- code-maat = callPackage ../development/tools/code-maat {};
-
- mdhtml = callPackage ../tools/text/mdhtml { };
-
- insulator2 = callPackage ../applications/misc/insulator2 {};
-
animdl = python3Packages.callPackage ../applications/video/animdl { };
dillo = callPackage ../by-name/di/dillo/package.nix {
diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
index 6b709ce625..fa15b777e3 100644
--- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
@@ -24077,12 +24077,12 @@ with self; {
SysVirt = buildPerlModule rec {
pname = "Sys-Virt";
- version = "10.2.0";
+ version = "10.9.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-perl";
rev = "v${version}";
- hash = "sha256-xpgZeXk9QefqbBMsvcMh/Cg/XFGEiVi3FbU/jBbSIr0=";
+ hash = "sha256-g2HH9Ep5cAa4qXo9/MKJmxeive6oqHQEX9C8qY+u2g4=";
};
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];
diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix
index 95772c0afc..c02e9f8ed0 100644
--- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix
@@ -682,6 +682,13 @@ in {
url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
+ ]
+ ++ lib.optionals (lib.versionAtLeast php.version "8.3") [
+ # https://github.com/php/php-src/pull/16733 (fix soap test)
+ (fetchpatch {
+ url = "https://github.com/php/php-src/commit/5c308d61db104854e4ff84ab123e3ea56e1b4046.patch";
+ hash = "sha256-xQ4Sg4kL0cgHYauRW2AzGgFXfcqtxeRVhI9zNh7CsoM=";
+ })
];
}
{
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index 09df81c933..eb1a12c33f 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -4382,6 +4382,8 @@ self: super: with self; {
fastapi-sso = callPackage ../development/python-modules/fastapi-sso { };
+ fastcrc = callPackage ../development/python-modules/fastcrc { };
+
fast-histogram = callPackage ../development/python-modules/fast-histogram { };
fastavro = callPackage ../development/python-modules/fastavro { };
@@ -9001,6 +9003,8 @@ self: super: with self; {
netifaces = callPackage ../development/python-modules/netifaces { };
+ netifaces2 = callPackage ../development/python-modules/netifaces2 { };
+
netmiko = callPackage ../development/python-modules/netmiko { };
netio = callPackage ../development/python-modules/netio { };
@@ -15013,6 +15017,8 @@ self: super: with self; {
sphinx-autodoc-typehints = callPackage ../development/python-modules/sphinx-autodoc-typehints { };
+ sphinx-autodoc2 = callPackage ../development/python-modules/sphinx-autodoc2 { };
+
sphinx-basic-ng = callPackage ../development/python-modules/sphinx-basic-ng { };
sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { };
diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix
index bf69d13c98..ade495ae48 100644
--- a/third_party/nixpkgs/pkgs/top-level/release.nix
+++ b/third_party/nixpkgs/pkgs/top-level/release.nix
@@ -87,55 +87,101 @@ let
lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };
- darwin-tested = if supportDarwin.x86_64 then pkgs.releaseTools.aggregate
+ darwin-tested = if supportDarwin.x86_64 || supportDarwin.aarch64 then pkgs.releaseTools.aggregate
{ name = "nixpkgs-darwin-${jobs.tarball.version}";
meta.description = "Release-critical builds for the Nixpkgs darwin channel";
- constituents =
- [ jobs.tarball
- jobs.release-checks
- jobs.cabal2nix.x86_64-darwin
- jobs.ghc.x86_64-darwin
- jobs.git.x86_64-darwin
- jobs.go.x86_64-darwin
- jobs.mariadb.x86_64-darwin
- jobs.nix.x86_64-darwin
- jobs.nixpkgs-review.x86_64-darwin
- jobs.nix-info.x86_64-darwin
- jobs.nix-info-tested.x86_64-darwin
- jobs.openssh.x86_64-darwin
- jobs.openssl.x86_64-darwin
- jobs.pandoc.x86_64-darwin
- jobs.postgresql.x86_64-darwin
- jobs.python3.x86_64-darwin
- jobs.ruby.x86_64-darwin
- jobs.rustc.x86_64-darwin
- # blocking ofBorg CI 2020-02-28
- # jobs.stack.x86_64-darwin
- jobs.stdenv.x86_64-darwin
- jobs.vim.x86_64-darwin
- jobs.cachix.x86_64-darwin
- jobs.darwin.linux-builder.x86_64-darwin
+ constituents = [
+ jobs.tarball
+ jobs.release-checks
+ ]
+ ++ optionals supportDarwin.x86_64 [
+ jobs.cabal2nix.x86_64-darwin
+ jobs.ghc.x86_64-darwin
+ jobs.git.x86_64-darwin
+ jobs.go.x86_64-darwin
+ jobs.mariadb.x86_64-darwin
+ jobs.nix.x86_64-darwin
+ jobs.nixpkgs-review.x86_64-darwin
+ jobs.nix-info.x86_64-darwin
+ jobs.nix-info-tested.x86_64-darwin
+ jobs.openssh.x86_64-darwin
+ jobs.openssl.x86_64-darwin
+ jobs.pandoc.x86_64-darwin
+ jobs.postgresql.x86_64-darwin
+ jobs.python3.x86_64-darwin
+ jobs.ruby.x86_64-darwin
+ jobs.rustc.x86_64-darwin
+ # blocking ofBorg CI 2020-02-28
+ # jobs.stack.x86_64-darwin
+ jobs.stdenv.x86_64-darwin
+ jobs.vim.x86_64-darwin
+ jobs.cachix.x86_64-darwin
+ jobs.darwin.linux-builder.x86_64-darwin
- # UI apps
- # jobs.firefox-unwrapped.x86_64-darwin
- jobs.qt5.qtmultimedia.x86_64-darwin
- jobs.inkscape.x86_64-darwin
- jobs.gimp.x86_64-darwin
- jobs.emacs.x86_64-darwin
- jobs.wireshark.x86_64-darwin
- jobs.transmission_3-gtk.x86_64-darwin
- jobs.transmission_4-gtk.x86_64-darwin
+ # UI apps
+ # jobs.firefox-unwrapped.x86_64-darwin
+ jobs.qt5.qtmultimedia.x86_64-darwin
+ jobs.inkscape.x86_64-darwin
+ jobs.gimp.x86_64-darwin
+ jobs.emacs.x86_64-darwin
+ jobs.wireshark.x86_64-darwin
+ jobs.transmission_3-gtk.x86_64-darwin
+ jobs.transmission_4-gtk.x86_64-darwin
- # Tests
- /*
- jobs.tests.cc-wrapper.default.x86_64-darwin
- jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin
- jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin
- jobs.tests.stdenv-inputs.x86_64-darwin
- jobs.tests.macOSSierraShared.x86_64-darwin
- jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin
- */
- ];
+ # Tests
+ /*
+ jobs.tests.cc-wrapper.default.x86_64-darwin
+ jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin
+ jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin
+ jobs.tests.stdenv-inputs.x86_64-darwin
+ jobs.tests.macOSSierraShared.x86_64-darwin
+ jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin
+ */
+ ]
+ ++ optionals supportDarwin.aarch64 [
+ jobs.cabal2nix.aarch64-darwin
+ jobs.ghc.aarch64-darwin
+ jobs.git.aarch64-darwin
+ jobs.go.aarch64-darwin
+ jobs.mariadb.aarch64-darwin
+ jobs.nix.aarch64-darwin
+ jobs.nixpkgs-review.aarch64-darwin
+ jobs.nix-info.aarch64-darwin
+ jobs.nix-info-tested.aarch64-darwin
+ jobs.openssh.aarch64-darwin
+ jobs.openssl.aarch64-darwin
+ jobs.pandoc.aarch64-darwin
+ jobs.postgresql.aarch64-darwin
+ jobs.python3.aarch64-darwin
+ jobs.ruby.aarch64-darwin
+ jobs.rustc.aarch64-darwin
+ # blocking ofBorg CI 2020-02-28
+ # jobs.stack.aarch64-darwin
+ jobs.stdenv.aarch64-darwin
+ jobs.vim.aarch64-darwin
+ jobs.cachix.aarch64-darwin
+ jobs.darwin.linux-builder.aarch64-darwin
+
+ # UI apps
+ # jobs.firefox-unwrapped.aarch64-darwin
+ jobs.qt5.qtmultimedia.aarch64-darwin
+ jobs.inkscape.aarch64-darwin
+ jobs.gimp.aarch64-darwin
+ jobs.emacs.aarch64-darwin
+ jobs.wireshark.aarch64-darwin
+ jobs.transmission_3-gtk.aarch64-darwin
+ jobs.transmission_4-gtk.aarch64-darwin
+
+ # Tests
+ /*
+ jobs.tests.cc-wrapper.default.aarch64-darwin
+ jobs.tests.cc-wrapper.llvmPackages.clang.aarch64-darwin
+ jobs.tests.cc-wrapper.llvmPackages.libcxx.aarch64-darwin
+ jobs.tests.stdenv-inputs.aarch64-darwin
+ jobs.tests.macOSSierraShared.aarch64-darwin
+ jobs.tests.stdenv.hooks.patch-shebangs.aarch64-darwin
+ */
+ ];
} else null;
unstable = pkgs.releaseTools.aggregate