Commit Graph

3009 Commits

Author SHA1 Message Date
Mario Rodas
322aaa9b19 fraunces: init at 1.000 2020-10-29 04:20:00 +00:00
Andreas Rammhold
db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
Ben Siraphob
db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
R. RyanTM
afdd017def matcha-gtk-theme: 2020-10-05 -> 2020-10-23 2020-10-25 20:31:23 +00:00
Vladimír Čunát
2f6b00b15e
Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Alexander Bich
6078bad045 open-sans: fix revision
Remove URL encoding of revision, it results in double encoding.
2020-10-24 22:05:32 +03:00
WORLDofPEACE
949f7f9227
Merge pull request #98316 from NixOS/gnome-3.38
GNOME 3.38
2020-10-23 20:02:38 -04:00
Piotr Bogdan
47dc5607b4
gnome-user-docs: 3.36.2 -> 3.38.0 2020-10-24 01:15:08 +02:00
Jan Tojnar
c252654584
Merge branch 'master' into staging-next 2020-10-24 01:10:07 +02:00
Peter Simons
7f7a12f20e all-cabal-hashes: update to Hackage at 2020-10-22T01:32:08Z 2020-10-23 21:00:26 +02:00
Jan Tojnar
d13fc932cd
Merge branch 'master' into staging-next 2020-10-22 21:20:14 +02:00
Rok Garbas
d5ebdf57c8
Merge pull request #101390 from garbas/fix-juliamono
julia-mono: update sha256
2020-10-22 18:57:26 +02:00
Rok Garbas
92cb4e843c
julia-mono: update sha256 2020-10-22 17:33:29 +02:00
Jan Tojnar
03c64130bb
Merge pull request #94892 from toonn/font-joypixels-emoji 2020-10-22 10:21:25 +02:00
Jan Tojnar
5902a08028
joypixels: run install hooks
Also clean up formatting.
2020-10-22 03:32:45 +02:00
toonn
196c828153
joypixels: Use updated font for macOS
After some back and forth with JoyPixels they agreed to creating a
version of their font for macOS that does not use the exact same name as
the Apple Color Emoji default font.

