b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
308593 commits 2 branches 0 tags 3.3 GiB
Commit graph

781 commits

Author SHA1 Message Date
Alvar Penning b710d59295 spdx-license-list-data: 3.11 -> 3.12 2021-03-18 13:57:54 +01:00
Peter Simons 1fab990d47 Merge origin/master into haskell-updates. 2021-03-17 21:19:22 +01:00
github-actions[bot] 8fa4dca9b5
Merge master into staging-next 2021-03-15 00:40:27 +00:00
R. RyanTM 0af0c5c8e7 osinfo-db: 20210215 -> 20210312 2021-03-14 23:01:11 +01:00
Peter Simons e21a77518d all-cabal-hashes: update to Hackage at 2021-03-12T19:55:03Z 2021-03-12 21:43:44 +01:00
github-actions[bot] f9d4095295
Merge staging-next into staging 2021-03-07 00:41:13 +00:00
R. RyanTM f754c844d9 osinfo-db: 20210202 -> 20210215 2021-03-07 00:27:12 +01:00
Jörg Thalheim 63963400dc
iana-etc: 20200729 -> 20210225 2021-02-27 10:14:08 +01:00
WORLDofPEACE b884af7c1d
Merge pull request #114276 from worldofpeace/update-nixos-artwork 
nixos-icons: 2017-03-16 -> 2021-02-24
 2021-02-25 13:09:38 -05:00
WORLDofPEACE 8a89af81d1 nixos-icons: 2017-03-16 -> 2021-02-24 
Adds a white variant of the nixos logo
 2021-02-24 16:23:20 -05:00
Alexander Vieth a65208ca8e tzdata: use nativePrefix for zic-native 
would not be able to run the install phase for a cross compile otherwise
 2021-02-22 19:59:06 -05:00
Ben Siraphob 223f25cf4a treewide: add targetPrefix to hardcoded references to CC=cc 2021-02-20 01:01:46 +07:00
Peter Simons 3ae580be68 all-cabal-hashes: update to Hackage at 2021-02-12T08:19:51Z 2021-02-12 20:35:22 +01:00
Matt Jibson 0cf1f67aa1 ddccontrol-db: 20180908 -> 20201221 2021-02-11 10:58:22 +01:00
R. RyanTM 8e364d2684 osinfo-db: 20201218 -> 20210202 2021-02-05 19:18:37 +01:00
R. RyanTM c06068bc1e osinfo-db: 20201119 -> 20201218 2021-01-30 23:19:51 +00:00
Peter Simons 34a21d6f21 all-cabal-hashes: update to Hackage at 2021-01-29T18:57:29Z 2021-01-29 21:25:23 +01:00
Pavol Rusnak a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Peter Simons 412a9e7d7c all-cabal-hashes: update to Hackage at 2021-01-22T18:56:49Z 2021-01-22 20:43:02 +01:00
Ben Siraphob ca7f39f987 pkgs/data, pkgs/games: [sS]tdenv.*lib -> lib 2021-01-17 20:59:16 +07:00
Ben Siraphob d13840759c pkgs/data: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Austin Seipp ca27105b04
Revert "Merge pull request #105709 from CajuM/symbiflow" 
This reverts commit 02828f91f1, reversing
changes made to f0a7fce6ee.
 2021-01-15 10:13:27 -06:00
Ben Siraphob 4eb185bd6a pkgs/data: stdenv.lib -> lib 2021-01-15 14:29:18 +07:00
Dmitry Kalinkin 02828f91f1
Merge pull request #105709 from CajuM/symbiflow 
Add Symbiflow + prjxray for OSS Xilinx FPGA development
 2021-01-11 18:49:31 -05:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib; 
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
 2021-01-11 10:38:22 +01:00
Câju Mihai-Drosi ccdf7431bb symbiflow-arch-defs: init at 20200914-111752-g05d68df0 2021-01-10 10:01:48 +02:00
Câju Mihai-Drosi 7d9c736824 prjxray-db: init at 0.0-0232-g303a61d 2021-01-10 09:32:26 +02:00
github-actions[bot] e251591528
Merge master into staging-next 2021-01-09 01:00:25 +00:00
Peter Simons 3cb9768557 all-cabal-hashes: update to Hackage at 2021-01-07T20:56:37Z 2021-01-08 21:38:20 +01:00
Ben Siraphob b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
ajs124 4e70a418c7 tzdata: 2020c -> 2020f 2020-12-29 21:41:01 +01:00
Peter Simons d8d2e94f97 all-cabal-hashes: update to Hackage at 2020-12-24T01:16:25Z 2020-12-25 20:42:36 +01:00
github-actions[bot] 6904262415
Merge master into staging-next 2020-12-19 00:42:26 +00:00
Peter Simons 365fc52cd1 all-cabal-hashes: update to Hackage at 2020-12-18T01:03:03Z 2020-12-18 20:49:03 +01:00
ajs124 11d6355308 cacert: 3.57 -> 3.60 2020-12-17 07:31:34 +01:00
Mario Rodas 9de26d2610
Merge pull request #106476 from r-ryantm/auto-update/osinfo-db 
osinfo-db: 20201015 -> 20201119
 2020-12-13 20:56:07 -05:00
