diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
commit | ac6761c9081134baaa7dae18f06cbfaca38270d5 (patch) | |
tree | a1ff0e93e8907624d65aff367496513d3dc47374 /pkgs/applications/version-management | |
parent | 177667eea987898097e854a54962ff90bbf4fa35 (diff) | |
parent | 8088837dc8f35ef7853787f88bb1db7248900cc4 (diff) | |
download | nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.gz nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.bz2 nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.lz nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.xz nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.zst nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.zip |
Merge master into stdenv-updates
Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/cgit/default.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/version-management/gource/default.nix | 10 |
2 files changed, 24 insertions, 12 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 63dd56d7e33c..ce4d9f98596f 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,23 +1,35 @@ -{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt, docbook_xml_xslt }: +{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt +, docbook_xml_xslt, pkgconfig, luajit +, gzip, bzip2, xz +}: stdenv.mkDerivation rec { - name = "cgit-0.9.2"; + name = "cgit-0.10"; src = fetchurl { url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "0q177q1r7ssna32c760l4dx6p4aaz6kdv27zn2jb34bx98045h08"; + sha256 = "0ynywva0lrsasdm3nlk3dmd8k5bnrd9qlvmk4n42dfw9g1xj5i4h"; }; # cgit is is tightly coupled with git and needs a git source tree to build. - # The cgit-0.9.2 Makefile has GIT_VER = 1.8.3, so use that version. + # The cgit-0.10 Makefile has GIT_VER = 1.8.5, so use that version. # IMPORTANT: Remember to check which git version cgit needs on every version # bump. gitSrc = fetchurl { - url = https://git-core.googlecode.com/files/git-1.8.3.tar.gz; - sha256 = "0fn5xdx30dl8dl1cdpqif5hgc3qnxlqfpwyhm0sm1wgqhgbcdlzi"; + url = https://git-core.googlecode.com/files/git-1.8.5.tar.gz; + sha256 = "08vbq8y3jx1da417hkqmrkdkysac1sqjvrjmaj1v56dmkghm43w7"; }; - buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt ]; + buildInputs = [ + openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt pkgconfig luajit + ]; + + postPatch = '' + sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ + -e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \ + -e 's|"xz"|"${xz}/bin/xz"|' \ + -i ui-snapshot.c + ''; # Give cgit a git source tree and pass configuration parameters (as make # variables). diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 1dab01c09fcb..13c554767743 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre -, SDL_image, glew, mesa, boostHeaders +, SDL_image, glew, mesa, boost, glm }: stdenv.mkDerivation rec { @@ -11,16 +11,17 @@ stdenv.mkDerivation rec { }; buildInputs = [ - glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boostHeaders + glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost glm ]; + configureFlags = "--with-boost-libdir=${boost}/lib"; + NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions meta = { homepage = "http://code.google.com/p/gource/"; description = "software version control visualization tool"; license = stdenv.lib.licenses.gpl3Plus; - longDescription = '' Software projects are displayed by Gource as an animated tree with the root directory of the project at its centre. Directories @@ -31,7 +32,6 @@ stdenv.mkDerivation rec { Mercurial and Bazaar and SVN. Gource can also parse logs produced by several third party tools for CVS repositories. ''; - - broken = true; + platforms = stdenv.lib.platforms.linux; }; } |