diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:00:58 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:22:20 +0200 |
commit | bf414c9d4f892fd4e392a5f42016b57e84402a8b (patch) | |
tree | 08c000d609ed8e608ca542fa78360e4217f3fc36 /pkgs/development/libraries/javascript/jquery-ui/default.nix | |
parent | 29901451700a7382f3f9d5a0a23cd55b187e5585 (diff) | |
parent | 9de9669496a05f64ea436c01f9b66c057cd74f90 (diff) | |
download | nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.gz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.bz2 nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.lz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.xz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.zst nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.zip |
Merge 'staging' into closure-size
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
Diffstat (limited to 'pkgs/development/libraries/javascript/jquery-ui/default.nix')
-rw-r--r-- | pkgs/development/libraries/javascript/jquery-ui/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix index 9a485906e53..fd7f5367c8e 100644 --- a/pkgs/development/libraries/javascript/jquery-ui/default.nix +++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix @@ -1,29 +1,19 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "jquery-ui-1.10.4"; + name = "jquery-ui-1.11.1"; src = fetchurl { - url = "http://jqueryui.com/resources/download/${name}.custom.zip"; - sha256 = "04kp27ln74j4k2jacs54264x2bsdjx1dxlw5zlpd889jqv2m6dfc"; + url = "http://jqueryui.com/resources/download/${name}.zip"; + sha256 = "05dlcfwklymx94fb4n88l5syf80l6zrs862zzmla477vd8ndk537"; }; buildInputs = [ unzip ]; installPhase = '' - mkdir -p $out - cp -prvd css js $out/ - - # For convenience, provide symlinks "jquery.min.js" etc. (i.e., - # without the version number). - pushd $out/js - ln -s jquery-ui-*.custom.js jquery-ui.js - ln -s jquery-ui-*.custom.min.js jquery-ui.min.js - ln -s jquery-1.*.js jquery.js - popd - pushd $out/css/smoothness - ln -s jquery-ui-*.custom.css jquery-ui.css + mkdir -p "$out/js" + cp -rv . "$out/js" ''; meta = { |