Commit graph

12946 commits

Author SHA1 Message Date
Sandro 17452e28e4
Merge pull request #155034 from sikmir/far2l 2022-01-20 01:50:57 +01:00
github-actions[bot] b74b591fbe
Merge master into staging-next 2022-01-20 00:01:46 +00:00
Anderson Torres a97ae545f3
Merge pull request #155048 from mweinelt/python2-must-die
gnome2.vte: drop with all reverse dependencies
2022-01-19 19:24:20 -03:00
Wout Mertens 5c89b03700
Merge pull request #155231 from gador/pgadmin3-fix
pgadmin: fix build
2022-01-19 22:24:08 +01:00
Luke Granger-Brown dd51718e70
Merge pull request #155243 from lukegb/waybar
waybar: 0.9.8 -> 0.9.9
2022-01-19 19:59:30 +00:00
R. Ryantm 60d76ea50b topydo: 0.13 -> 0.14 2022-01-19 15:27:12 +00:00
Martin Weinelt fb7eb9e80c
grip: trim dependencies
Uses much less dependencies than we were giving it these days.
2022-01-19 13:45:06 +01:00
github-actions[bot] 28abf69ffd
Merge master into staging-next 2022-01-19 12:01:24 +00:00
Sandro 9693f55366
Merge pull request #136513 from j0hax/octolapse 2022-01-19 12:12:24 +01:00
Sandro 2ff2c9595d
Merge pull request #155539 from vs49688/notame 2022-01-19 12:02:16 +01:00
R. Ryantm 280ebc81a7 nwg-wrapper: 0.1.0 -> 0.1.2 2022-01-19 06:33:41 +00:00
R. Ryantm f1e3f2ebef xplr: 0.15.2 -> 0.17.1 2022-01-19 06:24:34 +00:00
github-actions[bot] 1b54e5bb50
Merge master into staging-next 2022-01-19 06:01:24 +00:00
Philipp Woelfel 61d6c0e234
Update pkgs/applications/misc/pdfstudioviewer/default.nix
Co-authored-by: Nikolay Korotkiy <sikmir@disroot.org>
2022-01-18 21:22:37 -07:00
Philipp Woelfel cbee72024c file formatting 2022-01-18 21:16:17 -07:00
Philipp Woelfel 9ae0c9a972 Implemented reviewer suggestions 2022-01-18 21:11:32 -07:00
Bobby Rong a9a141ec08
Merge pull request #155449 from bobby285271/minder
minder: 1.13.1 -> 1.14.0
2022-01-19 10:44:37 +08:00
Zane van Iperen 3c457c542d
airtame: remove
The download has been broken for eons, and the latest
version (4.1.1) has switched to Snap instead of a tarball.

