Merge branch 'master' into staging-next

This commit is contained in:
Vladimír Čunát
2019-09-04 11:00:56 +02:00
217 changed files with 7332 additions and 2071 deletions

View File

@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
version = "2.2.1";
version = "2.3.0";
in fetchzip {
name = "iosevka-bin-${version}";
@@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
'';
sha256 = "0d5ys9k8adj9v1hpwbmjqshzpjlnyj81xwp0328vc5q8pvjcfly6";
sha256 = "0nry6zsmvcj44rijhbvrry84rh5hrixzb4n1mx9c27vvpy33a56w";
meta = with stdenv.lib; {
homepage = https://be5invis.github.io/Iosevka/;

View File

@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/2b4df08d487f0821b932f92392b67fe12dc1d42c.tar.gz";
sha256 = "02d06fr2jr69za5751z25c3x3zspiwdmlhmdmxaj1g48v00gbfag";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/93bcfb09798da885d29304fa4dab1e234e3b728e.tar.gz";
sha256 = "1mv5kxqldakapzbmch2b88mynng268njq3dxbkmyzli8fwnllra2";
}

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "materia-theme";
version = "20190315";
version = "20190831";
src = fetchFromGitHub {
owner = "nana-4";
repo = pname;
rev = "v${version}";
sha256 = "1fpipwvwxjiriqhysqgx51rnax73hyd5jkyxhc2g3y73s5r2xq82";
sha256 = "19b2wyq38wj3id0an47jln1y3zp5ih3kbrgmfpjp6bbdrmfcyccf";
};
nativeBuildInputs = [ glib libxml2 bc ];