JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,834 Commits 2 Branches 0 Tags 13 GiB
4d65677903
Commit Graph

621 Commits

Author SHA1 Message Date
Peter Simons
78bb20c424 all-cabal-hashes: update to Hackage at 2020-11-06T01:07:40Z 2020-11-06 21:37:06 +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
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