public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-07-09 15:46:00 +02:00
parent 5c8472a2a1 f0e38f7b38
commit 74c24385cb
102 changed files with 2944 additions and 1758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/data/misc/adapta-backgrounds/default.nix
View File

@@ -1,23 +1,23 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }:
stdenv.mkDerivation rec {
name = "adapta-backgrounds-${version}";
version = "0.5.2.3";
pname = "adapta-backgrounds";
version = "0.5.3.1";
src = fetchFromGitHub {
owner = "adapta-project";
repo = "adapta-backgrounds";
rev = version;
sha256 = "0n0ggcxinja81lasmpviqq3l4jiwb05bs8r5aah1im2zvls1g007";
sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj";
};
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [ meson ninja pkgconfig glib ];
meta = with stdenv.lib; {
description = "Wallpaper collection for adapta-project";
homepage = https://github.com/adapta-project/adapta-backgrounds;
homepage = "https://github.com/adapta-project/adapta-backgrounds";
license = with licenses; [ gpl2 cc-by-sa-40 ];
platforms = platforms.all;
maintainers = [ maintainers.romildo ];
maintainers = with maintainers; [ romildo ];
};
}

4
pkgs/data/themes/shades-of-gray/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "shades-of-gray-theme";
version = "1.1.7";
version = "1.1.8";
src = fetchFromGitHub {
owner = "WernerFP";
repo = pname;
rev = version;
sha256 = "09r26izbx9sj9czc95cn4r0c1v9yj2qm84zdl047fiqa49czwbzq";
sha256 = "08i2pkq7ygf9fs9cdrw4khrb8m1w2hvgmz064g36fh35r02sms3w";
};
buildInputs = [ gtk_engines ];