summary refs log tree commit diff
path: root/pkgs/applications/version-management
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-03
|\
| * treewide: Add lots of meta.platformsTuomas Tynkkynen2016-08-02
| | | | | | | | Build-tested on x86_64 Linux & Mac.
| * treewide: Add lots of platforms to packages with no metaTuomas Tynkkynen2016-08-02
| | | | | | | | Build-tested on x86_64 Linux and on Darwin.
| * treewide: Lots of meta.hydraPlatforms -> meta.platformsTuomas Tynkkynen2016-08-02
| | | | | | | | | | | | In all of these files, there is no meta.platforms but only meta.hydraPlatforms, which doesn't seem to have any purpose except being inconsistent.
* | bitkeeper: disable fortify hardeningFranz Pletz2016-08-02
| |
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-31
|\|
| * meld: 3.16.1 -> 3.16.2mimadrid2016-07-30
| |
| * git: 2.9.1 -> 2.9.2mimadrid2016-07-29
| |
| * git: fix gitweb.cgi breakage due to missing CGI.pmBjørn Forsman2016-07-26
| | | | | | | | | | | | | | | | | | CGI.pm was removed from Perl core in v5.22, breaking the gitweb.cgi script and thus NixOS' services.lighttpd.gitweb. Nixpkgs switched to Perl 5.22 with a85ba820a409c84d97ca0 ("perl: Make 5.22 the default"). Fix it by bringing in the Perl CGI module (and dependency HTMLParser). The closure size of "nix-build -A git" increase by 1 MiB, to 201 MiB.
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-25
|\|
| * haskell: remove all but the latest LTS package sets (version 6.7)Peter Simons2016-07-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step towards dropping Stackage support. We keep LTS 6.x around because I don't want to downgrade our default compiler to GHC 7.x, but once LTS 7.x comes out we'll switch our main package set to that and drop Nightly. More details are at: http://permalink.gmane.org/gmane.linux.distributions.nixos/20505 Closes https://github.com/NixOS/nixpkgs/issues/14897. Also relevant: - https://github.com/NixOS/nixpkgs/issues/16130 - https://github.com/commercialhaskell/stack/issues/2259
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-19
|\|
| * nixpkgs: build bitkeeper only on linuxAustin Seipp2016-07-18
| | | | | | | | | | | | | | The OS X build fails due to the dependency on 'crypt' failing. Perhaps in future versions of BitKeeper this build can be re-enabled. Signed-off-by: Austin Seipp <aseipp@pobox.com>
| * nixpkgs: add bitkeeper-7.3ceWayne Scott2016-07-18
| | | | | | | | | | | | Closes #16928. Signed-off-by: Austin Seipp <aseipp@pobox.com>
| * Merge pull request #17043 from womfoo/fix/qmake4Hook-buildsNikolay Amiantov2016-07-18
| |\ | | | | | | reintroduce qmake .pro files after qmake4Hook changes
| | * guitone: fix qmake4Hook buildKranium Gikos Mendoza2016-07-17
| | | | | | | | | | | | pass guitone.pro which was removed in 9a8a4b6
| * | diff-so-fancy: 0.10.0 -> 0.10.1 (#17033)Miguel Madrid2016-07-17
| | |
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-15
|\| |
| * | git: 2.9.0 -> 2.9.1mimadrid2016-07-13
| |/
| * diff-so-fancy: 0.9.3 -> 0.10.0mimadrid2016-07-05
| |
| * src: bumpShea Levy2016-06-28
| |
| * Merge pull request #16504 from cko/gitAndTools_git-extraszimbatm2016-06-25
| |\ | | | | | | git-ant-tools.git-extras: 3.0.0 -> 4.1.0
| | * git-ant-tools.git-extras: 3.0.0 -> 4.1.0Christine Koppelt2016-06-25
| | |
| * | Merge pull request #16499 from mimadrid/update/meld-3.16.1Joachim Fasting2016-06-25
| |\ \ | | |/ | |/| meld: 3.16.0 -> 3.16.1
| | * meld: 3.16.0 -> 3.16.1mimadrid2016-06-25
| | |
| * | Captialize meta.description of all packagesBjørn Forsman2016-06-20
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In line with the Nixpkgs manual. A mechanical change, done with this command: find pkgs -name "*.nix" | \ while read f; do \ sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \ done I manually skipped some: * Descriptions starting with an abbreviation, a user name or package name * Frequently generated expressions (haskell-packages.nix)
| * Merge pull request #16319 from mimadrid/update/bazaar-2.7.0zimbatm2016-06-19
| |\ | | | | | | bazaar: 2.6.0 -> 2.7.0
| | * bazaar: 2.6.0 -> 2.7.0mimadrid2016-06-18
| | |
| * | diff-so-fancy: init at 0.9.3Alexey Lebedeff2016-06-17
| | | | | | | | | | | | | | | Script was mentioned at GitHub blog - https://github.com/blog/2188-git-2-9-has-been-released :)
| * | git: fix perl shebangs in contribAlexey Lebedeff2016-06-16
| | | | | | | | | | | | | | | | | | There are a lot of scripts in contrib (e.g. `diff-highlight`) that contain perl shebang line. But `patchShebangs` is unablle to fix this without explicitly listing `perl` in `buildInputs`.
| * | git: 2.8.3 -> 2.9.0Nathan Zadoks2016-06-15
| | |
| * | Merge #16216: meld: 3.14.0 -> 3.16.0Vladimír Čunát2016-06-13
| |\ \
| | * | meld: 3.14.0 -> 3.16.0mimadrid2016-06-13
| | |/
| * | mercurial: update source urlChristoph Hrdinka2016-06-12
| | | | | | | | | | | | | | | The old download url isn't reachable since a few weeks. The new one uses mercurials domain instead of selenics.
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-06-10
|\| |
| * | git-lfs: 1.2.0 -> 2016-06-07zimbatm2016-06-09
| | | | | | | | | | | | Fixes import issues after go1.5+
| * | Moving from fetchgit generated by go2nix to fetchFromGitHub where rev isKamil Chmielewski2016-06-09
| | | | | | | | | | | | a tag
| * | no more goPackagesKamil Chmielewski2016-06-09
| | |
| * | git-lfs: extracted from goPackagesKamil Chmielewski2016-06-09
| | |
| * | git-annex: take this tool from LTS Haskell while Stackage Nightly is brokenPeter Simons2016-06-06
| | |
| * | Fix lots of fetchgit hashes (fallout from #15469)Tuomas Tynkkynen2016-06-03
| |/
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-05-30
|\|
| * hub: fix incorrect hash (#15830)Kazunori Kajihiro2016-05-30
| |
| * Merge branch 'staging'Vladimír Čunát2016-05-27
| |\ | | | | | | | | | Includes a security update of libxml2.
| | * Merge branch 'master' into stagingVladimír Čunát2016-05-26
| | |\ | | | | | | | | | | | | ... to get the systemd update (rebuilding ~7k jobs).
| | * \ Merge branch 'master' into stagingVladimír Čunát2016-05-23
| | |\ \ | | | | | | | | | | | | | | | That's to get mesa rebuild from master, as it's nontrivial.
| | * \ \ Merge: make dev output references explicitVladimír Čunát2016-05-22
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | This is a rebase of most commits from #14766, resolving conflicts and a few other evaluation problems.
| | | * | | treewide: Make explicit that 'dev' output of zlib is usedTuomas Tynkkynen2016-05-19
| | | | | |
| | | * | | treewide: Make explicit that 'dev' output of subversion is usedTuomas Tynkkynen2016-05-19
| | | | | |
| | | * | | treewide: Make explicit that 'dev' output of sqlite is usedTuomas Tynkkynen2016-05-19
| | | | | |