Commit Graph

1617 Commits

Author SHA1 Message Date
R. RyanTM
46184ba62f poedit: 2.3.1 -> 2.4.1 2020-08-26 08:51:01 +02:00
Mario Rodas
7118d7773a
Merge pull request #96200 from r-ryantm/auto-update/ugrep
ugrep: 2.5.1 -> 2.5.3
2020-08-24 18:30:28 -05:00
R. RyanTM
7c5ecbcde9 vale: 2.3.2 -> 2.3.3 2020-08-24 19:00:32 +00:00
R. RyanTM
a22da2e043 ugrep: 2.5.1 -> 2.5.3 2020-08-24 18:53:30 +00:00
R. RyanTM
9a7318af21 miller: 5.8.0 -> 5.9.0 2020-08-23 06:47:12 +00:00
zowoq
d559c776a1 shfmt: fix failing test on go 1.15 2020-08-21 16:40:30 +10:00
zowoq
473536e3b5 buildRustPackage: remove platform.all from packages 2020-08-16 12:48:18 +10:00
zowoq
a83a88db05 buildGoPackage: remove platform.all from packages 2020-08-15 19:34:47 -07:00
Alvar Penning
0a53c6b565 maintainers: rename geistesk to oxzi
For reasons I have renamed my GitHub account and would like to include
this name change here.
2020-08-15 16:03:46 +02:00
Daniël de Kok
b7295bdf40
Merge pull request #95397 from r-ryantm/auto-update/html-xml-utils
html-xml-utils: 7.8 -> 7.9
2020-08-14 08:25:29 +02:00
R. RyanTM
551147ab22 html-xml-utils: 7.8 -> 7.9 2020-08-14 03:47:36 +00:00
Mario Rodas
3a96f14ee7
Merge pull request #95328 from marsam/update-vale
vale: 2.3.0 -> 2.3.2
2020-08-13 18:15:20 -05:00
Mario Rodas
82f62b2247
vale: 2.3.0 -> 2.3.2 2020-08-13 04:20:00 +00:00
Mario Rodas
0779b6cd14
Merge pull request #98806 from r-ryantm/auto-update/mdbook
mdbook: 0.4.2 -> 0.4.3
2020-10-03 23:27:04 -05:00
Patrick Hilhorst
f7e390e6d4 treewide: fix redirected urls (run 3)
Related:
 - 9fc5e7e473
 - 593e11fd94
 - 508ae42a0f

Since the last time I ran this script, the Repology API changed, so I had to
adapt the script used in the previous PR. The new API should be more robust, so
overall this is a positive (no more grepping the error messages for our relevant
data but just a nice json structure).

Here's the new script I used:

```sh
curl https://repology.org/api/v1/repository/nix_unstable/problems \
   | jq -r '.[] | select(.type == "homepage_permanent_https_redirect") | .data | "s@\(.url)@\(.target)@"' \
   | sort | uniq | tee script.sed
find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```

I will also add this script to `maintainers/scripts`.
2020-10-02 09:01:35 -07:00
Maciej Krüger
946369adbd
spidermonkey: remove spidermonkey_38 -> spidermonkey alias
This removes the spidermonkey alias and renames it in the packages still
using it

Not sure if we need it in aliases.nix since just about nothing depends
on it anymore

