diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2020-05-14 14:34:50 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2020-05-14 14:34:50 +0200 |
commit | 0ffc85d64b081f0210787435122ef7f42b81d791 (patch) | |
tree | 1399f8608455577a5f515963754ec98d5fffb586 | |
parent | 3116788c9bab3ad999fdecd310bf9f020cf7686e (diff) | |
download | nixlib-0ffc85d64b081f0210787435122ef7f42b81d791.tar nixlib-0ffc85d64b081f0210787435122ef7f42b81d791.tar.gz nixlib-0ffc85d64b081f0210787435122ef7f42b81d791.tar.bz2 nixlib-0ffc85d64b081f0210787435122ef7f42b81d791.tar.lz nixlib-0ffc85d64b081f0210787435122ef7f42b81d791.tar.xz nixlib-0ffc85d64b081f0210787435122ef7f42b81d791.tar.zst nixlib-0ffc85d64b081f0210787435122ef7f42b81d791.zip |
Remove unused files
-rw-r--r-- | nixos/lib/testing-python.nix | 6 | ||||
-rw-r--r-- | nixos/lib/testing.nix | 6 | ||||
-rw-r--r-- | nixos/lib/testing/jquery-ui.nix | 24 | ||||
-rw-r--r-- | nixos/lib/testing/jquery.nix | 36 |
4 files changed, 2 insertions, 70 deletions
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 88801f20517d..123323711a7c 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -10,11 +10,7 @@ with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; with pkgs; -let - jquery-ui = callPackage ./testing/jquery-ui.nix { }; - jquery = callPackage ./testing/jquery.nix { }; - -in rec { +rec { inherit pkgs; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index cbb7faf039ec..5c784c2f0abe 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -10,11 +10,7 @@ with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; with pkgs; -let - jquery-ui = callPackage ./testing/jquery-ui.nix { }; - jquery = callPackage ./testing/jquery.nix { }; - -in rec { +rec { inherit pkgs; diff --git a/nixos/lib/testing/jquery-ui.nix b/nixos/lib/testing/jquery-ui.nix deleted file mode 100644 index 05bd8dc2f946..000000000000 --- a/nixos/lib/testing/jquery-ui.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "jquery-ui-1.11.4"; - - src = fetchurl { - url = "https://jqueryui.com/resources/download/${name}.zip"; - sha256 = "0ciyaj1acg08g8hpzqx6whayq206fvf4whksz2pjgxlv207lqgjh"; - }; - - buildInputs = [ unzip ]; - - installPhase = - '' - mkdir -p "$out/js" - cp -rv . "$out/js" - ''; - - meta = { - homepage = "https://jqueryui.com/"; - description = "A library of JavaScript widgets and effects"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixos/lib/testing/jquery.nix b/nixos/lib/testing/jquery.nix deleted file mode 100644 index 732fdb3ba879..000000000000 --- a/nixos/lib/testing/jquery.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, compressed ? true }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "jquery-1.11.3"; - - src = if compressed then - fetchurl { - url = "http://code.jquery.com/${name}.min.js"; - sha256 = "1f4glgxxn3jnvry3dpzmazj3207baacnap5w20gr2xlk789idfgc"; - } - else - fetchurl { - url = "http://code.jquery.com/${name}.js"; - sha256 = "1v956yf5spw0156rni5z77hzqwmby7ajwdcd6mkhb6zvl36awr90"; - }; - - dontUnpack = true; - - installPhase = - '' - mkdir -p "$out/js" - cp -v "$src" "$out/js/jquery.js" - ${optionalString compressed '' - (cd "$out/js" && ln -s jquery.js jquery.min.js) - ''} - ''; - - meta = with stdenv.lib; { - description = "JavaScript library designed to simplify the client-side scripting of HTML"; - homepage = "http://jquery.com/"; - license = licenses.mit; - platforms = platforms.all; - }; -} |