diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 00:23:12 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 00:23:12 -0400 |
| commit | 3bc923bf5f08f49a6c654ea20dc51c13abee941c (patch) | |
| tree | ff233292b9f9505f5aeee8c8005dffe44e89650c /pkgs/top-level/all-packages.nix | |
| parent | b3ef3227704080b6058ae10ed2fcb739ec31ff78 (diff) | |
| parent | 17b2ef2461ccaae59aef957babcdfc7a57d71bb3 (diff) | |
| download | nixlib-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar nixlib-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar.gz nixlib-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar.bz2 nixlib-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar.lz nixlib-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar.xz nixlib-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar.zst nixlib-3bc923bf5f08f49a6c654ea20dc51c13abee941c.zip | |
Merge remote-tracking branch 'upstream/master' into uclibc
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 71ef037ab9dd..9d381af0af91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -611,6 +611,8 @@ with pkgs; bonfire = callPackage ../tools/misc/bonfire { }; + cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; cconv = callPackage ../tools/text/cconv { }; @@ -3053,6 +3055,8 @@ with pkgs; innoextract = callPackage ../tools/archivers/innoextract { }; + input-utils = callPackage ../os-specific/linux/input-utils { }; + intecture-agent = callPackage ../tools/admin/intecture/agent.nix { }; intecture-auth = callPackage ../tools/admin/intecture/auth.nix { }; @@ -11501,6 +11505,8 @@ with pkgs; simp_le = callPackage ../tools/admin/simp_le { }; + simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; + sfml = callPackage ../development/libraries/sfml { }; csfml = callPackage ../development/libraries/csfml { }; |