diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-09-20 12:25:19 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-09-20 12:25:19 +0200 |
commit | 5d4267b0f2ef92056bb5e1d7016071ad0c6b3593 (patch) | |
tree | 1ee0be046baf8291a5e37725c729235987e1c70d /pkgs/top-level/all-packages.nix | |
parent | c5ff1bb9258e4b5a3b5caa54caea225f2b2fb233 (diff) | |
parent | c6c10c4c7ad6f67aaafc3731c20ca1ee67747d39 (diff) | |
download | nixpkgs-5d4267b0f2ef92056bb5e1d7016071ad0c6b3593.tar nixpkgs-5d4267b0f2ef92056bb5e1d7016071ad0c6b3593.tar.gz nixpkgs-5d4267b0f2ef92056bb5e1d7016071ad0c6b3593.tar.bz2 nixpkgs-5d4267b0f2ef92056bb5e1d7016071ad0c6b3593.tar.lz nixpkgs-5d4267b0f2ef92056bb5e1d7016071ad0c6b3593.tar.xz nixpkgs-5d4267b0f2ef92056bb5e1d7016071ad0c6b3593.tar.zst nixpkgs-5d4267b0f2ef92056bb5e1d7016071ad0c6b3593.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04162b9457f..7267f1c150a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2754,6 +2754,8 @@ with pkgs; goku = callPackage ../os-specific/darwin/goku { }; + grb = callPackage ../applications/misc/grb { }; + kerf = kerf_1; /* kerf2 is WIP */ kerf_1 = callPackage ../development/interpreters/kerf { stdenv = clangStdenv; @@ -3221,6 +3223,8 @@ with pkgs; caddy = callPackage ../servers/caddy { }; + xcaddy = callPackage ../servers/caddy/xcaddy { }; + traefik = callPackage ../servers/traefik { }; traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; @@ -13266,6 +13270,8 @@ with pkgs; dbmate = callPackage ../development/tools/database/dbmate { }; + dbmonster = callPackage ../tools/security/dbmonster { }; + devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; devpi-server = callPackage ../development/tools/devpi-server {}; @@ -14548,6 +14554,7 @@ with pkgs; }; cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { }; cargo-graph = callPackage ../development/tools/rust/cargo-graph { }; + cargo-hack = callPackage ../development/tools/rust/cargo-hack { }; cargo-license = callPackage ../development/tools/rust/cargo-license { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { @@ -15822,7 +15829,7 @@ with pkgs; }; bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { - inherit (darwin) cctools; + inherit (darwin) cctools sigtool; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; @@ -16814,7 +16821,7 @@ with pkgs; modd = callPackage ../development/tools/modd { }; mold = callPackage ../development/tools/mold { - stdenv = llvmPackages_latest.stdenv; + inherit (llvmPackages) stdenv; }; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; @@ -18250,6 +18257,8 @@ with pkgs; freetype = callPackage ../development/libraries/freetype { }; + freexl = callPackage ../development/libraries/freexl { }; + frei0r = callPackage ../development/libraries/frei0r { }; fribidi = callPackage ../development/libraries/fribidi { }; @@ -20529,7 +20538,7 @@ with pkgs; lirc = callPackage ../development/libraries/lirc { }; - liquid-dsp = callPackage ../development/libraries/liquid-dsp { }; + liquid-dsp = callPackage ../development/libraries/liquid-dsp { inherit (darwin) cctools; }; liquidfun = callPackage ../development/libraries/liquidfun { }; @@ -21770,8 +21779,6 @@ with pkgs; spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {}; - spatialite_tools = callPackage ../development/libraries/spatialite-tools { }; - spdk = callPackage ../development/libraries/spdk { }; speechd = callPackage ../development/libraries/speechd { }; @@ -26401,6 +26408,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; + spatialite_tools = callPackage ../applications/gis/spatialite-tools { }; + udig = callPackage ../applications/gis/udig { }; whitebox-tools = callPackage ../applications/gis/whitebox-tools { |