Commit Graph

48336 Commits

Author SHA1 Message Date
Vladimír Čunát
0b32140b34
Merge branch 'staging-next' into staging 2020-10-28 18:48:56 +01:00
Vladimír Čunát
31839c352e
Merge branch 'master' into staging-next 2020-10-28 18:48:18 +01:00
StigP
4512dac960
Merge pull request #99444 from etu/aldo-upgrade
aldo: 0.7.7 -> 0.7.8
2020-10-28 13:23:42 +00:00
Anderson Torres
c3feda093d
Merge pull request #101569 from AndersonTorres/megafix
Fixing some URLs
2020-10-28 10:15:26 -03:00
Niklas Hambüchen
c06f86d591
Merge pull request #101879 from sikmir/cloudcompare
cloudcompare: 2.11.0 → 2.11.2
2020-10-28 13:43:31 +01:00
Nikolay Korotkiy
59645d2e42 cloudcompare: 2.11.0 → 2.11.2 2020-10-28 13:24:55 +01:00
Mario Rodas
023ff35f38
Merge pull request #101746 from oyren/update-portfolio
portfolio: 0.48.1 -> 0.49.0
2020-10-28 06:18:01 -05:00
Mario Rodas
5b4331e2c9
Merge pull request #99949 from marsam/update-micro
micro: 2.0.7 -> 2.0.8
2020-10-28 05:22:00 -05:00
Frederik Rietdijk
1489c07cb7 teams: work around screen sharing bug 2020-10-28 09:39:16 +01:00
Andreas Rammhold
db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
Mario Rodas
9fce5c704a
Merge pull request #101779 from dbirks/update-helm
kubernetes-helm: 3.3.4 -> 3.4.0
2020-10-27 19:27:24 -05:00
Mario Rodas
9952b7b244
Merge pull request #101818 from marsam/update-rclone
rclone: 1.53.1 -> 1.53.2
2020-10-27 18:57:47 -05:00
hyperfekt
22ac8b79b0 nym: 0.7.0 -> 0.8.1
The tests requiring network access are no longer called by the root
package.
2020-10-27 22:01:58 +01:00
Nicolas Martin
e129f41522 glow: 1.0.2 -> 1.1.0 2020-10-27 21:58:00 +01:00
WORLDofPEACE
f2d8aebe8e
Merge pull request #101493 from Magicloud/vbox6116
virtualbox: 6.1.14 -> 6.1.16
2020-10-27 12:37:16 -04:00
Ben Siraphob
db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
zowoq
f2eb36b889 gitAndTools.gh: 1.1.0 -> 1.2.0
https://github.com/cli/cli/releases/tag/v1.2.0
2020-10-28 00:38:12 +10:00
Martin Weinelt
91e28cfbcf
Merge pull request #101752 from petabyteboy/feature/docker-19-03-13
docker: 19.03.12 -> 19.03.13
2020-10-27 15:32:37 +01:00
Mario Rodas
2b0260f4bc
Merge pull request #101757 from magnetophon/geonkick
geonkick: 2.3.8 -> 2.4.0
2020-10-27 06:51:53 -05:00
Milan Pässler
0dc4ced3eb docker: 19.03.12 -> 19.03.13
Added libseccomp and pkgconfig inputs to containerd, because 1.3.x requires them.
However containerd 1.2.x and 1.4.x do not.
2020-10-27 12:48:51 +01:00
Mario Rodas
090f2cdf76
Merge pull request #101659 from r-ryantm/auto-update/helmfile
helmfile: 0.131.0 -> 0.132.1
2020-10-27 06:44:29 -05:00
Mario Rodas
c9494fc911
Merge pull request #101656 from r-ryantm/auto-update/gomuks
gomuks: 0.2.0 -> 0.2.1
2020-10-27 06:43:52 -05:00
Mario Rodas
2e64eb507d
Merge pull request #101819 from marsam/update-ncspot
ncspot: 0.2.3 -> 0.2.4
2020-10-27 06:33:07 -05:00
Timo Kaufmann
39e62d5d6e
Merge pull request #101793 from omasanori/maxima/remove-5.41
maxima: remove 5.41.0
2020-10-27 09:46:35 +01:00
R. RyanTM
3ff7bf9166 gqrx: 2.13 -> 2.13.2 2020-10-27 08:55:38 +01:00
Lassulus
4c5ff0a412
Merge pull request #101804 from nyanloutre/ledger_update
electron-cash: 4.1.1 -> 4.2.0
2020-10-27 08:00:23 +01:00
Mario Rodas
228cad0521
Merge pull request #101775 from magnetophon/wmfocus
wmfocus: 1.1.3 -> 1.1.5
2020-10-27 00:33:27 -05:00
Mario Rodas
8deec83113 ncspot: 0.2.3 -> 0.2.4
https://github.com/hrkfdn/ncspot/releases/tag/v0.2.4
2020-10-27 00:00:00 +00:00
nyanloutre
765b7f33ea
electron-cash: 4.1.1 -> 4.2.0 2020-10-27 00:06:52 +01:00
Max Hausch
a8d35dc10d
ssw 0.3 -> 0.6 2020-10-26 23:57:03 +01:00
Masanori Ogino
40fb3ed6dc maxima: remove 5.41.0
It had been kept for SageMath, but it uses the default version nowadays
and this version is not referenced in nixpkgs.

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2020-10-27 06:09:12 +09:00
Samuel Dionne-Riel
9119d715dc
Merge pull request #101204 from samueldr/fix/rsync-cross-compilation-regression
rsync: Work around upstream cross-compilation issue
2020-10-26 15:05:10 -04:00
Ryan Mulligan
bcbb5833a0
Merge pull request #101708 from r-ryantm/auto-update/nwg-launchers
nwg-launchers: 0.3.3 -> 0.4.0
2020-10-26 11:29:58 -07:00
David Birks
a091ac564f
kubernetes-helm: 3.3.4 -> 3.4.0 2020-10-26 13:23:53 -04:00
lewo
a7a1447e5d
Merge pull request #100985 from devhell/mediainfo-20.09
mediainfo{-gui}: 20.08 -> 20.09
2020-10-26 17:26:25 +01:00
devhell
8a4edf9087 {lib}mediainfo{-gui}: 20.08 -> 20.09
This release includes a fix for https://github.com/NixOS/nixpkgs/issues/92874
2020-10-26 15:57:08 +00:00
Maximilian Bosch
61fa498994
Merge pull request #101646 from luc65r/pkg/rofi-calc
rofi-calc: 1.8 -> 1.9
2020-10-26 16:36:43 +01:00
Bart Brouns
6d10913002 wmfocus: 1.1.3 -> 1.1.5 2020-10-26 16:35:11 +01:00
Maximilian Bosch
7898c75e7c
Merge pull request #101730 from lovek323/idea-2020.2.3
idea: 2020.2.2 -> 2020.2.3
2020-10-26 16:33:27 +01:00
Bart Brouns
f4b9950537 geonkick: 2.3.8 -> 2.4.0 2020-10-26 15:32:36 +01:00
Anderson Torres
ac08a3973c
Merge pull request #100536 from AndersonTorres/corectrl
corectrl: init at 1.1.1
2020-10-26 10:34:12 -03:00
Ryan Mulligan
f861aae44c
Merge pull request #101719 from r-ryantm/auto-update/opentx
opentx: 2.3.9 -> 2.3.10
2020-10-26 05:48:17 -07:00
Ryan Mulligan
4fce633319
Merge pull request #101716 from r-ryantm/auto-update/openhantek6022
openhantek6022: 3.1.2 -> 3.1.3
2020-10-26 05:43:38 -07:00
Ryan Mulligan
3ea0a61e08
Merge pull request #101711 from r-ryantm/auto-update/obsidian
obsidian: 0.9.1 -> 0.9.4
2020-10-26 05:42:04 -07:00
Alexey Shmalko
a3368f0eea
Merge pull request #101348 from cab404/super-slicer-2-2-54-1
super-slicer: 2.2.54.0 -> 2.2.54.1
2020-10-26 12:44:28 +02:00
Moritz Scheuren
8a26bfb4a1 portfolio: 0.48.1 -> 0.49.0 2020-10-26 11:08:17 +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
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
Vincent Laporte
a2b7bad6c8 ocamlPackages.google-drive-ocamlfuse: 0.7.21 → 0.7.22 2020-10-26 06:09:43 +01:00
AndersonTorres
fefda2dd98 bombono: update expression
- New github page
- Update license
- Update homepage
2020-10-26 01:20:50 -03:00