1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 17:25:11 +00:00
Commit graph

53 commits

Author SHA1 Message Date
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
ajs124 4e70a418c7 tzdata: 2020c -> 2020f 2020-12-29 21:41:01 +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
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 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
ajs124 8904ce243a tzdata: 2019c -> 2020c 2020-10-20 21:09:28 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Will Dietz 525c54c7ef tzdata: 2019b -> 2019c
https://github.com/eggert/tz/blob/2019c/NEWS
2019-11-24 10:04:17 +01:00
Averell Dalton d8be742844 tzdata: 2019a -> 2019b 2019-08-31 12:43:34 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Andreas Rammhold 2397bdad82
tzdata: 2018g -> 2019a 2019-03-27 09:07:00 +01:00
Franz Pletz 7c25174154 tzdata: 2018e -> 2018g
Notable changes:
  - Morocco switched to permanent +01 on 2018-10-27
  - Volgograd moved from +03 to +04 on 2018-10-28
  - Fiji ends DST 2019-01-13, not 2019-01-20
  - Most of Chile changes DST dates, effective 2019-04-06

tzdata: fetch over https
2018-12-05 22:17:18 +01:00
John Ericson ee4b56edd3 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 14:36:08 -04:00
Franz Pletz 9d0202faa1
tzdata: 2017c -> 2018e
Notable changes:

  - North Korea switches back to +09 on 2018-05-05.
2018-05-11 18:23:40 +02:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Shea Levy 942855c8bd
tzdata: Fix cross-compilation 2018-02-28 15:01:33 -05:00
Daiderd Jordan 6c39c9cbfa
tzdata: use addEnvHooks 2018-01-07 21:26:22 +01:00
Orivej Desh c13de40f04 tzdata: export TZDIR for dependent packages
https://github.com/NixOS/nix/issues/1709
2017-12-01 17:17:30 +00:00
Orivej Desh 9d2bd32b79 tzdata: avoid symlink loop "./posix" -> ".."
Fixes #31560
2017-11-23 05:12:03 +00:00
Franz Pletz bfd57788b6
tzdata; 2016j -> 2017c
Notable recent changes:

 - Northern Cyprus resumed EU rules starting 2017-10-29.
 - Namibia will switch from +01 with DST to +02 all year, affecting
   UT offsets starting 2018-04-01.
 - Sudan will switch from +03 to +02 on 2017-11-01.
 - Tonga will not observe DST on 2017-11-05.
 - Turks & Caicos will switch from -04 all year to -05 with US DST,
   affecting UT offset starting 2018-11-04.
2017-11-01 23:03:35 +01:00
Tuomas Tynkkynen 9158944b44 tzdata: Fix man directory 2017-08-11 21:32:54 +03:00
Vladimír Čunát 5ac7da9376
tzdata: 2016f -> 2016j 2016-12-28 19:15:18 +01:00
rexim b9a6ba4e8f tzdata: 2016e -> 2016f 2016-08-08 23:44:28 +06:00
Tobias Geerinckx-Rice 9f996d6406
tzdata: 2016d -> 2016e 2016-06-14 18:27:57 +02:00
Tobias Geerinckx-Rice 5a5012a7cd
tzdata: 2016c -> 2016d 2016-04-18 19:12:34 +02: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
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
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Tobias Geerinckx-Rice 0e5458edac tzdata: 2015f -> 2015g
(cherry picked from commit 18b3295970)
2015-10-02 14:17:22 +02:00
Tobias Geerinckx-Rice 18b3295970 tzdata: 2015f -> 2015g 2015-10-02 05:31:41 +02:00
Tobias Geerinckx-Rice 6783f1b440 tzdata: 2015e -> 2015f 2015-08-12 00:59:02 +02:00
Tobias Geerinckx-Rice a0473fde87 tzdata -> 2015e 2015-06-15 19:30:11 +02:00
Vladimír Čunát f074e5957d tzdata: go back to using a single output
The *.{a,h} files are very tiny together,
and I didn't see why a cyclic referrence was being created.
2015-05-05 11:52:07 +02:00
Tobias Geerinckx-Rice 7931799a0f tzdata 2015c -> 2015d 2015-05-04 17:30:56 +02:00
Tobias Geerinckx-Rice 4679104133 tzdata 2015a -> 2015c 2015-04-17 00:46:20 +02:00
Eelco Dolstra 586b9d9525 tzdata: Update to 2015a 2015-02-25 15:24:53 +01:00
Eelco Dolstra 52b743add4 tzdata: Update to 2014j 2014-11-25 00:42:22 +01:00
Domen Kožar 6f9a111186 tzdata: set platforms to build on hydra 2014-10-27 18:41:42 +01:00
Vladimír Čunát e76772d1fd tzdata: update 2014-10-25 21:37:24 +02:00
Mateusz Kowalczyk 5409201b64 Revert "Revert "tzdata: bump to 2014g.""
This reverts commit 0b4c22edaa.

This should now work according to #4243
2014-09-24 20:50:34 +01:00
Domen Kožar 0b4c22edaa Revert "tzdata: bump to 2014g."
This reverts commit 4dce30e510.

Breaks all go packages.
2014-09-19 20:40:54 +02:00
lostdj 4dce30e510 tzdata: bump to 2014g. 2014-09-18 20:21:26 +04:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Eelco Dolstra 0a11e40596 tzdata: Update to 2014e 2014-07-08 18:35:40 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Mihaly Barasz 1f2228cdc1 tzdata: use symlinks instead of hardlinks
Hard links are not handled by nar, so installing from binary cache
unnecessarily duplicates data. Also, it's more common to use symlinks for the
tzdata package in other distributions.
2014-04-29 16:25:10 +02:00
Eelco Dolstra dc224baba1 tzdata: Update to 2014b 2014-04-29 16:13:15 +02:00
Mihaly Barasz c2c90bf2bb tzdata: fix 'posix' symlink 2014-04-29 16:08:19 +02:00