Andreas Rammhold
31e5b8dc21
Remove myself from maintainers
...
I don't have time and energy to deal with all of this anymore.
2022-01-20 00:24:52 +01:00
github-actions[bot]
28abf69ffd
Merge master into staging-next
2022-01-19 12:01:24 +00:00
R. Ryantm
b9a0726261
v2ray-geoip: 202201060033 -> 202201130034
2022-01-19 06:40:59 +00:00
github-actions[bot]
1b54e5bb50
Merge master into staging-next
2022-01-19 06:01:24 +00:00
Ellie Hermaszewska
5f8b849418
all-cabal-hashes: 2022-01-14T12:47:41Z -> 2022-01-18T22:54:05Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-19 09:42:41 +08:00
github-actions[bot]
2d19cc436b
Merge master into haskell-updates
2022-01-16 00:09:16 +00:00
github-actions[bot]
ed9751296d
Merge master into staging-next
2022-01-15 18:01:07 +00:00
José Romildo Malaquias
e924173cf3
Merge pull request #154092 from NickCao/adapta-backgrounds
...
adapta-backgrounds: fix cross compilation and set strictDeps
2022-01-15 12:05:43 -03:00
Nick Cao
e8a7b9cd20
v2ray-domain-list-community: 20211228022859 -> 20220114024213
2022-01-15 20:28:55 +08:00
Ellie Hermaszewska
e4cf20c00f
all-cabal-hashes: 2022-01-11T06:28:14Z -> 2022-01-14T12:47:41Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-14 22:50:06 +08:00
github-actions[bot]
d15d1eee10
Merge master into haskell-updates
2022-01-12 00:08:56 +00:00
Alyssa Ross
d77022e114
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
nixos/doc/manual/release-notes/rl-2205.section.md
2022-01-11 16:35:43 +00:00
Alyssa Ross
23f24c95d7
shared-mime-info: 2.1 -> unstable-2021-12-03
...
We need https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/162
("migrate from itstool to msgfmt for creating translated XML") to fix
the build with Meson 0.60.0.
Signed-off-by: Patrick Hilhorst <git@hilhorst.be>
2022-01-11 12:51:09 +00:00
Ellie Hermaszewska
4326f3ec84
all-cabal-hashes: 2022-01-05T00:50:25Z -> 2022-01-11T06:28:14Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-11 15:14:39 +08:00
Ellie Hermaszewska
14921f050a
Merge pull request #153536 from NixOS/haskell-updates
...
haskellPackages: update stackage and hackage
2022-01-11 15:13:59 +08:00
github-actions[bot]
47c5df190a
Merge staging-next into staging
2022-01-11 06:02:00 +00:00
R. Ryantm
b2dea1626e
v2ray-geoip: 202112300030 -> 202201060033
2022-01-11 03:00:57 +00:00
github-actions[bot]
1f4785f32c
Merge master into haskell-updates
2022-01-11 00:08:39 +00:00
github-actions[bot]
0f8ce42c1f
Merge staging-next into staging
2022-01-10 06:01:45 +00:00
zowoq
00d2701b97
v2ray, v2ray-domain-list-community: switch to go_1_17, update vendorSha256
2022-01-10 12:44:07 +10:00
Jan Tojnar
f7aa55946b
Merge branch 'staging-next' into staging
...
; Conflicts:
; nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
; nixos/doc/manual/release-notes/rl-2205.section.md
; pkgs/build-support/libredirect/default.nix
2022-01-10 01:26:05 +01:00
github-actions[bot]
d79785deed
Merge master into haskell-updates
2022-01-10 00:08:34 +00:00
Bobby Rong
c0e55c5888
Merge pull request #154140 from wineee/rime-data
...
rime-data: 0.38.20210628 -> 0.38.20211002
2022-01-09 22:53:14 +08:00
rewine
08e6b80248
rime-data: 0.38.20210628 -> 0.38.20211002
2022-01-09 21:51:48 +08:00
sternenseemann
0d065994f6
Merge remote-tracking branch 'origin/master' into haskell-updates
2022-01-09 12:12:34 +01:00
Nick Cao
c73d90790c
adapta-backgrounds: fix cross compilation and set strictDeps
2022-01-09 09:55:51 +08:00
Dmitry Kalinkin
d16e166b47
Merge pull request #153769 from helsinki-systems/upd/nss
...
nss: 3.73.1 -> 3.74
2022-01-08 20:00:53 -05:00
github-actions[bot]
44dc8255ad
Merge master into haskell-updates
2022-01-08 00:08:05 +00:00
github-actions[bot]
b48a41c77c
Merge master into staging-next
2022-01-07 06:01:27 +00:00
Ben Siraphob
9a58b51e6a
treewide: fix homepages with permanent redirect to https
2022-01-07 09:57:54 +07:00
ajs124
eb9b64fc32
cacert: 3.71 -> 3.74
2022-01-06 22:46:17 +01:00
github-actions[bot]
4b70e0e343
Merge master into staging-next
2022-01-05 06:01:16 +00:00
Dennis Gosnell
7269b84957
all-cabal-hashes: 2021-12-28T00:33:48Z -> 2022-01-05T00:50:25Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-05 10:49:47 +09:00
Martin Weinelt
11a0b61783
Merge remote-tracking branch 'origin/master' into staging-next
2022-01-03 23:21:08 +01:00
github-actions[bot]
4acff2bbde
Merge master into haskell-updates
2022-01-03 00:08:40 +00:00
R. RyanTM
82a3519a78
unicode-character-database: 13.0.0 -> 14.0.0
...
(#138892 )
2022-01-02 10:08:44 +01:00
github-actions[bot]
b0c76508ef
Merge master into haskell-updates
2022-01-02 00:08:53 +00:00
Bobby Rong
b322fa1db2
Merge pull request #153027 from NickCao/v2ray-dlc
...
v2ray-domain-list-community: 20211119143108 -> 20211228022859
2022-01-01 12:52:09 +08:00
Dennis Gosnell
e122507667
Merge remote-tracking branch 'origin/master' into haskell-updates
2022-01-01 13:29:15 +09:00
Nick Cao
0382c9a9ce
v2ray-domain-list-community: 20211119143108 -> 20211228022859
2022-01-01 12:01:44 +08:00
R. Ryantm
746f4a3568
v2ray-geoip: 202112160030 -> 202112300030
2021-12-31 20:16:42 +00:00
Dennis Gosnell
28f2bea62c
all-cabal-hashes: 2021-12-27T15:07:56Z -> 2021-12-28T00:33:48Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-28 09:49:24 +09:00
github-actions[bot]
8ce4686310
Merge master into staging-next
2021-12-27 18:01:11 +00:00
sternenseemann
f7a3ebf051
all-cabal-hashes: 2021-12-21T13:58:08Z -> 2021-12-27T15:07:56Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-27 16:17:15 +01:00
github-actions[bot]
e5ae98c9e2
Merge master into haskell-updates
2021-12-26 00:09:07 +00:00
R. RyanTM
05cfc5fdab
poppler_data: 0.4.10 -> 0.4.11 ( #149621 )
2021-12-25 17:05:20 -05:00
Sergei Trofimovich
f394545b13
tzdata: 2021c -> 2021e ( #151446 )
2021-12-25 16:54:42 -05:00
github-actions[bot]
a7f62c75af
Merge master into staging-next
2021-12-21 18:01:15 +00:00
sternenseemann
a845bdf341
all-cabal-hashes: 2021-12-09T20:50:23Z -> 2021-12-21T13:58:08Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-21 15:08:21 +01:00
Dmitry Kalinkin
ccdaaa0788
tzdata: fix for darwin sandbox
2021-12-18 19:08:43 -05:00
github-actions[bot]
0c19ae0aba
Merge master into haskell-updates
2021-12-19 00:08:41 +00:00
github-actions[bot]
2add1758ab
Merge master into staging-next
2021-12-18 18:01:03 +00:00
Nick Cao
b8ea60f47b
v2ray-domain-list-community: fix cross compilation
2021-12-18 21:15:05 +08:00
github-actions[bot]
2189a53dad
Merge master into haskell-updates
2021-12-17 00:07:55 +00:00
Dmitry Kalinkin
889227a048
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/pdftotext/default.nix
2021-12-16 16:55:25 -05:00
R. Ryantm
858df33c59
v2ray-geoip: 202112090029 -> 202112160030
2021-12-16 16:36:04 +00:00
github-actions[bot]
d3da112c8c
Merge master into haskell-updates
2021-12-15 00:08:01 +00:00
github-actions[bot]
0242879f3f
Merge master into staging-next
2021-12-14 12:01:17 +00:00
Nick Cao
7747c15593
v2ray-geoip: init at 202112090029
2021-12-14 14:22:51 +08:00
github-actions[bot]
92aabc6576
Merge master into staging-next
2021-12-10 00:01:53 +00:00
Malte Brandy
02d2a9f55f
all-cabal-hashes: 2021-12-08T21:36:39Z -> 2021-12-09T20:50:23Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-09 22:31:38 +01:00
Alyssa Ross
c9a581b05f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master. Added pkgs/tools/misc/jsonwatch/default.nix in HEAD
2021-12-09 01:43:58 +00:00
Malte Brandy
c8234d693b
all-cabal-hashes: 2021-12-07T20:15:21Z -> 2021-12-08T21:36:39Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-08 23:01:43 +01:00
sternenseemann
49eba10372
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-12-08 21:50:23 +01:00
github-actions[bot]
ac0d4017c5
Merge master into staging-next
2021-12-08 12:01:20 +00:00
Malte Brandy
25c0241b8a
all-cabal-hashes: 2021-12-02T21:05:02Z -> 2021-12-07T20:15:21Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-07 21:20:13 +01:00
R. Ryantm
491ef7707d
scowl: 2019.10.06 -> 2020.12.07
2021-12-07 01:01:43 +00:00
github-actions[bot]
41895efeb5
Merge master into staging-next
2021-12-06 12:01:16 +00:00
sternenseemann
5f9cdd06ef
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-12-06 11:17:24 +01:00
Mauricio Collares
d93f7e5de8
elliptic_curves: use Python 3
2021-12-05 22:59:22 -08:00
Mauricio Collares
367eb04e2d
conway_polynomials: use Python 3
2021-12-05 22:59:22 -08:00
github-actions[bot]
287ecf6b5f
Merge master into haskell-updates
2021-12-03 00:07:58 +00:00
Malte Brandy
3619ce1071
all-cabal-hashes: 2021-11-18T20:32:52Z -> 2021-12-02T21:05:02Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-03 00:53:13 +01:00
Alyssa Ross
01bce76b11
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/applications/virtualization/qemu/default.nix
2021-11-30 18:54:47 +00:00
github-actions[bot]
3c6eb8fe49
Merge master into staging-next
2021-11-30 18:01:33 +00:00
Peng Mei Yu
640e54cda9
maintainers: Rename pengmeiyu to pmy
2021-11-29 18:39:31 +08:00
Jörg Thalheim
2372b2861e
iana-etc: 20210225 -> 20211124
2021-11-28 12:45:27 +01:00
github-actions[bot]
b529eccbb3
Merge master into staging-next
2021-11-26 18:01:19 +00:00
Sandro
d145e77525
Merge pull request #146943 from oxzi/spdx-license-list-data-3.15
2021-11-26 13:30:33 +01:00
github-actions[bot]
fc6ab3024e
Merge master into staging-next
2021-11-24 12:01:20 +00:00
Jonathan Ringer
4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next
...
Conflicts:
nixos/tests/custom-ca.nix
2021-11-22 21:33:23 -08:00
sternenseemann
fb67ad2eea
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-11-22 19:44:23 +01:00
github-actions[bot]
28641f51dc
Merge master into staging-next
2021-11-22 18:01:08 +00:00
Nick Cao
c71ccc045c
v2ray-domain-list-community: 20211103073737 -> 20211119143108
2021-11-22 21:21:52 +08:00
github-actions[bot]
9e1911e222
Merge master into staging-next
2021-11-22 12:01:27 +00:00
Bobby Rong
87d7bd1733
Merge pull request #143619 from r-ryantm/auto-update/ddccontrol-db
...
ddccontrol-db: 20210804 -> 20210812
2021-11-22 15:10:24 +08:00
Alvar Penning
73fa88190f
spdx-license-list-data: 3.14 -> 3.15
2021-11-22 00:15:53 +01:00
github-actions[bot]
9747d437c5
Merge staging-next into staging
2021-11-19 00:02:17 +00:00
github-actions[bot]
c83cfc58e5
Merge master into staging-next
2021-11-19 00:01:26 +00:00
sternenseemann
e8f81dc183
all-cabal-hashes: 2021-11-12T03:22:57Z -> 2021-11-18T20:32:52Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-11-18 21:37:48 +01:00
Robert Hensing
9005cb8835
Merge pull request #145841 from l0b0/fix-indentation
...
Fix indentation
2021-11-18 00:38:59 +01:00
Philipp Kern
7481bc7a31
publicsuffix-list: 2019-05-24 -> 2021-09-03 ( #136680 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-15 11:35:15 +01:00
Victor Engmark
57b496ea98
misc: Replace tab indentation with spaces
...
I've tried to be consistent, using four or eight spaces to line up
with existing code.
2021-11-14 16:04:46 +13:00
github-actions[bot]
c6ab946042
Merge master into haskell-updates
2021-11-13 00:07:15 +00:00
Sandro
e7c332ade0
Merge pull request #137691 from r-ryantm/auto-update/wireless-regdb
2021-11-12 17:38:44 +01:00
(cdep)illabout
9568b05c76
all-cabal-hashes: 2021-11-05T06:34:09Z -> 2021-11-12T03:22:57Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-11-12 13:00:07 +09:00
github-actions[bot]
1309d8da51
Merge master into haskell-updates
2021-11-06 00:06:48 +00:00
Sandro
285d6b1fdb
Merge pull request #140555 from NickCao/v2ray-domain-list-community
2021-11-05 14:10:17 +01:00
(cdep)illabout
bd742755f1
all-cabal-hashes: 2021-10-23T04:57:02Z -> 2021-11-05T06:34:09Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-11-05 15:42:34 +09:00
Nick Cao
aefde7c02a
v2ray-domain-list-community: init at 20211103073737
2021-11-03 17:03:17 +08:00
sternenseemann
b0f72c142c
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-11-02 11:44:15 +01:00
R. Ryantm
9567b928fa
ddccontrol-db: 20210804 -> 20210812
2021-10-29 09:43:17 +00:00
github-actions[bot]
59156778b4
Merge master into staging-next
2021-10-23 06:01:03 +00:00
Ellie Hermaszewska
b65bb811cf
all-cabal-hashes: 2021-10-18T14:27:09Z -> 2021-10-23T04:57:02Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-23 13:42:42 +08:00
github-actions[bot]
b0a41194a1
Merge master into staging-next
2021-10-18 18:01:14 +00:00
Ellie Hermaszewska
bd74d5b007
all-cabal-hashes: 2021-10-15T10:42:20Z -> 2021-10-18T14:27:09Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-18 22:53:48 +08:00
Martin Weinelt
a415d5dd2e
Merge remote-tracking branch 'origin/master' into staging-next
2021-10-15 23:10:08 +02:00
Malte Brandy
f2deb6ead2
all-cabal-hashes: 2021-10-11T20:00:11Z -> 2021-10-15T10:42:20Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-15 13:58:21 +02:00
github-actions[bot]
5065827878
Merge staging-next into staging
2021-10-12 00:02:05 +00:00
Malte Brandy
8fad89e4a3
all-cabal-hashes: 2021-10-08T09:46:02Z -> 2021-10-11T20:00:11Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-11 22:09:26 +02:00
Luke Granger-Brown
856913b191
Merge pull request #136777 from lukegb/buildcatrust
...
use buildcatrust to generate trust stores
2021-10-09 03:39:49 +01:00
github-actions[bot]
5da3c99f54
Merge staging-next into staging
2021-10-08 12:02:03 +00:00
Malte Brandy
2491951642
all-cabal-hashes: 2021-10-05T05:41:58Z -> 2021-10-08T09:46:02Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-08 12:00:59 +02:00
Luke Granger-Brown
91e4957081
cacert: extract certdata.txt from main package
...
This allows users to specify custom CAs without needing to download the
entirety of the NSS source code - just certdata.txt, which should end up
in cache.nixos.org.
2021-10-08 01:21:57 +00:00
Luke Granger-Brown
906f44cef3
cacert: port to use buildcatrust
...
This introduces the ability to have additional certificates in the trust
store using an override, similar to how the blacklist is done. If the
certificates are provided in OpenSSL TRUSTED CERTIFICATE form, then
those trust bits will be respected.
It also adds a p11-kit compatible trust store output.
2021-10-08 00:56:49 +00:00
sternenseemann
df720f8b7f
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-10-05 14:10:47 +02:00
github-actions[bot]
0b1fa10263
Merge staging-next into staging
2021-10-05 12:01:39 +00:00
Luke Granger-Brown
c55acca2a8
Merge pull request #139554 from NixOS/staging-next
...
staging-next 2021-09-26
2021-10-05 12:55:59 +01:00
Malte Brandy
2a9f449dff
all-cabal-hashes: 2021-10-05T05:41:58Z -> 2021-10-05T05:41:58Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-05 08:54:03 +02:00
sternenseemann
a5c8b9f166
all-cabal-hashes: 2021-10-01T17:27:40Z -> 2021-10-02T21:03:40Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-02 23:55:47 +02:00
Martin Weinelt
bd9a5bbca1
Merge pull request #140068 from helsinki-systems/upd/nss
2021-10-02 19:32:47 +02:00
Martin Weinelt
51ddf0d5c1
Merge pull request #140213 from helsinki-systems/upd/tzdata
2021-10-02 16:50:55 +02:00
github-actions[bot]
b38a46cddd
Merge staging-next into staging
2021-10-02 00:06:56 +00:00
github-actions[bot]
90a3ecee8f
Merge master into staging-next
2021-10-02 00:04:43 +00:00
ajs124
d014e1c7e5
tzdata: add myself as maintainer
2021-10-02 01:34:47 +02:00
ajs124
1143d2ca24
tzdata: 2021b -> 2021c
2021-10-02 01:20:12 +02:00
sternenseemann
d3f87c81cb
all-cabal-hashes: 2021-09-29T20:58:23Z -> 2021-10-01T17:27:40Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-01 21:27:24 +02:00
sterni
b7ee74fff0
Merge pull request #140146 from nomeata/joachim/haskell-maintainership
...
Add myself as maintainer for a few Haskell packages
2021-10-01 14:41:35 +02:00
github-actions[bot]
d52d86a965
Merge staging-next into staging
2021-10-01 12:01:52 +00:00
github-actions[bot]
c641792c36
Merge master into staging-next
2021-10-01 12:01:14 +00:00
Antonio Yang
82155ff501
rime-array: 2016-09-01 -> 2021-08-24 ( #140008 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-01 11:20:50 +02:00
ajs124
5a9b23f539
cacert: 3.66 -> 3.71
2021-09-30 21:16:26 +02:00
github-actions[bot]
2dfffe79b2
Merge staging-next into staging
2021-09-30 00:02:24 +00:00
github-actions[bot]
1994a3055b
Merge master into staging-next
2021-09-30 00:01:51 +00:00
sternenseemann
0280f0990a
all-cabal-hashes: 2021-09-19T21:23:33Z -> 2021-09-29T20:58:23Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-09-29 23:27:34 +02:00
ajs124
ec96691d78
tzdata: 2021a -> 2021b
2021-09-26 23:48:26 +02:00
sternenseemann
414d4ab627
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-09-24 16:26:28 +02:00
Jörg Thalheim
a65e3b66cb
Merge pull request #137601 from fzakaria/faridzakaria/glibc-netbase
...
glibc: allow environment variable for /etc/ files (i.e. /etc/protocols)
2021-09-21 08:07:02 +01:00
github-actions[bot]
f666c4d10f
Merge master into staging-next
2021-09-20 06:01:17 +00:00
Farid Zakaria
4687d7523b
glibc: add dependency on netbase /etc/protocols
...
Add an explicit dependency on netbase for /etc/protocols
Certain functions in glibc look for files present in /etc such as getprotobyname which reads /etc/protocols.
If you are using Nix over a Linux installation, this file may not be present, and therefore it will cause errors.
- add netbase as a new package in nixpks
- add a dependency in glibc on it using postPatchPhase and substitute
the path
Fixes #124401
2021-09-19 19:37:56 -07:00
(cdep)illabout
74f0bf6e78
all-cabal-hashes: 2021-09-17T18:08:40Z -> 2021-09-19T21:23:33Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-09-20 09:48:01 +09:00
github-actions[bot]
c4fd2a8f99
Merge master into staging-next
2021-09-18 00:01:33 +00:00
(cdep)illabout
548e93f7a1
all-cabal-hashes: 2021-09-10T22:56:58Z -> 2021-09-17T18:08:40Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-09-18 03:33:13 +09:00
github-actions[bot]
b7d0ebd8f8
Merge master into haskell-updates
2021-09-16 00:06:30 +00:00
R. RyanTM
18aa4e31ef
wireless-regdb: 2021.07.14 -> 2021.08.28
2021-09-13 21:13:09 +00:00
github-actions[bot]
ff5297bcd3
Merge staging-next into staging
2021-09-11 12:01:45 +00:00
Alyssa Ross
56314db098
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
pkgs/development/compilers/ghc/8.10.7.nix
pkgs/development/compilers/ghc/8.8.4.nix
I've removed the isWindows check from useLdGold in ghc, since that should
be covered by the new hasGold check.
2021-09-11 10:49:13 +00:00
(cdep)illabout
8a3fa78f1b
all-cabal-hashes: 2021-09-06T23:06:06Z -> 2021-09-10T22:56:58Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-09-11 11:30:14 +09:00
Luke Granger-Brown
9094826af8
Merge remote-tracking branch 'upstream/staging-next' into staging-fix
2021-09-07 16:23:11 +00:00
Vladimír Čunát
dbc3228248
Merge branch 'master' into staging-next
...
(It's a little older version of master, to bring haskell updates now.)
2021-09-07 08:21:02 +02:00
(cdep)illabout
121cc7c0dc
all-cabal-hashes: 2021-09-03T13:28:39Z -> 2021-09-06T23:06:06Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-09-07 10:51:23 +09:00
Martin Weinelt
7f732aca66
Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next"
...
This reverts commit b041b2e1b25b6c2380ad
2021-09-05 15:02:25 +02:00
Martin Weinelt
b041b2e1b2
Merge remote-tracking branch 'origin/python-unstable' into staging-next
2021-09-05 14:51:26 +02:00
github-actions[bot]
e750a74632
Merge staging-next into staging
2021-09-04 00:02:10 +00:00
Alyssa Ross
071a7a4583
Merge remote-tracking branch 'nixpkgs/master' into staging-next
2021-09-03 18:23:45 +00:00
Joe Hermaszewski
73be7eaf64
all-cabal-hashes: 2021-08-23T13:50:03Z -> 2021-09-03T13:28:39Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-09-03 15:04:38 +01:00
Sandro
ea1b1cb084
Merge pull request #135343 from SuperSandro2000/shared-mime-info
...
shared-mime-info: split outputs
2021-08-24 14:23:42 +02:00
Joe Hermaszewski
b1ab44bb76
all-cabal-hashes: 2021-08-22T14:40:47Z -> 2021-08-23T13:50:03Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-08-23 23:17:57 +08:00
Jan Tojnar
4ff3577f25
Merge branch 'staging-next' into staging
2021-08-23 14:19:54 +02:00
Sandro Jäckel
7feefdc31c
shared-mime-info: split outputs
2021-08-23 02:25:01 +02:00
Malte Brandy
8f3983e233
all-cabal-hashes: 2021-08-17T22:21:14Z -> 2021-08-22T14:40:47Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-08-22 19:58:32 +02:00
Malte Brandy
e50885838b
all-cabal-hashes: 2021-08-17T22:21:14Z -> 2021-08-17T22:21:14Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-08-18 02:13:28 +02:00
Jan Tojnar
e286e1cfa0
Merge branch 'staging-next' into staging
...
- boost 167 removed on staging-next (7915d1e03fd20aa4955dc62f911507a5341beb78e55554491d
2021-08-17 18:52:37 +02:00
Lassulus
99c5bf354e
Merge pull request #133889 from r-ryantm/auto-update/wireless-regdb
...
wireless-regdb: 2021.04.21 -> 2021.07.14
2021-08-17 09:49:21 +02:00
github-actions[bot]
60b1048b91
Merge master into haskell-updates
2021-08-16 00:06:12 +00:00
github-actions[bot]
4dfde9ac8e
Merge staging-next into staging
2021-08-15 18:01:33 +00:00
R. RyanTM
d1434fd896
wireless-regdb: 2021.04.21 -> 2021.07.14
2021-08-14 06:24:20 +00:00
Daniel Nagy
3e51989b06
spdx-license-list-data: 3.13 -> 3.14
2021-08-12 23:14:19 +02:00
Jan Tojnar
807d3ec359
Merge branch 'staging-next' into staging
...
; Conflicts:
; pkgs/tools/misc/t1utils/default.nix
2021-08-11 16:34:11 +02:00
Malte Brandy
0ad7297bea
all-cabal-hashes: 2021-08-07T10:52:35Z -> 2021-08-10T19:15:27Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-08-10 22:19:49 +02:00
Fabian Affolter
8823bc8c00
Merge pull request #132806 from maxeaubrey/mobile-broadband-provider-info_20210805
...
mobile-broadband-provider-info: 202001225 -> 20210805
2021-08-09 14:36:32 +02:00
github-actions[bot]
00856683aa
Merge master into haskell-updates
2021-08-09 00:06:41 +00:00
Artturi
5f0ab7555d
Merge pull request #132733 from r-ryantm/auto-update/ddccontrol-db
...
ddccontrol-db: 20210505 -> 20210804
2021-08-08 22:21:05 +03:00
github-actions[bot]
40442d5b19
Merge staging-next into staging
2021-08-07 18:01:40 +00:00
sternenseemann
981cf6a6e2
all-cabal-hashes: 2021-08-04T07:53:53Z -> 2021-08-07T10:52:35Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-08-07 16:17:16 +02:00
Maxine Aubrey
44fbbb22c2
mobile-broadband-provider-info: 202001225 -> 20210805
2021-08-06 10:30:44 +02:00
R. RyanTM
24ba262fbe
ddccontrol-db: 20210505 -> 20210804
2021-08-05 05:16:00 +00:00
github-actions[bot]
05e0d6aadf
Merge staging-next into staging
2021-08-04 12:01:50 +00:00
sternenseemann
256f507fe0
all-cabal-hashes: 2021-07-29T16:00:40Z -> 2021-08-04T07:53:53Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-08-04 12:33:53 +02:00
Sandro Jäckel
419a0f39ac
cacert: convert to pname + version, format, cleanup
2021-07-30 15:10:52 +02:00
sternenseemann
4eb88b29d2
all-cabal-hashes: 2021-07-26T15:54:23Z -> 2021-07-29T16:00:40Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
Additional changes:
* haskellPackages.distribution-nixpkgs: allow 1.6.0
* haskellPackages: regenerate using
`maintainers/scripts/haskell/regenerate-hackage-packages.sh`.
2021-07-30 11:25:05 +02:00
sterni
c3141f24f0
Merge pull request #131591 from NixOS/haskell-updates
...
haskellPackages: update stackage and hackage
2021-07-29 17:50:39 +02:00
github-actions[bot]
62c8cb1826
Merge master into haskell-updates
2021-07-28 00:06:03 +00:00
github-actions[bot]
2692c2e427
Merge master into staging-next
2021-07-27 12:01:20 +00:00
Sandro Jäckel
02732ba0a4
xorg-rgb: format, cleanup
2021-07-27 09:46:18 +02:00
github-actions[bot]
d01381167a
Merge master into staging-next
2021-07-26 18:01:17 +00:00
sternenseemann
7620da89f6
all-cabal-hashes: 2021-07-21T05:42:12Z -> 2021-07-26T15:54:23Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-07-26 18:19:53 +02:00
R. RyanTM
d952953b85
mailcap: 2.1.52 -> 2.1.53
2021-07-24 15:31:35 +02:00
(cdep)illabout
96e6ee3ea9
all-cabal-hashes: 2021-07-17T11:52:29Z -> 2021-07-21T05:42:12Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-07-21 13:55:09 +09:00
github-actions[bot]
8a3580c2f6
Merge master into haskell-updates
2021-07-21 00:05:28 +00:00
github-actions[bot]
3202dd166c
Merge master into staging-next
2021-07-20 12:02:05 +00:00
Felix Buehler
d6f3b3f01a
osinfo-db: deprecate phases
2021-07-20 11:42:18 +02:00
github-actions[bot]
eb0f97ec8f
Merge master into haskell-updates
2021-07-18 00:05:56 +00:00
github-actions[bot]
382fdc7ad3
Merge master into staging-next
2021-07-18 00:01:24 +00:00
Felix Buehler
82cb33a0ae
treewide: remove meta.version
2021-07-18 00:07:38 +02:00
(cdep)illabout
b1aca54121
all-cabal-hashes: 2021-07-17T04:19:10Z -> 2021-07-17T11:52:29Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-07-17 19:31:05 +09:00
github-actions[bot]
ee007cdc35
Merge master into staging-next
2021-07-17 06:01:21 +00:00
(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
