Merge pull request #45704 from Mic92/bootstrap

twitterBootstrap: v2 -> v3

3 files changed, 16 insertions, 47 deletions

diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix
index 1057e970865..461a81db857 100644
--- a/pkgs/development/web/twitter-bootstrap/default.nix
+++ b/pkgs/development/web/twitter-bootstrap/default.nix
@@ -1,31 +1,26 @@
-{ stdenv, fetchFromGitHub, lessc, closurecompiler }:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "twitter-bootstrap-${version}";
-  version = "2.3.2";
+  name = "bootstrap-${version}";
+  version = "3.3.7";
 
-  src = fetchFromGitHub {
-    owner = "twitter";
-    repo = "bootstrap";
-    rev =  "v${version}";
-    sha256 = "0b4dsk9sqlkwwfgqqjlgi6p05qz2jssmmz4adm83f31sx70lgh4g";
-  };  
-
-  buildInputs = [ lessc closurecompiler ];
+  src = fetchurl {
+    url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip";
+    sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l";
+  };
 
-  phases = [ "installPhase" ];
+  buildInputs = [ unzip ];
 
+  dontBuild = true;
   installPhase = ''
-    mkdir -p $out/css $out/js $out/img
-    cp $src/img/* $out/img/
-    closure-compiler --js $src/js/*.js > $out/js/bootstrap.js
-    lessc $src/less/bootstrap.less -O2 -x > $out/css/bootstrap.css
-  ''; 
+    mkdir $out
+    cp -r * $out/
+  '';
 
   meta = {
     description = "Front-end framework for faster and easier web development";
     homepage = http://getbootstrap.com/;
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.mit;
   };
+
 }
diff --git a/pkgs/development/web/twitter-bootstrap/v3.nix b/pkgs/development/web/twitter-bootstrap/v3.nix
deleted file mode 100644
index 461a81db857..00000000000
--- a/pkgs/development/web/twitter-bootstrap/v3.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "bootstrap-${version}";
-  version = "3.3.7";
-
-  src = fetchurl {
-    url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip";
-    sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l";
-  };
-
-  buildInputs = [ unzip ];
-
-  dontBuild = true;
-  installPhase = ''
-    mkdir $out
-    cp -r * $out/
-  '';
-
-  meta = {
-    description = "Front-end framework for faster and easier web development";
-    homepage = http://getbootstrap.com/;
-    license = stdenv.lib.licenses.mit;
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e176844738f..1d7eb4747f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5656,8 +5656,8 @@ with pkgs;
     libX11 = xorg.libX11;
   };
 
-  twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
-  twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {};
+  twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap {};
+  twitterBootstrap = twitterBootstrap3;
 
   txt2man = callPackage ../tools/misc/txt2man { };