diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-02 09:39:00 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-02 09:39:00 +0200 |
| commit | afb1041148b930750c769e1034804effaef2b823 (patch) | |
| tree | 2b474956a7c41fb38f3f6ee2822ac843a1f8e8d4 /pkgs/top-level/all-packages.nix | |
| parent | 00bbfccecf90f21b873d90bfeb3b81d7de79cf80 (diff) | |
| parent | 309711c4b4b665f47876f2a113d3872237467784 (diff) | |
| download | nixlib-afb1041148b930750c769e1034804effaef2b823.tar nixlib-afb1041148b930750c769e1034804effaef2b823.tar.gz nixlib-afb1041148b930750c769e1034804effaef2b823.tar.bz2 nixlib-afb1041148b930750c769e1034804effaef2b823.tar.lz nixlib-afb1041148b930750c769e1034804effaef2b823.tar.xz nixlib-afb1041148b930750c769e1034804effaef2b823.tar.zst nixlib-afb1041148b930750c769e1034804effaef2b823.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a8583ea0a68..d7e349708e7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -873,6 +873,8 @@ in ctrtool = callPackage ../tools/archivers/ctrtool { }; + crowbar = callPackage ../tools/security/crowbar { }; + crumbs = callPackage ../applications/misc/crumbs { }; crc32c = callPackage ../development/libraries/crc32c { }; @@ -4287,6 +4289,8 @@ in intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; + intermodal = callPackage ../tools/misc/intermodal { }; + invoice2data = callPackage ../tools/text/invoice2data { }; inxi = callPackage ../tools/system/inxi { }; @@ -7364,6 +7368,10 @@ in wootility = callPackage ../tools/misc/wootility { }; + wormhole = callPackage ../tools/networking/wormhole { + inherit (darwin.apple_sdk.frameworks) Security; + }; + wpscan = callPackage ../tools/security/wpscan { }; wsmancli = callPackage ../tools/system/wsmancli {}; @@ -7418,6 +7426,8 @@ in tweet-hs = haskell.lib.justStaticExecutables haskellPackages.tweet-hs; + tweeny = callPackage ../development/libraries/tweeny { }; + qfsm = callPackage ../applications/science/electronics/qfsm { }; tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { }; @@ -16093,7 +16103,7 @@ in spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; - spring-boot = callPackage ../development/tools/spring-boot { }; + spring-boot-cli = callPackage ../development/tools/spring-boot-cli { }; squid = callPackage ../servers/squid { }; @@ -19787,7 +19797,9 @@ in heme = callPackage ../applications/editors/heme { }; - herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { + asciidoc = asciidoc-full; + }; hercules = callPackage ../applications/virtualization/hercules { }; @@ -24596,7 +24608,9 @@ in dcmtk = callPackage ../applications/science/medicine/dcmtk { }; - ### PHYSICS + ### SCIENCE/PHYSICS + + elmerfem = callPackage ../applications/science/physics/elmerfem {}; sacrifice = callPackage ../applications/science/physics/sacrifice {}; @@ -26116,6 +26130,11 @@ in xzoom = callPackage ../tools/X11/xzoom {}; + yabai = callPackage ../os-specific/darwin/yabai { + inherit (darwin.apple_sdk.frameworks) + Carbon Cocoa ScriptingBridge; + }; + yabause = libsForQt5.callPackage ../misc/emulators/yabause { freeglut = null; openal = null; |