Commit Graph

3903 Commits

Author SHA1 Message Date
github-actions[bot]
8bc930ca39
Merge staging-next into staging 2021-09-12 00:02:23 +00:00
github-actions[bot]
3f2255106a
Merge master into staging-next 2021-09-12 00:01:45 +00:00
Sandro
99031a470a
Merge pull request #137097 from romildo/upd.canta-theme 2021-09-12 00:40:56 +02:00
Artturi
d03b2e85c1
Merge pull request #137024 from Artturin/iosevka-bin 2021-09-11 22:43:09 +03:00
github-actions[bot]
d370d9ee99
Merge staging-next into staging 2021-09-11 18:01:51 +00:00
github-actions[bot]
c435b0e35f
Merge master into staging-next 2021-09-11 18:01:16 +00:00
Sandro
7fc3c29235
Merge pull request #136389 from romildo/upd.numix-solarized-gtk-theme 2021-09-11 15:07:55 +02:00
Sandro
b90c20430b
Merge pull request #137330 from dsg22/feature-noto-fonts-fix-zopflipng-detection
noto-fonts: Fix path to zopflipng, remove broken check
2021-09-11 14:16:55 +02:00
github-actions[bot]
ff5297bcd3
Merge staging-next into staging 2021-09-11 12:01:45 +00:00
Alyssa Ross
56314db098
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/compilers/ghc/8.10.7.nix
	pkgs/development/compilers/ghc/8.8.4.nix

I've removed the isWindows check from useLdGold in ghc, since that should
be covered by the new hasGold check.
2021-09-11 10:49:13 +00:00
Davíð Steinn Geirsson
12d41756b0 noto-fonts: Fix path to zopflipng, remove broken check 2021-09-11 00:54:52 +00:00
github-actions[bot]
8de3dc884c
Merge master into haskell-updates 2021-09-10 00:06:15 +00:00
github-actions[bot]
a646151837
Merge staging-next into staging 2021-09-09 06:01:37 +00:00
github-actions[bot]
77893d86c2
Merge master into staging-next 2021-09-09 06:01:04 +00:00
Mario Rodas
f3940004be
Merge pull request #137063 from toastal/julia-mono-0.042
julia-mono: 0.041 -> 0.042
2021-09-08 20:47:42 -05:00
github-actions[bot]
6c413ed5bf
Merge master into haskell-updates 2021-09-09 00:06:35 +00:00
github-actions[bot]
b56a4e5e6e
Merge staging-next into staging 2021-09-09 00:02:15 +00:00
github-actions[bot]
8cd1da2362
Merge master into staging-next 2021-09-09 00:01:35 +00:00
José Romildo
21ddf57f72 canta-theme: 2021-07-06 -> 2021-09-08 2021-09-08 09:01:39 -03:00
Brice Waegeneire
a49177e0ce maintainers: remove bricewge
So long, and thanks for all the fish!
2021-09-08 11:56:00 +02:00
toastal
c9507977b0 julia-mono: 0.041 -> 0.042
https://github.com/cormullion/juliamono/releases/tag/v0.042
2021-09-08 11:35:25 +07:00
Artturin
81d4455359 iosevka-bin: make it possible to use sgr-iosevka variants 2021-09-07 23:02:28 +03:00
Luke Granger-Brown
9094826af8 Merge remote-tracking branch 'upstream/staging-next' into staging-fix 2021-09-07 16:23:11 +00:00
Luke Granger-Brown
9501e5d2fd Merge commit '5b6c2380adb4c4ddb0f87152cef0016333ea5a4d' into staging-fix 2021-09-07 16:21:36 +00:00
Vladimír Čunát
dbc3228248
Merge branch 'master' into staging-next
(It's a little older version of master, to bring haskell updates now.)
2021-09-07 08:21:02 +02:00
(cdep)illabout
121cc7c0dc
all-cabal-hashes: 2021-09-03T13:28:39Z -> 2021-09-06T23:06:06Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-09-07 10:51:23 +09:00
Martin Weinelt
7f732aca66 Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next"
This reverts commit b041b2e1b2, reversing
changes made to 5b6c2380ad.
2021-09-05 15:02:25 +02:00
Martin Weinelt
b041b2e1b2 Merge remote-tracking branch 'origin/python-unstable' into staging-next 2021-09-05 14:51:26 +02:00
github-actions[bot]
7a57a6bcd1
Merge master into haskell-updates 2021-09-05 00:06:37 +00:00
github-actions[bot]
5993483dcb
Merge master into staging-next 2021-09-05 00:01:33 +00:00
José Romildo Malaquias
1c7e40b758
Merge pull request #136529 from fortuneteller2k/papirus
papirus-icon-theme: 20210802 -> 20210901
2021-09-04 15:19:39 -03:00
github-actions[bot]
e750a74632
Merge staging-next into staging 2021-09-04 00:02:10 +00:00
Alyssa Ross
071a7a4583
Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-03 18:23:45 +00:00
Joe Hermaszewski
73be7eaf64
all-cabal-hashes: 2021-08-23T13:50:03Z -> 2021-09-03T13:28:39Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-09-03 15:04:38 +01:00
Joe Hermaszewski
5942b67b0c
Merge pull request #135453 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
2021-09-03 15:02:58 +01:00
fortuneteller2k
ed19d70dc6 papirus-icon-theme: 20210802 -> 20210901 2021-09-03 15:51:49 +08:00
Artturin
8d356bb2c6 helvetica-neue-lt-std: cleanup 2021-09-02 15:56:59 +03:00
Artturin
5d87d839d1 helvetica-neue-lt-std: 2013.06.07 -> 2014.08.16
switch to web.archive source
2021-09-02 15:55:38 +03:00
José Romildo
2b5d87d825 numix-solarized-gtk-theme: 20210522 -> 20210831 2021-09-01 11:24:08 -03:00
github-actions[bot]
2b967ea234
Merge master into haskell-updates 2021-08-27 00:06:46 +00:00
github-actions[bot]
e203130b8f
Merge staging-next into staging 2021-08-26 18:01:36 +00:00
github-actions[bot]
8fb1ff7c31
Merge master into staging-next 2021-08-26 18:01:02 +00:00
José Romildo
2e453be783 nordic: unstable-2021-06-04 -> unstable-2021-08-13 2021-08-26 09:55:43 -03:00
github-actions[bot]
faa97c56dc
Merge master into haskell-updates 2021-08-26 00:06:00 +00:00
github-actions[bot]
1b3d772f68
Merge staging-next into staging 2021-08-26 00:02:19 +00:00
github-actions[bot]
1bf55a993f
Merge master into staging-next 2021-08-26 00:01:37 +00:00
Sandro
793671c9ce
Merge pull request #135676 from romildo/upd.marwaita-peppermint
marwaita-peppermint: 0.6 -> 10.3
2021-08-26 01:21:20 +02:00
github-actions[bot]
90fa603351
Merge staging-next into staging 2021-08-25 18:01:39 +00:00
Vladimír Čunát
70e05c1003
Merge branch 'master' into staging-next 2021-08-25 19:42:15 +02:00
Ryan Mulligan
ffaf078cdd
Merge pull request #135612 from r-ryantm/auto-update/adwaita-qt
adwaita-qt: 1.3.1 -> 1.4.0
2021-08-25 08:36:32 -07:00