diff options
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/droid/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/overpass/default.nix | 30 | ||||
-rw-r--r-- | pkgs/data/fonts/roboto-mono/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/roboto-slab/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/icons/arc-icon-theme/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/icons/elementary-icon-theme/default.nix | 25 | ||||
-rw-r--r-- | pkgs/data/icons/faba-icon-theme/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/icons/faba-mono-icons/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/icons/maia-icon-theme/default.nix | 15 | ||||
-rw-r--r-- | pkgs/data/icons/moka-icon-theme/default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/icons/numix-icon-theme-circle/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/icons/numix-icon-theme/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh | 3 |
13 files changed, 74 insertions, 39 deletions
diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix index 784dfe710078..8051606632df 100644 --- a/pkgs/data/fonts/droid/default.nix +++ b/pkgs/data/fonts/droid/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sourceRoot = "./"; unpackCmd = '' - ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) + ttfName=$(basename $(stripHash $curSrc)) cp $curSrc ./$ttfName ''; diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix new file mode 100644 index 000000000000..d441ac514d37 --- /dev/null +++ b/pkgs/data/fonts/overpass/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "overpass-${version}"; + version = "2.1"; + + src = fetchurl { + url = "https://github.com/RedHatBrand/overpass/releases/download/2.1/overpass-fonts-ttf-2.1.zip"; + sha256 = "1kd7vbqffp5988j3p4zxkxajdmfviyv4y6rzk7jazg81xcsxicwf"; + }; + + nativeBuildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/doc/${name} + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype + cp -v LICENSE.md README.md $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + homepage = http://overpassfont.org/; + description = "Font heavily inspired by Highway Gothic"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; +} diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index 451725a6d802..e9eff414bc1d 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { sourceRoot = "./"; unpackCmd = '' - ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) + ttfName=$(basename $(stripHash $curSrc)) cp $curSrc ./$ttfName ''; diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index ade9fd2350e5..5a8a3f3c1201 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sourceRoot = "./"; unpackCmd = '' - ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) + ttfName=$(basename $(stripHash $curSrc)) cp $curSrc ./$ttfName ''; diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 07900eebeefa..760329a94bfa 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "arc-icon-theme"; - version = "2016-06-06"; + version = "2016-07-07"; src = fetchFromGitHub { owner = "horst3180"; repo = package-name; - rev = "69da5eed0761237fd287ea2fc95c708353ccc332"; - sha256 = "04ym3ix2cpjh1q7lwvhl578pv41mn9zsadlsygl0nck8yd22widq"; + rev = "664c05e723ac2971feb123d7baca3d298248e7f9"; + sha256 = "10vicnrv2v7y4capvllaz9x3nzjkjj9fs1dspjjjg6if3gcif7m4"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 19b2230eaa8d..b15e8dea5bc8 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,29 +1,32 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.2.2"; + version = "4.0.1"; package-name = "elementary-icon-theme"; name = "${package-name}-${version}"; - src = fetchzip { - url = "https://launchpad.net/elementaryicons/3.x/${version}/+download/elementary-icon-theme-${version}.tar.xz"; - sha256 = "0b6sgvkzc5h9zm3la6f0ngs9pfjrsj318qcynxd3yydb50cd3hnf"; + src = fetchurl { + url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; + sha256 = "0cbgbd9fqxk6rbsrj0gbh1rcapkkdlaig79kilq798v94jfdskrl"; }; dontBuild = true; installPhase = '' - install -dm 755 $out/share/icons + install -dm 755 $out/share/{icons,doc/$name} cp -dr --no-preserve='ownership' . $out/share/icons/Elementary/ + mv $out/share/icons/Elementary/{AUTHORS,CONTRIBUTORS,README.md} \ + $out/share/doc/$name/ + rm $out/share/icons/Elementary/{COPYING,pre-commit} ''; meta = with stdenv.lib; { - description = "Elementary icon theme"; - homepage = "https://launchpad.net/elementaryicons"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ simonvandel ]; + description = "Elementary icon theme"; + homepage = "https://launchpad.net/elementaryicons"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ simonvandel ]; }; } diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index b83abbe7e80c..37f46060ae31 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "faba-icon-theme"; - version = "2016-06-02"; + version = "2016-09-13"; src = fetchFromGitHub { owner = "moka-project"; repo = package-name; - rev = "e50649d0171fd8cce42404c7c5002d77710ffcfc"; - sha256 = "1fn969a6l58asnl9181c2z1fsj4dybl2mgbcpwig20bri6q7yz20"; + rev = "00431894bce5fb1b8caccaee064788996be228a7"; + sha256 = "0hif030pd4w3s851k0s65w0mf2pik10ha25ycpsv91gpbgarqcns"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index 16fa63c5424c..3a871e86d9d1 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2016-04-30"; src = fetchFromGitHub { - owner = "moka-project"; + owner = "snwh"; repo = package-name; rev = "2006c5281eb988c799068734f289a85443800cda"; sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9"; diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 32682a750101..f4f81f8de8be 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,21 +1,24 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "maia-icon-theme"; +stdenv.mkDerivation rec { + name = "maia-icon-theme-${version}"; + version = "2016-09-16"; src = fetchFromGitHub { owner = "manjaro"; repo = "artwork-maia"; - rev = "23235fa56e6111d30e9f92576030cc855a0facbe"; - sha256 = "1d5bv13gds1nx88pc6a9gkrz1lb8sji0wcc5h3bf4mjw0q072nfr"; + rev = "f6718cd9c383adb77af54b694c47efa4d581f5b5"; + sha256 = "0f9l3k9abgg8islzddrxgbxaw6vbai5bvz5qi1v2fzir7ykx7bgj"; }; dontBuild = true; installPhase = '' install -dm 755 $out/share/icons - rm icons/CMakeLists.txt - cp -dr --no-preserve='ownership' icons $out/share/icons/Maia + for f in "" "-dark"; do + rm icons$f/CMakeLists.txt + cp -dr --no-preserve='ownership' icons$f $out/share/icons/maia$f + done ''; meta = with stdenv.lib; { diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 4d98a50c0c4b..0ffe2411c4fa 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "moka-icon-theme"; - version = "2016-06-07"; + version = "2016-10-06"; src = fetchFromGitHub { - owner = "moka-project"; + owner = "snwh"; repo = package-name; - rev = "a03d14e30dbdf05e8ea904994b8081ad0824e155"; - sha256 = "1j1cnrrg0gfr4vfzxlabrv8090fg4yni99g61s82vnyszkiy1rcm"; + rev = "50894ee9411721649019cd168b8ae2c85f4b5cf0"; + sha256 = "1dlpsgqsn731ra5drkx72wljcgv1zydgldy4nn5bbia9s5w8mfgs"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 414360f2d7a4..5c7464098adb 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, numix-icon-theme }: stdenv.mkDerivation rec { - version = "2016-06-10"; + version = "2016-09-27"; package-name = "numix-icon-theme-circle"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "577b8a2a8dd6429f7d3df37b15d9fd7fcbb58d56"; - sha256 = "1zx26ng6z45j1yff2m0cng4nffk8swdq1pya1l2dm7841mx5ram4"; + rev = "481bc1100f01e25e92deb7facf61436b27f9ca8a"; + sha256 = "0fkr7w6z6sz5yblgshr3qr2bszia6dsjszv3gmcbi2xqvjjd8wij"; }; buildInputs = [ numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 735d1544cf55..be224f418e80 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2016-06-10"; + version = "2016-10-05"; package-name = "numix-icon-theme"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "8196e9eaa5a60b5c02a9e37a4ca768b07966b41f"; - sha256 = "0cyv0r66vil54y6w317msddq2fjs9zhrdx17m3bx85xpqz67zq5i"; + rev = "e03eb71454c176a98733eafa268ff79995f8159d"; + sha256 = "1f8prwq9zvzfk0ncwzbrwkpjggc8nadny81dqv1cr0014jc85bxi"; }; dontBuild = true; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh index 70fd729297c0..939305d486a7 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh @@ -3,5 +3,4 @@ source $stdenv/setup mkdir -p $out/xml/dtd/docbook-ebnf cd $out/xml/dtd/docbook-ebnf cp -p $dtd dbebnf.dtd -stripHash $catalog -cp -p $catalog $strippedName +cp -p $catalog $(stripHash $catalog) |