summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/compilers/scala/2.10.nix1
-rw-r--r--pkgs/development/compilers/scala/2.9.nix1
-rw-r--r--pkgs/development/libraries/libsigcxx/1.2.nix3
-rw-r--r--pkgs/development/libraries/libsigsegv/2.5.nix3
-rw-r--r--pkgs/development/libraries/qwt/6.nix1
-rw-r--r--pkgs/development/libraries/readline/5.x.nix4
-rw-r--r--pkgs/development/libraries/readline/6.2.nix1
-rw-r--r--pkgs/development/libraries/readline/6.3.nix1
-rw-r--r--pkgs/development/tools/misc/texinfo/4.13a.nix1
-rw-r--r--pkgs/development/tools/misc/texinfo/5.2.nix1
-rw-r--r--pkgs/tools/typesetting/tex/pgf/1.x.nix5
-rw-r--r--pkgs/tools/typesetting/tex/pgf/2.x.nix7
-rw-r--r--pkgs/tools/typesetting/tex/pgf/3.x.nix9
13 files changed, 29 insertions, 9 deletions
diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix
index 11c3c0d8c31..6a20afe2bca 100644
--- a/pkgs/development/compilers/scala/2.10.nix
+++ b/pkgs/development/compilers/scala/2.10.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.scala-lang.org/;
     license = "BSD";
     platforms = stdenv.lib.platforms.all;
+    branch = "2.10";
   };
 }
diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix
index 41f377dbfa3..93e87735571 100644
--- a/pkgs/development/compilers/scala/2.9.nix
+++ b/pkgs/development/compilers/scala/2.9.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.scala-lang.org/;
     license = "BSD";
     platforms = stdenv.lib.platforms.all;
+    branch = "2.9";
   };
 }
diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix
index 29a7093dbbd..896b321272a 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "libsigc++-1.2.7";
-  
+
   src = fetchurl {
     url = "mirror://gnome/sources/libsigc++/1.2/${name}.tar.bz2";
     sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr";
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libsigc.sourceforge.net/;
     description = "A typesafe callback system for standard C++";
+    branch = "1.2";
   };
 }
diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix
index ba11e0752b2..81b563bb022 100644
--- a/pkgs/development/libraries/libsigsegv/2.5.nix
+++ b/pkgs/development/libraries/libsigsegv/2.5.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "libsigsegv-2.5";
-  
+
   src = fetchurl {
     url = "mirror://gnu/libsigsegv/${name}.tar.gz";
     sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg";
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libsigsegv.sf.net;
     description = "A library for handling page faults in user mode";
+    branch = "2.5";
   };
 
   doCheck = true;
diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix
index 8d31978657d..3660ff88981 100644
--- a/pkgs/development/libraries/qwt/6.nix
+++ b/pkgs/development/libraries/qwt/6.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.qwt;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
+    branch = "6";
   };
 }
diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix
index ad9860d855e..13916040fba 100644
--- a/pkgs/development/libraries/readline/5.x.nix
+++ b/pkgs/development/libraries/readline/5.x.nix
@@ -11,5 +11,7 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [ncurses];
 
   patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
+  meta = {
+    branch = "5";
+  };
 }
-
diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix
index 1555f255c51..f50331ba684 100644
--- a/pkgs/development/libraries/readline/6.2.nix
+++ b/pkgs/development/libraries/readline/6.2.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation (rec {
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
+    branch = "6.2";
   };
 }
 
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index 38ecc034d89..ea459f291b3 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.ludo ];
 
     platforms = platforms.unix;
+    branch = "6.3";
   };
 }
diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix
index a3155230514..6eb384f51e3 100644
--- a/pkgs/development/tools/misc/texinfo/4.13a.nix
+++ b/pkgs/development/tools/misc/texinfo/4.13a.nix
@@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
 
     homepage = http://www.gnu.org/software/texinfo/;
+    branch = "4.13";
   };
 }
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
index 62e1ff62d1e..c43ebcd2de2 100644
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ b/pkgs/development/tools/misc/texinfo/5.2.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
       need revise only that one document.  The Texinfo system is
       well-integrated with GNU Emacs.
     '';
+    branch = "5.2";
   };
 }
diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix
index 032d9b5520e..a26513d9f26 100644
--- a/pkgs/tools/typesetting/tex/pgf/1.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "pgf-1.18";
-  
+
   src = fetchurl {
     url = mirror://sourceforge/pgf/pgf-1.18.tar.gz;
     sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv";
@@ -13,4 +13,7 @@ stdenv.mkDerivation {
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
+  meta = {
+    branch = "1";
+  };
 }
diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix
index 09ec1729cfd..821357e7273 100644
--- a/pkgs/tools/typesetting/tex/pgf/2.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix
@@ -2,16 +2,19 @@
 
 stdenv.mkDerivation {
   name = "pgf-2.00";
-  
+
   src = fetchurl {
     url = mirror://sourceforge/pgf/pgf-2.00.tar.gz;
     sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264";
   };
 
   buildPhase = "true";
-  
+
   installPhase = "
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
+  meta = {
+    branch = "2";
+  };
 }
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix
index 9a03500bb96..5c0c387a340 100644
--- a/pkgs/tools/typesetting/tex/pgf/3.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation {
   name = "pgf-3.00";
-  
+
   src = fetchurl {
     url = http://downloads.sourceforge.net/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip;
     sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";
   };
-  
+
   buildInputs = [ unzip ];
 
   # Multiple files problem
@@ -18,9 +18,12 @@ stdenv.mkDerivation {
   '';
 
   buildPhase = "true";
-  
+
   installPhase = "
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
+  meta = {
+    branch = "3";
+  };
 }