diff options
| author | Peter Simons <simons@cryp.to> | 2013-07-04 23:41:22 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-07-04 23:41:22 +0200 |
| commit | 400d4a03b082207020cca30cd0d577cd791012e9 (patch) | |
| tree | 70ac2e1439e54894b3d180c107289c21d95c8260 | |
| parent | d1c3c10d95d7f92bed31c60c16823d745a1c478e (diff) | |
| download | nixlib-400d4a03b082207020cca30cd0d577cd791012e9.tar nixlib-400d4a03b082207020cca30cd0d577cd791012e9.tar.gz nixlib-400d4a03b082207020cca30cd0d577cd791012e9.tar.bz2 nixlib-400d4a03b082207020cca30cd0d577cd791012e9.tar.lz nixlib-400d4a03b082207020cca30cd0d577cd791012e9.tar.xz nixlib-400d4a03b082207020cca30cd0d577cd791012e9.tar.zst nixlib-400d4a03b082207020cca30cd0d577cd791012e9.zip | |
Update references to 'rLang' to the new name 'R'.
| -rw-r--r-- | pkgs/desktops/kde-4.10/kdeedu/cantor.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/science/biology/biolib/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/release-python.nix | 2 |
3 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix index d2a1b095b82f..4563012ac67a 100644 --- a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix +++ b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libspectre, analitza, rLang, pkgconfig, gfortran, libqalculate }: +{ kde, kdelibs, libspectre, analitza, R, pkgconfig, gfortran, libqalculate }: kde { - buildInputs = [ kdelibs libspectre analitza rLang gfortran libqalculate]; + buildInputs = [ kdelibs libspectre analitza R gfortran libqalculate]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix index b12366c01426..4e4c3c553616 100644 --- a/pkgs/development/libraries/science/biology/biolib/default.nix +++ b/pkgs/development/libraries/science/biology/biolib/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchurl, cmake, rLang, zlib }: +{ stdenv, fetchurl, cmake, R, zlib }: stdenv.mkDerivation rec { name = "biolib-${version}"; - + version = "0.0.1"; - + src = fetchurl { url = "http://bio3.xparrot.eu/download/nix-biology/biolib-${version}.tar.gz"; sha256 = "1la639rs0v4f3ayvarqv0yxwlnwn188bb1v71d2ybw1xr6gdy688"; }; - buildInputs = [cmake rLang zlib]; + buildInputs = [cmake R zlib]; meta = { + homepage = "http://biolib.open-bio.org/"; description = "BioLib"; - longDescription = - '' - BioLib brings together a set of opensource libraries written - in C/C++ and makes them available for major Bio* languages: - BioPerl, BioRuby, BioPython - ''; license = "GPL2"; - homepage = http://biolib.open-bio.org/; + longDescription = '' + BioLib brings together a set of opensource libraries written + in C/C++ and makes them available for major Bio* languages: + BioPerl, BioRuby, BioPython + ''; }; } diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index ad2f8e901c14..9cde018632fc 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1522,7 +1522,7 @@ in rhpl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rigsofrods = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rili = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rLang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + R = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rockbox_utility = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rrdtool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; |