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

Merge remote-tracking branch 'origin/master' into x-updates

Browse Source
This commit is contained in:
Eelco Dolstra
2012-10-03 14:43:10 -04:00
parent b78256fbd7 f9714ace11
commit 31f89ba349
23 changed files with 291 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/dosfstools/default.nix
+4 -1
View File
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
name = "dosfstools-3.0.11";
src = fetchurl {
url = "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2";
urls = [
"http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2"
"http://pkgs.fedoraproject.org/repo/pkgs/dosfstools/${name}.tar.bz2/8d2211d5bd813164e20740e7c852aa06/${name}.tar.bz2"
];
sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll";
};
pkgs/tools/misc/timidity/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ composableDerivation.composableDerivation {} {
name = "timidity-2.13.0";
src = fetchurl {
url = http://ovh.dl.sourceforge.net/sourceforge/timidity/TiMidity++-2.13.0.tar.bz2;
url = mirror://sourceforge/timidity/TiMidity++-2.13.0.tar.bz2;
sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf";
};
pkgs/tools/misc/youtube-dl/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{stdenv, fetchgit, python}:
let pkgname = "youtube-dl";
pkgver = "2012.02.27";
pkgver = "2012.09.27";
in
stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchgit {
url = "git://github.com/rg3/${pkgname}";
rev = "refs/tags/${pkgver}";
sha256 = "17270ba14f42e8f2813bc6a0eb3674e51592eede69612e156e7d99a96fd147ce";
sha256 = "a98f3339301324ddd6620f7b1353abed807cd8dea5586d6901d7fe69bc6a397c";
};
buildInputs = [python];