diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-03 09:48:42 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-03 09:48:42 +0100 |
commit | 55e0f12761f024582b26254ba3ad91ee2e5ee12a (patch) | |
tree | 1579b66c99968fdb12cd6abda4b7f9abdf7a578a /pkgs/top-level/all-packages.nix | |
parent | 10c8e6d0c590d6c83aa2efee7f701983440cca78 (diff) | |
parent | b99c86fde8c8005645da2a5f69331b4aae65f023 (diff) | |
download | nixlib-55e0f12761f024582b26254ba3ad91ee2e5ee12a.tar nixlib-55e0f12761f024582b26254ba3ad91ee2e5ee12a.tar.gz nixlib-55e0f12761f024582b26254ba3ad91ee2e5ee12a.tar.bz2 nixlib-55e0f12761f024582b26254ba3ad91ee2e5ee12a.tar.lz nixlib-55e0f12761f024582b26254ba3ad91ee2e5ee12a.tar.xz nixlib-55e0f12761f024582b26254ba3ad91ee2e5ee12a.tar.zst nixlib-55e0f12761f024582b26254ba3ad91ee2e5ee12a.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1035d5273a57..134075e3977a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17458,6 +17458,8 @@ with pkgs; testssl = callPackage ../applications/networking/testssl { }; umurmur = callPackage ../applications/networking/umurmur { }; + + udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; unigine-valley = callPackage ../applications/graphics/unigine-valley { }; |