From 0f44989a6c7cf2465ab911b22b4966a4be933d22 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 31 May 2022 14:44:47 -0600 Subject: [PATCH] nixui: remove --- pkgs/development/tools/node-webkit/nw12.nix | 59 ---------- .../package-management/nixui/default.nix | 44 ------- .../package-management/nixui/generate.sh | 4 - pkgs/tools/package-management/nixui/nixui.nix | 17 --- .../nixui/node-packages.nix | 108 ------------------ pkgs/tools/package-management/nixui/pkg.json | 3 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 -- 8 files changed, 1 insertion(+), 242 deletions(-) delete mode 100644 pkgs/development/tools/node-webkit/nw12.nix delete mode 100644 pkgs/tools/package-management/nixui/default.nix delete mode 100755 pkgs/tools/package-management/nixui/generate.sh delete mode 100644 pkgs/tools/package-management/nixui/nixui.nix delete mode 100644 pkgs/tools/package-management/nixui/node-packages.nix delete mode 100644 pkgs/tools/package-management/nixui/pkg.json diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix deleted file mode 100644 index da85be926715..000000000000 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, lib, fetchurl, buildEnv, makeWrapper -, xorg, alsa-lib, dbus, glib, gtk2, atk, pango, freetype, fontconfig -, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap -, libnotify}: -let - bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else "ia32"; - - nwEnv = buildEnv { - name = "nwjs-env"; - paths = [ - xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk-pixbuf - freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage - xorg.libXext xorg.libXfixes nss nspr gconf expat dbus - xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap - libnotify - ]; - - extraOutputsToInstall = [ "lib" "out" ]; - }; - -in stdenv.mkDerivation rec { - pname = "nwjs"; - version = "0.12.3"; - - src = fetchurl { - url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; - sha256 = if bits == "x64" then - "1i5ipn5x188cx54pbbmjj1bz89vvcfx5z1c7pqy2xzglkyb2xsyg" else - "117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c"; - }; - - installPhase = '' - mkdir -p $out/share/nwjs - cp -R * $out/share/nwjs - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc - - ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 - - patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw - patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc - - mkdir -p $out/bin - ln -s $out/share/nwjs/nw $out/bin - ln -s $out/share/nwjs/nwjc $out/bin - ''; - - nativeBuildInputs = [ makeWrapper ]; - - meta = with lib; { - description = "An app runtime based on Chromium and node.js"; - homepage = "https://nwjs.io/"; - platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix deleted file mode 100644 index c5aef5c1754d..000000000000 --- a/pkgs/tools/package-management/nixui/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, pkgs, fetchFromGitHub, nix, node_webkit, makeDesktopItem -, writeScript }: -let - nixui = (import ./nixui.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; - })."nixui-git+https://github.com/matejc/nixui.git#0.2.1"; - script = writeScript "nixui" '' - #! ${stdenv.shell} - export PATH="${nix}/bin:\$PATH" - ${node_webkit}/bin/nw ${nixui}/lib/node_modules/nixui/ - ''; - desktop = makeDesktopItem { - name = "nixui"; - exec = script; - icon = "${nixui}/lib/node_modules/nixui/img/128.png"; - desktopName = "NixUI"; - genericName = "NixUI"; - }; -in -stdenv.mkDerivation rec { - pname = "nixui"; - version = "0.2.1"; - src = fetchFromGitHub { - owner = "matejc"; - repo = "nixui"; - rev = version; - sha256 = "sha256-KisdzZIB4wYkJojGyG9SCsR+9d6EGuDX6mro/yiJw6s="; - }; - installPhase = '' - mkdir -p $out/bin - ln -s ${script} $out/bin/nixui - - mkdir -p $out/share/applications - ln -s ${desktop}/share/applications/* $out/share/applications/ - ''; - meta = { - description = "NodeWebkit user interface for Nix"; - homepage = "https://github.com/matejc/nixui"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.matejc ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh deleted file mode 100755 index fcb610c9d3b1..000000000000 --- a/pkgs/tools/package-management/nixui/generate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix - -exec node2nix --nodejs-10 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix deleted file mode 100644 index e6ff9b78d386..000000000000 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix deleted file mode 100644 index 89362dbec092..000000000000 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ /dev/null @@ -1,108 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - }; - "binary-search-tree-0.2.4" = { - name = "binary-search-tree"; - packageName = "binary-search-tree"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz"; - sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510"; - }; - }; - "isnumber-1.0.0" = { - name = "isnumber"; - packageName = "isnumber"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isnumber/-/isnumber-1.0.0.tgz"; - sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01"; - }; - }; - "mkdirp-0.3.5" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }; - }; - "nedb-1.0.2" = { - name = "nedb"; - packageName = "nedb"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nedb/-/nedb-1.0.2.tgz"; - sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593"; - }; - }; - "underscore-1.12.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz"; - sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ=="; - }; - }; - "underscore-1.4.4" = { - name = "underscore"; - packageName = "underscore"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }; - }; - }; -in -{ - "nixui-git+https://github.com/matejc/nixui.git#0.2.1" = nodeEnv.buildNodePackage { - name = "nixui"; - packageName = "nixui"; - version = "0.2.1"; - src = fetchgit { - url = "https://github.com/matejc/nixui.git"; - rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38"; - sha256 = "2a2b1dcd9201e306242688c6c86f520ac47ef5de841ae0d7ea6ae8ff2889c3ab"; - }; - dependencies = [ - sources."async-0.2.10" - (sources."binary-search-tree-0.2.4" // { - dependencies = [ - sources."underscore-1.4.4" - ]; - }) - sources."isnumber-1.0.0" - sources."mkdirp-0.3.5" - (sources."nedb-1.0.2" // { - dependencies = [ - sources."underscore-1.4.4" - ]; - }) - sources."underscore-1.12.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "nix-env frontend written with Polymer"; - homepage = "https://github.com/matejc/nixui"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/pkgs/tools/package-management/nixui/pkg.json b/pkgs/tools/package-management/nixui/pkg.json deleted file mode 100644 index 39aceb5b0e1f..000000000000 --- a/pkgs/tools/package-management/nixui/pkg.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - { "nixui": "git+https://github.com/matejc/nixui.git#0.2.1" } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c5b6cc7492d4..6278957813c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -909,6 +909,7 @@ mapAliases ({ nix_2_6 = nixVersions.nix_2_6; nixopsUnstable = nixops_unstable; # Added 2022-03-03 nixosTest = testers.nixosTest; # Added 2022-05-05 + nixui = throw "nixui has been removed from nixpkgs, due to the project being unmaintained"; # Added 2022-05-23 nmap-unfree = nmap; # Added 2021-04-06 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d60c4b41d8e..9b8bed119a54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15935,11 +15935,6 @@ with pkgs; sdk = true; }; - # only kept for nixui, see https://github.com/matejc/nixui/issues/27 - nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix { - gconf = gnome2.GConf; - }; - nrfutil = callPackage ../development/tools/misc/nrfutil { }; obelisk = callPackage ../development/tools/ocaml/obelisk { menhir = ocamlPackages.menhir; }; @@ -34308,8 +34303,6 @@ with pkgs; nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { }; - nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; - nixdoc = callPackage ../tools/nix/nixdoc {}; dnadd = callPackage ../tools/nix/dnadd { };