summary refs log tree commit diff
path: root/pkgs/os-specific/linux/fbterm/src-for-default.nix
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-08 16:01:12 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-08 16:01:12 +0000
commit9ee0a9df9bc69e72278b8d34093238428fa3ea82 (patch)
tree5b074e2ebbc2aba8c957753bfb9e549ed7689585 /pkgs/os-specific/linux/fbterm/src-for-default.nix
parent0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b (diff)
parent47288a22242b0cd554efc45d446e67573ca308f7 (diff)
downloadnixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar
nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.gz
nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.bz2
nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.lz
nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.xz
nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.zst
nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.zip
svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
Diffstat (limited to 'pkgs/os-specific/linux/fbterm/src-for-default.nix')
-rw-r--r--pkgs/os-specific/linux/fbterm/src-for-default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/fbterm/src-for-default.nix b/pkgs/os-specific/linux/fbterm/src-for-default.nix
index 39aaa2ca626..6705404ac9f 100644
--- a/pkgs/os-specific/linux/fbterm/src-for-default.nix
+++ b/pkgs/os-specific/linux/fbterm/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.5";
-   name="fbterm-1.5";
-   hash="05qzc6g9a79has3cy7dlw70n4pn13r552a2i1g4xy23acnpvvjsb";
+   version="1.7";
+   name="fbterm-1.7";
+   hash="19qjb2zb4gwr1jlybmalaw3y3zybvc8vliwj85dfabmill1k1afh";
    url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz";
-   advertisedUrl="http://fbterm.googlecode.com/files/fbterm-1.5.tar.gz";
+   advertisedUrl="http://fbterm.googlecode.com/files/fbterm-1.7.tar.gz";
   
   
 }