diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-12-22 11:28:56 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-12-22 11:28:56 +0100 |
| commit | 2e03ae274d36e695e4db63fb0a6b71346621b6af (patch) | |
| tree | 84af1a7ec323e1ce2865661756da1cca2b6ef07b /pkgs/top-level/all-packages.nix | |
| parent | 41f55691a96ca4f37a87c8659884edf19b2c8446 (diff) | |
| parent | 0c1382085b2969ce38359bcb28fc5dfe67cca7eb (diff) | |
| download | nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.gz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.bz2 nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.lz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.xz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.zst nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72355e8a7e42..d5f1791f355e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1099,6 +1099,8 @@ in mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; + nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { }; + libceph = ceph.lib; ceph = callPackage ../tools/filesystems/ceph { boost = boost159; }; ceph-dev = ceph; @@ -1880,6 +1882,10 @@ in stdenv = overrideCC stdenv gcc49; }; + gnome15 = callPackage ../applications/misc/gnome15 { + inherit (gnome2) gnome_python gnome_python_desktop; + }; + gnokii = callPackage ../tools/misc/gnokii { }; gnuapl = callPackage ../development/interpreters/gnu-apl { }; @@ -14809,6 +14815,8 @@ in ssr = callPackage ../applications/audio/soundscape-renderer {}; + ssrc = callPackage ../applications/audio/ssrc { }; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; @@ -17656,11 +17664,7 @@ in 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; - }; + xhyve = callPackage ../applications/virtualization/xhyve { }; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { }; |