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

701 commits

Author SHA1 Message Date
Nikolay Amiantov 6554997eaa zeal: move to qmakeHook
This reverts commit 9cfc8d94bb.
2016-04-20 18:55:50 +03:00
Vladimír Čunát 57474b7d4a Merge branch 'master' into staging
Compare to Hydra nixpkgs job 1260021.
2016-04-20 16:49:52 +02:00
Damien Cassou 972fd22fe4 cantarell-fonts: 0.0.17 -> 0.0.24 2016-04-20 16:46:00 +02:00
Tobias Geerinckx-Rice de56b74775
geolite-legacy 2016-02-29 -> 2016-04-19
Should fix the bug of Kansas farmers getting SWATted.

http://fusion.net/story/287592/internet-mapping-glitch-kansas-farm/
2016-04-19 12:30:12 +02:00
Tobias Geerinckx-Rice 5a5012a7cd
tzdata: 2016c -> 2016d 2016-04-18 19:12:34 +02:00
José Romildo Malaquias d94a8d67bd helvetica-neue-lt-std: init at 2013.06.07
fix
2016-04-16 21:42:01 +02:00
aszlig 9cfc8d94bb
zeal: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of zeal override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of zeal and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Myrl Hex c73d14a39f profont: init 2016-04-14 14:27:25 +03:00
Vladimír Čunát 056b5a1a5f tzdata: fixup after merging master
also rename lib output to dev - it contains a header and a static lib.
2016-04-02 16:26:32 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Nikolay Amiantov e65b0b851b noto-fonts-emoji: add uncommited fix 2016-03-29 21:05:32 +03:00
Nikolay Amiantov f4fa3565b8 noto-fonts-emoji: 2015-08-17 -> 2016-03-17 2016-03-29 21:02:16 +03:00
Nikolay Amiantov 08db1b19a2 noto-fonts-cjk: cleanup 2016-03-29 21:02:16 +03:00
Nikolay Amiantov 9c8f810f83 noto-fonts: 2015-09-08 -> 2016-03-29 2016-03-29 21:02:15 +03:00
Eelco Dolstra c22657b5f8 mplus: Don't start version with a letter 2016-03-24 13:24:29 +01:00
Arseniy Seroka fba952024f tzdata: 2016a -> 2016b 2016-03-19 00:23:45 +03:00
Tobias Geerinckx-Rice 1c9d5306fb tzdata: 2015g -> 2016a 2016-03-16 21:10:20 +01:00
Tobias Geerinckx-Rice 7a1f76bc5f man-pages: 4.04 -> 4.05 2016-03-16 21:10:20 +01:00
Graham Christensen 1b556f9f46 docbook: convert md5 to sha256 2016-03-11 15:54:55 -06:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Sergiu Ivanov 81f0eaa61f montserrat: init at 1.0 2016-03-07 19:42:26 +01:00
vbgl 7f422cf872 Merge pull request #13621 from DamienCassou/add-gentium-book-basic
gentium-book-basic: init at 1.102
2016-03-02 19:20:58 +01:00
Damien Cassou c3fa090616 gentium-book-basic: init at 1.102 2016-03-02 18:47:26 +01:00
Tobias Geerinckx-Rice b82c8e3cd4 geolite-legacy 2016-02-25 -> 2016-02-29 2016-02-29 21:15:25 +01:00
zimbatm 17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Tobias Geerinckx-Rice 2179b1d491 geolite-legacy 2016-02-08 -> 2016-02-25 2016-02-25 20:54:39 +01:00
Tobias Geerinckx-Rice 6497468762 dosemu-fonts: use versioned name
This also happens to solve a hash mismatch for me, but that might be
a coincidence.
2016-02-22 19:42:27 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Tobias Geerinckx-Rice 2671d4ffdb wireless-regdb: 2015-12-14 -> 2016-02-08 2016-02-12 00:14:01 +01:00
Eelco Dolstra aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Tobias Geerinckx-Rice e5b143a964 geolite-legacy 2016-02-02 -> 2016-02-08 2016-02-08 19:15:41 +01:00
Cole Mickens ea85ac9f15 powerline-fonts: 2015-06-29 -> 2015-12-11 (close #12856) 2016-02-07 15:19:10 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tobias Geerinckx-Rice 133ad6d722 geolite-legacy 2016-02-01 -> 2016-02-02 2016-02-02 21:22:42 +01:00
Domen Kožar 0b3becb269 Merge pull request #12701 from mayflower/builder-def-cleanup
builderDefsPackage cleanup
2016-02-01 21:09:34 +00:00
Tobias Geerinckx-Rice 8ba0fe2866 geolite-legacy 2016-01-25 -> 2016-02-01 2016-02-01 19:39:18 +01:00
Vladimír Čunát 576746970e liberation-fonts: fix meta after 2012 changes
/cc maintainer @7c6f434c.
2016-02-01 08:50:19 +01:00
Robin Gloster 1c6db21653 libertine: use mkDerivation 2016-01-30 20:31:03 +00:00
Robin Gloster 1af99b8dad arkpandora_ttf: use mkDerivation 2016-01-30 20:31:03 +00:00
Vladimír Čunát c979012631 man-only packages: fixup after stdenv changes
Thanks to @avnik for notification.
The stdenv now auto-removes developer-only documentation
unless explicitly indicated, which wasn't a good fit for these packages.
2016-01-28 13:55:37 +01:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Tobias Geerinckx-Rice 7b6454cbb9 geolite-legacy 2016-01-18 -> 2016-01-25 2016-01-25 16:37:13 +01:00
Jascha Geerds 73a22693ea numix-icon-theme-circle: 20151014 -> 20160121 2016-01-22 14:37:34 +01:00
Jascha Geerds 98a9bf6759 numix-icon-theme: 20151023 -> 20160120 2016-01-22 14:37:34 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Tobias Geerinckx-Rice 5cf03589a4 geolite-legacy 2016-01-11 -> 2016-01-18 2016-01-18 15:22:40 +01:00
Tobias Geerinckx-Rice 907481aca8 hack-font: 2.018 -> 2.019 2016-01-18 02:51:17 +01:00
Arseniy Seroka f845685128 Merge pull request #12394 from rasendubi/terminess
powerline-fonts: Install Terminus font
2016-01-15 22:45:34 +03:00
Alexey Shmalko 3b1fe914b9 powerline-fonts: Install Terminus font
Patched Terminus font is neither .otf, nor .ttf so it wasn't installed
before.
2016-01-15 01:21:26 +02:00