github-actions[bot]
51bf815af0
Merge master into staging-next
2021-06-17 00:09:48 +00:00
Sandro
29affb1603
Merge pull request #126207 from georgyo/usql
2021-06-17 01:18:16 +02:00
github-actions[bot]
2d104c99a7
Merge master into staging-next
2021-06-16 18:04:45 +00:00
Sandro
9dc0610429
Merge pull request #126842 from nessdoor/nixpkgs/jquake
...
jquake: init at 1.6.1
2021-06-16 15:30:36 +02:00
George Shammas
9f0e1ad7c6
maintainers: add georgyo
2021-06-16 08:18:33 -04:00
Jonathan Ringer
d1d37feb6d
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
Sandro
7a7c7de4e3
Merge pull request #126697 from arezvov/iotop-c
2021-06-16 03:20:23 +02:00
Alexander Rezvov
34ee46760f
maintainers: add arezvov
2021-06-16 03:16:16 +03:00
Ashley Chiara
77a51ff402
maintainers: add ashley
2021-06-15 21:04:39 +02:00
ajs124
c38de44e8c
Merge pull request #126944 from primeos/maintainers-remove-mbakke
...
maintainers: remove mbakke
2021-06-15 17:44:39 +02:00
Michael Weiss
42ded9d56b
maintainers: remove mbakke
...
Their last commit is b5bd862f24
2021-06-15 13:46:24 +02:00
polygon
f2c26dd810
maintainers: add polygon
2021-06-15 12:43:25 +02:00
Jan Tojnar
91171e2955
Merge branch 'master' into staging-next
...
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
Icy-Thought
687c03a5d0
whitesur-icon-theme: init at 2021-05-20 ( #126783 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-15 03:30:36 +02:00
Sandro
e0f9e2cc0e
Merge pull request #126523 from Princemachiavelli/package/electron-mail
2021-06-15 02:51:26 +02:00
Sandro
6aaabb89e2
Merge pull request #126100 from natto1784/anup
2021-06-14 19:55:40 +02:00
Tomas Antonio Lopez
86123c9c98
maintainers: add nessdoor
2021-06-14 23:29:21 +09:00
deliciouslytyped
3209371bbe
maintainers: add deliciouslytyped
2021-06-14 16:19:10 +02:00
github-actions[bot]
13f31f60bf
Merge master into staging-next
2021-06-14 00:08:48 +00:00
Michele Guerini Rocco
d7523d36ee
Merge pull request #126593 from ncfavier/efont-unicode
...
efont-unicode: init at 0.4.2
2021-06-13 20:41:51 +02:00
github-actions[bot]
261638938e
Merge master into staging-next
2021-06-13 00:10:24 +00:00
Sandro Jäckel
10f85360c6
maintainers: remove jD91mZM2
...
Thank you for every single commit to NixOS and nixpkgs.
https://github.com/NixOS/nixpkgs/commits?author=jD91mZM2
https://www.redox-os.org/news/open-source-mental-health/
2021-06-12 23:13:40 +02:00
Sandro
dea8072438
Merge pull request #125242 from cmars/kubebuilder
2021-06-12 21:35:34 +02:00
github-actions[bot]
65a7d168af
Merge master into staging-next
2021-06-12 18:04:56 +00:00
sternenseemann
922a444b27
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-06-11 21:14:29 +02:00
Naïm Favier
40f58ac5ab
maintainers: add ncfavier
2021-06-11 14:02:56 +02:00
natto1784
5de8597c9b
maintainers: add natto1784
2021-06-11 10:46:40 +05:30
Josh Hoffer
1fdddce7f2
maintainers: add princemachiavelli
2021-06-10 19:54:09 -06:00
github-actions[bot]
51dce04dde
Merge master into staging-next
2021-06-10 12:05:05 +00:00
Pol Dellaiera
4e1dcacc30
maintainers: add drupol
2021-06-09 20:28:10 +02:00
Martin Weinelt
3da00fa467
Merge branch 'master' into staging-next
2021-06-09 14:18:55 +02:00
Sandro
7e343d4ca0
Merge pull request #118744 from rnpgp/rnp
2021-06-09 12:57:28 +02:00
Sandro
b8a0f46db5
Merge pull request #121995 from jo1gi/add-base16-universal-manager
2021-06-09 12:55:27 +02:00
Jeffrey Lau
4871a550bf
maintainers: add ribose-jeffreylau
2021-06-07 11:39:35 +08:00
github-actions[bot]
0093d2d2d8
Merge master into staging-next
2021-06-06 18:30:33 +00:00
Casey Marshall
d856ea701b
maintainers: add Casey Marshall
2021-06-06 13:29:42 -05:00
sternenseemann
be6de30ca4
maintainers/scripts/haskell: make commit messages more consistent
...
Make sure they are all prefixed with haskellPackages: except for
update-hackage.sh which changes the top-level attribute
all-cabal-hashes.
2021-06-06 18:53:56 +02:00
sterni
34140d6b8c
Merge pull request #125429 from NixOS/haskell-updates
...
haskell.packages: update
2021-06-06 18:37:26 +02:00
pacien
b24cc395cc
maintainers/teams: remove pacien from the matrix team
...
I prefer to focus only on the individual packages which I know.
2021-06-06 16:08:22 +02:00
sternenseemann
7f31ab271c
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-06-06 12:44:46 +02:00
github-actions[bot]
47de0ebf63
Merge master into staging-next
2021-06-06 06:23:08 +00:00
Nicolás Kennedy
19f80f0d32
veikk-linux-driver-gui: init at 2.0
...
Add configuration utility to configure VEIKK brand digitizers
2021-06-05 17:16:38 -07:00
github-actions[bot]
d9d6f71e43
Merge master into staging-next
2021-06-05 18:30:28 +00:00
Sandro
32e38027aa
Merge pull request #125747 from ratsclub/master
2021-06-05 18:30:56 +02:00
Sandro
db0abdd87e
Merge pull request #118921 from necessarily-equal/unvanquished
2021-06-05 17:20:56 +02:00
sternenseemann
1e7351550c
maintainers/…/regenerate-hackage-packages.sh: overrideable hackage2nix
...
Allow setting the HACKAGE2NIX environment variable to change the
hackage2nix the script uses to an absolute path to a local build. Useful
to test local changes in a realistic environment.
2021-06-05 17:03:08 +02:00
Sandro
1918720d0f
Merge pull request #124234 from rkitover/aucc-init
2021-06-05 16:57:36 +02:00
Victor Freire
841ae9708e
maintainers: add ratsclub
2021-06-05 01:21:10 -03:00
github-actions[bot]
ad63c3d31f
Merge master into staging-next
2021-06-04 19:40:59 +00:00
Antoine Fontaine
758c87007c
unvanquished: init at 0.52.0
2021-06-04 17:48:46 +02:00
