Commit Graph
10552 Commits
Author SHA1 Message Date
Jonathan Ringer c227fb4b17 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
Kanashimia 9c6daedb29 keepassxc: add readline support, minor refactor 2021-05-17 17:00:44 +08:00
J. Neto 74e27e2236 slade-git: 3.1.2 -> 3.2.0 2021-05-16 23:46:53 -07:00
github-actions[bot] 3ff6965554 Merge master into staging-next 2021-05-17 06:22:23 +00:00
Jonathan Ringer d8e62d8e41 Merge remote-tracking branch 'origin/master' into staging-next
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro 700942d2a5 Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Sandro 9bc04854e1 Merge pull request #123213 from mdevlamynck/update-plasma-applet-volumewin7mixer
plasma-applet-volumewin7mixer: v25 -> v26
2021-05-17 02:36:37 +02:00
Sandro 4e60302dbe Merge pull request #123128 from sayanarijit/master
xplr: 0.8.4 -> 0.9.1
2021-05-17 02:28:16 +02:00
Sandro 72df572fa3 Merge pull request #122819 from primeos/maintainers-remove-pesterhazy
maintainers: remove pesterhazy
2021-05-17 02:22:35 +02:00
Sandro 8605692f10 Merge pull request #122882 from r-ryantm/auto-update/gallery_dl
gallery-dl: 1.17.3 -> 1.17.4
2021-05-17 01:47:57 +02:00
Robert Schütz ce0cabb49d numberstation: init at 0.4.0 (#122190) 2021-05-17 00:16:15 +02:00
github-actions[bot] 6cdac75d25 Merge staging-next into staging 2021-05-16 18:32:44 +00:00
github-actions[bot] 8c6d819143 Merge master into staging-next 2021-05-16 18:32:41 +00:00
Anderson Torres cf45c45605 Merge pull request #121588 from eduardosm/sip-rename
pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
2021-05-16 13:31:55 -03:00
Jan Tojnar 684991c696 Merge branch 'master' into staging-next
- Thunderbird 68 has been dropped on master.
- gccCrossLibcStdenv has been factored out on staging-next in all-packages.nix, while the file has been re-formatted on master.
2021-05-16 15:34:51 +02:00
Anderson Torres c58b97674b Merge pull request #123184 from lovesegfault/corectrl-1.1.3
corectrl: 1.1.2 -> 1.1.3
2021-05-16 09:50:20 -03:00
Matthias Devlamynck 4c0441c0b1 plasma-applet-volumewin7mixer: v25 -> v26 2021-05-16 11:48:34 +02:00
github-actions[bot] 5c18268a6b Merge staging-next into staging 2021-05-16 06:22:08 +00:00
github-actions[bot] d6fe7f78a8 Merge master into staging-next 2021-05-16 06:22:05 +00:00
Peter Hoeg 6e7fac368f solaar: 1.0.2 -> 1.0.5 2021-05-16 11:04:34 +08:00
Bernardo Meurer 61d8677ddf corectrl: 1.1.2 -> 1.1.3 2021-05-15 18:48:29 -07:00
github-actions[bot] 9911b1c75b Merge staging-next into staging 2021-05-16 01:01:01 +00:00
github-actions[bot] b484cef365 Merge master into staging-next 2021-05-16 01:00:58 +00:00
Stéphan Kochen 5548ff174c getxbook: fix clang build 2021-05-15 13:11:42 -07:00
github-actions[bot] c10600230e Merge staging-next into staging 2021-05-15 18:30:31 +00:00
github-actions[bot] f1b78f8618 Merge master into staging-next 2021-05-15 18:30:28 +00:00
midchildan d38f9c8dee zathura: disable checkPhase on Darwin 2021-05-16 02:10:11 +09:00
Arijit Basu 541a034ecf xplr: 0.8.4 -> 0.9.1 2021-05-15 21:20:53 +05:30
github-actions[bot] 49ec716c04 Merge staging-next into staging 2021-05-15 12:25:36 +00:00
github-actions[bot] ec10b0958d Merge master into staging-next 2021-05-15 12:25:33 +00:00
lewo ef95fa40e9 Merge pull request #122772 from nlewo/gremlin-3.5
gremlin-console: 3.4.10 -> 3.5.0
2021-05-15 09:18:34 +02:00
Antoine Eiche a4ae041a22 gremlin-console: 3.4.10 -> 3.5.0 2021-05-15 08:59:18 +02:00
zowoq 004f8cd986 Merge staging-next into staging 2021-05-14 16:32:43 +10:00
github-actions[bot] bf5d8bb531 Merge master into staging-next 2021-05-14 00:58:11 +00:00
Jan Tojnar ac6a4f7cf5 Merge branch 'staging-next' into staging 2021-05-14 01:40:09 +02:00
Fabian Affolter 504388666c Merge pull request #122799 from chuahou/update-stork
stork: 1.2.0 -> 1.2.1
2021-05-13 22:54:08 +02:00
R. RyanTM 03f23a8449 gallery-dl: 1.17.3 -> 1.17.4 2021-05-13 20:01:28 +00:00
github-actions[bot] 39e3f7c2cc Merge master into staging-next 2021-05-13 18:32:50 +00:00
R. RyanTM 01b771bce0 gpsprune: 20.3 -> 20.4 2021-05-13 18:48:07 +02:00
Dmitry Ivankov 9236fe835f sweethome3d: 6.4.2 -> 6.5.2, also bump editors, use fetchurl and fix build
fixes build failures
https://hydra.nixos.org/build/142550788/nixlog/2
https://hydra.nixos.org/build/142549864/nixlog/2

Replaces fetchsvn/fetchcvs with fetchurl because fetchcvs wasn't able to fetch newer versions.

jre8 seems to be required due to InaccessibleObjectException/IllegalAccessException on app start on jdk9+

ZHF: #122042
2021-05-13 09:46:22 -07:00
github-actions[bot] 60f5ecc76d Merge staging-next into staging 2021-05-13 12:26:52 +00:00
github-actions[bot] 7465594428 Merge master into staging-next 2021-05-13 12:26:48 +00:00
Michael Weiss b364139f2b maintainers: remove pesterhazy
Their last commit was caf43ad5af from 2015.
Thank you for your contributions.
2021-05-13 13:00:47 +02:00
Michael Weiss 621a242a1a jekyll: Remove myself as maintainer
I don't use it much anymore.
2021-05-13 12:54:36 +02:00
Chua Hou 159fe665a8 stork: 1.2.0 -> 1.2.1 2021-05-13 14:58:37 +08:00
github-actions[bot] b057978bb2 Merge staging-next into staging 2021-05-12 18:32:29 +00:00
Martin Weinelt a18880bf72 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-12 18:28:03 +02:00
Mario Rodas 9c3578a58f Merge pull request #122662 from jeffutter/_1password_fix_darwin
_1password: Fix Darwin Builds
2021-05-12 09:11:10 -05:00
Jan Tojnar 71fa678899 Merge branch 'staging-next' into staging 2021-05-12 14:31:36 +02:00
github-actions[bot] 1d2db66464 Merge master into staging-next 2021-05-12 12:27:04 +00:00