diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-17 10:56:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-17 10:56:54 +0000 |
| commit | c1d22074139ab0d048a05b5e5116265d099114d6 (patch) | |
| tree | 97977009422d675f8930f97c309b010481289e72 /nixpkgs/pkgs/development/web | |
| parent | 4dc8afe4fd6b18437150129e0a1ecc23c6a1c0b9 (diff) | |
| parent | bc9df0f66110039e495b6debe3a6cda4a1bb0fed (diff) | |
| download | nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.gz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.bz2 nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.lz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.xz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.zst nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.zip | |
Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'
Diffstat (limited to 'nixpkgs/pkgs/development/web')
| -rw-r--r-- | nixpkgs/pkgs/development/web/nodejs/v12.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/web/twitter-bootstrap/3.nix | 26 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix | 8 |
3 files changed, 40 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/web/nodejs/v12.nix b/nixpkgs/pkgs/development/web/nodejs/v12.nix new file mode 100644 index 000000000000..d087e7dea99f --- /dev/null +++ b/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -0,0 +1,10 @@ +{ stdenv, callPackage, lib, openssl, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; +in + buildNodejs { + inherit enableNpm; + version = "12.1.0"; + sha256 = "1efb792c689fed2e028025e1398e84193281f329427a17a62b0bffee8e771395"; + } diff --git a/nixpkgs/pkgs/development/web/twitter-bootstrap/3.nix b/nixpkgs/pkgs/development/web/twitter-bootstrap/3.nix new file mode 100644 index 000000000000..71cda3d3d9fc --- /dev/null +++ b/nixpkgs/pkgs/development/web/twitter-bootstrap/3.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "bootstrap-${version}"; + version = "3.4.1"; + + src = fetchurl { + url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip"; + sha256 = "0bnrxyryl4kyq250k4n2lxgkddfs9lxhqd6gq8x3kg9wfz7r75yl"; + }; + + buildInputs = [ unzip ]; + + dontBuild = true; + installPhase = '' + mkdir $out + cp -r * $out/ + ''; + + meta = { + description = "Front-end framework for faster and easier web development"; + homepage = https://getbootstrap.com/; + license = stdenv.lib.licenses.mit; + }; + +} diff --git a/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix index 7537c2795d23..61e7947a4796 100644 --- a/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix +++ b/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "bootstrap-${version}"; - version = "3.3.7"; + pname = "bootstrap"; + version = "4.3.1"; src = fetchurl { - url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip"; - sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l"; + url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; + sha256 = "08rkg4q8x36k03g1d81brhncrzb98sh8r53a5wg3i4p1nwqgv3w8"; }; buildInputs = [ unzip ]; |