1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

4340 commits

Author SHA1 Message Date
github-actions[bot] 80f539aa69
Merge master into staging-next 2021-12-19 00:01:40 +00:00
Janne Heß 79c0393baf
Merge pull request #151195 from romildo/upd.luna-icons
luna-icons: 1.7 -> 1.8
2021-12-18 21:35:12 +01:00
github-actions[bot] 2add1758ab
Merge master into staging-next 2021-12-18 18:01:03 +00:00
José Romildo 843729d487 luna-icons: 1.7 -> 1.8 2021-12-18 11:04:18 -03:00
Nick Cao b8ea60f47b
v2ray-domain-list-community: fix cross compilation 2021-12-18 21:15:05 +08:00
Dmitry Kalinkin 889227a048
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/pdftotext/default.nix
2021-12-16 16:55:25 -05:00
Ryan Mulligan 3b15136f74
Merge pull request #150987 from r-ryantm/auto-update/v2ray-geoip
v2ray-geoip: 202112090029 -> 202112160030
2021-12-16 11:12:04 -08:00
sternenseemann a15b2e876b s6-man-pages: 2.11.0.0.2 -> 2.11.0.0.5 2021-12-16 17:36:44 +01:00
R. Ryantm 858df33c59 v2ray-geoip: 202112090029 -> 202112160030 2021-12-16 16:36:04 +00:00
github-actions[bot] 0242879f3f
Merge master into staging-next 2021-12-14 12:01:17 +00:00
Nick Cao 7747c15593
v2ray-geoip: init at 202112090029 2021-12-14 14:22:51 +08:00
github-actions[bot] 784572e7cf
Merge master into staging-next 2021-12-13 18:01:18 +00:00
José Romildo Malaquias ceef03d9d8
Merge pull request #141992 from fufexan/orchis-theme
orchis-theme: 2021-06-25 -> 2021-12-13
2021-12-13 13:52:56 -03:00
Mihai Fufezan a4faf5e1d4
orchis-theme: 2021-06-25 -> 2021-12-13
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-12-13 14:10:45 +02:00
Martin Weinelt 423119b70b
Merge branch 'master' into staging-next 2021-12-13 12:20:07 +01:00
Janne Heß b979768afd
Merge pull request #150322 from Alexnortung/nordzy-cursor-theme 2021-12-12 20:03:45 +01:00
Dmitry Kalinkin 1dcb22acc9
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/gdown/default.nix
2021-12-12 00:00:04 -05:00
Mario Rodas 8a35362ea6
Merge pull request #149882 from r-ryantm/auto-update/man-pages
man-pages: 5.12 -> 5.13
2021-12-11 22:34:49 -05:00
Alexander Nortung 5a6e995a46 nordzy-cursor-theme: init at 0.1.0 2021-12-11 23:38:40 +01:00
github-actions[bot] 4620f3d0e3
Merge master into staging-next 2021-12-11 06:01:15 +00:00
R. Ryantm 79740d1f2e gnome-user-docs: 41.0 -> 41.1 2021-12-11 03:39:21 +01:00
github-actions[bot] 92aabc6576
Merge master into staging-next 2021-12-10 00:01:53 +00:00
sternenseemann 33ccff5813 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-12-09 21:32:06 +01:00
R. Ryantm b176613253 man-pages: 5.12 -> 5.13 2021-12-09 16:43:52 +00:00
github-actions[bot] 35a3e58b28
Merge master into staging-next 2021-12-09 12:01:25 +00:00
José Romildo Malaquias e3d3b00193
Merge pull request #149757 from r-ryantm/auto-update/numix-icon-theme-square
numix-icon-theme-square: 21.04.14 -> 21.11.29
2021-12-09 07:27:03 -03:00
Alyssa Ross c9a581b05f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master.  Added pkgs/tools/misc/jsonwatch/default.nix in HEAD
2021-12-09 01:43:58 +00:00
R. Ryantm 6403e19de9 numix-icon-theme-square: 21.04.14 -> 21.11.29 2021-12-09 00:47:17 +00:00
Robert Helgesson 0d59a239b8 fira-code: 6 -> 6.2 2021-12-09 01:08:20 +01:00
github-actions[bot] 11a84bc3c4
Merge master into haskell-updates 2021-12-09 00:07:43 +00:00
José Romildo Malaquias 497daadc9c
Merge pull request #149711 from r-ryantm/auto-update/numix-icon-theme-circle
numix-icon-theme-circle: 21.04.14 -> 21.11.29
2021-12-08 19:31:32 -03:00
Malte Brandy c8234d693b
all-cabal-hashes: 2021-12-07T20:15:21Z -> 2021-12-08T21:36:39Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-08 23:01:43 +01:00
sternenseemann 49eba10372 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-12-08 21:50:23 +01:00
R. Ryantm d3a9827a81 numix-icon-theme-circle: 21.04.14 -> 21.11.29 2021-12-08 20:43:34 +00:00
github-actions[bot] ac0d4017c5
Merge master into staging-next 2021-12-08 12:01:20 +00:00
7c6f434c 9f329731b5
Merge pull request #149187 from r-ryantm/auto-update/scowl
scowl: 2019.10.06 -> 2020.12.07
2021-12-08 11:47:46 +00:00
github-actions[bot] 8c220e0dcb
Merge master into staging-next 2021-12-08 06:01:30 +00:00
Thiago Kenji Okada 3aacdbb18c
Merge pull request #149496 from AdsonCicilioti/bibata-cursors-update
Bibata cursors update
2021-12-07 23:34:14 -03:00
Adson Cicilioti 15e4cefbea bibata-cursors-translucent: unstable-2019-09-13 -> 1.1.1 2021-12-07 21:40:15 -03:00
Adson Cicilioti 408ecd60d4 bibata-extra-cursors: 0.3 -> 1.0.1 2021-12-07 21:39:55 -03:00
Adson Cicilioti b8fbdc8852 bibata-cursors: 0.4.2 -> 1.1.2 2021-12-07 21:38:38 -03:00
José Romildo Malaquias e01615c0f3
Merge pull request #149477 from r-ryantm/auto-update/papirus-icon-theme
papirus-icon-theme: 20211001 -> 20211201
2021-12-07 21:26:48 -03:00
Alyssa Ross 16fb150e03
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/libraries/libunwind/default.nix
2021-12-07 23:56:16 +00:00
R. Ryantm 4d9b815105 papirus-icon-theme: 20211001 -> 20211201 2021-12-07 23:31:48 +00:00
Malte Brandy 25c0241b8a
all-cabal-hashes: 2021-12-02T21:05:02Z -> 2021-12-07T20:15:21Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-07 21:20:13 +01:00
R. Ryantm 49f2fabd1d luna-icons: 1.6 -> 1.7 2021-12-07 12:30:30 +00:00
github-actions[bot] dc2fcd9f02
Merge master into staging-next 2021-12-07 12:01:31 +00:00
R. Ryantm 1c06d37843 kora-icon-theme: 1.4.7 -> 1.4.9 2021-12-07 08:17:13 +00:00
R. Ryantm 491ef7707d scowl: 2019.10.06 -> 2020.12.07 2021-12-07 01:01:43 +00:00
github-actions[bot] 41895efeb5
Merge master into staging-next 2021-12-06 12:01:16 +00:00