Commit Graph

2975 Commits

Author SHA1 Message Date
Aluísio Augusto Silva Gonçalves
08fd340b1e
iosevka: remove dependency on otfcc
As of Iosevka 3.7.0, otfcc is no longer used.  I haven't checked if
the situation has changed since [2017] but this should make Iosevka
available on aarch64-linux and *-darwin.

[2017]: https://github.com/NixOS/nixpkgs/pull/31835#issuecomment-347048242
2020-11-04 07:47:29 -03:00
Aluísio Augusto Silva Gonçalves
26ce7f2607
iosevka: add update script
As outlined in the previous commit, we just need to update the source
URL in node-packages.json, and wait for node-packages.nix to be rebuilt
from it.
2020-11-04 07:47:29 -03:00
Aluísio Augusto Silva Gonçalves
e6bc641ef4
iosevka: 3.2.2 -> 3.7.1; fetch source through nodePackages
Previously we used nodePackages only to fetch Iosevka's build
dependencies and then fetched the source code ourselves.  Updates
involved changing the version and hashes in the `iosevka` derivation and
then running node-packages/generate.sh to update the build dependencies,
which in turns updates *all* of node-packages.nix.

A new proposed policy for handling node-packages.nix updates involves
batching those updates.  Previously, that would mean `iosevka` and its
build dependencies could end up out of sync until the batched update was
run.

To work with the new policy, we now fetch Iosevka's source code (and
not only its dependencies) through nodePackages.  Updates are done by
changing the source URL in node-packages.json, which eventually becomes
part of an update of node-packages.nix, which is then propagated to
`iosevka` itself.

One con of this strategy is that errors can not be caught directly
after the update, but only after node-packages.nix is regenerated.
2020-11-04 07:47:29 -03:00
Aluísio Augusto Silva Gonçalves
e237f23b6a
iosevka-bin: move update script
Move bin.nix's update script to update-bin.sh so it doesn't conflict
with default.nix's update script.
2020-11-04 07:47:29 -03:00
Aluísio Augusto Silva Gonçalves
988f0cf3c5
iosevka-bin: Use iosevka's meta
The two packages have the same metadata, except for the maintainers.
2020-11-04 07:47:28 -03:00
Frederik Rietdijk
9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
Mario Rodas
79af4e8c91
Merge pull request #102554 from marsam/init-fraunces
fraunces: init at 1.000
2020-11-03 21:55:57 -05:00
José Romildo Malaquias
4dc4b62ee5
Merge pull request #102007 from stephaneyfx/fix-numix-cursor-theme-generation
numix-cursor-theme: patch inkscape command
2020-11-03 16:18:17 -03:00
José Romildo Malaquias
caf4851352
Merge pull request #102619 from r-ryantm/auto-update/numix-icon-theme-square
numix-icon-theme-square: 20.07.11 -> 20.09.19
2020-11-03 15:50:05 -03:00
José Romildo Malaquias
a5cc1469aa
Merge pull request #102627 from r-ryantm/auto-update/numix-icon-theme-circle
numix-icon-theme-circle: 20.07.11 -> 20.09.19
2020-11-03 15:45:29 -03:00
R. RyanTM
ea03a3a194 numix-icon-theme-circle: 20.07.11 -> 20.09.19 2020-11-03 13:13:15 +00:00
R. RyanTM
12c3408b9c numix-icon-theme-square: 20.07.11 -> 20.09.19 2020-11-03 12:02:27 +00:00
Frederik Rietdijk
237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
Mario Rodas
4f5156fdb9
Merge pull request #100746 from dtzWill/update/agave-30
agave: 22 -> 30
2020-11-02 18:35:54 -05:00
Mario Rodas
ac19435d99
Merge pull request #102405 from marsam/update-sudo-font
sudo-font: 0.51 -> 0.52
2020-11-02 12:00:41 -05:00
Pavol Rusnak
2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
Frederik Rietdijk
fe9f55907e Merge master into staging-next 2020-11-01 11:06:08 +01:00
Frederik Rietdijk
54f7498601
Merge pull request #101369 from doronbehar/pkg/kdeApplications/qt515
kdeApplications: Use latest qt515 by default
2020-11-01 11:05:05 +01:00
Mario Rodas
dbc3eda9d9 sudo-font: 0.51 -> 0.52 2020-11-01 04:20:00 +00:00
Vladimír Čunát
dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
V
d3025ee8c6 iosevka-bin: add support for variants
This adds the ability to select a specific prebuilt variant. It also adds
an updater script for generating their hashes. Additionally, switching
to TTC files reduces the package size by an order of magnitude.

Example usage:

	fonts.fonts = with pkgs; [
	  (iosevka-bin.override { variant = "ss10"; })
	  (iosevka-bin.override { variant = "sparkle"; })
	  (iosevka-bin.override { variant = "aile"; })
	];
2020-10-30 21:19:20 +01:00
Doron Behar
cf9f00b56d maia-icon-theme: Don't import kdeApplications
Use libsForQt5.callPackage (#101369).
2020-10-30 20:37:58 +02:00
Stephane Raux
d1cf7bd44e numix-cursor-theme: patch inkscape command
The generated cursor files were previously empty due to inkscape rejecting the command line argument. See #98481.
2020-10-29 13:08:39 -07:00
Mario Rodas
322aaa9b19 fraunces: init at 1.000 2020-10-29 04:20:00 +00: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 c778945806b 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: 4effe769e2b
 - `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 (803ca85c209)
 - 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
R. RyanTM
afdd017def matcha-gtk-theme: 2020-10-05 -> 2020-10-23 2020-10-25 20:31:23 +00: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 17f5305b6c20df795c365368d2d868266519599e, reversing
changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075.
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
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