Additionally considering removal should be a good choice, it's at least
insecure so it should get tagged as such
2020-10-01 10:00:22 +02:00
R. RyanTM
44f91f0623 mdbook: 0.4.2 -> 0.4.3 2020-09-25 21:44:30 +00:00
Maximilian Bosch
0f1223f8fa
Merge pull request #87916 from DeeUnderscore/highlight-update
highlight: 3.56 -> 3.57
2020-06-15 01:12:06 +02:00
Doron Behar
01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Mario Rodas
fb9ca6431c
Merge pull request #89784 from zowoq/add-maintainer
various packages: add myself as maintainer
2020-06-10 05:45:57 -05:00
Nikolay Korotkiy
c4cd635283
agrep: enable on darwin 2020-06-10 09:36:00 +03:00
Jörg Thalheim
d07a4906e7
Merge pull request #89710 from Kiwi/ocrmypdf-9.8.2 2020-06-08 11:07:53 +01:00
zowoq
794e0f7ca4 shfmt: add maintainer 2020-06-08 13:25:32 +10:00
zowoq
72fb771de9 ripgrep: add maintainer 2020-06-08 13:25:27 +10:00
Ian M. Jones
cf97978909 snippetpixie: 1.3.2 -> 1.3.3 2020-06-07 16:04:45 +02:00
Robert Djubek
96bfdf2843
ocrmypdf: 9.8.0 -> 9.8.2
version bump also fixes build after pikepdf update:
https://github.com/NixOS/nixpkgs/pull/88680
2020-06-07 00:17:28 +00:00
Daiderd Jordan
7b3a2963d1
treewide: replace base64 encoded hashes 2020-06-03 18:35:19 +02:00
David Wood
e9b0f30872
mdcat: 0.17.1 -> 0.18.2 2020-06-01 11:36:14 +01:00
zowoq
b8cc67579d ripgrep: 12.1.0 -> 12.1.1
https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md#1211-2020-05-29
2020-05-29 23:51:21 +10:00
R. RyanTM
c8768ec7ef poedit: 2.3 -> 2.3.1 2020-05-27 12:04:34 -07:00
Ryan Mulligan
b6a8a2b7dd
Merge pull request #88228 from r-ryantm/auto-update/snippetpixie
snippetpixie: 1.3.1 -> 1.3.2
2020-05-26 16:48:38 -07:00
David Wood
76b6bf22e1
mdcat: 0.17.0 -> 0.17.1 2020-05-24 15:28:45 +01:00
David Wood
6c14c6a620
mdcat: 0.16.0 -> 0.17.0
Signed-off-by: David Wood <david@davidtw.co>
2020-05-20 20:33:09 +01:00
R. RyanTM
fbc96272ba snippetpixie: 1.3.1 -> 1.3.2 2020-05-20 01:27:23 +00:00
Mario Rodas
7b35e2dd73
Merge pull request #88140 from xrelkd/update/xurls
xurls: 2.0.0 -> 2.2.0
2020-05-19 08:37:07 -05:00
Maximilian Bosch
f0bc522148
ripgrep-all: 0.9.5 -> 0.9.6
https://github.com/phiresky/ripgrep-all/releases/tag/v0.9.6
2020-05-19 13:16:18 +02:00
xrelkd
b44b4c87e6 xurls: 2.0.0 -> 2.2.0 2020-05-19 12:54:59 +08:00
D Anzorge
05aabc40fa highlight: 3.56 -> 3.57 2020-05-16 03:37:22 +02:00
Colin L Rice
d6162dab50
go-modules: Update files to use vendorSha256 2020-05-14 07:22:21 +01:00
Mario Rodas
8772cee9f9
ripgrep: 12.0.1 -> 12.1.0
Changelog: https://github.com/BurntSushi/ripgrep/releases/tag/12.1.0
2020-05-09 16:20:00 -05:00
chkno
8ff99ba57e
nawk: 20121220 -> 20180827
awk.tar.gz is no longer available from princeton.edu; The One True Awk
is now on GitHub.
2020-05-07 16:01:42 +00:00
Jörg Thalheim
ad1e7cfaeb
Merge pull request #87190 from r-ryantm/auto-update/FanFicFare 2020-05-07 16:59:47 +01:00
R. RyanTM
7c6da82c38 fanficfare: 3.17.0 -> 3.19.0 2020-05-07 13:53:16 +00:00
R. RyanTM
2979b2ac27 ocrmypdf: 9.6.1 -> 9.8.0 2020-05-06 23:13:21 -07:00
Martin Weinelt
e24f5eab66
treewide: add CVE identifiers to patches
This allows tools like broken.sh to correctly identify the patched
status.
2020-05-06 23:18:09 +02:00
Vladimír Čunát
54eb2d1018
Merge branch 'staging-next'
Status on Hydra for linuxes seems good enough:
https://hydra.nixos.org/eval/1585703?filter=linux&compare=1585482&full=#tabs-now-fail
2020-05-06 08:20:05 +02:00
Mario Rodas
f321c58c28
Merge pull request #86920 from filalex77/sd-0.7.5
sd: 0.7.4 -> 0.7.5
2020-05-05 20:13:24 -05:00
Frederik Rietdijk
9875bbae75 Merge master into staging-next 2020-05-05 19:51:09 +02:00
Jörg Thalheim
87b3ad919d
Merge pull request #86958 from r-ryantm/auto-update/LanguageTool 2020-05-05 17:54:24 +01:00
R. RyanTM
3da38dd0e9 languagetool: 4.9 -> 4.9.1 2020-05-05 16:27:26 +00:00
Oleksii Filonenko
d3c814b56b sd: add filalex77 to maintainers 2020-05-05 10:48:46 +00:00
Oleksii Filonenko
65a8e78d99 sd: 0.7.4 -> 0.7.5 2020-05-05 10:46:38 +00:00
R. RyanTM
035393f0f7 colordiff: 1.0.18 -> 1.0.19 2020-05-04 21:20:38 -07:00
zowoq
a7462dfa13 shfmt: 3.1.0 -> 3.1.1
https://github.com/mvdan/sh/releases/tag/v3.1.1
2020-05-05 09:35:55 +10:00
Frederik Rietdijk
00bbfccecf Merge staging into staging-next 2020-05-01 09:28:45 +02:00
Doron Behar
e16494a7db gjo: 1.0.2 -> 1.0.3 2020-05-01 09:24:40 +02:00
Chuck
3fd0b28f55 gawk: 5.0.1 -> 5.1.0 2020-05-01 08:58:16 +02:00
Maximilian Bosch
ee58c7a363
Merge pull request #82982 from cole-h/rust-cleanup
improve robustness of various Rust packages
2020-04-30 02:07:57 +02:00
Mario Rodas
900e433380
sd: 0.7.2 -> 0.7.4 2020-04-23 04:20:00 -05:00
worldofpeace
b4d5dd861b
Merge pull request #84673 from mmilata/qt5-mkDerivation-stdenv
Use qt5's mkDerivation in packages that otherwise crash
2020-04-22 13:39:46 -04:00
Martin Milata
7dce1c5202 glogg: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Elis Hirwing
09d82f63a4 transifex-client: 0.13.6 -> 0.13.9 2020-04-21 19:46:48 +02:00
Mario Rodas
77cb7ad618
Merge pull request #84938 from doronbehar/package-gjo
gjo: init at 1.0.2
2020-04-21 07:25:00 -05:00
AndersonTorres
a2ebba328e rs: init at 20200313 2020-04-14 08:32:11 -03:00
Mario Rodas
71eebe8d27
Merge pull request #85107 from r-ryantm/auto-update/mdcat
mdcat: 0.15.1 -> 0.16.0
2020-04-12 19:06:16 -05:00
R. RyanTM
5face5f523 mdcat: 0.15.1 -> 0.16.0 2020-04-12 23:16:56 +00:00
Cole Helbling
21b5e7d6f6
ripgrep: improve robustness of build 2020-04-12 14:07:31 -07:00
mingchuan
ef1ac8dda2
opencc: 1.0.5 -> 1.0.6 2020-04-13 02:47:14 +08:00
Ryan Mulligan
5709214f80
Merge pull request #85016 from r-ryantm/auto-update/amber
amber: 0.5.3 -> 0.5.4
2020-04-11 15:30:20 -07:00
R. RyanTM
b980e3e4cc amber: 0.5.3 -> 0.5.4 2020-04-11 18:21:27 +00:00
Doron Behar
94c416ccf4 gjo: init at 1.0.2 2020-04-10 23:47:13 +03:00
Benjamin Hipple
85cb04b520
Merge pull request #84847 from r-ryantm/auto-update/highlight
highlight: 3.55 -> 3.56
2020-04-10 14:27:30 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
R. RyanTM
84724715b5 highlight: 3.55 -> 3.56 2020-04-09 20:33:33 +00:00
Tor Hedin Brønner
88607e0e02
Merge pull request #84694 from hedning/gnome-3.36.1
Gnome 3.36.1
2020-04-09 10:37:23 +02:00
Jan Tojnar
f7edae890a
gtranslator: 3.34.0 → 3.36.0
https://ftp.gnome.org/pub/GNOME/sources/gtranslator/3.36/gtranslator-3.36.0.news
2020-04-09 10:24:08 +02:00
Samuel Leathers
72cb7f81fd
Merge pull request #81442 from manveru/bundler-2.1.4
bundler: 1.17.3 -> 2.1.4
2020-04-08 12:44:54 -04:00
Mario Rodas
2011c203c5
ripgrep-all: 0.9.3 -> 0.9.5 (#84714) 2020-04-08 18:00:06 +02:00
zowoq
190f3a6c06 shfmt: set ldflags 2020-04-08 10:59:35 +10:00
zowoq
ed3128fd80 shfmt: 3.0.2 -> 3.1.0
https://github.com/mvdan/sh/releases/tag/v3.1.0
2020-04-07 21:58:10 +10:00
R. RyanTM
205e3655b1 mdbook: 0.3.6 -> 0.3.7 2020-04-06 12:42:30 -07:00
Michael Fellinger
f92600b406
update versions in Gemfile.lock 2020-04-06 15:02:13 +02:00
Vladyslav M
6c36c6e8aa
sd: 0.6.5 -> 0.7.2 2020-04-01 00:30:56 +03:00
David Wood
375cb45232
diffr: 0.1.2 -> 0.1.4 2020-03-31 15:29:26 +01:00
R. RyanTM
589fa50df7 fanficfare: 3.16.0 -> 3.17.0 2020-03-30 22:26:35 -07:00
Ryan Mulligan
8a095e1097
Merge pull request #83834 from r-ryantm/auto-update/MarkdownPP
markdown-pp: 1.4 -> 1.5.1
2020-03-30 22:15:54 -07:00
R. RyanTM
294d2d703b markdown-pp: 1.4 -> 1.5.1 2020-03-31 03:33:09 +00:00
Dmitry Kalinkin
76b1875a40
Merge pull request #77777 from KoviRobi/rosie-init-at-unstable-2020-01-11
Rosie init at unstable 2020-01-11
2020-03-30 15:34:51 -04:00
Peter Hoeg
639041e0f3
Merge pull request #83723 from r-ryantm/auto-update/kdiff3
kdiff3: 1.8.1 -> 1.8.2
2020-03-30 20:24:10 +08:00
zowoq
6d4749dede ripgrep: 12.0.0 -> 12.0.1
https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md#1201-2020-03-29
2020-03-30 09:11:31 +10:00
R. RyanTM
c27b5de084 kdiff3: 1.8.1 -> 1.8.2 2020-03-29 22:56:16 +00:00
R. RyanTM
250b9c68bb languagetool: 4.8 -> 4.9 2020-03-27 04:20:20 +00:00
R. RyanTM
9280913df4 mdbook: 0.3.5 -> 0.3.6 2020-03-20 23:38:32 -07:00
Mario Rodas
535665d64f
Merge pull request #82931 from r-ryantm/auto-update/miller
miller: 5.6.2 -> 5.7.0
2020-03-19 18:57:04 -05:00
R. RyanTM
85d9b5b083 miller: 5.6.2 -> 5.7.0 2020-03-19 10:01:16 +00:00
zowoq
ca0050e806 ripgrep: 11.0.2 -> 12.0.0
https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md#1200-2020-03-15
2020-03-16 12:07:49 +10:00
Jörg Thalheim
0fe49d7051
Merge pull request #82114 from bhipple/remove/staccato
staccato: remove broken and unmaintained package
2020-03-15 18:19:39 +00:00
R. RyanTM
e04b6ecc64 ocrmypdf: 9.6.0 -> 9.6.1 2020-03-09 19:16:29 +01:00
Benjamin Hipple
ca015df0c3 staccato: remove broken and unmaintained package
This package was added in 2017, then never updated, and no longer builds.
While upstream does have a newer release at version 0.1.9, this doesn't build
with the latest rustc either, and was last released in 2018:
https://github.com/tshlabs/staccato/releases

Since the upstream package just has 1 contributor, and the package in Nix has no
maintainer and is not building or updated, let's just delete it.
2020-03-08 23:19:51 -04:00
Ryan Mulligan
aa7634d817
Merge pull request #81766 from r-ryantm/auto-update/FanFicFare
fanficfare: 3.15.0 -> 3.16.0
2020-03-05 07:56:25 -08:00
R. RyanTM
ebd985439f link-grammar: 5.7.0 -> 5.8.0 2020-03-05 08:05:02 +00:00
R. RyanTM
983a77a46c fanficfare: 3.15.0 -> 3.16.0 2020-03-04 22:17:43 +00:00
worldofpeace
1bb8a2baaf
Merge pull request #81554 from ianmjones/snippetpixie-update-1.3.1
snippetpixie: 1.2.2 -> 1.3.1
2020-03-03 19:19:27 +00:00
Ian M. Jones
017926a8b3 snippetpixie: 1.2.2 -> 1.3.1 2020-03-03 09:24:32 +00:00
Jan Tojnar
9555834399
netpbm: split into multiple outputs 2020-03-01 15:13:03 +01:00
Benjamin Hipple
af3093420a diffr: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-27 21:31:11 -05:00
Dmitry Bogatov
90a4f2d9ba
vale: install styles provided by upstream 2020-02-25 21:33:10 -05:00
Dmitry Bogatov
589fb6b374
vale: install documentation into $doc output 2020-02-25 20:33:33 -05:00
Dmitry Bogatov
aeb3a34a91
vale: 2.0.0 -> 2.2.2
Switch from buildGoPackage to buildGoModule

According to documentation, buildGoPackage is designed for legacy Go
packages which do not support go.mod, while "vale" do support it.
2020-02-25 20:23:38 -05:00
Oleksii Filonenko
4086a3a665
Merge pull request #94554 from r-ryantm/auto-update/sd
sd: 0.7.5 -> 0.7.6
2020-08-02 17:11:38 +03:00
R. RyanTM
93c6502c89 sd: 0.7.5 -> 0.7.6 2020-08-02 13:17:57 +00:00
R. RyanTM
55edd1e7d3 mdbook: 0.4.0 -> 0.4.1 2020-08-02 06:20:58 +00:00
zowoq
d4879a6962
shfmt: 3.0.1 -> 3.0.2 (#80842)
https://github.com/mvdan/sh/releases/tag/v3.0.2
2020-02-22 21:22:25 -10:00
R. RyanTM
2ce41a54ac ocrmypdf: 9.5.0 -> 9.6.0 2020-02-20 15:04:21 +00:00
Mario Rodas
bd9a0f022e vale: 1.7.1 -> 2.0.0
Changelog: https://github.com/errata-ai/vale/releases/tag/v2.0.0
2020-02-19 15:39:43 +01:00
Benjamin Hipple
4b212b91af mdbook: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
2020-02-17 23:23:37 -08:00
Vladyslav M
b92d2ce3a1
Merge pull request #80314 from bhipple/u/rust-cargo-xsv
xsv: upgrade cargo fetcher and cargoSha256
2020-02-17 20:55:51 +02:00
Maximilian Bosch
d880e848a7
Merge pull request #80303 from bhipple/u/rust-cargo-coloursum
coloursum: upgrade cargo fetcher and cargoSha256
2020-02-17 16:54:12 +01:00
Mario Rodas
05d0609cc3
Merge pull request #80308 from bhipple/u/rust-cargo-amber
amber: upgrade cargo fetcher and cargoSha256
2020-02-17 08:48:54 -05:00
Mario Rodas
c7fc4c0d9f
Merge pull request #80312 from bhipple/u/rust-cargo-sd
sd: upgrade cargo fetcher and cargoSha256
2020-02-17 08:46:07 -05:00
Benjamin Hipple
0504571874 xsv: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
2020-02-16 16:57:54 -05:00
Benjamin Hipple
8f818022a6 sd: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
2020-02-16 16:54:39 -05:00
Benjamin Hipple
c917e7cbc6 amber: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
2020-02-16 16:48:38 -05:00
Benjamin Hipple
f4195e6a6b ruplacer: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
2020-02-16 16:45:14 -05:00
Benjamin Hipple
5eeaac4433 coloursum: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
2020-02-16 16:40:31 -05:00
David Wood
29d2b6385f mdcat: 0.15.0 -> 0.15.1 2020-02-16 08:24:42 -08:00
Benjamin Hipple
edee7deaf4 ripgrep-all: upgrade cargo fetcher implementation and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-15 15:46:56 -05:00
Daniel Schaefer
00b25167ad
Merge pull request #79588 from r-ryantm/auto-update/poedit
poedit: 2.2.4 -> 2.3
2020-02-15 21:41:54 +01:00
Benjamin Hipple
9131efe52d tree-sitter: 0.15.7 -> 0.16.4
Includes some bugfixes/cleanups to the scripts and packaging, a run of the
updater, a bump of the version, an upgrade to the newer cargo fetcher in #79975,
and gets the web assembly portion to compile successfully.

Fixes #75863
2020-02-15 00:33:54 -05:00
Benjamin Hipple
eb11feaa0b treewide: change fetchCargoTarball default to opt-out
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
2020-02-13 22:41:37 -08:00
Dmitry Kalinkin
ac2699fdca
Merge pull request #79570 from sikmir/opencc
opencc: enable on darwin
2020-02-12 18:41:31 -05:00
R. RyanTM
ef38093b13 mawk: 1.3.4-20200106 -> 1.3.4-20200120 2020-02-12 15:42:02 +01:00
Guillaume Maudoux
529948c302
gist: 5.0.0 -> 5.1.0 (#79838) 2020-02-11 21:35:01 +01:00
R. RyanTM
84506b6c18 unoconv: 0.8.2 -> 0.9.0 2020-02-10 23:11:30 +01:00
Frederik Rietdijk
cffec212dc Merge staging into staging-next 2020-02-09 16:38:32 +01:00
R. RyanTM
7977bb1cf1 highlight: 3.54 -> 3.55 2020-02-09 09:46:21 +01:00
R. RyanTM
b6cd45699a poedit: 2.2.4 -> 2.3 2020-02-09 05:14:01 +00:00
Nikolay Korotkiy
5c8356105c
opencc: enable on darwin 2020-02-09 01:17:30 +03:00
Will Dietz
b2b5e087de gnugrep: 3.3 -> 3.4
https://savannah.gnu.org/forum/forum.php?forum_id=9640
2020-02-06 20:27:42 +01:00
Frederik Rietdijk
76a439239e Merge master into staging-next 2020-02-05 10:28:52 +01:00
Bjørn Forsman
f16019c58f opencc: fix build
LD_LIBRARY_PATH isn't expanded properly in makeFlags, so move it to
preBuild.

Fixes: 3cd8ce3bce ("treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH")
2020-02-03 16:49:41 +01:00
Frederik Rietdijk
c195ef6aab
Merge pull request #78928 from NixOS/staging-next
Staging next
2020-02-02 15:35:18 +01:00
Frederik Rietdijk
e4c28f78e7 Merge staging-next into staging 2020-02-02 15:33:13 +01:00
worldofpeace
356e228e74
Merge pull request #78799 from chkno/gnupatch-patches-in-tree
gnupatch: Don't fetch from cgit URLs with unstable hashes
2020-01-31 17:36:45 -05:00
R. RyanTM
ac1b7a2528 ansifilter: 2.15 -> 2.16 2020-01-31 16:55:09 +00:00
Frederik Rietdijk
5cc0468a20 Merge staging into staging-next 2020-01-31 00:16:31 +01:00
Chuck
2327204ad0 gnupatch: Don't fetch from cgit URLs with unstable hashes
cgit cannot serve patches with stable hashes, so store these patches
in-tree.  cgit community discussion about this problem:
https://lists.zx2c4.com/pipermail/cgit/2017-February/003470.html

We pull the patches in-tree rather than strip cgit footers with fetchpatch
because per https://github.com/NixOS/nixpkgs/pull/61471#issuecomment-493218587
dependencies of fetchpatch cannot use fetchpatch.

Verification that the only difference between the live page, the
patch committed here, and the version cached under the old hash at
tarballs.nixos.org is the cgit version footer:

$ curl -s -L http://tarballs.nixos.org/sha256/"$(nix-hash --type sha256 --to-base16 0iw0lk0yhnhvfjzal48ij6zdr92mgb84jq7fwryy1hdhi47hhq64)" > Allow_input_files_to_be_missing_for_ed-style_patches.patch
$ diff -U0 --label cgit-live <( curl -s -L https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1 ) Allow_input_files_to_be_missing_for_ed-style_patches.patch
--- cgit-live
+++ Allow_input_files_to_be_missing_for_ed-style_patches.patch  2020-01-29 17:22:00.077312937 -0800
@@ -32 +32 @@
-cgit v1.2.1
+cgit v1.0-41-gc330

$ curl -s -L http://tarballs.nixos.org/sha256/"$(nix-hash --type sha256 --to-base16 1bpy16n3hm5nv9xkrn6c4wglzsdzj3ss1biq16w9kfv48p4hx2vg)" > CVE-2018-1000156.patch
$ diff -U0 --label cgit-live <( curl -s -L https://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d ) CVE-2018-1000156.patch
--- cgit-live
+++ CVE-2018-1000156.patch      2020-01-29 17:23:41.021116969 -0800
@@ -210 +210 @@
-cgit v1.2.1
+cgit v1.0-41-gc330
2020-01-30 14:23:33 -08:00
Vladimír Čunát
b47ec9a6b3
Merge #75437: kramdown-rfc2629: init at 1.2.13
I left it open much longer than planned.  Re-tested it creates html.
2020-01-28 14:12:26 +01:00
Frederik Rietdijk
cdff57e1fc Merge staging-next into staging 2020-01-28 10:48:36 +01:00
Frederik Rietdijk
dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00