From 9aa47b62b63007aeb331bac0457b036acf40fc82 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Mon, 18 Feb 2013 22:12:11 +0100 Subject: Adding snappy 1.1.0 --- pkgs/development/libraries/snappy/default.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/snappy/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix new file mode 100644 index 000000000000..04e0897207f3 --- /dev/null +++ b/pkgs/development/libraries/snappy/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "snappy-1.1.0"; + + src = fetchurl { + url = "http://snappy.googlecode.com/files/${name}.tar.gz"; + sha256 = "0q31cx3zkw0apx1fy8z3xlh2lvivssvykqn0vxsgm4xvi32jpa0z"; + }; + + # -DNDEBUG for speed + preConfigure = '' + configureFlagsArray=("CXXFLAGS=-DNDEBUG -O2") + ''; + + doCheck = true; + + meta = { + homepage = http://code.google.com/p/snappy/ + license = "BSD" + description = "Compression/decompression library for very high speeds"; + }; +} -- cgit 1.4.1 From 08819d1aedacfad2e68eb39f9fb298a0cb844d84 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Feb 2013 11:23:28 +0100 Subject: Fix evaluation --- pkgs/development/libraries/snappy/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 04e0897207f3..ff1bfa7d4eb3 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://code.google.com/p/snappy/ - license = "BSD" + homepage = http://code.google.com/p/snappy/; + license = "BSD"; description = "Compression/decompression library for very high speeds"; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec049f6cede9..756509a4b956 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4580,7 +4580,7 @@ pythonPackages = python.modules // rec { meta = { homepage = http://pypi.python.org/pypi/Unidecode/; description = "ASCII transliterations of Unicode text"; - license = pkgs.lib.licenses.gplv2; + license = pkgs.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; -- cgit 1.4.1 From dfebdde16f9e4a3b358b3e603ecac7bbe4a9646d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 19 Feb 2013 10:14:09 +0100 Subject: texinfo: added version 5.0 --- pkgs/development/tools/misc/texinfo/4.13a.nix | 40 +++++++++++++++++++++++++ pkgs/development/tools/misc/texinfo/5.0.nix | 36 ++++++++++++++++++++++ pkgs/development/tools/misc/texinfo/default.nix | 40 ------------------------- pkgs/top-level/all-packages.nix | 5 ++-- 4 files changed, 79 insertions(+), 42 deletions(-) create mode 100644 pkgs/development/tools/misc/texinfo/4.13a.nix create mode 100644 pkgs/development/tools/misc/texinfo/5.0.nix delete mode 100644 pkgs/development/tools/misc/texinfo/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix new file mode 100644 index 000000000000..111f2d142008 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, ncurses, lzma }: + +stdenv.mkDerivation rec { + name = "texinfo-4.13a"; + + src = fetchurl { + url = "mirror://gnu/texinfo/texinfo-4.13a.tar.lzma"; + sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d"; + }; + + buildInputs = [ ncurses ]; + buildNativeInputs = [ lzma ]; + + # Disabled because we don't have zdiff in the stdenv bootstrap. + #doCheck = true; + + meta = { + description = "GNU Texinfo, the GNU documentation system"; + + longDescription = '' + Texinfo is the official documentation format of the GNU project. + It was invented by Richard Stallman and Bob Chassell many years + ago, loosely based on Brian Reid's Scribe and other formatting + languages of the time. It is used by many non-GNU projects as + well. + + Texinfo uses a single source file to produce output in a number + of formats, both online and printed (dvi, html, info, pdf, xml, + etc.). This means that instead of writing different documents + for online information and another for a printed manual, you + need write only one document. And when the work is revised, you + need revise only that one document. The Texinfo system is + well-integrated with GNU Emacs. + ''; + + license = "GPLv3+"; + + homepage = http://www.gnu.org/software/texinfo/; + }; +} diff --git a/pkgs/development/tools/misc/texinfo/5.0.nix b/pkgs/development/tools/misc/texinfo/5.0.nix new file mode 100644 index 000000000000..a4fb2e9b4688 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/5.0.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, ncurses, perl }: + +stdenv.mkDerivation rec { + name = "texinfo-5.0"; + + src = fetchurl { + url = "mirror://gnu/texinfo/${name}.tar.xz"; + sha256 = "1p34f68h9ggfj6ckgj0p62qlj7pmz3ha3vc91kh4hr44pnwm1pla"; + }; + + buildInputs = [ ncurses perl ]; + + doCheck = true; + + meta = { + homepage = "http://www.gnu.org/software/texinfo/"; + description = "GNU Texinfo, the GNU documentation system"; + license = stdenv.lib.licenses.gpl3Plus; + + longDescription = '' + Texinfo is the official documentation format of the GNU project. + It was invented by Richard Stallman and Bob Chassell many years + ago, loosely based on Brian Reid's Scribe and other formatting + languages of the time. It is used by many non-GNU projects as + well. + + Texinfo uses a single source file to produce output in a number + of formats, both online and printed (dvi, html, info, pdf, xml, + etc.). This means that instead of writing different documents + for online information and another for a printed manual, you + need write only one document. And when the work is revised, you + need revise only that one document. The Texinfo system is + well-integrated with GNU Emacs. + ''; + }; +} diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix deleted file mode 100644 index 111f2d142008..000000000000 --- a/pkgs/development/tools/misc/texinfo/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, ncurses, lzma }: - -stdenv.mkDerivation rec { - name = "texinfo-4.13a"; - - src = fetchurl { - url = "mirror://gnu/texinfo/texinfo-4.13a.tar.lzma"; - sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d"; - }; - - buildInputs = [ ncurses ]; - buildNativeInputs = [ lzma ]; - - # Disabled because we don't have zdiff in the stdenv bootstrap. - #doCheck = true; - - meta = { - description = "GNU Texinfo, the GNU documentation system"; - - longDescription = '' - Texinfo is the official documentation format of the GNU project. - It was invented by Richard Stallman and Bob Chassell many years - ago, loosely based on Brian Reid's Scribe and other formatting - languages of the time. It is used by many non-GNU projects as - well. - - Texinfo uses a single source file to produce output in a number - of formats, both online and printed (dvi, html, info, pdf, xml, - etc.). This means that instead of writing different documents - for online information and another for a printed manual, you - need write only one document. And when the work is revised, you - need revise only that one document. The Texinfo system is - well-integrated with GNU Emacs. - ''; - - license = "GPLv3+"; - - homepage = http://www.gnu.org/software/texinfo/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5a5ff40bba5..2beabc6a3272 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3342,9 +3342,10 @@ let swftools = callPackage ../tools/video/swftools { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { }; - - texinfo = callPackage ../development/tools/misc/texinfo { }; + texinfo5 = callPackage ../development/tools/misc/texinfo/5.0.nix { }; + texinfo = texinfo413; texi2html = callPackage ../development/tools/misc/texi2html { }; -- cgit 1.4.1 From 7dfd7a93d43eb391e1177b881cc40ed47706ddca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 19 Feb 2013 13:26:01 +0100 Subject: haskell-BNFC: fix broken version number in executable --- pkgs/development/tools/haskell/BNFC/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index c6cbc4a53587..3cb85b86acbd 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl }: +{ cabal, mtl, fetchurl }: cabal.mkDerivation (self: { pname = "BNFC"; @@ -7,6 +7,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; + patches = [ (fetchurl { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "103l04ylzswgxrmpv5zy6dd0jyr96z21mdkpgk1z4prvn8wjl624"; }) ]; + patchFlags = "-p2"; meta = { homepage = "http://bnfc.digitalgrammars.com/"; description = "A compiler front-end generator"; -- cgit 1.4.1