mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 07:04:28 +00:00
Code Issues Wiki Activity
249705 commits 192 branches 125 tags 8.1 GiB
Commit graph

2955 commits

Author SHA1 Message Date
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 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
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