diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-18 15:30:39 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-18 15:30:39 -0400 |
| commit | b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527 (patch) | |
| tree | 35f6e6901ea4e5ea2cded73fff1e12e2730a00ed /pkgs/top-level | |
| parent | a13286fcf04ec02f41f034b76a11dc920606e2b3 (diff) | |
| parent | 4627f0719dcc73ccd10d421b05af35170324971d (diff) | |
| download | nixlib-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar nixlib-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar.gz nixlib-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar.bz2 nixlib-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar.lz nixlib-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar.xz nixlib-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar.zst nixlib-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e842e896dbe2..7872e03426d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8930,6 +8930,8 @@ with pkgs; eclib = callPackage ../development/libraries/eclib {}; + editline = callPackage ../development/libraries/editline { }; + eigen = callPackage ../development/libraries/eigen {}; eigen3_3 = callPackage ../development/libraries/eigen/3.3.nix {}; @@ -18020,6 +18022,8 @@ with pkgs; inherit (xfce) exo; }; + lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { }; + slic3r = callPackage ../applications/misc/slic3r { }; slic3r-prusa3d = callPackage ../applications/misc/slic3r/prusa3d.nix { }; |