Commit Graph

3549 Commits

Author SHA1 Message Date
Jan Tojnar
997bb5e42c Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/python-modules/dnspython/default.nix
;	pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-03-28 17:55:31 +02:00
Sandro
72dab1fa30
Merge pull request #151705 from uakci/mplus-add-github-release 2022-03-28 13:40:32 +02:00
Sandro
528edfe5ec
Merge pull request #165187 from rgrinberg/ablog 2022-03-28 13:21:51 +02:00
Sandro
2f1e03cb2b
Merge pull request #165691 from lucc/github-removed-unencrypted-git 2022-03-28 12:47:42 +02:00
Lucas Hoffmann
21120194ee
luarocks-packages: replace git://github.com with https:// 2022-03-28 12:23:10 +02:00
github-actions[bot]
e3d20dfaa5
Merge master into staging-next 2022-03-27 18:01:05 +00:00
Artturin
52aa495303 maintainers/scripts/remove-old-aliases.py: add option to only operate on
throws
2022-03-27 19:47:48 +03:00
ppenguin
faefa9212c
Add pandoc-include (#164552)
Co-authored-by: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
2022-03-27 17:25:44 +02:00
uakci
6c5a2b69b4 maintainers: add uakci 2022-03-26 22:01:40 +01:00
github-actions[bot]
3b6f03e497
Merge master into staging-next 2022-03-26 18:01:22 +00:00
Rudi Grinberg
e68446288e maintainers: add rgrinberg 2022-03-26 08:31:55 -06:00
Sandro
bd14f9c03a
Merge pull request #164372 from lockejan/git-team 2022-03-26 13:32:48 +01:00
Vladimír Čunát
a42ca0678b
Merge branch 'master' into staging-next 2022-03-26 09:20:38 +01:00
Daniel Beckwith
baa2855358 Add maintainer 2022-03-25 22:11:48 -04:00
github-actions[bot]
880c50a133
Merge master into staging-next 2022-03-26 00:02:23 +00:00
Artturi
4152377b66
Merge pull request #162511 from Artturin/add-alias-keep-feature 2022-03-25 20:28:37 +02:00
Vladimír Čunát
0a8b4eddd2
Merge branch 'master' into staging-next 2022-03-25 10:16:56 +01:00
Sandro
4df9ab418f
Merge pull request #164985 from Freax13/init-gef 2022-03-23 07:46:15 +01:00
github-actions[bot]
c80dabe3b1
Merge staging-next into staging 2022-03-23 06:01:55 +00:00
Shawn8901
3bf28598c1
autoadb: init at unstable-2020-06-01 (#165244)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-23 06:29:45 +01:00
Sandro
105c8d02d2
Merge pull request #164121 from barinov274/banger 2022-03-23 02:55:43 +01:00
github-actions[bot]
9d35f2cd19
Merge staging-next into staging 2022-03-22 18:10:54 +00:00
Fabian Affolter
514544036f
Merge pull request #164784 from jmgilman/package/dunamai
python3Packages.dunamai: init at 1.10.0
2022-03-22 13:13:35 +01:00
barinov274
0077def6bf maintainers: add BarinovMaxim 2022-03-22 13:59:46 +10:00
Joshua Gilman
131ecf27a6
maintainers: add @jmgilman 2022-03-21 09:01:13 -07:00
Tom Dohrmann
7505d91783 maintainers: add freax13 2022-03-20 16:22:54 +01:00
Martin Weinelt
f4f3622cb1 Merge remote-tracking branch 'origin/staging-next' into staging 2022-03-20 00:00:32 +01:00
Nick Braga
06f09c3d3f wkhtmltopdf-bin: init at 0.12.6-1 2022-03-18 23:14:41 -04:00
github-actions[bot]
07e0324dff
Merge staging-next into staging 2022-03-18 06:01:55 +00:00
Gabriel Lievano
a62722a794 maintainers: add rgnns 2022-03-17 22:29:06 -04:00
github-actions[bot]
2eac3106df
Merge staging-next into staging 2022-03-17 00:02:45 +00:00
Akiyoshi Suda
b792b179ae maintainers: add carpinchomug 2022-03-17 03:39:14 +09:00
Jan Schmitt
9991e13d86
maintainers: add lockejan 2022-03-16 07:14:38 +01:00
zowoq
6431086967 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
Loïc Reynier
4cd21a1cba maintainers: add loicreynier 2022-03-15 14:48:08 +01:00
Alyssa Ross
d7e181ff83
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/compilers/ocaml/4.12.nix
	pkgs/development/python-modules/oci/default.nix
	pkgs/tools/admin/bubblewrap/default.nix
2022-03-14 12:33:16 +00:00
zowoq
820df5143b
Merge pull request #163657 from brianmcgee/feat/kubemq
kubemq: init kubemq-community at 2.2.12 and kubemqctl at 3.5.1
2022-03-14 20:06:04 +10:00
Jakub Dupak
d09489e5f1
QtRvSim: init at 0.9.1 (#163128)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-13 03:08:40 +01:00
Bernardo Meurer
963a524d93
Merge pull request #163388 from lodi/wl-gammactl
wl-gammactl: init at unstable-2021-09-13
2022-03-11 22:48:00 -08:00
github-actions[bot]
918a92940f
Merge staging-next into staging 2022-03-12 00:04:25 +00:00
Sandro
14260bb7ba
Merge pull request #160417 from steinybot/fix/iterm2-signing 2022-03-12 00:58:16 +01:00
lodi
aff47e64c6 maintainers: add lodi 2022-03-11 18:23:16 -05:00
Christopher Grainger
2b6904e082 add cigrainger to maintainers list 2022-03-12 09:15:26 +11:00
github-actions[bot]
a9a2d9475d
Merge staging-next into staging 2022-03-11 18:01:59 +00:00
Profpatsch
a23d59e2ed regenerate-hackage-packages.sh: use runCommandLocal
Running tar will not benefit from running on a builder (it’s mostly
I/O load and cannot be parallelized), and the network will dominate.
2022-03-11 14:32:36 +01:00
Brian McGee
423913035a
maintainers: add brianmcgee 2022-03-11 11:45:17 +00:00
github-actions[bot]
7a0501594d
Merge staging-next into staging 2022-03-11 06:02:02 +00:00
Ben Siraphob
267148d196
Merge pull request #163542 from sandro-fugro/add-darwin-support-obsidian 2022-03-10 21:59:01 -08:00
Sandro Stikić
93f7a50d02 maintainers/maintainers-list.nix: add opeik 2022-03-11 12:09:58 +08:00
github-actions[bot]
03c9842a65
Merge staging-next into staging 2022-03-10 18:02:01 +00:00