Considering the fact that it hasn't been updated and no one's
complained, I'd say this is ripe for removal.
2022-01-19 11:21:27 +10:00
Johannes Arnold 2fe87635b5 python3Packages.file_read_backwards: init at 2.0.0 2022-01-18 20:54:00 +01:00
Johannes Arnold a85dc0c5a0 octoprint.python.pkgs.octolapse: init at 0.4.1 2022-01-18 20:51:55 +01:00
github-actions[bot] 1b0315af15
Merge master into staging-next 2022-01-18 18:01:04 +00:00
Sandro 30cc7340f5
Merge pull request #143401 from WolfangAukang/pomotroid 2022-01-18 15:54:25 +01:00
Philipp Woelfel 05ad6b0a11
Update pkgs/applications/misc/pdfstudioviewer/default.nix
Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com>
2022-01-18 00:50:18 -07:00
Philipp Woelfel 6114ed4314
Update pkgs/applications/misc/pdfstudioviewer/default.nix
Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com>
2022-01-18 00:50:06 -07:00
Philipp Woelfel e14cabc709
Update pkgs/applications/misc/pdfstudioviewer/default.nix
Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com>
2022-01-18 00:49:45 -07:00
Bobby Rong 6e22314d38
minder: 1.13.1 -> 1.14.0 2022-01-18 14:51:59 +08:00
Frederik Rietdijk 4d125692e5 Merge master into staging-next 2022-01-17 16:10:06 +01:00
Bobby Rong bd05750ca6
Merge pull request #155111 from wentasah/amc-fix-texinputs
auto-multiple-choice: Fix TEXINPUTS
2022-01-17 21:24:45 +08:00
github-actions[bot] 0eee7ee8c8
Merge master into staging-next 2022-01-17 12:01:25 +00:00
Sandro 44e6704c37
Merge pull request #150169 from bew/init-rofi-wayland 2022-01-17 10:53:33 +01:00
Luke Granger-Brown eda3747c9f waybar: add catch2 dep, required for running tests 2022-01-16 19:08:13 +00:00
Robert Schütz d5cceedbd1 python,pythonPackages: make aliases
Since aliases are disallowed in nixpkgs, this makes usage of Python 2
which is EOL more explicit.
2022-01-16 18:39:59 +00:00
github-actions[bot] d1d6f982a8
Merge master into staging-next 2022-01-16 18:00:59 +00:00
Sergei Trofimovich 641a7dedef artha: 1.0.3 -> 1.0.5
Among other things fixes build against -fno-common toolchains
like clang-12:

    $ nix build --impure --expr 'with import ./.{}; artha.override { stdenv = clang12Stdenv; }' -L
    ...
    artha> ld: gui.o:/build/artha-1.0.3/src/./mod_notify.h:37:
      multiple definition of `notify_uninit';
        mod_notify.o:/build/artha-1.0.3/src/./mod_notify.h:37: first defined here
2022-01-16 17:12:35 +00:00
legendofmiracles f4decd21e1
Merge pull request #152918 from hqurve/cubiomes 2022-01-16 10:31:01 -06:00
Luke Granger-Brown 41ec26879a waybar: 0.9.8 -> 0.9.9 2022-01-16 15:37:36 +00:00
florian on nixos (Florian Brandes) b9979ae503
pgadmin: fix build
add a compiler flag to ignore narrowing errors
2022-01-16 16:30:05 +01:00
hqurve 66370f4f12 cubiomes-viewer: init at 1.12.1 2022-01-16 11:20:30 -04:00
Michal Sojka 960ef9fe03 auto-multiple-choice: add OpenOfficeOODoc as dependency
Without this, AMC cannot export the results to OpenOffice. When one
presses "Reports->OpenOffice->Export", a dialog appears saying that
OpenOffice::OODoc perl module is not installed.

We switch to using makeFullPerlPath to make dependencies of
OpenOfficeOODoc also available. Without this, export complains about
missing XMLTwig.
2022-01-16 16:06:47 +01:00
github-actions[bot] 0173b359a6
Merge master into staging-next 2022-01-16 12:01:11 +00:00
kraem f2c9cb2bd8 rivercarro: init at 0.1.1 2022-01-16 11:35:25 +01:00
Frederik Rietdijk ae18d68b6b python2.pkgs: move expressions into python2-modules/ folder
Another step in further separating python2 from python3.
2022-01-16 10:00:16 +01:00
github-actions[bot] 122cae786e
Merge master into staging-next 2022-01-16 06:01:16 +00:00
Martin Weinelt 608cde3bd4
metamorphose2: drop
Relies on python2 and last upstream release in 2015.

> AttributeError: 'str' object has no attribute 'decode'
2022-01-16 02:34:57 +01:00
Martin Weinelt 4a1da0bed9
neap: drop
Requires pygtk2, which is python2 only and upstream last touched that
script in 2011.
2022-01-16 02:34:57 +01:00
Martin Weinelt 5d0261b438
curaByDagoma: drop
The package is unmaintained and uses python2. There are newer upstream
versions, but upgrading the package requires some dedication, which only
a maintainer should need to provide.
2022-01-16 02:34:56 +01:00
github-actions[bot] f8fb795136
Merge master into staging-next 2022-01-16 00:01:52 +00:00
R. RyanTM 4a94071fb3
mkgmap: 4836 -> 4855
(#154450)
2022-01-15 22:17:38 +01:00
Philipp Woelfel f7f1f47f9f pdfstudioviewer: init at 2021.1.2 2022-01-15 12:46:07 -07:00
Michal Sojka 3c2dc29a04 auto-multiple-choice: Fix TEXINPUTS
Without this change, LaTeX run during "Update documents" (AMC-prepare)
phase complains about not finding automultiplechoice.sty. TEXINPUTS
should match TEXDIR value specified in makeFlags.
2022-01-15 14:14:16 +01:00
github-actions[bot] 6d8719a23d
Merge master into staging-next 2022-01-15 12:01:13 +00:00
Jörg Thalheim c991351858
Merge pull request #155068 from jtojnar/xiphos-cleanup
xiphos: clean up
2022-01-15 08:10:47 +00:00
github-actions[bot] a6317e795d
Merge master into staging-next 2022-01-15 06:01:01 +00:00
Bobby Rong d00f78b8af
Merge pull request #154927 from bbigras/anytype
anytype: 0.22.3 -> 0.23.0
2022-01-15 13:11:45 +08:00
Jan Tojnar a3720ac9a1 xiphos: clean up dependencies
- Moved build dependencies to native.
- Most of those added in 4.2.1 update are only transitive.
- Switched to GTK 3.
- The GNOME 2 dependencies can me removed as they are not used.
  - Except for GTKHtml since WebKit2-based editor is not implemented.
- Python is not needed either.
- D-Bus functionality requires a patch to build
- gsf was replaced by minizip – https://github.com/crosswire/xiphos/pull/1003
2022-01-15 05:35:27 +01:00
Jan Tojnar 7cf24465b2 xiphos: drop lucene
This is supposedly not used since 4.1.0 according to its release notes
https://github.com/crosswire/xiphos/releases/tag/4.1.0
but I do not see a commit removing it and lucene is still mentioned
throughout the interface.

But there is no closure change.
2022-01-15 05:35:27 +01:00
Jan Tojnar 569eea8ec1 xiphos: do not use patchFlags
Those apply to all patches making applying patches in the future problematic.

Also pin the patch while at it.
2022-01-15 05:35:27 +01:00
Jan Tojnar fe1ba3c9be xiphos: clean up the expression
- attribute ordering
2022-01-15 05:35:20 +01:00
Nikolay Korotkiy b375c24322
far2l: 2020-12-30 → 2.4.0, enable on darwin 2022-01-14 23:21:31 +03:00
github-actions[bot] d5e672b839
Merge master into staging-next 2022-01-14 18:01:18 +00:00
legendofmiracles da0f36afe4
Merge pull request #154857 from sikmir/mepo 2022-01-14 08:03:01 -06:00
Dmitry Kalinkin a56da82f7a
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/restfly/default.nix
2022-01-13 21:39:05 -05:00
Bobby Rong 78b047c640
Merge pull request #154743 from hiljusti/update/sigi
sigi: 2.1.1 -> 3.0.0
2022-01-14 10:27:36 +08:00
Bruno Bigras d1838b5148 anytype: 0.22.3 -> 0.23.0 2022-01-13 14:50:35 -05:00
Anderson Torres 3decc8a139
Merge pull request #154899 from AndersonTorres/new-misc
xiphos: code refactor
2022-01-13 15:31:01 -03:00
Fabian Affolter 229298c6de
Merge pull request #154889 from fabaff/bump-celery
python3Packages.celery: 5.2.1 -> 5.2.3
2022-01-13 18:52:18 +01:00
Sandro 5e1226aef7
Merge pull request #153896 from lucasew/packages/bpycv 2022-01-13 18:22:53 +01:00
Sandro 2a5b7a5d32
Merge pull request #154896 from datastory/master 2022-01-13 17:30:03 +01:00
Honza Cibulka d1c70dc137 calibre: added pycryptodome Python package
Pycryptodome Python package needed for running DeDRM Plugin.
2022-01-13 16:49:46 +01:00
AndersonTorres ce35012411 xiphos: code refactor
Now with my (current) personal tastes.
2022-01-13 12:19:58 -03:00
Anderson Torres 15a0935454
Merge pull request #154891 from AndersonTorres/new-misc
variety: use runtimeShell instead of stdenv.shell
2022-01-13 12:18:23 -03:00
Nikolay Korotkiy b1c6a1d42b
mepo: init at 0.2 2022-01-13 17:57:16 +03:00
AndersonTorres 8d0e70bb58 variety: use runtimeShell instead of stdenv.shell 2022-01-13 11:37:58 -03:00
Fabian Affolter 3bbec485b1 octoprint: update celery override 2022-01-13 15:35:02 +01:00
Anderson Torres 235949bbbd
Merge pull request #154796 from dasj19/xiphos-enchant2
xiphos: 4.1.0 -> 4.2.1
2022-01-13 11:34:59 -03:00
lucasew 56b407d573 blender-with-packages: add wrapper to load python packages with blender
Signed-off-by: lucasew <lucas59356@gmail.com>
2022-01-13 11:07:25 -03:00
Daniel Șerbănescu 7508d82289 xiphos: 4.1.0 -> 4.2.1
- Changes build system from waf to cmake
- Upgrades to enchant-2
2022-01-13 14:17:17 +01:00
github-actions[bot] a6928c74cc
Merge master into staging-next 2022-01-13 12:01:29 +00:00
Renaud 46821ea01c
Merge pull request #154836 from rhendric/patch-1
pwsafe: substitute paths in .desktop file
2022-01-13 11:30:18 +01:00
Fabian Affolter 91be887b49
Merge pull request #154153 from dotlambda/django-extensions-3.1.5
python3Packages.django-extensions: 3.1.3 -> 3.1.5
2022-01-13 08:58:23 +01:00
Bobby Rong 123844971c
Merge pull request #154552 from WolfangAukang/whalebird
whalebird: 4.4.6 -> 4.5.0
2022-01-13 15:53:59 +08:00
Bobby Rong d39a9ed4ba
Merge pull request #154820 from PhilippWoelfel/submit/pdfstudio-2021-1-2
pdfstudio: 2021.1.1 -> 2021.1.2
2022-01-13 15:50:07 +08:00
Bobby Rong 594c2e1a94
Merge pull request #154817 from Stunkymonkey/qpdfview-refactor
qpdfview: refactor
2022-01-13 15:28:06 +08:00
Bobby Rong c3eb3abbb0
Merge pull request #154227 from berbiche/avizo-1.1
avizo: unstable-2021-07-21 -> 1.1
2022-01-13 15:15:45 +08:00
Bobby Rong 1141814aa5
Merge pull request #154558 from r-ryantm/auto-update/snapmaker-luban
snapmaker-luban: 4.1.2 -> 4.1.3
2022-01-13 15:08:05 +08:00
♪ hiljusti 🎮 022fc3ab02 sigi: 2.1.1 -> 3.0.0 2022-01-12 22:47:34 -08:00
Ryan Hendrickson 4d1de6bdac
pwsafe: substitute paths in .desktop file
Upstream uses an absolute path in the .desktop file to point to the
icon.
2022-01-12 21:54:53 -05:00
github-actions[bot] a8b75d6f2f
Merge master into staging-next 2022-01-13 00:01:59 +00:00
Philipp Woelfel be4504dd16 pdfstudio: 2021.1.1 -> 2021.1.2 2022-01-12 16:33:56 -07:00
Felix Bühler f0616a2045
Merge pull request #153862 from Stunkymonkey/treewide-github-5
treewide: switch to fetchFromGitHub
2022-01-13 00:24:44 +01:00
Felix Buehler ebbbd42140 qpdfview: refactor 2022-01-13 00:22:37 +01:00
Martin Weinelt 042ebd62fd
Merge pull request #154799 from Frostman/hugo-0.92.0 2022-01-12 22:33:32 +01:00
R. RyanTM bad08fbef1
gphoto2: 2.5.27 -> 2.5.28
(#154530)
2022-01-12 22:04:59 +01:00
Sergey Lukjanov be5fbe4c1b hugo: 0.91.2 -> 0.92.0
https://github.com/gohugoio/hugo/releases/tag/v0.92.0
2022-01-12 09:16:46 -08:00
Philipp Woelfel 1e6acdc3be kup: init at 0.9.1 2022-01-12 00:09:15 -07:00
github-actions[bot] 89c9684b4b
Merge staging-next into staging 2022-01-12 06:01:45 +00:00
legendofmiracles 197f637e25
Merge pull request #154701 from legendofmiracles/llama
llama: init at 1.0.1
2022-01-11 23:14:30 -06:00
legendofmiracles bc151db96f
llama: init at 1.0.1 2022-01-11 21:50:14 -06:00
github-actions[bot] e81177a147
Merge staging-next into staging 2022-01-12 00:02:57 +00:00
R. RyanTM 36ba8c55f4
moonlight-embedded: 2.5.1 -> 2.5.2
(#152810)
2022-01-12 00:30:20 +01:00
legendofmiracles b5d5032847
Merge pull request #154593 from r-ryantm/auto-update/kondo
kondo: 0.4 -> 0.5
2022-01-11 17:21:54 -06:00
legendofmiracles 5d3d925d87
Merge pull request #154643 from r-ryantm/auto-update/mob
mob: 2.1.0 -> 2.2.0
2022-01-11 17:12:09 -06:00
R. RyanTM ce53f09f6f
moolticute: 0.53.2 -> 0.53.7
(#152809)
2022-01-11 23:04:28 +01:00
Kierán Meinhardt 15079ba19e ratt: init at unstable-2022-01-11 2022-01-11 21:11:44 +01:00
R. Ryantm 89a18020fa mob: 2.1.0 -> 2.2.0 2022-01-11 19:59:53 +00:00
github-actions[bot] e8dc263ca3
Merge staging-next into staging 2022-01-11 18:01:57 +00:00
Gabriel Ebner f977c72b7f
Merge pull request #150662 from Stunkymonkey/CostEstimation-3.4.0
octoprint.python.pkgs.costestimate: 3.3.0 -> 3.4.0
2022-01-11 17:57:12 +01:00
R. Ryantm e6480a823e spicetify-cli: 2.8.3 -> 2.8.4 2022-01-11 08:38:10 -08: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
R. Ryantm 46324ebbdd kondo: 0.4 -> 0.5 2022-01-11 16:06:00 +00:00
R. Ryantm c0a737930a snapmaker-luban: 4.1.2 -> 4.1.3 2022-01-11 13:20:39 +00:00
P. R. d. O 5d04bb9562
whalebird: 4.4.6 -> 4.5.0 2022-01-11 07:16:50 -06:00
Las Safin 41d9dfb619 meson: Remove 0.57, use 0.60 everywhere 2022-01-11 12:51:09 +00:00
Dmitry Kalinkin 793bbe6c69
Merge pull request #154294 from Eliot00/quake-update
inherd-quake: 0.3.0 -> 0.4.0
2022-01-11 01:35:01 -05:00
github-actions[bot] 47c5df190a
Merge staging-next into staging 2022-01-11 06:02:00 +00:00
legendofmiracles 511b379b8e
Merge pull request #154359 from r-ryantm/auto-update/xchm 2022-01-10 22:49:39 -06:00
R. Ryantm a78a7310ca xchm: 1.32 -> 1.33 2022-01-11 00:30:25 +00:00
github-actions[bot] bbe8f3965a
Merge staging-next into staging 2022-01-11 00:02:27 +00:00
Michael Weiss f0c39f6d83
Merge pull request #151519 from zhaofengli/phoc-0.11.0
phoc: 0.9.0 -> 0.11.0, wlroots_0_12: drop
2022-01-10 19:37:33 +01:00
Jan Tojnar 3dba2db347 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
2022-01-10 19:27:28 +01:00
Elliot 80fb0564e9
inherd-quake: 0.3.0 -> 0.4.0 2022-01-10 23:29:44 +08:00
legendofmiracles 492de558b5
Merge pull request #153353 from lammermann/submit/add-tuhi 2022-01-10 08:21:55 -06:00
Benjamin Kober d551a1ce21 tuhi: init at 0.5 2022-01-10 12:31:06 +01:00
Jonathan Ringer 2b914ee8e2 deco: 0.0.2 -> unstable-2019-04-03 2022-01-09 23:27:25 -08:00
github-actions[bot] 0f8ce42c1f
Merge staging-next into staging 2022-01-10 06:01:45 +00:00
Nicolas Berbiche 1c7b2186e2
avizo: unstable-2021-07-21 -> 1.1
Includes a temporary `meson.build` patch that will need to be
removed on the next update.
2022-01-09 23:01:51 -05:00
legendofmiracles d9b2a764b0
Merge pull request #148541 from legendofmiracles/final-asf 2022-01-09 20:45:13 -06:00
legendofmiracles 7d1d2fe2f8
ArchiSteamFarm: 5.2.0.10 -> 5.2.1.5; ASF-ui: update 2022-01-09 20:26:03 -06: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
Mario Rodas 5335212bf4
Merge pull request #154156 from r-ryantm/auto-update/gallery_dl
gallery-dl: 1.19.3 -> 1.20.1
2022-01-09 17:24:13 -05:00
Zhaofeng Li 84595758cc phoc: 0.9.0 -> 0.11.0
We can finally drop wlroots_0_12! On the other hand, we now need to keep
wlroots_0_14 when 0.15 gets merged :P

Removing archseer from maintainers per request: https://github.com/NixOS/nixpkgs/pull/143785#issuecomment-955873911
2022-01-09 10:40:37 -08:00
Michael Weiss 533e921c60
Merge pull request #153736 from primeos/gammastep
gammastep: 2.0.7 -> 2.0.8
2022-01-09 19:05:23 +01:00
R. Ryantm 91d0228224 gallery-dl: 1.19.3 -> 1.20.1 2022-01-09 16:07:02 +00:00
Profpatsch f89427f939 tagtime: init at 2018-09-02
The original perl implementation of tagtime.

I packaged it to the point of being able to use it on my system, in a
very barebones state.
The configuration is … well it just assumes you have a perl file
somewhere and it evals it at startup. Since that configuration needs
access to the distpath of tagtime, we just patch it a bit for
now (which also means no user configuration is possible atm).

The main changes to the config are:

- instead of defaulting to `vim`, we use `$EDITOR`
- The log file is placed in `$HOME/.local/share/tagtime/pings.log`
  (which corresponds to `$XDG_DATA_HOME` on normal unix systems), but
  could be patched to use the real logic instead.
2022-01-09 16:59:29 +01:00
Robert Schütz c0b9a9ee44 python3Packages.django_extensions: rename to django-extensions 2022-01-09 15:25:05 +00:00
Jan Tojnar 8cdc5aee3f
Merge pull request #125895 from arkanoid87/gstreamer_tools_bin
gstreamer: move executables to bin output
2022-01-09 01:36:55 +01:00
github-actions[bot] 3ce63131a1
Merge master into staging-next 2022-01-09 00:01:57 +00:00
Martin Weinelt ff0ee5bf85
octoprint: ignore pyyaml version constraint 2022-01-09 00:48:23 +01:00
Thiago Franco de Moraes cbd80f293c
Zettlr: 2.0.2 -> 2.1.1 2022-01-08 18:50:56 -03:00
Robert Hensing 91917122d3
Merge pull request #126718 from roberth/testEqualDerivation
testEqualDerivation: init
2022-01-08 21:44:21 +01:00
Fabián Heredia Montiel d990513e49 calibre: fix build on staging-next due to missing setuptools 2022-01-08 10:22:43 -08:00
Felix Buehler 17c63d329d toggldesktop: switch to fetchFromGitHub 2022-01-08 15:38:10 +01:00
Robert Hensing 0edf0fd220 hello: Test independence of environment.noXlibs 2022-01-08 15:18:57 +01:00
github-actions[bot] cf7efe1192
Merge staging-next into staging 2022-01-08 12:01:36 +00:00
github-actions[bot] c1fac0a1c0
Merge master into staging-next 2022-01-08 12:01:03 +00:00
Renaud e8e6c6aceb
Merge pull request #153672 from jyooru/update/obsidian
obsidian: 0.13.14 -> 0.13.19
2022-01-08 10:50:25 +01:00
Nikolay Korotkiy f306663cf6 josm: 18303 → 18360 2022-01-08 09:06:10 +01:00
Dmitry Kalinkin 477540469e
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/gradient-utils/default.nix
	pkgs/development/python-modules/gradient/default.nix
2022-01-08 02:39:35 -05:00
Bobby Rong cf6c60cdf7
Merge pull request #153692 from brandonweeks/electron1
obinskit: 1.1.8 -> 1.2.11
2022-01-08 13:02:06 +08:00
Jonathan Ringer 172bcecd6b
Merge remote-tracking branch 'origin/staging-next' into staging 2022-01-07 10:32:13 -08:00