1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 10:00:56 +00:00
Commit graph

846 commits

Author SHA1 Message Date
Vladimír Čunát 422adc3063
Merge branch 'staging'
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
2017-09-12 19:17:52 +02:00
Daiderd Jordan 7b00a6ef15
html2text: fix clang build 2017-09-11 23:40:46 +02:00
Frederik Rietdijk 628b6c0e9d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-11 22:52:53 +02:00
Bjørn Forsman 0a7d124eb0 basex: 8.6.4 -> 8.6.6 2017-09-11 17:24:33 +02:00
Bjørn Forsman 0177902337 ascii: 3.15 -> 3.18 2017-09-11 17:24:33 +02:00
Eelco Dolstra ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
2017-09-07 12:51:21 +02:00
John Ericson 0a944b345e Merge pull request #28557 from obsidiansystems/binutils-wrapper
Binutils-wrapper: Init by refactoring out of cc-wrapper
2017-09-03 10:37:27 -04:00
Frederik Rietdijk d0dab8a330 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-02 11:10:52 +02:00
John Ericson 3f30cffa55 misc pkgs: Use $NIX_BINUTILS for when needed
Certain files are now only there instead of $NIX_CC (some are in both)
2017-09-01 11:44:55 -04:00
Frederik Rietdijk 6d4bd78fad Merge commit '2858c41' into HEAD 2017-08-30 21:07:07 +02:00
WilliButz 5b36d3993f highlight: 3.35 -> 3.39 2017-08-29 16:45:20 +02:00
Victor Calvert be40ed5a0b fanficfare: 2.9.0 -> 2.16.0 2017-08-29 06:30:52 -04:00
Vladimír Čunát 2858c41823
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
Jörg Thalheim 8d4f6ece15 Merge pull request #28602 from sigma/pr/silver-searcher-2.1.0
silver-searcher: 2.0.0 -> 2.1.0
2017-08-27 06:17:18 +01:00
Yann Hodique 04ff3e137d
silver-searcher: 2.0.0 -> 2.1.0 2017-08-26 12:00:52 -07:00
mimadrid c3f28f84a8
xsv: 0.12.1 -> 0.12.2 2017-08-26 20:07:18 +02:00
Joachim Fasting 0387f84cf3
Revert "xsv: 0.12.1 -> 0.12.2"
This reverts commit edb61d1151.

The sha256 is malformed.
2017-08-26 18:45:41 +02:00
mimadrid edb61d1151
xsv: 0.12.1 -> 0.12.2 2017-08-26 16:09:25 +02:00
Frederik Rietdijk 665d393919 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-25 19:39:41 +02:00
dywedir 5db77990db ripgrep: 0.5.2 -> 0.6.0 2017-08-25 01:25:02 +03:00
Vladimír Čunát 8137a8cb73
gawk: refactor
- Don't build with libsigsegv by default.  The build apparently attempted
  to link against it, but it never retained the reference anyway...
- Side effect: stdenv bootstrapping needs no libsigsegv anymore.
- Run checks, but only in the interactive gawk by default on Linux,
  so that stdenv bootstrap isn't slowed down (by glibc locales, etc.).
- xz should be no longer needed in inputs, as we have it in stdenvs now.

The whole change was triggered by some used kernel versions still
breaking libsigsegv tests #28464.
2017-08-24 11:06:53 +02:00
John Ericson 63428ebab9 diffutils: coreutils is a run-time dep; specify pr's location 2017-08-16 11:54:34 -04:00
Frederik Rietdijk 62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Frederik Rietdijk 13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Vladimír Čunát 34946256a0
Merge #27424: stdenv: Don't put man pages into $doc 2017-08-13 19:32:51 +02:00
Frederik Rietdijk 7ebcd39a0f Merge commit '4c49205' into HEAD 2017-08-13 18:34:59 +02:00
Frederik Rietdijk 2a8cd14d5f Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-13 09:50:47 +02:00
Tuomas Tynkkynen 1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
Robin Gloster 14080832b0
spCompat: remove
not used anymore
2017-08-11 13:26:50 +02:00
Domen Kožar 486e1c3c16 Merge pull request #27998 from davidak/macOS
replace "Mac OS X" and "OS X" with "macOS"
2017-08-11 13:01:36 +02:00
Robin Gloster 28cc2642f0
treewide: use less phases if not necessary
This removes some skipping of e.g. fixupPhase and cleans up occurences
where this led to duplicating code
2017-08-11 11:40:36 +02:00
Silvan Mosberger 310563fab8
gist: 4.5.0 -> 4.6.1 2017-08-10 04:52:16 +02:00
davidak 3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
mimadrid 09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Franz Pletz 5bfc47bbab
catdoc: add to patch fix CVE-2017-11110 2017-08-01 10:26:19 +02:00
Frederik Rietdijk 740d76371e Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD 2017-07-31 09:12:15 +02:00
mimadrid 3e6e05bf98 mawk: 1.3.4-20141206 -> 1.3.4-20161120 2017-07-30 20:58:48 +02:00
Franz Pletz b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Muhammad Herdiansyah d31e7ee1bd nawk: init at 20121220 2017-07-27 21:51:10 +07:00
John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
Patrick Callahan edef4459f6 html-tidy: 5.2.0 -> 5.4.0 2017-07-24 09:19:03 -07:00
Thomas Tuegel 6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv 2017-07-21 20:36:34 -05:00
Yegor Timoshenko 90f0c3b93e html-xml-utils: 6.9 → 7.1, macOS support 2017-07-17 21:46:02 +03:00
Vladimír Čunát e2b7b09960
Merge branch 'master' into staging 2017-07-15 12:15:56 +02:00
Lancelot SIX 706f0c3849 gnugrep: 3.0 -> 3.1
See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00000.html
for release announcement
2017-07-13 15:19:29 +02:00
Benno Fünfstück f3cbde9125 codesearch: correct version number 2017-07-11 22:44:43 +02:00
Vladimír Čunát 9e1c7ddaae
Merge branch 'master' into staging 2017-07-05 09:53:53 +02:00
Vladimír Čunát 1db1ba9048
groff: (nitpick) quote shell variables 2017-07-05 09:33:39 +02:00
Vladimír Čunát 7b7eb577a2
Merge #27061: groff: fix man page coloring 2017-07-05 09:30:47 +02:00