diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-08 18:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-08 18:01:16 +0000 |
| commit | d47f26379adf02bb973cbae487c2dcf40d3613bd (patch) | |
| tree | fca453db0514ec48d01cb3dcdb0b9d9103de78c8 /pkgs/data | |
| parent | 4a35c770221bf9dea0da66b9e92702c5da144581 (diff) | |
| parent | 55face65be766a52d8277404b3b2023778e7f408 (diff) | |
| download | nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.gz nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.bz2 nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.lz nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.xz nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.zst nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/soundfonts/fluid/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/data/soundfonts/ydp-grand/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/themes/gnome-breeze/default.nix | 22 |
3 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix index 1f84a6fd1ee..193c9a60b9f 100644 --- a/pkgs/data/soundfonts/fluid/default.nix +++ b/pkgs/data/soundfonts/fluid/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "Fluid-3"; + pname = "Fluid"; + version = "3"; src = fetchurl { url = "https://ftp.osuosl.org/pub/musescore/soundfont/fluid-soundfont.tar.gz"; diff --git a/pkgs/data/soundfonts/ydp-grand/default.nix b/pkgs/data/soundfonts/ydp-grand/default.nix index 3b44b712139..635b445f611 100644 --- a/pkgs/data/soundfonts/ydp-grand/default.nix +++ b/pkgs/data/soundfonts/ydp-grand/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "ydp-grand"; + pname = "ydp-grand"; version = "unstable-2016-08-04"; src = fetchurl { diff --git a/pkgs/data/themes/gnome-breeze/default.nix b/pkgs/data/themes/gnome-breeze/default.nix index 09f9ecd197a..38733590a34 100644 --- a/pkgs/data/themes/gnome-breeze/default.nix +++ b/pkgs/data/themes/gnome-breeze/default.nix @@ -1,12 +1,16 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "gnome-breeze-20160526"; - src = fetchgit { - url = "https://github.com/dirruk1/gnome-breeze"; - sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm"; + pname = "gnome-breeze"; + version = "unstable-2016-05-26"; + + src = fetchFromGitHub { + owner = "dirruk1"; + repo = "gnome-breeze"; rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221"; + sha256 = "sha256-lQYVOhFBDOYT+glUHleuymGTfHEE5bIyqUFnS/EDc0I="; }; + installPhase = '' mkdir -p $out/share/themes cp -r Breeze* $out/share/themes @@ -14,12 +18,12 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = { + meta = with lib; { description = "A GTK theme built to match KDE's breeze theme"; homepage = "https://github.com/dirruk1/gnome-breeze"; - license = lib.licenses.lgpl2; - maintainers = with lib.maintainers; [ bennofs ]; - platforms = lib.platforms.all; + license = licenses.lgpl2; + maintainers = with maintainers; [ bennofs ]; + platforms = platforms.all; hydraPlatforms = []; }; } |