From 4a92863fd55de5a1b73c3ba68c1dc1eb66dc841a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 Sep 2015 15:18:46 +0200 Subject: enblend-enfuse: rename to actual package name Retain old and unreadable "enblendenfuse" alias for compatibility. --- pkgs/applications/graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/graphics/hugin/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ea638de7925d..702911fee744 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -245,7 +245,7 @@ rec { /* =============== simple script files ==================== */ - # also have a look at enblendenfuse in all-packages.nix + # also have a look at enblend-enfuse in all-packages.nix exposureBlend = scriptDerivation { name = "exposure-blend"; src = fetchurl { diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 88912cbda55d..b11ed1a99df7 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, gnumake, pkgconfig , boost, gettext, tclap, wxGTK , freeglut, glew, libXi, libXmu, mesa -, autopanosiftc, enblendenfuse, exiv2, ilmbase, lensfun, libpng, libtiff +, autopanosiftc, enblend-enfuse, exiv2, ilmbase, lensfun, libpng, libtiff , openexr, panotools, perlPackages }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # commandline tools needed by the hugin batch processor # you may have to tell hugin (in the preferences) where these binaries reside - propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake + propagatedUserEnvPackages = [ autopanosiftc enblend-enfuse gnumake perlPackages.ImageExifTool ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0bf1a051098..c599390157c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1366,7 +1366,7 @@ let emv = callPackage ../tools/misc/emv { }; - enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; + enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; encfs = callPackage ../tools/filesystems/encfs { }; @@ -15106,6 +15106,7 @@ aliases = with self; rec { clangAnalyzer = clang-analyzer; # added 2015-02-20 cool-old-term = cool-retro-term; # added 2015-01-31 cv = progress; # added 2015-09-06 + enblendenfuse = enblend-enfuse; # 2015-09-30 exfat-utils = exfat; # 2015-09-11 firefoxWrapper = firefox-wrapper; fuse_exfat = exfat; # 2015-09-11 -- cgit 1.4.1