From 1592e03abaed9be050e1546fb6dd28d2436f9c39 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Apr 2018 15:40:30 -0500 Subject: treewide: rename bad filenames Most of these can easily be moved to subdirectories of other directories. This helps reduce clutter in the main trees. --- .../window-managers/xmonad-log-applet/default.nix | 45 ---------- .../xmonad-log-applet/fix-paths.patch | 50 ----------- .../window-managers/xmonad/log-applet/default.nix | 45 ++++++++++ .../xmonad/log-applet/fix-paths.patch | 50 +++++++++++ .../compilers/emscripten-fastcomp/default.nix | 28 ------- .../emscripten-fastcomp/emscripten-fastcomp.nix | 55 ------------ .../compilers/emscripten/fastcomp/default.nix | 28 +++++++ .../emscripten/fastcomp/emscripten-fastcomp.nix | 55 ++++++++++++ pkgs/development/compilers/openjdk-darwin/8.nix | 54 ------------ .../compilers/openjdk-darwin/default.nix | 44 ---------- pkgs/development/compilers/openjdk/darwin/8.nix | 54 ++++++++++++ .../compilers/openjdk/darwin/default.nix | 44 ++++++++++ pkgs/development/misc/stm32/betaflight/default.nix | 65 +++++++++++++++ pkgs/development/qtcreator/default.nix | 60 ------------- pkgs/development/stm32/betaflight/default.nix | 65 --------------- pkgs/development/tools/qtcreator/default.nix | 60 +++++++++++++ pkgs/tools/misc/nagstamon/default.nix | 25 ++++++ pkgs/tools/nagstamon/default.nix | 25 ------ pkgs/tools/networking/connman-gtk/default.nix | 43 ---------- pkgs/tools/networking/connman-ncurses/default.nix | 32 ------- pkgs/tools/networking/connman-notify/default.nix | 40 --------- .../networking/connman/connman-gtk/default.nix | 43 ++++++++++ .../networking/connman/connman-ncurses/default.nix | 32 +++++++ .../networking/connman/connman-notify/default.nix | 40 +++++++++ .../networking/connman/connman_dmenu/default.nix | 35 ++++++++ .../tools/networking/connman/connmanui/default.nix | 34 ++++++++ pkgs/tools/networking/connman_dmenu/default.nix | 35 -------- pkgs/tools/networking/connmanui/default.nix | 34 -------- .../networking/network-manager-applet/default.nix | 60 ------------- pkgs/tools/networking/network-manager/applet.nix | 60 +++++++++++++ pkgs/tools/networking/network-manager/dmenu.nix | 40 +++++++++ .../networking/networkmanager_dmenu/default.nix | 40 --------- pkgs/tools/security/keybase-gui/default.nix | 97 ---------------------- pkgs/tools/security/keybase/gui.nix | 97 ++++++++++++++++++++++ pkgs/tools/security/pinentry-mac/default.nix | 30 ------- pkgs/tools/security/pinentry/mac.nix | 30 +++++++ pkgs/top-level/all-packages.nix | 34 ++++---- 37 files changed, 854 insertions(+), 854 deletions(-) delete mode 100644 pkgs/applications/window-managers/xmonad-log-applet/default.nix delete mode 100644 pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch create mode 100644 pkgs/applications/window-managers/xmonad/log-applet/default.nix create mode 100644 pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch delete mode 100644 pkgs/development/compilers/emscripten-fastcomp/default.nix delete mode 100644 pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix create mode 100644 pkgs/development/compilers/emscripten/fastcomp/default.nix create mode 100644 pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix delete mode 100644 pkgs/development/compilers/openjdk-darwin/8.nix delete mode 100644 pkgs/development/compilers/openjdk-darwin/default.nix create mode 100644 pkgs/development/compilers/openjdk/darwin/8.nix create mode 100644 pkgs/development/compilers/openjdk/darwin/default.nix create mode 100644 pkgs/development/misc/stm32/betaflight/default.nix delete mode 100644 pkgs/development/qtcreator/default.nix delete mode 100644 pkgs/development/stm32/betaflight/default.nix create mode 100644 pkgs/development/tools/qtcreator/default.nix create mode 100644 pkgs/tools/misc/nagstamon/default.nix delete mode 100644 pkgs/tools/nagstamon/default.nix delete mode 100644 pkgs/tools/networking/connman-gtk/default.nix delete mode 100644 pkgs/tools/networking/connman-ncurses/default.nix delete mode 100644 pkgs/tools/networking/connman-notify/default.nix create mode 100644 pkgs/tools/networking/connman/connman-gtk/default.nix create mode 100644 pkgs/tools/networking/connman/connman-ncurses/default.nix create mode 100644 pkgs/tools/networking/connman/connman-notify/default.nix create mode 100644 pkgs/tools/networking/connman/connman_dmenu/default.nix create mode 100644 pkgs/tools/networking/connman/connmanui/default.nix delete mode 100644 pkgs/tools/networking/connman_dmenu/default.nix delete mode 100644 pkgs/tools/networking/connmanui/default.nix delete mode 100644 pkgs/tools/networking/network-manager-applet/default.nix create mode 100644 pkgs/tools/networking/network-manager/applet.nix create mode 100644 pkgs/tools/networking/network-manager/dmenu.nix delete mode 100644 pkgs/tools/networking/networkmanager_dmenu/default.nix delete mode 100644 pkgs/tools/security/keybase-gui/default.nix create mode 100644 pkgs/tools/security/keybase/gui.nix delete mode 100644 pkgs/tools/security/pinentry-mac/default.nix create mode 100644 pkgs/tools/security/pinentry/mac.nix diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix deleted file mode 100644 index f2acf03958b6..000000000000 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib -, desktopSupport -, gtk2, gnome2_panel, GConf2 -, libxfce4util, xfce4-panel -}: - -assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; - -stdenv.mkDerivation rec { - version = "2.1.0"; - pname = "xmonad-log-applet"; - name = "${pname}-${version}-${desktopSupport}"; - - src = fetchFromGitHub { - owner = "alexkay"; - repo = pname; - rev = "${version}"; - sha256 = "1g1fisyaw83v72b25fxfjln8f4wlw3rm6nyk27mrqlhsc1spnb5p"; - }; - - buildInputs = with stdenv.lib; - [ glib dbus-glib ] - ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] - # TODO: no idea where to find libpanelapplet-4.0 - ++ optionals (desktopSupport == "gnome3") [ ] - ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] - ; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - configureFlags = [ "--with-panel=${desktopSupport}" ]; - - patches = [ ./fix-paths.patch ]; - - meta = with stdenv.lib; { - homepage = https://github.com/alexkay/xmonad-log-applet; - license = licenses.bsd3; - description = "An applet that will display XMonad log information (${desktopSupport} version)"; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - - broken = desktopSupport == "gnome3"; - }; -} - diff --git a/pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch b/pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch deleted file mode 100644 index 031843afb172..000000000000 --- a/pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 619012d..dcc6d3c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,5 @@ - plugindir = $(PLUGIN_DIR) -+SESSION_BUS_SERVICES_DIR = $(prefix)/share/dbus-1/services - plugin_PROGRAMS = xmonad-log-applet - - xmonad_log_applet_SOURCES = main.c -diff --git a/configure.ac b/configure.ac -index ad4cffb..110c953 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,28 +27,28 @@ AC_ARG_WITH( - AS_IF( - [test "x$panel" = xgnome2], - [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)] -- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/share/gnome-panel/applets -- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/libexec -+ LIBPANEL_APPLET_DIR=${prefix}/share/gnome-panel/applets -+ PLUGIN_DIR=${prefix}/libexec - [AC_DEFINE(PANEL_GNOME, 1, [panel type])] - [AC_DEFINE(PANEL_GNOME2, 1, [panel type])] - , - [test "x$panel" = xgnome3], - [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-4.0 >= 3.0.0)] - LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0` -- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-4.0`/libexec -+ PLUGIN_DIR=${prefix}/libexec - [AC_DEFINE(PANEL_GNOME, 1, [panel type])] - [AC_DEFINE(PANEL_GNOME3, 1, [panel type])] - , - [test "x$panel" = xmate], - [PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-3.0 >= 1.4.0)] -- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/share/mate-panel/applets -- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/libexec -+ LIBPANEL_APPLET_DIR=${prefix}/share/mate-panel/applets -+ PLUGIN_DIR=${prefix}/libexec - [AC_DEFINE(PANEL_MATE, 1, [panel type])] - , - [test "x$panel" = xxfce4], - [PKG_CHECK_MODULES(LIBPANEL, libxfce4panel-1.0 >= 4.6.0)] -- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libxfce4panel-1.0`/share/xfce4/panel-plugins -- PLUGIN_DIR=`$PKG_CONFIG --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins -+ LIBPANEL_APPLET_DIR=${prefix}/share/xfce4/panel-plugins -+ PLUGIN_DIR=${prefix}/lib/xfce4/panel/plugins - [AC_DEFINE(PANEL_XFCE4, 1, [panel type])] - , - [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, mate or xfce4])] diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix new file mode 100644 index 000000000000..f2acf03958b6 --- /dev/null +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib +, desktopSupport +, gtk2, gnome2_panel, GConf2 +, libxfce4util, xfce4-panel +}: + +assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; + +stdenv.mkDerivation rec { + version = "2.1.0"; + pname = "xmonad-log-applet"; + name = "${pname}-${version}-${desktopSupport}"; + + src = fetchFromGitHub { + owner = "alexkay"; + repo = pname; + rev = "${version}"; + sha256 = "1g1fisyaw83v72b25fxfjln8f4wlw3rm6nyk27mrqlhsc1spnb5p"; + }; + + buildInputs = with stdenv.lib; + [ glib dbus-glib ] + ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] + # TODO: no idea where to find libpanelapplet-4.0 + ++ optionals (desktopSupport == "gnome3") [ ] + ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] + ; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + configureFlags = [ "--with-panel=${desktopSupport}" ]; + + patches = [ ./fix-paths.patch ]; + + meta = with stdenv.lib; { + homepage = https://github.com/alexkay/xmonad-log-applet; + license = licenses.bsd3; + description = "An applet that will display XMonad log information (${desktopSupport} version)"; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + + broken = desktopSupport == "gnome3"; + }; +} + diff --git a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch new file mode 100644 index 000000000000..031843afb172 --- /dev/null +++ b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch @@ -0,0 +1,50 @@ +diff --git a/Makefile.am b/Makefile.am +index 619012d..dcc6d3c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,5 @@ + plugindir = $(PLUGIN_DIR) ++SESSION_BUS_SERVICES_DIR = $(prefix)/share/dbus-1/services + plugin_PROGRAMS = xmonad-log-applet + + xmonad_log_applet_SOURCES = main.c +diff --git a/configure.ac b/configure.ac +index ad4cffb..110c953 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,28 +27,28 @@ AC_ARG_WITH( + AS_IF( + [test "x$panel" = xgnome2], + [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/share/gnome-panel/applets +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/libexec ++ LIBPANEL_APPLET_DIR=${prefix}/share/gnome-panel/applets ++ PLUGIN_DIR=${prefix}/libexec + [AC_DEFINE(PANEL_GNOME, 1, [panel type])] + [AC_DEFINE(PANEL_GNOME2, 1, [panel type])] + , + [test "x$panel" = xgnome3], + [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-4.0 >= 3.0.0)] + LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0` +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-4.0`/libexec ++ PLUGIN_DIR=${prefix}/libexec + [AC_DEFINE(PANEL_GNOME, 1, [panel type])] + [AC_DEFINE(PANEL_GNOME3, 1, [panel type])] + , + [test "x$panel" = xmate], + [PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-3.0 >= 1.4.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/share/mate-panel/applets +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/libexec ++ LIBPANEL_APPLET_DIR=${prefix}/share/mate-panel/applets ++ PLUGIN_DIR=${prefix}/libexec + [AC_DEFINE(PANEL_MATE, 1, [panel type])] + , + [test "x$panel" = xxfce4], + [PKG_CHECK_MODULES(LIBPANEL, libxfce4panel-1.0 >= 4.6.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libxfce4panel-1.0`/share/xfce4/panel-plugins +- PLUGIN_DIR=`$PKG_CONFIG --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins ++ LIBPANEL_APPLET_DIR=${prefix}/share/xfce4/panel-plugins ++ PLUGIN_DIR=${prefix}/lib/xfce4/panel/plugins + [AC_DEFINE(PANEL_XFCE4, 1, [panel type])] + , + [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, mate or xfce4])] diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix deleted file mode 100644 index 10c1107da026..000000000000 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ newScope, stdenv, binutils, wrapCCWith, symlinkJoin }: -let - callPackage = newScope (self // {inherit stdenv;}); - - self = { - emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {}; - emscriptenfastcomp-wrapped = wrapCCWith { - cc = self.emscriptenfastcomp-unwrapped; - # Never want Apple's cctools for WASM target - bintools = binutils; - libc = stdenv.cc.libc; - extraBuildCommands = '' - # hardening flags break WASM support - cat > $out/nix-support/add-hardening.sh - ''; - }; - emscriptenfastcomp = symlinkJoin { - name = "emscriptenfastcomp"; - paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; - preferLocalBuild = false; - allowSubstitutes = true; - postBuild = '' - # replace unwrapped clang-3.9 binary by wrapper - ln -sf $out/bin/clang $out/bin/clang-[0-9]* - ''; - }; - }; -in self diff --git a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix deleted file mode 100644 index 5317cf25d41b..000000000000 --- a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ emscriptenVersion, stdenv, llvm, fetchFromGitHub, cmake, python, gtest, ... }: - -let - rev = emscriptenVersion; - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; -in -stdenv.mkDerivation rec { - name = "emscripten-fastcomp-${rev}"; - - src = fetchFromGitHub { - owner = "kripken"; - repo = "emscripten-fastcomp"; - sha256 = "04j698gmp686b5lricjakm5hyh2z2kh28m1ffkghmkyz4zkzmx98"; - inherit rev; - }; - - srcFL = fetchFromGitHub { - owner = "kripken"; - repo = "emscripten-fastcomp-clang"; - sha256 = "1ici51mmpgg80xk3y8f376nbbfak6rz27qdy98l8lxkrymklp5g5"; - inherit rev; - }; - - nativeBuildInputs = [ cmake python gtest ]; - preConfigure = '' - cp -Lr ${srcFL} tools/clang - chmod +w -R tools/clang - ''; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'" - "-DLLVM_INCLUDE_EXAMPLES=OFF" - "-DLLVM_INCLUDE_TESTS=ON" - #"-DLLVM_CONFIG=${llvm}/bin/llvm-config" - "-DLLVM_BUILD_TESTS=ON" - "-DCLANG_INCLUDE_TESTS=ON" - ] ++ (stdenv.lib.optional stdenv.isLinux - # necessary for clang to find crtend.o - "-DGCC_INSTALL_PREFIX=${gcc}" - ); - enableParallelBuilding = true; - - passthru = { - isClang = true; - inherit gcc; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/kripken/emscripten-fastcomp; - description = "Emscripten LLVM"; - platforms = platforms.all; - maintainers = with maintainers; [ qknight matthewbauer ]; - license = stdenv.lib.licenses.ncsa; - }; -} diff --git a/pkgs/development/compilers/emscripten/fastcomp/default.nix b/pkgs/development/compilers/emscripten/fastcomp/default.nix new file mode 100644 index 000000000000..10c1107da026 --- /dev/null +++ b/pkgs/development/compilers/emscripten/fastcomp/default.nix @@ -0,0 +1,28 @@ +{ newScope, stdenv, binutils, wrapCCWith, symlinkJoin }: +let + callPackage = newScope (self // {inherit stdenv;}); + + self = { + emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {}; + emscriptenfastcomp-wrapped = wrapCCWith { + cc = self.emscriptenfastcomp-unwrapped; + # Never want Apple's cctools for WASM target + bintools = binutils; + libc = stdenv.cc.libc; + extraBuildCommands = '' + # hardening flags break WASM support + cat > $out/nix-support/add-hardening.sh + ''; + }; + emscriptenfastcomp = symlinkJoin { + name = "emscriptenfastcomp"; + paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; + preferLocalBuild = false; + allowSubstitutes = true; + postBuild = '' + # replace unwrapped clang-3.9 binary by wrapper + ln -sf $out/bin/clang $out/bin/clang-[0-9]* + ''; + }; + }; +in self diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix new file mode 100644 index 000000000000..5317cf25d41b --- /dev/null +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -0,0 +1,55 @@ +{ emscriptenVersion, stdenv, llvm, fetchFromGitHub, cmake, python, gtest, ... }: + +let + rev = emscriptenVersion; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; +in +stdenv.mkDerivation rec { + name = "emscripten-fastcomp-${rev}"; + + src = fetchFromGitHub { + owner = "kripken"; + repo = "emscripten-fastcomp"; + sha256 = "04j698gmp686b5lricjakm5hyh2z2kh28m1ffkghmkyz4zkzmx98"; + inherit rev; + }; + + srcFL = fetchFromGitHub { + owner = "kripken"; + repo = "emscripten-fastcomp-clang"; + sha256 = "1ici51mmpgg80xk3y8f376nbbfak6rz27qdy98l8lxkrymklp5g5"; + inherit rev; + }; + + nativeBuildInputs = [ cmake python gtest ]; + preConfigure = '' + cp -Lr ${srcFL} tools/clang + chmod +w -R tools/clang + ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'" + "-DLLVM_INCLUDE_EXAMPLES=OFF" + "-DLLVM_INCLUDE_TESTS=ON" + #"-DLLVM_CONFIG=${llvm}/bin/llvm-config" + "-DLLVM_BUILD_TESTS=ON" + "-DCLANG_INCLUDE_TESTS=ON" + ] ++ (stdenv.lib.optional stdenv.isLinux + # necessary for clang to find crtend.o + "-DGCC_INSTALL_PREFIX=${gcc}" + ); + enableParallelBuilding = true; + + passthru = { + isClang = true; + inherit gcc; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kripken/emscripten-fastcomp; + description = "Emscripten LLVM"; + platforms = platforms.all; + maintainers = with maintainers; [ qknight matthewbauer ]; + license = stdenv.lib.licenses.ncsa; + }; +} diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix deleted file mode 100644 index cc7c5fd371d2..000000000000 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: -let - jce-policies = fetchurl { - # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; - sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; - }; - - jdk = stdenv.mkDerivation { - name = "zulu1.8.0_121-8.20.0.5"; - - src = fetchurl { - url = "http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-macosx_x64.zip"; - sha256 = "2a58bd1d9b0cbf0b3d8d1bcdd117c407e3d5a0ec01e2f53565c9bec5cf9ea78b"; - curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; - }; - - buildInputs = [ unzip freetype ]; - - installPhase = '' - mkdir -p $out - mv * $out - - unzip ${jce-policies} - mv -f ZuluJCEPolicies/*.jar $out/jre/lib/security/ - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/darwin/*_md.h $out/include/ - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib - - # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - passthru = { - jre = jdk; - home = jdk; - }; - - meta.platforms = stdenv.lib.platforms.darwin; - - }; -in jdk diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix deleted file mode 100644 index 6ecc785be3b9..000000000000 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: -let - jdk = stdenv.mkDerivation { - name = "openjdk-7u60b30"; - - # From https://github.com/alexkasko/openjdk-unofficial-builds - src = fetchurl { - url = https://bitbucket.org/alexkasko/openjdk-unofficial-builds/downloads/openjdk-1.7.0-u60-unofficial-macosx-x86_64-bundle.zip; - sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401"; - }; - - buildInputs = [ unzip freetype ]; - - installPhase = '' - mv */Contents/Home $out - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/darwin/*_md.h $out/include/ - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib - - # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - passthru = { - jre = jdk; - home = jdk; - }; - - meta.platforms = stdenv.lib.platforms.darwin; - - }; -in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix new file mode 100644 index 000000000000..cc7c5fd371d2 --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: +let + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + + jdk = stdenv.mkDerivation { + name = "zulu1.8.0_121-8.20.0.5"; + + src = fetchurl { + url = "http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-macosx_x64.zip"; + sha256 = "2a58bd1d9b0cbf0b3d8d1bcdd117c407e3d5a0ec01e2f53565c9bec5cf9ea78b"; + curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; + }; + + buildInputs = [ unzip freetype ]; + + installPhase = '' + mkdir -p $out + mv * $out + + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/jre/lib/security/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + passthru = { + jre = jdk; + home = jdk; + }; + + meta.platforms = stdenv.lib.platforms.darwin; + + }; +in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix new file mode 100644 index 000000000000..6ecc785be3b9 --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: +let + jdk = stdenv.mkDerivation { + name = "openjdk-7u60b30"; + + # From https://github.com/alexkasko/openjdk-unofficial-builds + src = fetchurl { + url = https://bitbucket.org/alexkasko/openjdk-unofficial-builds/downloads/openjdk-1.7.0-u60-unofficial-macosx-x86_64-bundle.zip; + sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401"; + }; + + buildInputs = [ unzip freetype ]; + + installPhase = '' + mv */Contents/Home $out + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + passthru = { + jre = jdk; + home = jdk; + }; + + meta.platforms = stdenv.lib.platforms.darwin; + + }; +in jdk diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix new file mode 100644 index 000000000000..8d4d0d7f4a2b --- /dev/null +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchFromGitHub +, gcc-arm-embedded, python2 +, skipTargets ? [ + # These targets do not build for various unexplored reasons + # TODO ... fix them + "AFROMINI" + "ALIENWHOOP" + "BEEBRAIN" + "CJMCU" + "FRSKYF3" +]}: + +let + + version = "3.2.3"; + +in stdenv.mkDerivation rec { + + name = "betaflight-${version}"; + + src = fetchFromGitHub { + owner = "betaflight"; + repo = "betaflight"; + rev = "v${version}"; + sha256 = "0vbjyxfjxgpaiiwvj5bscrlfikzp3wnxpmc4sxcz5yw5mwb9g428"; + }; + + buildInputs = [ + gcc-arm-embedded + python2 + ]; + + postPatch = '' + sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 9 src.rev}/" Makefile # Let's not require git in shell + sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + ''; + + enableParallelBuilding = true; + + preBuild = '' + buildFlagsArray=( + "SKIP_TARGETS=${toString skipTargets}" + "GCC_REQUIRED_VERSION=$(arm-none-eabi-gcc -dumpversion)" + all + ) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp obj/*.hex $out + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft"; + homepage = https://github.com/betaflight/betaflight; + license = licenses.gpl3; + maintainers = with maintainers; [ elitak ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix deleted file mode 100644 index de94b7a8eff3..000000000000 --- a/pkgs/development/qtcreator/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, fetchurl, makeWrapper -, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake -, withDocumentation ? false -}: - -with stdenv.lib; - -let - baseVersion = "4.5"; - revision = "0"; -in - -stdenv.mkDerivation rec { - name = "qtcreator-${version}"; - version = "${baseVersion}.${revision}"; - - src = fetchurl { - url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "1yfrfma23xxzz8hl43g7pk7ay5lg25l9lscjlih617lyv6jmc0hl"; - }; - - buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; - - nativeBuildInputs = [ qmake makeWrapper ]; - - doCheck = true; - - enableParallelBuilding = true; - - buildFlags = optional withDocumentation "docs"; - - installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; - - preConfigure = '' - substituteInPlace src/plugins/plugins.pro \ - --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' - ''; - - preBuild = optional withDocumentation '' - ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share - ''; - - postInstall = '' - substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ - --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" - ''; - - meta = { - description = "Cross-platform IDE tailored to the needs of Qt developers"; - longDescription = '' - Qt Creator is a cross-platform IDE (integrated development environment) - tailored to the needs of Qt developers. It includes features such as an - advanced code editor, a visual debugger and a GUI designer. - ''; - homepage = https://wiki.qt.io/Category:Tools::QtCreator; - license = "LGPL"; - maintainers = [ maintainers.akaWolf ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/stm32/betaflight/default.nix b/pkgs/development/stm32/betaflight/default.nix deleted file mode 100644 index 8d4d0d7f4a2b..000000000000 --- a/pkgs/development/stm32/betaflight/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchFromGitHub -, gcc-arm-embedded, python2 -, skipTargets ? [ - # These targets do not build for various unexplored reasons - # TODO ... fix them - "AFROMINI" - "ALIENWHOOP" - "BEEBRAIN" - "CJMCU" - "FRSKYF3" -]}: - -let - - version = "3.2.3"; - -in stdenv.mkDerivation rec { - - name = "betaflight-${version}"; - - src = fetchFromGitHub { - owner = "betaflight"; - repo = "betaflight"; - rev = "v${version}"; - sha256 = "0vbjyxfjxgpaiiwvj5bscrlfikzp3wnxpmc4sxcz5yw5mwb9g428"; - }; - - buildInputs = [ - gcc-arm-embedded - python2 - ]; - - postPatch = '' - sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 9 src.rev}/" Makefile # Let's not require git in shell - sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex - ''; - - enableParallelBuilding = true; - - preBuild = '' - buildFlagsArray=( - "SKIP_TARGETS=${toString skipTargets}" - "GCC_REQUIRED_VERSION=$(arm-none-eabi-gcc -dumpversion)" - all - ) - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp obj/*.hex $out - - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft"; - homepage = https://github.com/betaflight/betaflight; - license = licenses.gpl3; - maintainers = with maintainers; [ elitak ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix new file mode 100644 index 000000000000..de94b7a8eff3 --- /dev/null +++ b/pkgs/development/tools/qtcreator/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, makeWrapper +, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake +, withDocumentation ? false +}: + +with stdenv.lib; + +let + baseVersion = "4.5"; + revision = "0"; +in + +stdenv.mkDerivation rec { + name = "qtcreator-${version}"; + version = "${baseVersion}.${revision}"; + + src = fetchurl { + url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; + sha256 = "1yfrfma23xxzz8hl43g7pk7ay5lg25l9lscjlih617lyv6jmc0hl"; + }; + + buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; + + nativeBuildInputs = [ qmake makeWrapper ]; + + doCheck = true; + + enableParallelBuilding = true; + + buildFlags = optional withDocumentation "docs"; + + installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; + + preConfigure = '' + substituteInPlace src/plugins/plugins.pro \ + --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' + ''; + + preBuild = optional withDocumentation '' + ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share + ''; + + postInstall = '' + substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ + --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" + ''; + + meta = { + description = "Cross-platform IDE tailored to the needs of Qt developers"; + longDescription = '' + Qt Creator is a cross-platform IDE (integrated development environment) + tailored to the needs of Qt developers. It includes features such as an + advanced code editor, a visual debugger and a GUI designer. + ''; + homepage = https://wiki.qt.io/Category:Tools::QtCreator; + license = "LGPL"; + maintainers = [ maintainers.akaWolf ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix new file mode 100644 index 000000000000..3163b78437ec --- /dev/null +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "nagstamon-${version}"; + version = "2.0.1"; + + src = fetchurl { + url = "https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"; + sha256 = "3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b"; + }; + + # Test assumes darwin + doCheck = false; + + propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests + beautifulsoup4 ]; + + meta = with stdenv.lib; { + description = "A status monitor for the desktop"; + homepage = https://nagstamon.ifw-dresden.de/; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + inherit version; + }; +} diff --git a/pkgs/tools/nagstamon/default.nix b/pkgs/tools/nagstamon/default.nix deleted file mode 100644 index 3163b78437ec..000000000000 --- a/pkgs/tools/nagstamon/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pythonPackages }: - -pythonPackages.buildPythonApplication rec { - name = "nagstamon-${version}"; - version = "2.0.1"; - - src = fetchurl { - url = "https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"; - sha256 = "3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b"; - }; - - # Test assumes darwin - doCheck = false; - - propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests - beautifulsoup4 ]; - - meta = with stdenv.lib; { - description = "A status monitor for the desktop"; - homepage = https://nagstamon.ifw-dresden.de/; - license = licenses.gpl2; - maintainers = with maintainers; [ pSub ]; - inherit version; - }; -} diff --git a/pkgs/tools/networking/connman-gtk/default.nix b/pkgs/tools/networking/connman-gtk/default.nix deleted file mode 100644 index d5688354a76d..000000000000 --- a/pkgs/tools/networking/connman-gtk/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, intltool, pkgconfig, -gtk3, connman, openconnect, wrapGAppsHook }: - -stdenv.mkDerivation rec { - name = "connman-gtk-${version}"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "jgke"; - repo = "connman-gtk"; - rev = "v${version}"; - sha256 = "09k0hx5hxpbykvslv12l2fq9pxdwpd311mxj038hbqzjghcyidyr"; - }; - - nativeBuildInputs = [ - autoconf - automake - intltool - pkgconfig - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - openconnect - connman - ]; - - preConfigure = '' - # m4/intltool.m4 is an invalid symbolic link - rm m4/intltool.m4 - ln -s ${intltool}/share/aclocal/intltool.m4 m4/ - ./autogen.sh - ''; - - meta = with stdenv.lib; { - description = "GTK GUI for Connman"; - homepage = https://github.com/jgke/connman-gtk; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/tools/networking/connman-ncurses/default.nix b/pkgs/tools/networking/connman-ncurses/default.nix deleted file mode 100644 index 8c4d4fa84865..000000000000 --- a/pkgs/tools/networking/connman-ncurses/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }: - -stdenv.mkDerivation rec { - name = "connman-ncurses-${version}"; - version = "2015-07-21"; - - src = fetchFromGitHub { - owner = "eurogiciel-oss"; - repo = "connman-json-client"; - rev = "3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2"; - sha256 = "1831r0776fv481g8kgy1dkl750pzv47835dw11sslq2k6mm6i9p1"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - buildInputs = [ dbus ncurses json_c connman ]; - - NIX_CFLAGS_COMPILE = "-Wno-error"; - - installPhase = '' - mkdir -p "$out/bin" - cp -va connman_ncurses "$out/bin/" - ''; - - meta = with stdenv.lib; { - description = "Simple ncurses UI for connman"; - homepage = https://github.com/eurogiciel-oss/connman-json-client; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/tools/networking/connman-notify/default.nix b/pkgs/tools/networking/connman-notify/default.nix deleted file mode 100644 index 42b0c37411c8..000000000000 --- a/pkgs/tools/networking/connman-notify/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: - -stdenv.mkDerivation rec { - name = "connman-notify-${version}"; - version = "2014-06-23"; - - src = fetchFromGitHub { - owner = "wavexx"; - repo = "connman-notify"; - rev = "0ed9b5e4a0e1f03c83c4589cabf410cac66cd11d"; - sha256 = "0lhk417fdg3qxs1marpqp277bdxhwnbyrld9xj224bfk5v7xi4bg"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ - pythonPackages.python - pythonPackages.dbus-python - pythonPackages.pygobject2 - pythonPackages.pygtk - pythonPackages.notify - ]; - - installPhase = '' - mkdir -p $out/bin - cp -vai connman-notify $out/bin/ - ''; - - preFixup = '' - wrapProgram $out/bin/connman-notify --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with stdenv.lib; { - description = "Desktop notification integration for connman"; - homepage = https://github.com/wavexx/connman-notify; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix new file mode 100644 index 000000000000..d5688354a76d --- /dev/null +++ b/pkgs/tools/networking/connman/connman-gtk/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, intltool, pkgconfig, +gtk3, connman, openconnect, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "connman-gtk-${version}"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "jgke"; + repo = "connman-gtk"; + rev = "v${version}"; + sha256 = "09k0hx5hxpbykvslv12l2fq9pxdwpd311mxj038hbqzjghcyidyr"; + }; + + nativeBuildInputs = [ + autoconf + automake + intltool + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + openconnect + connman + ]; + + preConfigure = '' + # m4/intltool.m4 is an invalid symbolic link + rm m4/intltool.m4 + ln -s ${intltool}/share/aclocal/intltool.m4 m4/ + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "GTK GUI for Connman"; + homepage = https://github.com/jgke/connman-gtk; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix new file mode 100644 index 000000000000..8c4d4fa84865 --- /dev/null +++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }: + +stdenv.mkDerivation rec { + name = "connman-ncurses-${version}"; + version = "2015-07-21"; + + src = fetchFromGitHub { + owner = "eurogiciel-oss"; + repo = "connman-json-client"; + rev = "3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2"; + sha256 = "1831r0776fv481g8kgy1dkl750pzv47835dw11sslq2k6mm6i9p1"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ dbus ncurses json_c connman ]; + + NIX_CFLAGS_COMPILE = "-Wno-error"; + + installPhase = '' + mkdir -p "$out/bin" + cp -va connman_ncurses "$out/bin/" + ''; + + meta = with stdenv.lib; { + description = "Simple ncurses UI for connman"; + homepage = https://github.com/eurogiciel-oss/connman-json-client; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix new file mode 100644 index 000000000000..42b0c37411c8 --- /dev/null +++ b/pkgs/tools/networking/connman/connman-notify/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: + +stdenv.mkDerivation rec { + name = "connman-notify-${version}"; + version = "2014-06-23"; + + src = fetchFromGitHub { + owner = "wavexx"; + repo = "connman-notify"; + rev = "0ed9b5e4a0e1f03c83c4589cabf410cac66cd11d"; + sha256 = "0lhk417fdg3qxs1marpqp277bdxhwnbyrld9xj224bfk5v7xi4bg"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + pythonPackages.python + pythonPackages.dbus-python + pythonPackages.pygobject2 + pythonPackages.pygtk + pythonPackages.notify + ]; + + installPhase = '' + mkdir -p $out/bin + cp -vai connman-notify $out/bin/ + ''; + + preFixup = '' + wrapProgram $out/bin/connman-notify --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + meta = with stdenv.lib; { + description = "Desktop notification integration for connman"; + homepage = https://github.com/wavexx/connman-notify; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix new file mode 100644 index 000000000000..c39c82df634c --- /dev/null +++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, connman, dmenu }: + +stdenv.mkDerivation rec { + name = "connman_dmenu-${version}"; + version = "git-29-9-2015"; + + src = fetchFromGitHub { + owner = "march-linux"; + repo = "connman_dmenu"; + rev = "cc89fec40b574b0d234afeb70ea3c94626ca3f5c"; + sha256 = "061fi83pai4n19l9d7wq6wwj2d7cixwkhkh742c5ibmw1wb274yk"; + }; + + buildInputs = [ connman dmenu ]; + + dontBuild = true; + + # remove root requirement, see: https://github.com/march-linux/connman_dmenu/issues/3 + postPatch = '' + sed -i '89,92d' connman_dmenu + ''; + + installPhase = '' + mkdir -p $out/bin + cp connman_dmenu $out/bin/ + ''; + + meta = { + description = "A dmenu wrapper for connmann"; + homepage = https://github.com/march-linux/connman_dmenu; + license = stdenv.lib.licenses.free; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix new file mode 100644 index 000000000000..7c42cc965a00 --- /dev/null +++ b/pkgs/tools/networking/connman/connmanui/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }: + +stdenv.mkDerivation rec { + name = "connmanui-${version}"; + rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516"; + version = "22062015-${rev}"; + + src = fetchgit { + inherit rev; + url = "git://github.com/tbursztyka/connman-ui.git"; + sha256 = "0ixx8c9cfdp480z21xfjb7n1x27sf1g8gmgbmcfhr0k888dmziyy"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool glib gtk3 dbus file intltool connman ]; + + preConfigure = '' + rm m4/intltool.m4 + ln -s ${intltool}/share/aclocal/intltool.m4 m4/ + set -e + ./autogen.sh + sed -i "s/\/usr\/bin\/file/file/g" ./configure + ''; + + configureScript = "./configure"; + + meta = { + description = "A full-featured GTK based trayicon UI for ConnMan"; + homepage = https://github.com/tbursztyka/connman-ui; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/networking/connman_dmenu/default.nix b/pkgs/tools/networking/connman_dmenu/default.nix deleted file mode 100644 index c39c82df634c..000000000000 --- a/pkgs/tools/networking/connman_dmenu/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchFromGitHub, connman, dmenu }: - -stdenv.mkDerivation rec { - name = "connman_dmenu-${version}"; - version = "git-29-9-2015"; - - src = fetchFromGitHub { - owner = "march-linux"; - repo = "connman_dmenu"; - rev = "cc89fec40b574b0d234afeb70ea3c94626ca3f5c"; - sha256 = "061fi83pai4n19l9d7wq6wwj2d7cixwkhkh742c5ibmw1wb274yk"; - }; - - buildInputs = [ connman dmenu ]; - - dontBuild = true; - - # remove root requirement, see: https://github.com/march-linux/connman_dmenu/issues/3 - postPatch = '' - sed -i '89,92d' connman_dmenu - ''; - - installPhase = '' - mkdir -p $out/bin - cp connman_dmenu $out/bin/ - ''; - - meta = { - description = "A dmenu wrapper for connmann"; - homepage = https://github.com/march-linux/connman_dmenu; - license = stdenv.lib.licenses.free; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix deleted file mode 100644 index 7c42cc965a00..000000000000 --- a/pkgs/tools/networking/connmanui/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }: - -stdenv.mkDerivation rec { - name = "connmanui-${version}"; - rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516"; - version = "22062015-${rev}"; - - src = fetchgit { - inherit rev; - url = "git://github.com/tbursztyka/connman-ui.git"; - sha256 = "0ixx8c9cfdp480z21xfjb7n1x27sf1g8gmgbmcfhr0k888dmziyy"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool glib gtk3 dbus file intltool connman ]; - - preConfigure = '' - rm m4/intltool.m4 - ln -s ${intltool}/share/aclocal/intltool.m4 m4/ - set -e - ./autogen.sh - sed -i "s/\/usr\/bin\/file/file/g" ./configure - ''; - - configureScript = "./configure"; - - meta = { - description = "A full-featured GTK based trayicon UI for ConnMan"; - homepage = https://github.com/tbursztyka/connman-ui; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix deleted file mode 100644 index dd32cebea111..000000000000 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl -, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection -, libindicator-gtk3, libappindicator-gtk3, withGnome ? false }: - -let - pname = "network-manager-applet"; - version = "1.8.10"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a"; - }; - - mesonFlags = [ - "-Dselinux=false" - "-Dappindicator=true" - "-Dgcr=${if withGnome then "true" else "false"}" - ]; - - outputs = [ "out" "dev" "devdoc" ]; - - buildInputs = [ - gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas - polkit isocodes libgudev - modemmanager jansson glib-networking - libindicator-gtk3 libappindicator-gtk3 - ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ]; - - nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; - - propagatedUserEnvPkgs = [ hicolor-icon-theme ]; - - NIX_CFLAGS = [ - ''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "networkmanagerapplet"; - }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/NetworkManager; - description = "NetworkManager control applet for GNOME"; - license = licenses.gpl2; - maintainers = with maintainers; [ phreedom rickynils ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix new file mode 100644 index 000000000000..dd32cebea111 --- /dev/null +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 +, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl +, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas +, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection +, libindicator-gtk3, libappindicator-gtk3, withGnome ? false }: + +let + pname = "network-manager-applet"; + version = "1.8.10"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a"; + }; + + mesonFlags = [ + "-Dselinux=false" + "-Dappindicator=true" + "-Dgcr=${if withGnome then "true" else "false"}" + ]; + + outputs = [ "out" "dev" "devdoc" ]; + + buildInputs = [ + gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas + polkit isocodes libgudev + modemmanager jansson glib-networking + libindicator-gtk3 libappindicator-gtk3 + ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ]; + + nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; + + propagatedUserEnvPkgs = [ hicolor-icon-theme ]; + + NIX_CFLAGS = [ + ''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanagerapplet"; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/NetworkManager; + description = "NetworkManager control applet for GNOME"; + license = licenses.gpl2; + maintainers = with maintainers; [ phreedom rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix new file mode 100644 index 000000000000..82810e714d52 --- /dev/null +++ b/pkgs/tools/networking/network-manager/dmenu.nix @@ -0,0 +1,40 @@ +{ stdenv, glib, fetchFromGitHub, networkmanager, python3Packages +, gobjectIntrospection, dmenu }: + +let inherit (python3Packages) python pygobject3; +in stdenv.mkDerivation rec { + name = "networkmanager_dmenu-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "firecat53"; + repo = "networkmanager-dmenu"; + rev = "v${version}"; + sha256 = "1z6151z7c4jv5k2i50zr7ld4k3m07dgpmss9f3hsav95cv55dcnb"; + }; + + buildInputs = [ glib python pygobject3 gobjectIntrospection networkmanager python3Packages.wrapPython ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp networkmanager_dmenu $out/bin/ + ''; + + postFixup = '' + makeWrapperArgs="\ + --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \ + --prefix PYTHONPATH : \"$(toPythonPath $out):$(toPythonPath ${pygobject3})\"" + wrapPythonPrograms + ''; + + + meta = with stdenv.lib; { + description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet"; + homepage = https://github.com/firecat53/networkmanager-dmenu; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.jensbin ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/networkmanager_dmenu/default.nix deleted file mode 100644 index 82810e714d52..000000000000 --- a/pkgs/tools/networking/networkmanager_dmenu/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, glib, fetchFromGitHub, networkmanager, python3Packages -, gobjectIntrospection, dmenu }: - -let inherit (python3Packages) python pygobject3; -in stdenv.mkDerivation rec { - name = "networkmanager_dmenu-${version}"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "firecat53"; - repo = "networkmanager-dmenu"; - rev = "v${version}"; - sha256 = "1z6151z7c4jv5k2i50zr7ld4k3m07dgpmss9f3hsav95cv55dcnb"; - }; - - buildInputs = [ glib python pygobject3 gobjectIntrospection networkmanager python3Packages.wrapPython ]; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin - cp networkmanager_dmenu $out/bin/ - ''; - - postFixup = '' - makeWrapperArgs="\ - --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \ - --prefix PYTHONPATH : \"$(toPythonPath $out):$(toPythonPath ${pygobject3})\"" - wrapPythonPrograms - ''; - - - meta = with stdenv.lib; { - description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet"; - homepage = https://github.com/firecat53/networkmanager-dmenu; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.jensbin ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix deleted file mode 100644 index 1d50f5498c83..000000000000 --- a/pkgs/tools/security/keybase-gui/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups -, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2 -, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }: - -let - libPath = stdenv.lib.makeLibraryPath [ - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - freetype - gcc.cc - gdk_pixbuf - glib - gnome2.GConf - gtk2 - libnotify - nspr - nss - pango - systemd - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - ]; -in -stdenv.mkDerivation rec { - name = "keybase-gui-${version}"; - version = "1.0.44-20180223200436.9a9ccec79"; - src = fetchurl { - url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "0dmi0fw39924kpahlsk853hbmpy8a6nj78lrh1wharayjpvj6jv3"; - }; - phases = ["unpackPhase" "installPhase" "fixupPhase"]; - unpackPhase = '' - ar xf $src - tar xf data.tar.xz - ''; - installPhase = '' - mkdir -p $out/bin - mv usr/share $out/share - mv opt/keybase $out/share/ - - cat > $out/bin/keybase-gui <&2 - exit 1 - } - - if [ ! -S "\$XDG_RUNTIME_DIR/keybase/keybased.sock" ]; then - echo "Keybase service doesn't seem to be running." >&2 - echo "You might need to run: keybase service" >&2 - checkFailed - fi - - ${utillinuxMinimal}/bin/mountpoint /keybase &>/dev/null - if [ "\$?" -ne "0" ]; then - echo "Keybase is not mounted to /keybase." >&2 - echo "You might need to run: kbfsfuse /keybase" >&2 - checkFailed - fi - - exec $out/share/keybase/Keybase "\$@" - EOF - chmod +x $out/bin/keybase-gui - - substituteInPlace $out/share/applications/keybase.desktop \ - --replace run_keybase $out/bin/keybase-gui - ''; - postFixup = '' - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase" - ''; - - meta = with stdenv.lib; { - homepage = https://www.keybase.io/; - description = "The Keybase official GUI."; - platforms = platforms.linux; - maintainers = with maintainers; [ puffnfresh np ]; - }; -} diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix new file mode 100644 index 000000000000..1d50f5498c83 --- /dev/null +++ b/pkgs/tools/security/keybase/gui.nix @@ -0,0 +1,97 @@ +{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups +, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2 +, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }: + +let + libPath = stdenv.lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gcc.cc + gdk_pixbuf + glib + gnome2.GConf + gtk2 + libnotify + nspr + nss + pango + systemd + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + ]; +in +stdenv.mkDerivation rec { + name = "keybase-gui-${version}"; + version = "1.0.44-20180223200436.9a9ccec79"; + src = fetchurl { + url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; + sha256 = "0dmi0fw39924kpahlsk853hbmpy8a6nj78lrh1wharayjpvj6jv3"; + }; + phases = ["unpackPhase" "installPhase" "fixupPhase"]; + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + ''; + installPhase = '' + mkdir -p $out/bin + mv usr/share $out/share + mv opt/keybase $out/share/ + + cat > $out/bin/keybase-gui <&2 + exit 1 + } + + if [ ! -S "\$XDG_RUNTIME_DIR/keybase/keybased.sock" ]; then + echo "Keybase service doesn't seem to be running." >&2 + echo "You might need to run: keybase service" >&2 + checkFailed + fi + + ${utillinuxMinimal}/bin/mountpoint /keybase &>/dev/null + if [ "\$?" -ne "0" ]; then + echo "Keybase is not mounted to /keybase." >&2 + echo "You might need to run: kbfsfuse /keybase" >&2 + checkFailed + fi + + exec $out/share/keybase/Keybase "\$@" + EOF + chmod +x $out/bin/keybase-gui + + substituteInPlace $out/share/applications/keybase.desktop \ + --replace run_keybase $out/bin/keybase-gui + ''; + postFixup = '' + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase" + ''; + + meta = with stdenv.lib; { + homepage = https://www.keybase.io/; + description = "The Keybase official GUI."; + platforms = platforms.linux; + maintainers = with maintainers; [ puffnfresh np ]; + }; +} diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix deleted file mode 100644 index e555889d1abb..000000000000 --- a/pkgs/tools/security/pinentry-mac/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }: - -stdenv.mkDerivation rec { - name = "pinentry-mac-0.9.4"; - - src = fetchFromGitHub { - owner = "matthewbauer"; - repo = "pinentry-mac"; - rev = "6dfef256c8ea32d642fea847f27d800f024cf51e"; - sha256 = "0g75302697gqcxyf2hyqzvcbd5pyss1bl2xvfd40wqav7dlyvj83"; - }; - - buildInputs = [ xcbuild libiconv Cocoa ncurses ]; - - installPhase = '' - mkdir -p $out/Applications - mv Products/Release/pinentry-mac.app $out/Applications - ''; - - passthru = { - binaryPath = "Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac"; - }; - - meta = { - description = "Pinentry for GPG on Mac"; - license = stdenv.lib.licenses.gpl2Plus; - homepage = https://github.com/GPGTools/pinentry-mac; - platforms = stdenv.lib.platforms.darwin; - }; -} diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix new file mode 100644 index 000000000000..e555889d1abb --- /dev/null +++ b/pkgs/tools/security/pinentry/mac.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }: + +stdenv.mkDerivation rec { + name = "pinentry-mac-0.9.4"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "pinentry-mac"; + rev = "6dfef256c8ea32d642fea847f27d800f024cf51e"; + sha256 = "0g75302697gqcxyf2hyqzvcbd5pyss1bl2xvfd40wqav7dlyvj83"; + }; + + buildInputs = [ xcbuild libiconv Cocoa ncurses ]; + + installPhase = '' + mkdir -p $out/Applications + mv Products/Release/pinentry-mac.app $out/Applications + ''; + + passthru = { + binaryPath = "Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac"; + }; + + meta = { + description = "Pinentry for GPG on Mac"; + license = stdenv.lib.licenses.gpl2Plus; + homepage = https://github.com/GPGTools/pinentry-mac; + platforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b0423de0f43..aa99d8a65810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1637,15 +1637,15 @@ with pkgs; connman = callPackage ../tools/networking/connman { }; - connman-gtk = callPackage ../tools/networking/connman-gtk { }; + connman-gtk = callPackage ../tools/networking/connman/connman-gtk { }; - connman-ncurses = callPackage ../tools/networking/connman-ncurses { }; + connman-ncurses = callPackage ../tools/networking/connman/connman-ncurses { }; - connman-notify = callPackage ../tools/networking/connman-notify { }; + connman-notify = callPackage ../tools/networking/connman/connman-notify { }; - connmanui = callPackage ../tools/networking/connmanui { }; + connmanui = callPackage ../tools/networking/connman/connmanui { }; - connman_dmenu = callPackage ../tools/networking/connman_dmenu { }; + connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu { }; convertlit = callPackage ../tools/text/convertlit { }; @@ -2107,7 +2107,7 @@ with pkgs; emscripten = callPackage ../development/compilers/emscripten { }; - emscriptenfastcompPackages = callPackage ../development/compilers/emscripten-fastcomp { }; + emscriptenfastcompPackages = callPackage ../development/compilers/emscripten/fastcomp { }; emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp; @@ -3164,7 +3164,7 @@ with pkgs; kbfs = callPackage ../tools/security/kbfs { }; - keybase-gui = callPackage ../tools/security/keybase-gui { }; + keybase-gui = callPackage ../tools/security/keybase/gui.nix { }; keychain = callPackage ../tools/misc/keychain { }; @@ -3305,7 +3305,7 @@ with pkgs; mxt-app = callPackage ../misc/mxt-app { }; - nagstamon = callPackage ../tools/nagstamon { + nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; }; @@ -3886,9 +3886,9 @@ with pkgs; networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; - networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; + networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager/applet.nix { }; - networkmanager_dmenu = callPackage ../tools/networking/networkmanager_dmenu { }; + networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { }; newsboat = callPackage ../applications/networking/feedreaders/newsboat { }; @@ -4318,7 +4318,7 @@ with pkgs; qt = qt5.qtbase; }; - pinentry_mac = callPackage ../tools/security/pinentry-mac { + pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -6428,7 +6428,7 @@ with pkgs; openjdk8 = if stdenv.isDarwin then - callPackage ../development/compilers/openjdk-darwin/8.nix { } + callPackage ../development/compilers/openjdk/darwin/8.nix { } else callPackage ../development/compilers/openjdk/8.nix { bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; @@ -7376,7 +7376,7 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/stm32/betaflight { }; + betaflight = callPackage ../development/misc/stm32/betaflight { }; sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; @@ -8110,7 +8110,7 @@ with pkgs; pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt5.callPackage ../development/qtcreator { }; + qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; r10k = callPackage ../tools/system/r10k { }; @@ -18667,21 +18667,21 @@ with pkgs; packages = self: []; }; - xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad-log-applet { + xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "gnome2"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; GConf2 = gnome2.GConf; }; - xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad-log-applet { + xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "gnome3"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; GConf2 = gnome2.GConf; }; - xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad-log-applet { + xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "xfce4"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; -- cgit 1.4.1