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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/stdenv/generic/default.nix
This commit is contained in:
Eelco Dolstra
2014-11-06 10:16:39 +01:00
parent c964077200 782a12e450
commit 0518ccf5af
232 changed files with 3422 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/ruby/ruby-1.8.7.nix
+1 -1
View File
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
'';
meta = {
license = "Ruby";
license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language";
};
pkgs/development/interpreters/ruby/ruby-2.0.0.nix
+1 -1
View File
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
'';
meta = {
license = "Ruby";
license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language";
platforms = stdenv.lib.platforms.all;
pkgs/development/interpreters/ruby/ruby-2.1.0.nix
+1 -1
View File
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
'';
meta = {
license = "Ruby";
license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language";
platforms = stdenv.lib.platforms.all;
pkgs/development/interpreters/ruby/ruby-2.1.1.nix
+1 -1
View File
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
'';
meta = {
license = "Ruby";
license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language";
platforms = stdenv.lib.platforms.all;
pkgs/development/interpreters/ruby/ruby-2.1.2.nix
+1 -1
View File
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
'';
meta = {
license = "Ruby";
license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language";
platforms = stdenv.lib.platforms.all;
pkgs/development/interpreters/ruby/ruby-2.1.3.nix
+1 -1
View File
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
'';
meta = {
license = "Ruby";
license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language";
platforms = stdenv.lib.platforms.all;