3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

909 commits

Author SHA1 Message Date
(cdep)illabout eb19dcff7f
all-cabal-hashes: 2021-07-07T20:16:30Z -> 2021-07-17T04:19:10Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-07-17 14:15:15 +09:00
Robert Hensing 5d57104d84 cacert: Add Haskell x509-system compatibility
This allows cacert to be used with Haskell-based fetchers like
you would with regular OpenSSL-based fetchers:

  buildInputs = [ cacert ];
2021-07-08 19:27:09 +02:00
Dmitry Kalinkin 280e629ee0
Merge branch 'master' into staging-next 2021-07-08 04:38:15 -04:00
Joe Hermaszewski 7805d07602
all-cabal-hashes: 2021-07-02T10:49:03Z -> 2021-07-07T20:16:30Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-07-08 10:36:31 +08:00
github-actions[bot] 6a6b10fd9a
Merge master into haskell-updates 2021-07-05 00:06:49 +00:00
github-actions[bot] c852543c1f
Merge staging-next into staging 2021-07-04 06:01:43 +00:00
arcnmx 6cc62b1843
shared-mime-info: strictdeps (#128803) 2021-07-04 03:50:36 +02:00
Sandro e152180109
Merge pull request #128181 from pmeiyu/master 2021-07-04 02:38:51 +02:00
github-actions[bot] 015c6d73ad
Merge master into haskell-updates 2021-07-04 00:05:27 +00:00
Daniël de Kok 017aa88470 Remove danieldk as a maintainer for some packages
- AMD GPU packages: AMD removed support for the RX5x0 GPUs from ROCm, so
  I cannot test these packages anymore.
- A small number of GUI packages: I switched back to macOS on the
  desktop for work reasons, so I cannot easily test these.
- broot: I took over maintainership from someone else, but do not really
  use broot.
2021-07-03 12:14:20 +02:00
Joe Hermaszewski 962c8311a4
all-cabal-hashes: 2021-06-26T12:56:56Z -> 2021-07-02T10:49:03Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-07-02 21:05:06 +08:00
github-actions[bot] 61c79ee058
Merge master into haskell-updates 2021-07-01 00:06:16 +00:00
arcnmx 90f2a9d997
shared-mime-info: fix cross build (#128553) 2021-06-30 03:53:39 +02:00
Daniel Nagy a105c611e6
spdx-license-list-data: 3.12 -> 3.13 (#128678) 2021-06-30 01:21:29 +02:00
Yurii Matsiuk 5ca20c29fa
wireless-regdb: 2020.04.29 -> 2021.04.21 2021-06-28 10:43:40 +02:00
Peng Mei Yu 851848fcbc rime-data: init at 0.38.20210628 2021-06-28 09:20:28 +08:00
Malte Brandy 841fa25e22
all-cabal-hashes: 2021-06-22T21:14:17Z -> 2021-06-26T12:56:56Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-06-26 15:13:11 +02:00
sternenseemann c1c6f4a0b9 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-06-26 14:47:34 +02:00
Martin Weinelt b607aadaac
Merge branch 'master' into staging-next 2021-06-22 23:55:21 +02:00
Malte Brandy b0f0b5c6c0
all-cabal-hashes: 2021-06-22T07:13:30Z -> 2021-06-22T21:14:17Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-06-22 23:35:14 +02:00
Robert Hensing ea13609aae all-cabal-hashes: 2021-06-21T21:28:52Z -> 2021-06-22T07:13:30Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-06-22 09:48:51 +02:00
Malte Brandy 208c19ef47
all-cabal-hashes: 2021-06-19T11:58:52Z -> 2021-06-21T21:28:52Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-06-22 00:50:29 +02:00
Malte Brandy 465f4e27be
all-cabal-hashes: 2021-06-12T16:23:24Z -> 2021-06-19T11:58:52Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-06-19 14:22:10 +02:00
github-actions[bot] 011dae7f43
Merge master into staging-next 2021-06-19 06:05:05 +00:00
github-actions[bot] 9309a23dd3
Merge staging-next into staging 2021-06-12 18:04:58 +00:00
Malte Brandy f60d1f542a
all-cabal-hashes: 2021-06-06T15:18:11Z -> 2021-06-12T16:23:24Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-06-12 19:46:44 +02:00
sternenseemann 922a444b27 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-06-11 21:14:29 +02:00
Jan Tojnar ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
Maciej Krüger 2a85a9835b
common-licenses: init at 11.1
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-10 09:38:28 +02:00
sternenseemann 81ea9c837b all-cabal-hashes: 2021-06-02T14:32:36Z -> 2021-06-06T15:18:11Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-06-08 12:50:04 +02:00
Jan Tojnar b43f2e92a3
Merge pull request #126050 from est31/update-shared-mime-info
shared-mime-info: 1.13.1 -> 2.1
2021-06-07 21:17:02 +02:00
est31 59adc6c538 shared-mime-info: 1.13.1 -> 2.1
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/tags/2.1
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/releases#2.1

Also add the freedesktop team to the maintainers.
2021-06-07 18:59:47 +02:00
github-actions[bot] a1f68141f3
Merge staging-next into staging 2021-06-06 18:30:36 +00:00
Martin Weinelt 99b4d189e2
tzdata: add licenses
https://github.com/eggert/tz/blob/main/LICENSE
2021-06-04 04:21:05 +02:00
Martin Weinelt 5b485337cf
tzdata: 2020f -> 2021a 2021-06-04 04:21:05 +02:00
sternenseemann 21c2b85ec1 all-cabal-hashes: 2021-05-19T07:17:55Z -> 2021-06-02T14:32:36Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-06-03 00:12:17 +02:00
github-actions[bot] cf75c491be
Merge staging-next into staging 2021-06-02 20:25:08 +00:00
sternenseemann e308370fc8 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-06-02 17:07:43 +02:00
ajs124 e579e93b65 cacert: 3.63 -> 3.66
mozilla says this is CA version 2.50, up from 2.48 in nss 3.63
2021-06-01 23:12:06 +02:00
Andreas Rammhold 4e318bcca1
cacerts: Make updater script aware of the nss_latest attribute
Usually, on the stable channel, we have a nss_latest attribute that is
more up to date than the nss attribute (which is usually frozen during
branch-off and only receives security updates). Cacerts are a sensitive
matter and should be updated more frequently than the stable NSS package,
if required. By making the update script aware of the nss_latest
attribute we can prefer that when it exists.

By having this change in the unstable branch of Nixpgks we can carry it
from release to release without requiring more churn from those doing
the stable release maintenance.
2021-05-30 17:01:33 +02:00
(cdep)illabout 22cefb0445
all-cabal-hashes: 2021-05-12T11:46:04Z -> 2021-05-19T07:17:55Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-05-19 21:29:21 +09:00
Dennis Gosnell b76684aff7
Merge pull request #122719 from NixOS/haskell-updates
haskell: update package set
2021-05-19 10:52:35 +09:00
R. RyanTM db2815a9da ddccontrol-db: 20201221 -> 20210505 2021-05-17 14:03:47 -07:00
(cdep)illabout 27157c7867
all-cabal-hashes: 2021-05-11T22:36:02Z -> 2021-05-12T11:46:04Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-05-12 22:10:12 +09:00
Malte Brandy 441c9e9e04
all-cabal-hashes: 2021-05-10T22:01:59Z -> 2021-05-11T22:36:02Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-05-12 21:56:29 +09:00
Anderson Torres 363d7c6f86
Merge pull request #122592 from collares/sage-9.3
sage: 9.3rc4 -> 9.3
2021-05-12 01:31:22 -03:00
Mauricio Collares b413d3570a sage: 9.3.rc4 -> 9.3 2021-05-11 16:49:32 -03:00
Malte Brandy 2ca168f44e
all-cabal-hashes: 2021-05-07T19:29:19Z -> 2021-05-10T22:01:59Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-05-11 02:32:40 +02:00
Daniël de Kok a35e46c335
Merge pull request #121938 from danieldk/fedora-backgrounds-34
fedora-backgrounds.f34: init at 34.0.1
2021-05-09 09:57:27 +02:00
sternenseemann e37a0ebc85 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-05-08 14:04:31 +02:00
Jan Tojnar 468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Malte Brandy 000a0985f1
all-cabal-hashes: 2021-05-03T20:39:01Z -> 2021-05-07T19:29:19Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-05-07 23:58:18 +02:00
Malte Brandy 2a11f1f5cc
Merge branch 'master' into haskell-updates 2021-05-07 15:03:54 +02:00
Daniël de Kok c234c5b16d fedora-backgrounds.f34: init at 34.0.1 2021-05-06 19:32:51 +02:00
Jan Tojnar 0109d298a1
mobile-broadband-provider-info: 20190116 → 20201225
Co-Authored-By: Symphorien Gibol <symphorien+git@xlumurb.eu>
2021-05-05 22:42:28 +02:00
Malte Brandy e9430c7f2b
all-cabal-hashes: Changing pin to 'Update from Hackage at 2021-05-03T20:39:01Z' 2021-05-03 22:59:53 +02:00
hyperfekt f3f84855e8
maintainers/scripts/haskell/regenerate-hackage-packages.sh: init
Introduces a script that can be used to update the Nix expressions for

the Haskell package set. In service of that, also

- introduces cabal2nix-latest, which pins the hackage2nix version used

- changes all-cabal-hashes to use fetchFromGitHub

- adds update-hackage.sh & update-cabal2nix-latest.sh & update-stackage.sh maintainer scripts
2021-05-01 21:55:18 +02:00
Peter Simons b6b5fe550d all-cabal-hashes: update to Hackage at 2021-04-30T19:36:25Z 2021-04-30 22:02:27 +02:00
Peter Simons 0df579f0b9 all-cabal-hashes: update to Hackage at 2021-04-30T19:36:25Z 2021-04-30 22:02:00 +02:00
Michael Raskin 14f65f0dc5
Merge pull request #116365 from omasanori/sage-9.3
sage: 9.2 -> 9.3
2021-04-25 21:17:32 +00:00
Mauricio Collares 4d56f7c18a graphs: 20161026 -> 20210214 2021-04-22 09:01:07 +09:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Peter Simons cb29de02c4
Merge pull request #118350 from NixOS/haskell-updates
Update Haskell package set to Stackage Nightly 2021-04-02 (plus other fixes)
2021-04-09 20:50:19 +02:00
Peter Simons 60770bf185 all-cabal-hashes: update to Hackage at 2021-04-09T18:32:26Z 2021-04-09 20:49:48 +02:00
Sandro Jäckel f40b3249f1 mailcap: 2.1.48 -> 2.1.52 2021-04-05 23:50:08 +02:00
github-actions[bot] 636e58e31b
Merge staging-next into staging 2021-04-02 00:21:46 +00:00
Vladimír Čunát 10cb065706
cacert: fix fetchurl invocation
It was breaking probably just the tarball job (difficult to localize).
https://hydra.nixos.org/build/140479925
2021-04-01 22:18:02 +02:00
Jan Tojnar b3c854b60b
Merge branch 'staging-next' into staging 2021-03-26 07:53:44 +01:00
github-actions[bot] 7c9222212f
Merge master into staging-next 2021-03-25 18:14:01 +00:00
Frederik Rietdijk 63540c9df8 libkkc-data: stay with python2 2021-03-25 12:40:55 +01:00
Frederik Rietdijk 9f9a1a01ab elliptic_curves: stay with python2
because its sage
2021-03-25 12:36:24 +01:00
Frederik Rietdijk 3e9d81498b conway_polynomials: use python2 2021-03-25 11:43:39 +01:00
ajs124 8dbc855b49 cacert: 3.60 -> 3.63 2021-03-20 16:42:40 +01:00
Dmitry Kalinkin 11ae139333 cacert.certdata2pem: add a download mirror from ubuntu 2021-03-20 09:11:48 +01:00
Dmitry Kalinkin 62d332feaf cacert: refactor to put certdata2pem on tarballs.nixos.org
nix-instantiate --eval --json --strict ./maintainers/scripts/find-tarballs.nix --arg expr '(import ./. {}).cacert' 2>/dev/null | jq '.[].name' | grep cert
"certdata2pem.py"
2021-03-20 09:11:48 +01:00
Peter Simons a839c811a5
Merge pull request #116096 from NixOS/haskell-updates
Update Haskell package set to Stackage Nightly 2021-03-17 (plus other fixes)
2021-03-19 21:24:10 +01:00
Peter Simons 0f3acba0fd all-cabal-hashes: update to Hackage at 2021-03-19T20:01:05Z 2021-03-19 21:22:17 +01:00
Jan Tojnar 2445e9a681
Merge branch 'master' into staging-next 2021-03-18 19:24:39 +01:00
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