diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-13 12:13:25 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-13 12:13:25 +0200 |
| commit | 658b7c3f2ebb7d04d950b95ce81cd5fea2a03141 (patch) | |
| tree | fdcfa83f21b9c98315a3a751ef4d27772976589a /pkgs/top-level/all-packages.nix | |
| parent | f14841f3ce734b27988a605fc9775a035d313d23 (diff) | |
| parent | a2981671523416ad5c9a49de8c16ac8fccb2306b (diff) | |
| download | nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.gz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.bz2 nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.lz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.xz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.zst nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a73c7fbddd2e..6fd4b6bd902f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1061,6 +1061,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; }; + compsize = callPackage ../os-specific/linux/compsize { }; + coturn = callPackage ../servers/coturn { }; coursier = callPackage ../development/tools/coursier {}; @@ -4707,6 +4709,8 @@ with pkgs; rnv = callPackage ../tools/text/xml/rnv { }; + rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { }; + roundup = callPackage ../tools/misc/roundup { }; routino = callPackage ../tools/misc/routino { }; @@ -8652,6 +8656,8 @@ with pkgs; coin3d = callPackage ../development/libraries/coin3d { }; + soxt = callPackage ../development/libraries/soxt { }; + CoinMP = callPackage ../development/libraries/CoinMP { }; cointop = callPackage ../applications/misc/cointop { }; |