From 4c2554ebf40d2a73f3e9e1976c80ad5d9c80ef1b Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Fri, 23 Jan 2015 15:47:43 +0100 Subject: [PATCH] Remove nixui to fix travis failures --- .../package-management/nixui/default.nix | 57 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 59 deletions(-) delete mode 100644 pkgs/tools/package-management/nixui/default.nix diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix deleted file mode 100644 index 62d890359a6..00000000000 --- a/pkgs/tools/package-management/nixui/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, pkgs, fetchgit, nix, node_webkit, config, makeDesktopItem, writeScript -, profilePaths ? (config.nixui.profilePaths or ["/nix/var/nix/profiles"]) -, dataDir ? (config.nixui.dataDir or "/tmp") -, configurations ? (config.nixui.configurations or ["/etc/nixos/configuration.nix"]) -, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos-config=/etc/nixos/configuration.nix") }: -let - version = "0.1.0"; - src = fetchgit { - url = "git://github.com/matejc/nixui.git"; - rev = "refs/tags/${version}"; - sha256 = "198inv8ih751fc1l4dvjp9p6k4kfacikab61v6f604d45psnk6qf"; - }; - # FIXME this should not import from the derivation - # default.nix and and its dependencies should be in the nixpkgs tree - nixui = (import "${src}/default.nix" { nixui = src; inherit pkgs; }).build; - script = writeScript "nixui" '' - #! ${stdenv.shell} - export PATH="${nix}/bin:\$PATH" - export NIXUI_CONFIG="${config}" - ${node_webkit}/bin/nw ${nixui}/lib/node_modules/nixui/ - ''; - config = builtins.toFile "config.json" '' - { - "profilePaths": ${builtins.toJSON profilePaths}, - "dataDir": "${dataDir}", - "configurations": ${builtins.toJSON configurations}, - "NIX_PATH": "${NIX_PATH}" - } - ''; - desktop = makeDesktopItem { - name = "nixui"; - exec = script; - icon = "${nixui}/lib/node_modules/nixui/img/128.png"; - desktopName = "NixUI"; - genericName = "NixUI"; - }; -in -stdenv.mkDerivation rec { - name = "nixui-${version}"; - inherit version src; - 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 = { - # We don't want derivation building during evaluation - broken = true; - description = "NodeWebkit user interface for Nix"; - homepage = https://github.com/matejc/nixui; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abddc81fd21..bac5a5be2ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12893,8 +12893,6 @@ let nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; - nixui = callPackage ../tools/package-management/nixui { node_webkit = node_webkit_0_11; }; - nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { }; nix-repl = callPackage ../tools/package-management/nix-repl { };