github-actions[bot]
578939f5e2
Merge staging-next into staging
2021-11-20 18:01:43 +00:00
github-actions[bot]
f515d91189
Merge master into staging-next
2021-11-20 18:01:07 +00:00
Domen Kožar
6f8bd3e634
Merge pull request #146771 from risicle/ris-gimp-darwin
...
gimp: fix build on darwin
2021-11-20 18:43:51 +01:00
Alexander Bantyev
9e06375eb2
Merge pull request #146758 from cab404/super-slicer-2-3-57-9
...
super-slicer-staging: 2.3.57.0 -> 2.3.57.6
2021-11-20 20:14:08 +03:00
Guillaume Girol
26fd4a9a48
Merge pull request #145969 from lsix/qgis-3.16.13
...
qgis: 3.6.10 -> 3.6.13
2021-11-20 17:06:08 +00:00
Michael Weiss
be2bc44d0e
Partially revert "chromiumDev: 97.0.4692.20 -> 98.0.4710.4"
...
This partially reverts commit 241c145226
.
It embarrassingly included Signal-Desktop changes/tests that it
shouldn't and I somehow noticed it too late... :o Sorry!
2021-11-20 17:56:27 +01:00
Michael Weiss
10eee6abfa
Merge pull request #146768 from primeos/chromiumDev
...
chromiumDev: 97.0.4692.20 -> 98.0.4710.4
2021-11-20 17:54:28 +01:00
Robert Scott
67c0df93ea
gimp: fix build on darwin
...
despite us currently having a gtk2 without `GDK_OSX_BIGSUR` defined,
gimp have gone and spelt it `GDK_OSX_BIG_SUR` so define this
manually anyway
2021-11-20 16:48:52 +00:00
Michael Weiss
62c3931a11
Merge pull request #146678 from primeos/chromiumBeta
...
chromiumBeta: 96.0.4664.45 -> 97.0.4692.20
2021-11-20 17:24:05 +01:00
Michael Weiss
241c145226
chromiumDev: 97.0.4692.20 -> 98.0.4710.4
2021-11-20 17:23:24 +01:00
Guillaume Girol
3372278ecb
Merge pull request #146129 from gbtb/rocketchat-desktop_wrapGAppsHook
...
rocketchat-desktop: added wrapGAppsHook, 3.5.7 -> 3.6.0
2021-11-20 15:54:47 +00:00
Anderson Torres
9377c08f8a
Merge pull request #146741 from trofi/fix-afterstep-for-binutils-2.36
...
afterstep: fix build on upcoming binutils-2.36
2021-11-20 11:30:33 -03:00
Vladimir Serov
a6eeab7ab7
super-slicer-staging: 2.3.57.0 -> 2.3.57.6
2021-11-20 15:59:05 +03:00
Sergei Trofimovich
5da59495a3
afterstep: fix build on upcoming binutils-2.36
...
Without the change build fails on binutils-2.36 as:
ar clq libAfterBase.a ashash.o ...
ar: libdeps specified more than once
2021-11-20 10:39:25 +00:00
github-actions[bot]
aa83b76836
Merge staging-next into staging
2021-11-20 06:02:02 +00:00
github-actions[bot]
0373476c4a
Merge master into staging-next
2021-11-20 06:01:21 +00:00
figsoda
9a675cdced
joshuto: 0.9.1 -> 0.9.2
2021-11-19 21:01:47 -05:00
Sandro
fae94004b7
Merge pull request #146355 from jkarlson/wezterm
2021-11-20 01:57:54 +01:00
github-actions[bot]
580f371380
Merge staging-next into staging
2021-11-20 00:01:57 +00:00
github-actions[bot]
7495684853
Merge master into staging-next
2021-11-20 00:01:21 +00:00
Marek Mahut
9798a593c6
Merge pull request #146688 from alyssais/catgirl-parallel
...
catgirl: enable parallel building
2021-11-20 00:09:07 +01:00
Vladimír Čunát
83e4222bb6
Merge branch 'staging-next' into staging
2021-11-20 00:06:34 +01:00
arkivm
18e1ae0d99
bcompare: add darwin support ( #141413 )
...
Co-authored-by: Paweł Kruszewski <kruszewsky@gmail.com>
2021-11-19 23:50:53 +01:00
Jonathan Ringer
fadaef5aed
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/networking/browsers/chromium/common.nix
2021-11-19 14:31:57 -08:00
Alyssa Ross
54caa42f9e
catgirl: enable parallel building
...
Tested at -j48.
2021-11-19 21:58:23 +00:00
Michael Weiss
ce224d8643
chromiumBeta: 96.0.4664.45 -> 97.0.4692.20
2021-11-19 22:22:41 +01:00
Michael Weiss
51712daede
Merge pull request #146433 from primeos/ungoogled-chromium
...
ungoogled-chromium: 95.0.4638.69 -> 96.0.4664.45
2021-11-19 22:07:21 +01:00
Sandro
ab9aa0dfeb
Merge pull request #146668 from rittelle/remove-rittelle
2021-11-19 21:56:17 +01:00
Sandro
e476113f29
Merge pull request #145509 from SuperSandro2000/mpv
2021-11-19 21:42:36 +01:00
Alexander Bantyev
5ecebf037f
Merge pull request #146666 from ymatsiuk/fricas
...
fricas: fix build
2021-11-19 23:37:32 +03:00
rittelle
4d8d035c6c
Removed rittelle from the maintainer list
2021-11-19 21:29:09 +01:00
Yurii Matsiuk
29ed2bbe02
fricas: fix build
2021-11-19 21:06:44 +01:00
Evgenia Vaartis
b23e863959
gigedit: use old pangomm version
2021-11-19 21:51:12 +03:00
Jonathan Ringer
7268b1ea83
hybridreverb2: fix eval with expoxy rename
2021-11-19 10:46:18 -08:00
Francesco Zanini
f4cd131e38
roomeqwizard: init at 5.20.4
2021-11-19 19:42:50 +01:00
Robert Schütz
41aaf69b7d
Merge pull request #145585 from dotlambda/mauikit-2.1.0
...
libsForQt5.mauikit: 2.0.2 -> 2.1.0
2021-11-19 10:05:30 -08:00
github-actions[bot]
e9cc89e77e
Merge staging-next into staging
2021-11-19 18:01:56 +00:00
Emil Karlson
b3c72ce7c6
wezterm: Mark build broken for Darwin
...
Linking fails on Darwin with
ld: framework not found UserNotifications
2021-11-19 19:49:33 +02:00
Emil Karlson
d9a85999d0
wezterm: Add perl to deps for Darwin
...
Currently compile fails on Darwin on command
running "perl" "./Configure" "--prefix=/private/tmp/nix-build-wezterm-20210814-124438-54e29167.drv-0/source/target/aarch64-apple-darwin/release/build/openssl-sys-90b3c73e9c998931/out/openssl-build/install" "no-dso" "no-shared" "no-ssl3" "no-unit-test" "no-comp" "no-zlib" "no-zlib-dynamic" "no-md2" "no-rc5" "no-weak-ssl-ciphers" "no-camellia" "no-idea" "no-seed" "darwin64-arm64-cc" "-O2" "-ffunction-sections" "-fdata-sections" "-fPIC"
with
`Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" }'
This commit fixes this issue.
2021-11-19 19:49:18 +02:00
Jonathan Ringer
6ede9cd761
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/audio/hybridreverb2/default.nix
2021-11-19 08:44:33 -08:00
Jichao Ouyang
7cb6bb064a
synology-drive-client: init at 3.0.2 ( #144706 )
2021-11-19 17:16:58 +01:00
Sandro
b95292072f
Merge pull request #144241 from Stunkymonkey/applications-github-1
2021-11-19 17:09:37 +01:00
Sandro
788fceee45
Merge pull request #145754 from eduarrrd/marktext
2021-11-19 17:07:48 +01:00
Sandro
1ca1038ae5
Merge pull request #138103 from misuzu/alfis-update
2021-11-19 17:04:14 +01:00
Sandro
0cfcd37c77
Merge pull request #146509 from fgaz/libresprite/init
2021-11-19 17:00:10 +01:00
ajs124
91ec4e2897
Merge pull request #146559 from trofi/fix-sngrep-for-ncurses-6.3
...
sngrep: pull upstream fix for ncurses-6.3
2021-11-19 16:04:50 +01:00
ajs124
63da4b6e30
Merge pull request #146558 from trofi/fix-profanity-for-ncurses-6.3
...
profanity: pull upstream fixes for ncurses-6.3
2021-11-19 16:01:58 +01:00
Francesco Gazzetta
f3ece9f26c
nixosTests.aseprite: init
2021-11-19 15:09:53 +01:00
Francesco Gazzetta
6ac64dc1c4
libresprite: init at 1.0
2021-11-19 15:09:48 +01:00
Thiago Kenji Okada
64ec2b0383
Merge pull request #146625 from romildo/upd.e16
...
e16: 1.0.23 -> 1.0.24
2021-11-19 11:09:09 -03:00