Adding Gphoto2FS - filesystem for attached cameras

svn path=/nixpkgs/trunk/; revision=16841

6 files changed, 74 insertions, 2 deletions

diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix
new file mode 100644
index 00000000000..767c8078e97
--- /dev/null
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@@ -0,0 +1,30 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+  s = import ./src-info-for-gphotofs.nix;
+
+  version = a.lib.attrByPath ["version"] s.version a; 
+  buildInputs = with a; [
+    libgphoto2 fuse pkgconfig glib
+  ];
+in
+rec {
+  src = fetchurl {
+    url = s.url;
+    sha256 = s.hash;
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  name = "gphoto2fs-" + version;
+  meta = {
+    description = "Fuse FS to mount a digital camera";
+    maintainers = [
+      a.lib.maintainers.raskin
+    ];
+  };
+}
diff --git a/pkgs/applications/misc/gphoto2/src-for-gphotofs.nix b/pkgs/applications/misc/gphoto2/src-for-gphotofs.nix
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/pkgs/applications/misc/gphoto2/src-for-gphotofs.nix
@@ -0,0 +1 @@
+{}
diff --git a/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix b/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix
new file mode 100644
index 00000000000..2e350b9232f
--- /dev/null
+++ b/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix
@@ -0,0 +1,6 @@
+rec {
+  advertisedUrl="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2";
+  version = "0.4.0";
+  url="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2";
+  hash = "07zxnawkyzy6np9zas6byp9ksjkbi16d11zqrznqarfkf3fkg3yq";
+}
diff --git a/pkgs/build-support/builder-defs/template-bdp-uud.nix b/pkgs/build-support/builder-defs/template-bdp-uud.nix
new file mode 100644
index 00000000000..46d2da40a70
--- /dev/null
+++ b/pkgs/build-support/builder-defs/template-bdp-uud.nix
@@ -0,0 +1,30 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+  s = import ./src-info-for-default.nix;
+
+  version = a.lib.attrByPath ["version"] s.version a; 
+  buildInputs = with a; [
+    
+  ];
+in
+rec {
+  src = fetchurl {
+    url = s.url;
+    sha256 = s.hash;
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  name = "${abort "Specify name"}-" + version;
+  meta = {
+    description = "${abort "Specify description"}";
+    maintainers = [
+      a.lib.maintainers.(abort "Specify maintainer")
+    ];
+  };
+}
diff --git a/pkgs/build-support/upstream-updater/design.txt b/pkgs/build-support/upstream-updater/design.txt
index fe707a6f4d4..2f5a78c0bfa 100644
--- a/pkgs/build-support/upstream-updater/design.txt
+++ b/pkgs/build-support/upstream-updater/design.txt
@@ -14,8 +14,8 @@ src-info-for-file.nix:
 downloadPage
 sourceRegexp (default = '.*[.]tar[.].*')
 choiceCommand (default = 'head -1')
-versionExtractorSedScript (default = 's/.*-([0-9.a-z]+)[.].*/\1/')
-versionReferenceCreator (default = 's/-([0-9.a-z]+)[.]/-${version}./')
+versionExtractorSedScript (default = 's/.*-([0-9.]+)[.].*/\1/')
+versionReferenceCreator (default = 's/-([0-9.]+)[.]/-${version}./')
 mirrorSedScript (default = none)
 
 src-for-file.nix:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af20ab3c4c5..664113504ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6529,6 +6529,11 @@ let
       libjpeg readline libtool;
   };
 
+  gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix {
+    inherit libgphoto2 fuse pkgconfig; 
+    inherit (gtkLibs) glib;
+  };
+
   gtkpod = import ../applications/audio/gtkpod {
     inherit stdenv fetchurl pkgconfig libgpod gettext perl perlXMLParser flex libid3tag;
     inherit (gtkLibs) gtk glib;