Commit Graph

342 Commits

Author SHA1 Message Date
Vladimír Čunát
694fa543af Merge 'staging'
Conflicts:
	pkgs/servers/x11/xorg/default.nix
2014-08-24 10:50:22 +02:00
Eelco Dolstra
2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-08-22 00:07:05 +02:00
Pascal Wittmann
464ec2a8e5 silver-searcher: update from 0.21.0 to 0.24.1 2014-08-19 19:27:16 +02:00
Vladimír Čunát
8a4827a881 kdiff3: minor update 2014-08-14 19:43:27 +02:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
taku0
74ce1a016f add peco: Simplistic interactive filtering tool 2014-08-07 01:34:28 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
4c2c0499f3 enscript: Build with the default GCC 2014-07-23 11:25:38 +02:00
Eelco Dolstra
8aacdfee7c gawk: Remove unnecessary ‘gawk-<version>’ copy
This saves > 600 KiB.
2014-07-08 15:43:05 +02:00
John Wiegley
f4b3bc0334 diffstat: weaken platform requirement
This fixes a change made in 3ae765278f.
2014-06-24 14:45:33 -07:00
Bjørn Forsman
5d97335b6d colordiff: update 1.0.9 -> 1.0.13 2014-06-22 23:00:14 +02:00
Bjørn Forsman
7061116faa colordiff: add meta attributes 2014-06-22 22:57:08 +02:00
Bjørn Forsman
4d120e29c5 catdoc: add meta.description 2014-06-22 22:48:09 +02:00
Bjørn Forsman
3ae765278f diffstat: clean up expression
Most importantly, add meta.description and meta.platforms.
2014-06-22 13:39:28 +02:00
Rob Vermaas
6bfb25b9e8 dos2unix: update from 6.0.4 to 6.0.5 2014-05-27 21:33:07 +02:00
Bjørn Forsman
1d79330e1d basex: update 7.7.2 -> 7.8.2 2014-05-25 13:00:37 +02:00
Austin Seipp
c0db39e294 Merge pull request #2671 from wmertens/recode-osx
Recode: Build on OS X
2014-05-18 14:07:35 -05:00
Vladimír Čunát
137eae0b55 Merge #2630: add and use fetchpatch
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
2014-05-17 07:31:03 +02:00
Wout Mertens
d04c84d0ac Recode: Build on OS X 2014-05-16 23:28:19 +02:00
Eelco Dolstra
6aeb59bbe0 Rename fetchGitHub -> fetchFromGitHub
We're not fetching all of GitHub, after all.
2014-05-08 15:49:39 +02:00
Eelco Dolstra
ebd8573046 Add a utility function "fetchGitHub"
This is a small wrapper around fetchzip. It allows you to say:

  src = fetchGitHub {
    owner = "NixOS";
    repo = "nix";
    rev = "924e19341a5ee488634bc9ce1ea9758ac496afc3"; # or a tag
    sha256 = "1ld1jc26wy0smkg63chvdzsppfw6zy1ykf3mmc50hkx397wcbl09";
  };
2014-05-08 15:30:18 +02:00
aszlig
709ccd520b
patchutils: Update to new upstream version 0.3.3.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-08 15:01:55 +02:00
Eelco Dolstra
dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
宋文武
c796adfd65 add kakasi, a Kanji to Hiragana, Katakana or Romaji converter 2014-04-18 22:07:17 +08:00
Georges Dubus
b13a33550a silver-searcher: update to 0.21.0 2014-03-27 17:57:02 +01:00
Shea Levy
d574c34e0a Merge branch 'master' of git://github.com/madjar/nixpkgs
silver-searcher: avoid -lgcc_s on darwin
2014-03-19 18:18:08 -04:00
Cillian de Róiste
b57ee8c331 nixpkgs-lint: add the platforms meta attr for most of my packages 2014-03-16 12:08:26 +01:00
Georges Dubus
b805528552 silver-searcher: avoid -lgcc_s on darwin 2014-03-12 17:48:32 +01:00
Karn Kallio
0774192dd3 xmlstarlet: advance version to 1.5.0 2014-02-11 23:17:39 +01:00
Georges Dubus
8677b19c9d silver-searcher: updated to 0.19.2
Also fixed the "libgcc_s.so.1 must be installed for pthread_cancel to
work" problem.
2014-02-03 18:21:43 +01:00
Georges Dubus
a737352862 silver-searcher: updated to 0.19.1 2014-02-01 21:56:28 +01:00
Eelco Dolstra
150ec8f79e wdiff: Update to 1.2.1 2014-01-27 17:58:26 +01:00
Kevin Quick
8f0511b0a0 gawk: add gawkInteractive with readline support
stdenv (on linux) depends on gawk, readline and similar are useless for non-interactive usage.
Close #1596. Original patch was almost completely rewritten by vcunat.

On darwin we always specify whether to use readline, so it isn't always picked as reported.
2014-01-26 10:53:22 +01:00
Shea Levy
ca116f76f9 Unmaintain a bunch of packages
Trying to take maintainership more seriously...

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 22:34:41 -05:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Georges Dubus
9f9244f061 silver-search: Add 2014-01-19 17:42:43 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Eelco Dolstra
86afcccecb sp-compat: Fix build
You can't run fixupPhase before installPhase.

http://hydra.nixos.org/build/8149119
2014-01-17 12:13:20 +01:00
Nixpkgs Monitor
bfb16b5296 dos2unix: update from 6.0.3 to 6.0.4 2014-01-13 17:28:42 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát
cb639302df Merge glibc-2.18 branch into stdenv-updates
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
2013-12-28 18:51:23 +01:00
Eelco Dolstra
9f75797d0b Merge remote-tracking branch 'origin/glibc-2.18' 2013-12-26 14:49:19 +01:00
Nixpkgs Monitor
69e6bd8707 mairix: update from 0.22 to 0.23 2013-12-21 04:07:50 +02:00
Nixpkgs Monitor
32a2e5dad3 numdiff: update from 5.6.1 to 5.8.1 2013-12-21 04:00:19 +02:00
Nixpkgs Monitor
d9952c5b40 namazu: update from 2.0.20 to 2.0.21 2013-12-21 02:28:24 +02:00
Nixpkgs Monitor
1ef60acae5 highlight: update from 3.5 to 3.9 2013-12-18 18:18:31 +02:00
Evgeny Egorochkin
74ced3209e enca: update dependencies 2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
74c3965b92 enca: update from 1.13 to 1.15 2013-12-18 18:18:25 +02:00