diff options
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/networking/zerotierone.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/pcmanx-gtk2/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/teamviewer/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/mqtt/mosquitto/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/networking/zerotierone/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
8 files changed, 41 insertions, 13 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7426e18a61b..39d91df0498 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -211,6 +211,7 @@ meisternu = "Matt Miemiec <meister@krutt.org>"; michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>"; + mingchuan = "Ming Chuan <ming@culpring.com>"; mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>"; modulistic = "Pablo Costa <modulistic@gmail.com>"; diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index 886ea18d980..6237f95b127 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -21,10 +21,9 @@ in chown -R root:root /var/lib/zerotier-one ''; serviceConfig = { - Type = "forking"; - User = "root"; - PIDFile = "/var/lib/zerotier-one/zerotier-one.pid"; - ExecStart = "${pkgs.zerotierone}/bin/zerotier-one -d"; + ExecStart = "${pkgs.zerotierone}/bin/zerotier-one"; + Restart = "always"; + KillMode = "process"; }; }; environment.systemPackages = [ pkgs.zerotierone ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index f345e9710d2..bf06761bc53 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,7 +5,7 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.0.19.106.gb8a7150f"; + version = "1.0.23.93.gd6cfae15-30"; deps = [ alsaLib @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "be6b99329bb2fccdc9d77bc949dd463576fdb40db7f56195b4284bd348c470be"; + sha256 = "0n6vz51jv6s20dp4zlqkk52bpmpyfm1qn5bfm4lfq09x1g6ir5lr"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix new file mode 100644 index 00000000000..fb655ceba5d --- /dev/null +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }: + +stdenv.mkDerivation { + name = "pcmanx-gtk2-1.3"; + src = fetchurl { + url = "https://github.com/pcman-bbs/pcmanx/archive/1.3.tar.gz"; + sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; + }; + + buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ]; + + preConfigurePhases = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = "http://pcman.ptt.cc"; + license = licenses.gpl2; + description = "Telnet BBS browser with GTK+ interface"; + maintainers = [ maintainers.mingchuan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index dd947d86daf..1abedc890f4 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { ${if stdenv.system == "x86_64-linux" then '' sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config '' else '' - sed -i ",TV_LD64_PATH=.*,d" script/tvw_config + sed -i "/TV_LD64_PATH=.*/d" script/tvw_config ''} sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/teamviewer-*.desktop diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 4fdb475d89b..0dacaf4cfe4 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -13,11 +13,14 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libuuid ]; - buildFlags = "mosquitto"; + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + ]; - installPhase = '' - mkdir -p $out/bin - cp src/mosquitto $out/bin/ + preBuild = '' + substituteInPlace config.mk \ + --replace "/usr/local" "" ''; meta = { diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index d9a50d7dc69..e2ba2102d76 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.1.4"; name = "zerotierone"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "2d7ff178bd7fd284ebb7011d8a91bde51befda60f100eb5429a2dcb6626cf676"; + sha256 = "10aw0dlkmprdvph3aqkqximxqkryf0l4jcnv2bbm7f1qvclqihva"; }; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2989f0c9f6..a436bbe7cd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12900,6 +12900,8 @@ let pcmanfm = callPackage ../applications/misc/pcmanfm { }; + pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { }; + pig = callPackage ../applications/networking/cluster/pig { }; pijul = callPackage ../applications/version-management/pijul { |