diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-28 18:00:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-28 18:00:57 +0000 |
| commit | 017d32f216c32e06bb4fd36fdaeaf77455548bb6 (patch) | |
| tree | ab1c3dfa3a10779cce8bc3e91b3f123ce9a2f569 /pkgs/data | |
| parent | 61659835578c01f279c7c5d87c4728ea286c6d70 (diff) | |
| parent | 70c6189db536356f9eb97610eddc531811115b2e (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/recursive/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/fonts/sudo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/icons/numix-cursor-theme/default.nix | 20 |
3 files changed, 9 insertions, 19 deletions
diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index a1d99c33b85b9..142f84ba7d9eb 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.082"; + version = "1.084"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "1hjyjvzhfgqw58py4gk58fwyp5pxr3j8j76ppj6apg4dndfhs0lp"; + sha256 = "sha256-YL09RVU9pgP0/aGRKECHzd5t1VmNDPtOFcRygWqIisg="; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 2cb310109ba48..e0bc42f8d129d 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.60"; + version = "0.61"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "1zhl9yhx0dzkzc31i60lmcrizq8f3rkc7dbng5fal6iy8dwhnkmg"; + sha256 = "sha256-4GDlx2zhwkcsxJPq0IrS1owmw+RKy09X3Q0zzA9l79w="; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index 377cf05ac179f..e7f0905ff40eb 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,28 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, xcursorgen }: +{ lib, stdenv, fetchFromGitHub, inkscape, xcursorgen }: stdenv.mkDerivation rec { - version = "1.1"; - package-name = "numix-cursor-theme"; - name = "${package-name}-${version}"; + pname = "numix-cursor-theme"; + version = "1.2"; src = fetchFromGitHub { owner = "numixproject"; - repo = package-name; + repo = pname; rev = "v${version}"; - sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi"; + sha256 = "1q3w5i0h3ly6i7s9pqjdrb14kp89i78s0havri7lhiqyxizjvcvh"; }; nativeBuildInputs = [ inkscape xcursorgen ]; - patches = [ - # Remove when https://github.com/numixproject/numix-cursor-theme/pull/7 is merged - (fetchpatch { - url = "https://github.com/stephaneyfx/numix-cursor-theme/commit/3b647bf768cebb8f127b88e3786f6a9640460197.patch"; - sha256 = "174kmhlvv76wwvndkys78aqc32051sqg3wzc0xg6b7by4agrbg76"; - name = "support-inkscape-1-in-numix-cursor-theme.patch"; - }) - ]; - buildPhase = '' patchShebangs . HOME=$TMP ./build.sh |