3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2340 commits

Author SHA1 Message Date
Bobby Rong 839460c9f8
Merge pull request #169390 from bobby285271/khronos
khronos: 3.6.6 -> 3.7.0
2022-04-21 23:23:22 +08:00
Bobby Rong cc3a4082ac
khronos: 3.6.6 -> 3.7.0 2022-04-20 11:22:35 +08:00
Martin Weinelt fa1bb283d8 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-16 23:14:55 +02:00
Robert Schütz 66430ab09e banking: 0.3.0 -> 0.4.0 2022-04-16 19:25:11 +00:00
github-actions[bot] 5aa88e2354
Merge master into staging-next 2022-04-15 12:01:32 +00:00
Bobby Rong a7cf9372e9
Merge pull request #167984 from eliandoran/dev/trilium-update
trilium: 0.50.2 -> 0.50.3
2022-04-15 19:41:11 +08:00
Martin Weinelt a7fc5aaa76 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-15 13:30:48 +02:00
Bobby Rong b193aedb6b
Merge pull request #168299 from Shawn8901/update_portfolio
portfolio: 0.56.5 -> 0.57.1
2022-04-15 19:15:27 +08:00
Martin Weinelt 33425fdc96
Merge pull request #166489 from NixOS/python-updates 2022-04-15 03:47:30 +02:00
Martin Weinelt b95480efb1 fava: 1.19 -> 1.21; fix Werkzeug compat 2022-04-15 01:39:56 +02:00
Vladimír Čunát d5d94127fd
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
Shawn8901 2bc6afceaf portfolio: adds shawn8901 as maintainer 2022-04-13 17:06:27 +02:00
Erik Arvstedt 0977227b86
nixos/paperless-ng: rename to paperless, use paperless-ngx package
Use this opportunity to rename `paperless-(ng)-server` to `paperless-scheduler`.
This follows the naming scheme in the paperless repo and docs.
2022-04-12 18:15:44 +02:00
Erik Arvstedt 99f40c2c13
paperless-ng: delete pkg, add alias to paperless-ngx 2022-04-11 22:46:43 +02:00
Luke Granger-Brown 9faba97d24
paperless-ngx: init at 1.6.0 2022-04-11 22:46:42 +02:00
Shawn8901 8b5c9741f9 portfolio: 0.56.5 -> 0.57.1 2022-04-11 19:54:48 +02:00
github-actions[bot] 55db28db36
Merge staging-next into staging 2022-04-09 18:01:56 +00:00
github-actions[bot] f303d4de3b
Merge staging-next into staging 2022-04-09 12:02:07 +00:00
Elian Doran d018a53664 trilium: 0.50.2 -> 0.50.3 2022-04-09 14:48:36 +03:00
Jonas Heinrich bc45ba1038 foliate: Minor cleanup 2022-04-09 12:12:04 +02:00
R. Ryantm 156bacf937 morgen: 2.5.0 -> 2.5.2 2022-04-08 15:08:13 +00:00
Martin Weinelt cc774b5792 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-07 12:12:57 +02:00
R. Ryantm 832d4ec77e vnote: 3.12.888 -> 3.13.0 2022-04-06 23:01:42 +00:00
github-actions[bot] 42debb0b5a
Merge staging-next into staging 2022-04-03 06:01:52 +00:00
Bobby Rong 752e85be8d
Merge pull request #166538 from bobby285271/banking
banking: fix build with meson 0.61
2022-04-03 11:55:32 +08:00
Alyssa Ross 8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00:00
Artturi 96a1835155
Merge pull request #166771 from Artturin/zoteroscheme 2022-04-01 11:09:33 +03:00
Artturin c2b8260981 zotero: add x-scheme-handler/zotero to desktop file
so `zotero://select/library/items/GICAH8PU` will work
2022-04-01 09:33:37 +03:00
github-actions[bot] 9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Ben Siraphob 5187709ff7
Merge pull request #166508 from siraben/automake-buildinputs 2022-03-31 03:15:41 -05:00
Bobby Rong fd049bba8c
banking: fix build with meson 0.61 2022-03-31 15:15:59 +08:00
Ben Siraphob 21faf9fc29
treewide: move autoconf, automake to nativeBuildInputs 2022-03-30 20:17:24 -05:00
sternenseemann 70530708a5 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-03-30 19:09:12 +02:00
Ryan Mulligan 05a7d70e09
Merge pull request #166418 from r-ryantm/auto-update/morgen
morgen: 2.4.4 -> 2.5.0
2022-03-30 09:50:10 -07:00
R. Ryantm 07d588de4d morgen: 2.4.4 -> 2.5.0 2022-03-30 13:04:50 +00:00
github-actions[bot] 01c08ff8bf
Merge master into haskell-updates 2022-03-30 00:10:53 +00:00
Matthias Thym e2a703070b qownnotes: 22.3.3 -> 22.3.4 2022-03-29 14:16:34 +02:00
github-actions[bot] b2fc63a844
Merge staging-next into staging 2022-03-26 12:02:50 +00:00
sternenseemann 372d0a707e Merge remote-tracking branch 'origin/master' into haskell-updates 2022-03-26 09:59:28 +01:00
Jan Tojnar 3d12c9ce1c scribusUnstable: Fix build with Poppler 22.03 2022-03-25 21:35:53 +01:00
Jan Tojnar 9102478153 libreoffice: fix build with Poppler 22.03 2022-03-25 19:27:18 +01:00
github-actions[bot] 8357b101a5
Merge staging-next into staging 2022-03-25 12:02:05 +00:00
Ben Siraphob fcd48783a7
Merge pull request #165416 from SuperSandro2000/autokey 2022-03-24 23:14:23 -05:00
github-actions[bot] 79b7796557
Merge master into haskell-updates 2022-03-25 00:11:06 +00:00
davidak 6ea8d5ee71
Merge pull request #165297 from Stunkymonkey/treewide-pname-version-17
treewide: rename name to pname&version
2022-03-24 16:38:33 +01:00
sternenseemann b2f458dc40 hledger-check-fancyassertions: update source hash for 1.25 2022-03-24 15:17:50 +01:00
Doron Behar 4a02c56a7d
Merge pull request #164746 from ncfavier/makeWrapper-chdir 2022-03-24 13:51:27 +02:00
github-actions[bot] e5b9619cbf
Merge master into haskell-updates 2022-03-24 00:10:32 +00:00
Felix Buehler 3bc5196252 treewide: rename name to pname&version 2022-03-23 22:55:50 +01:00
Sandro f25337c6ef
autokey: delete unused patch 2022-03-23 10:12:40 +01:00