R. RyanTM cc6e51138a osinfo-db: 20201015 -> 20201119 2020-12-09 19:24:27 +00:00
github-actions[bot] db90e75ade
Merge staging-next into staging 2020-12-08 00:39:07 +00:00
Daniël de Kok 18a5777c77
fedora-backgrounds: use stdenvNoCC (#106149) 
No need for a C build environment when copying some backgrounds.
 2020-12-07 13:49:58 -05:00
github-actions[bot] acbe77678e
Merge staging-next into staging 2020-12-05 00:38:04 +00:00
github-actions[bot] 4763e8b8fd
Merge master into staging-next 2020-12-05 00:38:01 +00:00
Peter Simons 9b7113f437 all-cabal-hashes: update to Hackage at 2020-12-04T10:00:55Z 2020-12-04 22:26:28 +01:00
Andreas Rammhold f17006459c
Merge pull request #105568 from lukegb/nixpkgs-cacert-blacklist 
cacert: fix certificate denylist
 2020-12-01 20:11:55 +01:00
Luke Granger-Brown 87f4676492 cacert: add lukegb as maintainer 2020-12-01 17:55:59 +00:00
Andreas Rammhold 17b1bde9c5
cacert: add myself as maintainer 2020-12-01 17:51:05 +01:00
Luke Granger-Brown b28436a7e9 cacert: remove broken includeEmail option 
This doesn't do anything. Building with includeEmail = true produces
the same set as includeEmail = false, and the substitute rule removes
a random dictionary index operation.
 2020-12-01 15:54:58 +00:00
Luke Granger-Brown b1f9e9c259 cacert: fix blacklist 
It's broken under Python 3, ironically due to the patch we're carrying.
Fix it, and add a test to check it works.

Fixes #93230.
 2020-12-01 15:54:58 +00:00
Frederik Rietdijk ff90abd5dd Merge staging-next into staging 2020-12-01 14:23:10 +01:00
R. RyanTM 418c88a4d5 spdx-license-list-data: 3.10 -> 3.11 2020-12-01 09:29:21 +00:00
Mario Rodas e91a1e91a6
Merge pull request #102638 from r-ryantm/auto-update/osinfo-db 
osinfo-db: 20200804 -> 20201015
 2020-11-28 20:32:11 -05:00
Timo Kaufmann e04721b289
Merge pull request #104083 from timokau/sage-maintainers-team 
maintainers: create sage team
 2020-11-19 19:20:49 +01:00
Daniël de Kok a0bbcb7632 fedora-backgrounds.f33: init at 33.0.7 2020-11-19 10:52:31 +08:00
Timo Kaufmann ff8338343b maintainers: create sage team 
Maintaining all the packages whose updates might break some aspect of
sage.

For reference:
https://github.com/NixOS/nixpkgs/pull/103810#issuecomment-727536510
 2020-11-18 21:27:37 +01:00
Andreas Rammhold 94448baf6d
cacert: decouple from NSS to reduce rebuild amount 
In [#100765] @vcunat pointed out that we could decouple cacert from the
NSS package to make it more rebuild friendly. Just rebuilding packages
that depend on NSS seems to be about ~100. Rebuilding all the packages
that depend on cacert is >9k as of this writing. This makes it much more
feasible to upgrade high-profile packages that are (rightfully) pedantic
on their NSS version like firefox and thunderbird.

[#100765]: https://github.com/NixOS/nixpkgs/pull/100765
 2020-11-18 20:13:22 +01:00
Frederik Rietdijk 8aaf2e60e5 Merge staging-next into staging 2020-11-09 14:49:10 +01:00
Frederik Rietdijk 20f001c01e Merge master into staging-next 2020-11-09 14:33:52 +01:00
Peter Simons 78bb20c424 all-cabal-hashes: update to Hackage at 2020-11-06T01:07:40Z 2020-11-06 21:37:06 +01:00
Robert Hensing d328ba130b tzdata: Revert to the "fat" "bloated" format 
The timezone dumps have switched to a "slim" format since 2020b.
This has broken various packages, including
 - go 1.4 (used for bootstrapping)
 - haskellPackages.tz
 - libical

The "fat" format can still be generated, as this commit shows.
It seems to create files that are *mostly* the slim versions with
some more data attached.
 2020-11-06 14:48:28 +01:00
R. RyanTM cc3d5f46e3 poppler_data: 0.4.9 -> 0.4.10 2020-11-04 17:51:12 +01:00
R. RyanTM 87246e474b osinfo-db: 20200804 -> 20201015 2020-11-03 15:02:56 +00:00
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge 
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
 2020-10-26 09:01:04 +01:00
Vladimír Čunát 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
 2020-10-26 08:19:17 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
 2020-10-25 09:41:51 +01:00
Vladimír Čunát 17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Peter Simons 7f7a12f20e all-cabal-hashes: update to Hackage at 2020-10-22T01:32:08Z 2020-10-23 21:00:26 +02:00
ajs124 8904ce243a tzdata: 2019c -> 2020c 2020-10-20 21:09:28 +02:00
Ben Siraphob 683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Peter Simons 582f5cea5f all-cabal-hashes: update to Hackage at 2020-10-01T23:28:17Z 2020-10-02 21:07:31 +02:00
Peter Simons ae183ba4f7 all-cabal-hashes: update to Hackage at 2020-09-25T08:31:15Z 2020-09-25 21:10:38 +02:00
R. RyanTM 37a3ebb725 cldr-emoji-annotation: 37.0_13.0_0_1 -> 37.0_13.0_0_2 2020-09-01 23:42:39 +02:00
Jan Tojnar 36cfca88a7 osinfo-db: 20200529 -> 20200804 2020-08-16 23:48:40 +02:00
R. RyanTM cf0c098e35 spdx-license-list-data: 3.9 -> 3.10 2020-08-11 14:29:58 +00:00
Frederik Rietdijk 67af42e35f Merge staging-next into staging 2020-08-01 19:37:45 +02:00
Jörg Thalheim 9cb6894241
iana-etc: 20200407 -> 20200729 2020-08-01 09:57:46 +01:00
Peter Simons 16bd71bf8e all-cabal-hashes: update to Hackage at 2020-07-30T22:14:54Z 2020-07-31 21:21:57 +02:00
Peter Simons 3b46d9a65e all-cabal-hashes: update to Hackage at 2020-07-24T00:16:27Z 2020-07-24 21:38:22 +02:00
R. RyanTM af34714c8d cldr-emoji-annotation: 36.12.120200305_0 -> 37.0_13.0_0_1 2020-07-06 04:19:34 +02:00
Maximilian Bosch 3897eb5836
Merge pull request #92234 from samuelgrf/update/nixos-wallpapers 
nixos-artwork: add missing wallpapers
 2020-07-04 19:27:15 +02:00
Samuel Gräfenstein 18b5737723
nixos-artwork: add missing wallpapers 2020-07-04 00:31:18 +02:00
Peter Simons e081b183ab all-cabal-hashes: update to Hackage at 2020-07-02T22:46:43Z 2020-07-03 21:29:17 +02:00
Vladimír Čunát 075e8aeecb
dns-root-data: switch to new URL 
There's a redirect in place, so it doesn't really matter.
 2020-07-01 16:20:48 +02:00
Markus Kowalewski 3ddeb521d8
nss-cacert: add license 2020-06-27 00:54:50 +02:00
Peter Simons 8ffed96359 all-cabal-hashes: update to Hackage at 2020-06-25T08:18:20Z 2020-06-25 10:42:12 +02:00
Peter Simons 881e0cffaf all-cabal-hashes: update to Hackage at 2020-06-19T00:10:12Z 2020-06-19 22:29:30 +02:00
Peter Simons 6e8d0133f9 all-cabal-hashes: update to Hackage at 2020-06-12T00:09:36Z 2020-06-19 22:29:21 +02:00
R. RyanTM bba6d992f8 osinfo-db: 20200515 -> 20200529 2020-06-17 12:31:50 -07:00
worldofpeace d508591039
Merge pull request #86163 from worldofpeace/wallpaper-refactor 
Gnome and Pantheon: install nixos wallpapers
 2020-06-07 14:44:59 -04:00
R. RyanTM 0bbb0d488c wireless-regdb: 2019.06.03 -> 2020.04.29 2020-06-07 10:53:07 +02:00
Peter Simons e35f94c80c all-cabal-hashes: update to Hackage at 2020-05-28T23:38:21Z 2020-05-29 22:28:47 +02:00
Jan Tojnar f0c4c0bc7b
Merge pull request #86537 from r-ryantm/auto-update/cldr-emoji-annotation 
cldr-emoji-annotation: 36.12.120191002_0 -> 36.12.120200305_0
 2020-05-28 04:16:19 +02:00
Martin Milata 578ffc402b osinfo-db: 20200214 -> 20200515 2020-05-23 14:09:07 +02:00
R. RyanTM f17dae17dd spdx-license-list-data: 3.8 -> 3.9 2020-05-20 01:39:11 +00:00
Peter Simons a4282b6dc1 all-cabal-hashes: update to Hackage at 2020-05-15T17:34:35Z 2020-05-15 21:19:10 +02:00
Peter Simons 93c48507c9 all-cabal-hashes: update to Hackage at 2020-05-08T08:52:23Z 2020-05-08 21:13:07 +02:00
Frederik Rietdijk afb1041148 Merge master into staging-next 2020-05-02 09:39:00 +02:00
R. RyanTM af57a609aa cldr-emoji-annotation: 36.12.120191002_0 -> 36.12.120200305_0 2020-05-02 05:17:12 +00:00
Peter Simons ff61b07bb1 all-cabal-hashes: update to Hackage at 2020-04-28T23:45:54Z 2020-05-01 21:52:30 +02:00
worldofpeace 62587f43dd nixos-artwork: add file path attributes 
This makes things so much easier, and we install to
the path that both gnome-backgrounds and
elementary-wallpapers install to.
 2020-04-29 13:23:35 -04:00
Jörg Thalheim ce6e0abd50
iana_etc: 20190731 -> 20200407 2020-04-27 11:37:40 +01:00
Peter Simons 783af05bbb all-cabal-hashes: update to Hackage at 2020-04-17T17:47:53Z 2020-04-17 20:56:52 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
R. RyanTM b85f995802 scowl: 2018.04.16 -> 2019.10.06 2020-04-07 16:53:28 +00:00
Frederik Rietdijk 866c5aa090 Merge master into staging-next 2020-04-05 08:33:39 +02:00
Peter Simons 996c95b08f all-cabal-hashes: update to Hackage at 2020-04-03T06:25:45Z 2020-04-03 22:00:30 +02:00
Frederik Rietdijk 92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00
Konrad Borowski e69e48a1e4 lib.licenses: Add Unicode License Agreement for Data Files and Software 2020-04-01 13:43:41 +00:00
Frederik Rietdijk a36be028f5 Merge staging-next into staging 2020-03-28 21:15:15 +01:00
Peter Simons 743747999e all-cabal-hashes: update to Hackage at 2020-03-27T01:22:37Z 2020-03-27 20:58:34 +01:00
Tor Hedin Brønner f3b309224d
osinfo-db: fix homepage 
Changed homepage to gitlab, as prior seems outdated.
 2020-03-24 07:11:20 +01:00
Orivej Desh 1b89aa3f7a Merge branch 'master' into staging 2020-03-23 00:53:16 +00:00
Matthew Bauer 67b0ddf3f3 Merge remote-tracking branch 'origin/staging' into mb-cross-fixes-march-2020 2020-03-16 14:34:03 -04:00
R. RyanTM 8cdfd69bb6 unicode-character-database: 12.1.0 -> 13.0.0 2020-03-16 11:10:22 +00:00
R. RyanTM 4615b8b4c3 osinfo-db: 20200203 -> 20200214 2020-03-14 14:28:31 +01:00
Peter Simons 4c791cb15a all-cabal-hashes: update to Hackage at 2020-03-06T12:35:04Z 2020-03-06 22:15:13 +01:00
Matthew Bauer d1e58be703 nixos-artwork: make imagemagick a native build input 
This is only needed on the builder, no need to cross compile it.
 2020-03-06 00:45:47 -05:00
Peter Simons dcf76c729a all-cabal-hashes: update to Hackage at 2020-02-28T12:23:03Z 2020-02-28 20:42:31 +01:00
Mario Rodas 59e0025ec8
spdx-license-list-data: add platforms 2020-02-11 18:18:18 -05:00
R. RyanTM 44fb48ecd5 spdx-license-list-data: 3.7 -> 3.8 2020-02-11 21:12:47 +00:00
R. RyanTM 6ec453251e osinfo-db: 20191125 -> 20200203 2020-02-09 12:10:19 +01:00
Franz Pletz c5d06b022b
spdx-license-list-data: init at 3.7 2020-01-27 11:46:10 +01:00
Peter Simons d17666f923 all-cabal-hashes: update to Hackage at 2020-01-23T17:44:54Z 2020-01-24 21:02:43 +01:00
Peter Simons ff84bdcf69 all-cabal-hashes: update to Hackage at 2020-01-17T18:23:06Z 2020-01-17 21:14:35 +01:00
Jan Tojnar 480fc1856a
Merge branch 'master' into staging-next 2019-12-30 05:22:23 +01:00
Robin Gloster c9c03c00de
media-player-info: fix build 2019-12-30 04:50:38 +01:00
Jan Tojnar ca39dd3a8a
Merge branch 'master' into staging-next 2019-12-25 05:15:06 +01:00
Mario Rodas e615edeb20
Merge pull request #75295 from r-ryantm/auto-update/osinfo-db 
osinfo-db: 20190920 -> 20191125
 2019-12-22 18:00:59 -05:00
Jan Tojnar 3a8d826723
cacert: switch to python3 2019-12-15 01:50:34 +01:00
R. RyanTM 7b431fd487 osinfo-db: 20190920 -> 20191125 2019-12-08 12:55:44 -08:00
Jan Tojnar 808082f6b6
unicode-emoji: init at 12.1 2019-12-07 00:58:29 +01:00
Jan Tojnar 523f0dd754
cldr-emoji-annotation: init at 36.12.120191002_0 2019-12-07 00:58:28 +01:00
Jan Tojnar fe59567e08
unihan-database: init at 12.1.0 2019-12-07 00:58:28 +01:00
Jan Tojnar 2d405f9078
unicode-character-database: init at 12.1.0 2019-12-07 00:58:28 +01:00
Will Dietz 525c54c7ef tzdata: 2019b -> 2019c 
https://github.com/eggert/tz/blob/2019c/NEWS
 2019-11-24 10:04:17 +01:00
Peter Simons a83ece64ca all-cabal-hashes: update to Hackage at 2019-11-08T16:49:51Z 2019-11-08 18:52:37 +01:00
Peter Simons 327f135c46 all-cabal-hashes: update to Hackage at 2019-11-01T17:31:41Z 2019-11-01 21:34:11 +01:00
Peter Simons b712543128 all-cabal-hashes: update to Hackage at 2019-10-17T23:44:51Z 2019-10-18 22:50:37 +02:00
Jan Tojnar 6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Milan Pässler ff0148d868 nixos/nginx: use mailcap mime.types 
The mime type definitions included with nginx are very incomplete, so
we use a list of mime types from the mailcap package, which is also
used by most other Linux distributions by default.
 2019-10-09 14:20:40 +00:00
Frederik Rietdijk 503081fa5b Merge staging into staging-next 2019-09-29 11:05:22 +02:00
R. RyanTM 2026c28743 osinfo-db: 20190805 -> 20190920 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/osinfo-db/versions
 2019-09-29 00:19:04 +02:00
Matthew Bauer f7e4eeda6c
Merge pull request #68614 from nspin/pr/simplify-cacert-setup-hook 
cacert: simplify setupHook
 2019-09-20 17:59:34 -04:00
worldofpeace 3b48814e8d
Merge pull request #68732 from dtzWill/update/shared-mime-info-1.13.1 
shared-mime-info: 1.12 -> 1.13.1
 2019-09-18 15:46:52 -04:00
Will Dietz a8303d2494 shared-mime-info: 1.12 -> 1.13.1 
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/tags/Release-1-13
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/tags/Release-1-13-1
 2019-09-18 15:45:54 -04:00
Miguel Madrid Mencía 148c82e07e
maintainer: mimadrid: update github username and personal data 2019-09-14 12:15:46 +02:00
Nick Spinale e7ede726ba cacert: simplify setupHook 
Triggering this setupHook for dependencies at targetOffset does not work
in cross-compilation cases where such a dependency is lacking. This
simplified setupHook is more robust.
 2019-09-12 20:14:47 +00:00
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Peter Simons 79cfb44011 all-cabal-hashes: update to Hackage at 2019-09-03T05:02:25Z 2019-09-03 09:23:56 +02:00
Averell Dalton d8be742844 tzdata: 2019a -> 2019b 2019-08-31 12:43:34 +02:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
 2019-08-24 08:55:37 +02:00