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

xdg-utils, libclc: Use fetchzip

Browse Source
This commit is contained in:
Eelco Dolstra 2015-05-13 15:32:32 +02:00
parent f40c885a34
commit 94389cb8c6
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libclc/default.nix
View File

@ -1,12 +1,13 @@
{ stdenv, fetchsvn, python, llvm, clang }:
{ stdenv, fetchFromGitHub, python, llvm, clang }:
stdenv.mkDerivation {
name = "libclc-2015-03-27";
src = fetchsvn {
url = "http://llvm.org/svn/llvm-project/libclc/trunk";
rev = "233456";
sha256 = "0g56kgffc1qr9rzhcjr4w8kljcicg0q828s9b4bmfzjvywd7hhr0";
src = fetchFromGitHub {
owner = "llvm-mirror";
repo = "libclc";
rev = "0a2d1619921545b52303be5608b64dc46f381e97";
sha256 = "0hgm013c0vlfqfbbf4cdajl01hhk1mhsfk4h4bfza1san97l0vcc";
};
buildInputs = [ python llvm clang ];
@ -22,7 +23,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = http://libclc.llvm.org/;
description = "implementation of the library requirements of the OpenCL C programming language";
description = "Implementation of the library requirements of the OpenCL C programming language";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ wkennington ];

12
pkgs/tools/X11/xdg-utils/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, fetchgit, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto, w3m }:
{ stdenv, fetchzip, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto, w3m }:
let rev = "e8ee3b18d16e41b95148111b920a0c8beed3ac6c"; in
stdenv.mkDerivation rec {
name = "xdg-utils-1.1.0-rc3p7";
src = fetchgit {
url = "http://anongit.freedesktop.org/git/xdg/xdg-utils.git";
rev = "e8ee3b18d16e41b95148111b920a0c8beed3ac6c";
sha256 = "0qy9h7vh6sw7wmadjvasw4sdhb9fvv7bn32ifgasdx7ag3r3939w";
src = fetchzip {
name = "xdg-utils-${rev}.tar.gz";
url = "http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/${rev}.tar.gz";
sha256 = "1hz6rv45blcii1a8n1j45rg8vzm98vh4fvlca3zmay1kp57yr4jl";
};
# just needed when built from git