Commit graph

29274 commits

Author SHA1 Message Date
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 4bd836b381
Merge branch 'master' into staging-next 2020-10-25 09:46:04 +01:00
R. RyanTM 961aebb1c8 clex: 4.6.patch9 -> 4.6.patch10 2020-10-25 09:43:45 +01:00
R. RyanTM 87b4e22f0f ckbcomp: 1.196 -> 1.197 2020-10-25 09:43:14 +01:00
R. RyanTM 9baf29e382 cksfv: 1.3.14 -> 1.3.15 2020-10-25 09:42:54 +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
R. RyanTM c88f981f80 tpm2-abrmd: 2.3.2 -> 2.3.3 2020-10-25 09:40:35 +01:00
R. RyanTM 2dd05b3d2f wpgtk: 6.1.0 -> 6.1.3 2020-10-25 09:34:43 +01:00
Vladimír Čunát 17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Bjørn Forsman 7ad5e816fa basex: fix build
An unmatched double quote in installPhase broke the build in the last update.
Fix it.

Reported by @solson (thanks!).

Fixes: 21b9c04a2c ("basex: 8.6.6 -> 9.4.3")
2020-10-25 08:12:25 +01:00
Vladimír Čunát 803ca85c20
coreutils: fix aarch64 build by upstream patch
https://hydra.nixos.org/build/128781441
We can't use fetchpatch here, unfortunately.
2020-10-25 08:07:15 +01:00
R. RyanTM 2948121261 auctex: 12.2 -> 12.3 2020-10-24 23:17:49 -07:00
Silvan Mosberger 605b1ecb0c
Merge pull request #101603 from r-ryantm/auto-update/pdd
pdd: 1.4 -> 1.5
2020-10-25 05:10:17 +01:00
r-burns 4e88622ac9
bacula: fix build on darwin (#101526) 2020-10-25 00:04:37 -04:00
Benjamin Hipple d895524ae8
Merge pull request #101419 from SuperSandro2000/bdsync-0.11.2
bdsync: 0.11.1 -> 0.11.2
2020-10-24 23:06:05 -04:00
Benjamin Hipple 13046ed34d
Merge pull request #101545 from SuperSandro2000/kindlegen-broken
kindlegen: mark broken due to download removal
2020-10-24 22:58:24 -04:00
Andreas Rammhold 6cf1c3aea6
Merge pull request #101605 from r-ryantm/auto-update/zfs-replicate
zfs-replicate: 1.1.14 -> 1.2.3
2020-10-25 02:44:59 +02:00
Andreas Rammhold 250fb4611f
Merge pull request #100456 from maralorn/boolToString
treewide: De-inline uses of lib.boolToString
2020-10-25 00:45:11 +02:00
R. RyanTM 62f2bbc941 zfs-replicate: 1.1.14 -> 1.2.3 2020-10-24 22:43:36 +00:00
R. RyanTM 7f7a303106 pdd: 1.4 -> 1.5 2020-10-24 22:03:25 +00:00
Ryan Mulligan 61f857abaa
Merge pull request #101587 from r-ryantm/auto-update/croc
croc: 8.5.1 -> 8.5.2
2020-10-24 13:32:11 -07:00
R. RyanTM 668f38cb75 croc: 8.5.1 -> 8.5.2 2020-10-24 19:23:01 +00:00
Daniël de Kok a6135dd3cf
Merge pull request #101449 from wedens/radeon-profile-1
radeon-profile: 20190903 -> 20200824
2020-10-24 20:41:42 +02:00
Maximilian Bosch 4a4015a6d2
Merge pull request #101558 from r-ryantm/auto-update/dos2unix
dos2unix: 7.4.1 -> 7.4.2
2020-10-24 18:20:36 +02:00
R. RyanTM 6d3efc39fa dos2unix: 7.4.1 -> 7.4.2 2020-10-24 14:27:14 +00:00
Ryan Mulligan 59e6270050
Merge pull request #100941 from r-ryantm/auto-update/gammy
gammy: 0.9.58a -> 0.9.59
2020-10-24 06:18:45 -07:00
Lassulus 303e7d6ef4
Merge pull request #99551 from makefu/pkgs/bento4/update
bento4: 1.5.1-629 -> 1.6.0-637
2020-10-24 14:44:49 +02:00
Sandro Jäckel 76e1cda6c6
kindlegen: mark broken due to download removal 2020-10-24 13:36:39 +02:00
Bjørn Forsman 3d4e133e77 parallel: fix calculation of max line length
parallel >= 20200822 uses /bin/echo to calculate the max allowed line
length. Patch it to a correct path, so that it doesn't (silently) fail
and fall back to a low value of 324.

Before:
  $ parallel --max-line-length-allowed
  324

After:
  $ parallel --max-line-length-allowed
  131063

Fixes: 16ca8725ff ("parallel: 20200722 -> 20200822")
2020-10-24 09:55:06 +02:00
Jan Tojnar c252654584
Merge branch 'master' into staging-next 2020-10-24 01:10:07 +02:00
Doron Behar c90450014f
Merge pull request #101480 from Flakebi/salt 2020-10-24 01:31:41 +03:00
Doron Behar 70e351ea34
Merge pull request #101478 from doronbehar/pkg/tectonic 2020-10-24 00:52:08 +03:00
Ryan Mulligan 921fd8c807
Merge pull request #101392 from r-ryantm/auto-update/cargo-release
cargo-release: 0.13.5 -> 0.13.8
2020-10-23 14:26:13 -07:00
zimbatm ae66cd924c
direnv: 2.23.0 -> 2.23.1 (#101487) 2020-10-23 21:39:29 +02:00
Flakebi a0d8dd8320
salt: 3001.1 -> 3002 2020-10-23 19:48:48 +02:00
Flakebi e0ea4826f4
salt: remove aneeshusa and add Flakebi as maintainer 2020-10-23 19:48:48 +02:00
Ryan Mulligan 3c96aceb3c
Merge pull request #101465 from ryantm/sonar-scanner-cli
sonar-scanner-bin: rename to sonar-scanner-cli, 3.3.0.1492 -> 4.5.0.2216
2020-10-23 09:59:59 -07:00
Vladyslav M 59749cb1b6
Merge pull request #101177 from dywedir/skim
skim: 0.8.2 -> 0.9.1, use fetchCrate
2020-10-23 19:49:32 +03:00
Doron Behar bfb892ef11 tectonic: 0.1.17 -> 0.2.0 2020-10-23 19:39:41 +03:00
Ryan Mulligan 77fe740a5b sonar-scanner-bin: rename to sonar-scanner-cli, 3.3.0.1492 -> 4.5.0.2216
also fix up meta info
2020-10-23 06:30:32 -07:00
Ryan Mulligan e3ac67d42e
Merge pull request #55558 from ghost/sonar-scanner
sonar-scanner-bin: init at 3.3.0.1492
2020-10-23 06:21:41 -07:00
Andreas Rammhold 5506c40150
Merge pull request #101091 from mweinelt/fastd
fastd: 19 -> 21
2020-10-23 15:15:01 +02:00
wedens 0c8ede6446 radeon-profile: 20190903 -> 20200824 2020-10-23 16:32:58 +07:00
Jörg Thalheim 630f19b3ef
Merge pull request #99576 from makefu/pkgs/mergerfs/update
mergerfs: 2.28.3 -> 2.31.0
2020-10-23 09:05:41 +02:00
Dmitry Kalinkin e05f484129
Merge pull request #101016 from veprbl/pr/texlive_post2020_cleanup
texlive: minor cleanups
2020-10-22 20:04:01 -04:00
Ryan Mulligan fbd0264277
Merge pull request #101366 from r-ryantm/auto-update/bpytop
bpytop: 1.0.42 -> 1.0.44
2020-10-22 16:43:33 -07:00
Sandro Jäckel 6dcc6f05b6
bdsync: 0.11.1 -> 0.11.2 2020-10-22 23:57:05 +02:00
Jan Tojnar 3e01d383ee
Merge branch 'staging-next' into staging 2020-10-22 21:20:32 +02:00
Jan Tojnar d13fc932cd
Merge branch 'master' into staging-next 2020-10-22 21:20:14 +02:00
Daniël de Kok 26d0e6bc55
Merge pull request #101290 from r-ryantm/auto-update/1password
_1password-gui: 0.8.10 -> 0.9.0
2020-10-22 20:45:25 +02:00