diff options
| author | Robin Gloster <mail@glob.in> | 2017-03-30 12:21:32 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-03-30 16:23:33 +0200 |
| commit | ce953d0bc90f17dfc35f0e498cfe192bfad0cc20 (patch) | |
| tree | da3e9b672eef521e1defb18305d3e6d742cb96ff | |
| parent | c5a99f89e635e42f0dbb9f04353cc8fd46cc184f (diff) | |
| download | nixlib-ce953d0bc90f17dfc35f0e498cfe192bfad0cc20.tar nixlib-ce953d0bc90f17dfc35f0e498cfe192bfad0cc20.tar.gz nixlib-ce953d0bc90f17dfc35f0e498cfe192bfad0cc20.tar.bz2 nixlib-ce953d0bc90f17dfc35f0e498cfe192bfad0cc20.tar.lz nixlib-ce953d0bc90f17dfc35f0e498cfe192bfad0cc20.tar.xz nixlib-ce953d0bc90f17dfc35f0e498cfe192bfad0cc20.tar.zst nixlib-ce953d0bc90f17dfc35f0e498cfe192bfad0cc20.zip | |
panomatic: remove
| -rw-r--r-- | nixos/tests/gnome3-gdm.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/graphics/panomatic/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 1 insertions, 20 deletions
diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix index 42425b57ba33..2c9c745021af 100644 --- a/nixos/tests/gnome3-gdm.nix +++ b/nixos/tests/gnome3-gdm.nix @@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.enable = true; + services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.gdm = { enable = true; autoLogin = { diff --git a/pkgs/tools/graphics/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix deleted file mode 100644 index f14c16775f8d..000000000000 --- a/pkgs/tools/graphics/panomatic/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, boost, zlib}: - -stdenv.mkDerivation { - name = "panomatic-0.9.4"; - - src = fetchurl { - url = http://aorlinsk2.free.fr/panomatic/bin/panomatic-0.9.4-src.tar.bz2; - sha256 = "0vfkj3k3y8narwwijh996q2zzprjxbr2fhym15nm4fkq14yw4wwn"; - }; - - buildInputs = [ boost zlib ]; - - meta = { - homepage = http://aorlinsk2.free.fr/panomatic/; - description = "Tool that automates the creation of control points in Hugin"; - license = stdenv.lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4a38faed288..2fb97372a484 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3346,8 +3346,6 @@ with pkgs; buildTools = drv.buildTools or [] ++ [haskellPackages.hsb2hs]; }); - panomatic = callPackage ../tools/graphics/panomatic { }; - pamtester = callPackage ../tools/security/pamtester { }; paper-gtk-theme = callPackage ../misc/themes/paper { }; |