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

Merge remote-tracking branch 'origin/master' into stdenv-updates.

Browse Source 
Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Peter Simons
2013-10-26 18:28:05 +02:00
parent f7bec094e6 e1c9c133b0
commit 91f2c362de
156 changed files with 2797 additions and 844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/misc/cl-launch/default.nix
View File

@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="cl-launch";
version="3.21.1";
version="3.22.1";
name="${baseName}-${version}";
hash="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij";
url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-3.21.1.tar.gz";
sha256="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij";
hash="08lb8nm4dvkbgraqclw5xd7j6xskw9hgjpg9ql087gib5a90k09i";
url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-3.22.1.tar.gz";
sha256="08lb8nm4dvkbgraqclw5xd7j6xskw9hgjpg9ql087gib5a90k09i";
};
buildInputs = [
];

8
pkgs/development/tools/misc/luarocks/default.nix
View File

@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="luarocks";
version="2.0.13-rc1";
version="2.1.0";
name="${baseName}-${version}";
hash="1cpdi61dwcc2i4bwrn7bb8fibkd1s75jrr0bjcbs8p76rn6hkb2y";
url="http://luarocks.org/releases/luarocks-2.0.13-rc1.tar.gz";
sha256="1cpdi61dwcc2i4bwrn7bb8fibkd1s75jrr0bjcbs8p76rn6hkb2y";
hash="12aqwchzn77yin2ahpxnc3lam5w0xhksrnhf31n3r7cxdsfh446c";
url="http://luarocks.org/releases/luarocks-2.1.0-rc3.tar.gz";
sha256="12aqwchzn77yin2ahpxnc3lam5w0xhksrnhf31n3r7cxdsfh446c";
};
buildInputs = [
lua curl

2
pkgs/development/tools/misc/texinfo/5.2.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses perl xz ];
preInstall = ''
installFlags="TEXMF=$out/texmf";
installFlags="TEXMF=$out/texmf-dist";
installTargets="install install-tex";
'';

25
pkgs/development/tools/misc/xc3sprog/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchsvn, cmake, libusb, libftdi }:
# The xc3sprog project doesn't seem to make proper releases, they only put out
# prebuilt binary subversion snapshots on sourceforge.
stdenv.mkDerivation rec {
version = "748"; # latest @ 2013-10-26
name = "xc3sprog-${version}";
src = fetchsvn rec {
url = "https://svn.code.sf.net/p/xc3sprog/code/trunk";
sha256 = "0wkz6094kkqz91qpa24pzlbhndc47sjmqhwk3p7ccabv0041rzk0";
rev = "${version}";
};
buildInputs = [ cmake libusb libftdi ];
meta = with stdenv.lib; {
description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG";
homepage = http://xc3sprog.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}