This naming collision meant it was impossible to configure applications
to use the JoyPixels emoji font unless you disabled the Apple Color
Emoji font using Font Book. Which meant the JoyPixels font could either
replace the Apple Color Emoji font completely or only fill in the gaps
in that font (on my system "hot face" isn't in the system font) but not
be used entirely for specific apps or be used with the system font as a
back up.
2020-10-22 03:32:45 +02:00
toonn
fd653b992a
joypixels: Move assert to allow override
By moving the assert concerning license acceptance into the src
attribute license acceptance can be expressed with an override,
`joypixels.override { acceptLicense = true; }`.
2020-10-22 03:32:44 +02:00
toonn
ca61c67381
joypixels: Drop dash from nixos endpoint url
The url was changed on request.
2020-10-22 03:32:44 +02:00
toonn
0da946eac8
joypixels: Reword license acceptance warning 2020-10-22 03:32:44 +02:00
toonn
48128ba77f
joypixels: Mark license as unfree 2020-10-22 03:32:44 +02:00
toonn
f9f1cbbffa
joypixels: Switch on kernel.name rather than system
x86_64-darwin is too specific because macOS runs on multiple
architectures.
2020-10-22 03:32:43 +02:00
toonn
c5249d1e9d
joypixels: Refactor to special-case darwin
Specifying the system-specific variables for x86_64-darwin and
x86_64-linux is too restrictive, excluding for example i686-linux.
Since macOS seems to be the odd one out we can special-case only
x86_64-darwin.
2020-10-22 03:32:43 +02:00
toonn
25ca62c2a2
joypixels: Switch from override to config option
Switch from an overridden variable to an option specified in
configuration.nix or config.nix:
  ```
  joypixels.acceptLicense = true;
  ```
2020-10-22 03:32:43 +02:00
toonn
a880ab2e98
joypixels: Refactor to group system-specific variables 2020-10-22 03:32:42 +02:00
toonn
cd255a375e
joypixels: Add proper license
The JoyPixels font comes with a license which requires explicit
acceptance by the user.
2020-10-22 03:32:42 +02:00
toonn
d36a92fd2c
joypixels: Update metadata 2020-10-22 03:32:42 +02:00
toonn
568beeaa28
joypixels: Refactor src and installPhase for clarity 2020-10-22 03:32:41 +02:00
toonn
e0ad840a06
joypixels: Add support for darwin 2020-10-22 03:32:41 +02:00
toonn
da117df3f4
joypixels: Use dedicated NixOS cdn endpoint
The Arch Linux endpoint was not intended to be used as-is by other
distros. I have asked for and received a proper license with a dedicated
endpoint for NixOS.
2020-10-22 03:32:41 +02:00
André Silva
609d817586
jetbrains-mono: 2.002 -> 2.200 2020-10-22 00:45:30 +01:00
Vladimír Čunát
90094b0468
Merge branch 'master' into staging-next
minor conflict: rust update vs. darwin fixes for it
  (not tested but seems quite OK)
2020-10-21 13:34:06 +02:00
José Romildo Malaquias
b542b692e8
Merge pull request #101075 from romildo/upd.numix-solarized-gtk-theme
numix-solarized-gtk-theme: 20180913 -> 20200910
2020-10-20 23:01:44 -03:00
ajs124
8904ce243a tzdata: 2019c -> 2020c 2020-10-20 21:09:28 +02:00
José Romildo Malaquias
07c91d7908 numix-solarized-gtk-theme: 20180913 -> 20200910 2020-10-19 11:15:34 -03:00
toastal
d6ade09d5f julia-mono: 0.018 -> 0.022 2020-10-19 13:38:16 +03:00
José Romildo Malaquias
0363fd5fd8
Merge pull request #100084 from romildo/upd.luna-icons
luna-icons: 2020-08-09 -> 0.6
2020-10-18 17:01:48 -03:00
José Romildo Malaquias
9cf5238ee7
Merge pull request #100201 from romildo/upd.stilo-themes
stilo-themes: 3.36-2 -> 3.36-3
2020-10-18 17:00:35 -03:00
José Romildo Malaquias
aa07adf211
Merge pull request #100338 from romildo/upd.lounge-gtk-theme
lounge-gtk-theme: 1.22 -> 1.24
2020-10-18 16:59:39 -03:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Will Dietz
e94e19655a
agave: 22 -> 30
https://github.com/agarick/agave/releases/tag/v30
(see also notes for other releases, not linked here)
2020-10-16 13:20:17 -05:00
José Romildo Malaquias
29187f1073 luna-icons: 2020-08-09 -> 0.6 2020-10-14 11:30:18 -03:00
José Romildo Malaquias
722a480c88 marwaita-ubuntu: init at 1.5 2020-10-14 10:47:51 -03:00
José Romildo Malaquias
71db2669e8 arc-theme: fix license 2020-10-13 09:33:15 -03:00
José Romildo Malaquias
b31577aea8 arc-theme: use pkg-config instead of the alias pkgconfig 2020-10-13 09:27:35 -03:00
José Romildo Malaquias
0c32ddda71 arc-theme: 20200819 -> 20201013 2020-10-13 09:27:00 -03:00
José Romildo Malaquias
511f36333e amber-theme: 3.36-1 -> 3.36-2 2020-10-12 10:10:21 -07:00
José Romildo Malaquias
95e3e3e09a plano-theme: 3.36-1 -> 3.36-2 2020-10-12 10:09:42 -07:00
José Romildo Malaquias
d38c911a06 zuki-themes: 3.36-3 -> 3.36-4 2020-10-12 10:08:28 -07:00
José Romildo Malaquias
d9d1273c0d
Merge pull request #99620 from romildo/upd.matcha-gtk-theme
matcha-gtk-theme: 2020-09-28 -> 2020-10-05
2020-10-12 13:03:26 -03:00
José Romildo Malaquias
8eb2086f25 lounge-gtk-theme: 1.22 -> 1.24 2020-10-12 12:00:36 -03:00
Anderson Torres
e61c9d185d
Merge pull request #100193 from AndersonTorres/big-upload
A bunch of updates
2020-10-12 08:48:52 -03:00
Mario Rodas
0f81680440
Merge pull request #100130 from suhr/julia-mono
julia-mono: init at 0.018
2020-10-12 06:32:25 -05:00
AndersonTorres
890d47fc33 comic-neue: 2.5 -> 2.51 2020-10-12 04:07:17 -03:00
José Romildo Malaquias
e2064ae542
Merge pull request #99704 from Vonfry/update/dracula
dracula-theme: 1.3.0 -> 2.0 and rename ant-dracula to dracula-theme
2020-10-11 16:07:12 -03:00
Vonfry
0f1be68116
dracula-theme: rename ant-dracula-theme to dracula-theme and update 2020-10-11 20:16:27 +08:00
José Romildo Malaquias
14258779e6 stilo-themes: 3.36-2 -> 3.36-3 2020-10-11 00:25:48 -03:00
Сухарик
2336543338 julia-mono: init at 0.018 2020-10-10 10:38:22 +03:00
Mario Rodas
5dbc275975 cascadia-code: 2008.25 -> 2009.22
https://github.com/microsoft/cascadia-code/releases/tag/v2009.22
2020-10-10 00:00:00 -05:00
José Romildo Malaquias
bd98971936
Merge pull request #99305 from romildo/upd.skeu
skeu: init at 0.5.1
2020-10-10 10:49:06 -03:00
José Romildo Malaquias
0d5f50e48c
Merge pull request #99295 from romildo/upd.marwaita-pop_os
marwaita-pop_os: init at 0.9
2020-10-10 10:48:21 -03:00
José Romildo Malaquias
b2b64e4a44
Merge pull request #99311 from romildo/upd.flat-remix-icon-theme
flat-remix-icon-theme: 20200116 -> 20200710
2020-10-07 18:50:30 -03:00
Jiehong Ma
799e0f1a2a ttf-tw-moe: first version 2020-10-07 16:11:28 +02:00
José Romildo Malaquias
9fee367103 matcha-gtk-theme: 2020-09-28 -> 2020-10-05 2020-10-05 09:08:45 -03:00
Justin Humm
b6b8503f85 monoid: 2016-07-21 -> 2018-06-03
Also applied a patch, so we can build with python3Packages.fontforge, as
fontforge doesn't have python2 bindings anymore.
2020-10-04 16:10:17 +02:00
José Romildo Malaquias
9cbf927826
Merge pull request #99032 from romildo/upd.marwaita-manjaro
marwaita-manjaro: 1.5 -> 1.6
2020-10-03 11:28:28 -03:00
José Romildo Malaquias
1859df5110
Merge pull request #99002 from romildo/upd.matcha-gtk-theme
matcha-gtk-theme: 2020-07-27 -> 2020-09-28
2020-10-03 11:27:24 -03:00
Peter Simons
582f5cea5f all-cabal-hashes: update to Hackage at 2020-10-01T23:28:17Z 2020-10-02 21:07:31 +02:00
Patrick Hilhorst
f7e390e6d4 treewide: fix redirected urls (run 3)
Related:
 - 9fc5e7e473
 - 593e11fd94
 - 508ae42a0f

Since the last time I ran this script, the Repology API changed, so I had to
adapt the script used in the previous PR. The new API should be more robust, so
overall this is a positive (no more grepping the error messages for our relevant
data but just a nice json structure).

Here's the new script I used:

```sh
curl https://repology.org/api/v1/repository/nix_unstable/problems \
   | jq -r '.[] | select(.type == "homepage_permanent_https_redirect") | .data | "s@\(.url)@\(.target)@"' \
   | sort | uniq | tee script.sed
find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```

I will also add this script to `maintainers/scripts`.
2020-10-02 09:01:35 -07:00
Silvan Mosberger
5ce1f9d129
Merge pull request #99051 from Infinisil/man-pages-bin
man-pages: Make it findable by manpages
2020-10-02 00:52:30 +02:00
José Romildo Malaquias
8dc5cbc6f3 iconpack-jade: 1.23 -> 1.24 2020-10-01 22:01:04 +00:00
José Romildo Malaquias
2ee2137879 flat-remix-icon-theme: 20200116 -> 20200710 2020-10-01 14:53:42 -03:00
José Romildo Malaquias
32762b808f
Merge pull request #98857 from romildo/upd.marwaita
marwaita: 7.6.1 -> 7.7
2020-10-01 14:12:47 -03:00
José Romildo Malaquias
b08ef82364 skeu: init at 0.5.1 2020-10-01 13:54:20 -03:00
José Romildo Malaquias
f15c4c31d5 marwaita-pop_os: init at 0.9 2020-10-01 12:51:34 -03:00
Mario Rodas
33d21a2bff
Merge pull request #99047 from marsam/update-sudo-font
sudo-font: 0.50 -> 0.51
2020-10-01 04:56:19 -05:00
Samuel Dionne-Riel
4c3b84ca6c
Merge pull request #99119 from samueldr/fix/noto-emoji-hangs
noto-fonts-emoji: Work around Hydra silence timeouts on AArch64 by being noisy
2020-09-30 14:16:08 -04:00
José Romildo Malaquias
d6a12e8d9e
Merge pull request #98426 from romildo/fix.hicolor-icon-theme
hicolor-icon-theme: fix quoting shell variables in setup hook
2020-09-30 10:54:45 -03:00
Samuel Dionne-Riel
174db5caad noto-fonts-emoji: Work around Hydra silence timeouts by being noisy
The added noise should keep Hydra from stopping this build thinking it
is hanging doing nothing, while in fact it's just churning slowly
through thousands of funny pictures!
2020-09-29 17:46:22 -04:00
José Romildo Malaquias
1063be86e9
Merge pull request #98434 from romildo/upd.materia-theme
materia-theme: 20190912 -> 20200916
2020-09-29 17:05:33 -03:00
Silvan Mosberger
75d24ef5e7
man-pages: Make it findable by manpages
Previously `nix-shell -p man-pages` wouldn't work, because `man` by
default looks up man pages only for the packages that appear in PATH.
Since man-pages didn't have anything in $out/bin though, it wouldn't be
put on PATH.

This fixes that by just creating an empty $out/bin
2020-09-29 02:08:16 +02:00
Mario Rodas
02fff7fff9 sudo-font: 0.50 -> 0.51
https://github.com/jenskutilek/sudo-font/releases/tag/v0.51
2020-09-28 18:00:00 -05:00
José Romildo Malaquias
d180ceff2d marwaita-manjaro: 1.5 -> 1.6 2020-09-28 17:20:31 -03:00
José Romildo Malaquias
9695c3168b matcha-gtk-theme: 2020-07-27 -> 2020-09-28 2020-09-28 09:01:01 -03:00
José Romildo Malaquias
fa5cb6b2a8 hicolor-icon-theme: fix quoting shell variables in setup hook 2020-09-27 15:51:41 -03:00
José Romildo Malaquias
e8100d9fef marwaita: 7.6.1 -> 7.7 2020-09-26 09:24:43 -03:00
Peter Simons
ae183ba4f7 all-cabal-hashes: update to Hackage at 2020-09-25T08:31:15Z 2020-09-25 21:10:38 +02:00
AndersonTorres
a3323d4934 comic-neue: 2.3 -> 2.5 2020-09-21 23:37:31 -03:00
José Romildo Malaquias
e388dd8542 materia-theme: 20190912 -> 20200916 2020-09-21 21:58:35 -03:00
José Romildo Malaquias
066412597a materia-theme: format with nix-format 2020-09-21 21:15:16 -03:00
Daniël de Kok
b83824d9c4
Merge pull request #98159 from sternenseemann/noto-emoji-unicode-13.1
noto-fonts-emoji: unstable-2020-08-20 → 2020-09-16
2020-09-20 14:20:19 +02:00
Daniël de Kok
a9953f1ead
Merge pull request #98122 from turboMaCk/corefonts-output-hash
corefonts: fix hash mismatch update
2020-09-19 16:06:53 +02:00
Mario Rodas
72b9660dc1
_3270font: 2.0.4 -> 2.1.0 (#98156)
https://github.com/rbanffy/3270font/releases/tag/v.2.1.0
2020-09-17 19:00:53 -05:00
sternenseemann
ebd9355231 noto-fonts-emoji: unstable-2020-08-20 → 2020-09-16-unicode13.1 2020-09-17 19:55:25 +02:00
sternenseemann
e8a612c066 pythonPackages.nototools: 0.2.12 → 0.2.13 2020-09-17 19:55:25 +02:00
Marek Fajkus
b529c6cf65
corefonts: fix hash mismatch update 2020-09-16 21:16:01 +02:00
Jan Tojnar
9763e55345
Merge pull request #97862 from jtojnar/emoji-inkscape-fix 2020-09-14 01:43:57 +02:00