From d0779bc16e3ac8b134843575e8da8a0452b7d24a Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sun, 10 Jan 2021 02:06:53 +0100 Subject: [PATCH 01/37] enigma: init at 1.21 --- pkgs/games/enigma/default.nix | 31 ++++++++++++++++++++++++ pkgs/games/enigma/src_Value.cc.patch | 15 ++++++++++++ pkgs/games/enigma/src_client.cc.patch | 12 +++++++++ pkgs/games/enigma/src_lev_Proxy.cc.patch | 11 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 71 insertions(+) create mode 100644 pkgs/games/enigma/default.nix create mode 100644 pkgs/games/enigma/src_Value.cc.patch create mode 100644 pkgs/games/enigma/src_client.cc.patch create mode 100644 pkgs/games/enigma/src_lev_Proxy.cc.patch diff --git a/pkgs/games/enigma/default.nix b/pkgs/games/enigma/default.nix new file mode 100644 index 00000000000..d277768dbf5 --- /dev/null +++ b/pkgs/games/enigma/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, makeWrapper, pkg-config, curl, imagemagick, libpng, SDL, SDL_image, SDL_mixer, SDL_ttf, xercesc, xdg_utils, hicolor-icon-theme }: +stdenv.mkDerivation rec { + pname = "enigma"; + version = "1.21"; + + src = fetchurl { + url = "mirror://sourceforge/enigma-game/enigma-${version}.tar.gz"; + sha256 = "d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01"; + }; + + # patches lifted from Arch + patches = [ ./src_client.cc.patch ./src_lev_Proxy.cc.patch ./src_Value.cc.patch ]; + + NIX_CFLAGS_COMPILE = [ "-Wno-deprecated-declarations" ]; + + nativeBuildInputs = [ pkg-config imagemagick makeWrapper ]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf libpng xercesc curl xdg_utils ]; + + postInstall = '' + rm -r $out/include + wrapProgram $out/bin/enigma --prefix PATH : "${stdenv.lib.makeBinPath [ xdg_utils ]}" + ''; + + meta = with stdenv.lib; { + description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga"; + license = with licenses; [ gpl2 free ]; + platforms = platforms.unix; + maintainers = with maintainers; [ iblech ]; + homepage = "https://www.nongnu.org/enigma/"; + }; +} diff --git a/pkgs/games/enigma/src_Value.cc.patch b/pkgs/games/enigma/src_Value.cc.patch new file mode 100644 index 00000000000..6ce85692dd2 --- /dev/null +++ b/pkgs/games/enigma/src_Value.cc.patch @@ -0,0 +1,15 @@ +--- a/src/Value.cc.orig 2017-09-03 15:39:37 UTC ++++ b/src/Value.cc +@@ -146,10 +146,10 @@ namespace enigma { + val.str[0] = 0; + break; + case BOOL : +- val.dval[0] = false; ++ val.dval[0] = 0; + break; + case OBJECT : +- val.dval[0] = (double) NULL; ++ val.dval[0] = 0; + break; + case NAMEDOBJECT: + ASSERT(false, XLevelRuntime, "Value: illegal type usage"); diff --git a/pkgs/games/enigma/src_client.cc.patch b/pkgs/games/enigma/src_client.cc.patch new file mode 100644 index 00000000000..48d989470ff --- /dev/null +++ b/pkgs/games/enigma/src_client.cc.patch @@ -0,0 +1,12 @@ +--- a/src/client.cc ++++ b/src/client.cc +@@ -208,8 +208,8 @@ void Client::handle_events() { + case SDL_MOUSEBUTTONUP: on_mousebutton(e); break; + case SDL_ACTIVEEVENT: { + update_mouse_button_state(); +- if (e.active.gain == 0 && !video::IsFullScreen()) +- show_menu(false); ++// if (e.active.gain == 0 && !video::IsFullScreen()) ++// show_menu(false); + break; + } diff --git a/pkgs/games/enigma/src_lev_Proxy.cc.patch b/pkgs/games/enigma/src_lev_Proxy.cc.patch new file mode 100644 index 00000000000..86796484dfd --- /dev/null +++ b/pkgs/games/enigma/src_lev_Proxy.cc.patch @@ -0,0 +1,11 @@ +--- a/src/lev/Proxy.cc.orig 2017-09-03 15:54:50 UTC ++++ b/src/lev/Proxy.cc +@@ -933,7 +933,7 @@ namespace enigma { namespace lev { + } else if (haveLocalCopy) { + // plain file + basic_ifstream ifs(absExtPath.c_str(), ios::binary | ios::in); +- if (ifs != NULL) ++ if (ifs) + Readfile(ifs, extCode); + else + haveLocalCopy = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c460379c313..9374b4fa4cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2135,6 +2135,8 @@ in enca = callPackage ../tools/text/enca { }; + enigma = callPackage ../games/enigma {}; + ent = callPackage ../tools/misc/ent { }; envconsul = callPackage ../tools/system/envconsul { }; From 725051e81cdd650329e948f481b93278d3ef0670 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sun, 10 Jan 2021 13:45:48 +0100 Subject: [PATCH 02/37] enigma: 1.21 -> 1.30-alpha --- pkgs/games/enigma/default.nix | 25 ++++++++++++------------ pkgs/games/enigma/src_Value.cc.patch | 15 -------------- pkgs/games/enigma/src_client.cc.patch | 12 ------------ pkgs/games/enigma/src_lev_Proxy.cc.patch | 11 ----------- 4 files changed, 13 insertions(+), 50 deletions(-) delete mode 100644 pkgs/games/enigma/src_Value.cc.patch delete mode 100644 pkgs/games/enigma/src_client.cc.patch delete mode 100644 pkgs/games/enigma/src_lev_Proxy.cc.patch diff --git a/pkgs/games/enigma/default.nix b/pkgs/games/enigma/default.nix index d277768dbf5..1912f870275 100644 --- a/pkgs/games/enigma/default.nix +++ b/pkgs/games/enigma/default.nix @@ -1,30 +1,31 @@ -{ stdenv, fetchurl, makeWrapper, pkg-config, curl, imagemagick, libpng, SDL, SDL_image, SDL_mixer, SDL_ttf, xercesc, xdg_utils, hicolor-icon-theme }: +{ stdenv, lib, fetchurl, makeWrapper, pkg-config, gettext, imagemagick, curl, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, xercesc, xdg_utils, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "enigma"; - version = "1.21"; + version = "1.30-alpha"; src = fetchurl { - url = "mirror://sourceforge/enigma-game/enigma-${version}.tar.gz"; - sha256 = "d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01"; + url = "https://github.com/Enigma-Game/Enigma/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "1zyk3j43gzfr1lhc6g13j7qai5f33fv5xm5735nnznaqvaz17949"; }; - # patches lifted from Arch - patches = [ ./src_client.cc.patch ./src_lev_Proxy.cc.patch ./src_Value.cc.patch ]; + nativeBuildInputs = [ pkg-config gettext makeWrapper imagemagick ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng xercesc curl xdg_utils ]; - NIX_CFLAGS_COMPILE = [ "-Wno-deprecated-declarations" ]; - - nativeBuildInputs = [ pkg-config imagemagick makeWrapper ]; - buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf libpng xercesc curl xdg_utils ]; + # For some reason (might be related to the alpha status), some includes + # which are required by lib-src/enigma-core are not picked up by the + # configure script. Hence we add them manually. + CPPFLAGS = "-I${SDL2.dev}/include/SDL2 -I${SDL2_ttf}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_mixer}/include/SDL2"; postInstall = '' rm -r $out/include wrapProgram $out/bin/enigma --prefix PATH : "${stdenv.lib.makeBinPath [ xdg_utils ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga"; - license = with licenses; [ gpl2 free ]; + license = with licenses; [ gpl2 free ]; # source + bundles libs + art platforms = platforms.unix; + broken = stdenv.targetPlatform.isDarwin; maintainers = with maintainers; [ iblech ]; homepage = "https://www.nongnu.org/enigma/"; }; diff --git a/pkgs/games/enigma/src_Value.cc.patch b/pkgs/games/enigma/src_Value.cc.patch deleted file mode 100644 index 6ce85692dd2..00000000000 --- a/pkgs/games/enigma/src_Value.cc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/Value.cc.orig 2017-09-03 15:39:37 UTC -+++ b/src/Value.cc -@@ -146,10 +146,10 @@ namespace enigma { - val.str[0] = 0; - break; - case BOOL : -- val.dval[0] = false; -+ val.dval[0] = 0; - break; - case OBJECT : -- val.dval[0] = (double) NULL; -+ val.dval[0] = 0; - break; - case NAMEDOBJECT: - ASSERT(false, XLevelRuntime, "Value: illegal type usage"); diff --git a/pkgs/games/enigma/src_client.cc.patch b/pkgs/games/enigma/src_client.cc.patch deleted file mode 100644 index 48d989470ff..00000000000 --- a/pkgs/games/enigma/src_client.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/client.cc -+++ b/src/client.cc -@@ -208,8 +208,8 @@ void Client::handle_events() { - case SDL_MOUSEBUTTONUP: on_mousebutton(e); break; - case SDL_ACTIVEEVENT: { - update_mouse_button_state(); -- if (e.active.gain == 0 && !video::IsFullScreen()) -- show_menu(false); -+// if (e.active.gain == 0 && !video::IsFullScreen()) -+// show_menu(false); - break; - } diff --git a/pkgs/games/enigma/src_lev_Proxy.cc.patch b/pkgs/games/enigma/src_lev_Proxy.cc.patch deleted file mode 100644 index 86796484dfd..00000000000 --- a/pkgs/games/enigma/src_lev_Proxy.cc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/lev/Proxy.cc.orig 2017-09-03 15:54:50 UTC -+++ b/src/lev/Proxy.cc -@@ -933,7 +933,7 @@ namespace enigma { namespace lev { - } else if (haveLocalCopy) { - // plain file - basic_ifstream ifs(absExtPath.c_str(), ios::binary | ios::in); -- if (ifs != NULL) -+ if (ifs) - Readfile(ifs, extCode); - else - haveLocalCopy = false; From f8c06505dbed21b59c0f5f4286c0b160c0b3ca70 Mon Sep 17 00:00:00 2001 From: CRTified Date: Fri, 15 Jan 2021 21:30:55 +0100 Subject: [PATCH 03/37] aliza: 1.98.32 -> 1.98.43 --- pkgs/applications/science/medicine/aliza/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index b4e56591f9c..e9b69d5bad5 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation { pname = "aliza"; - version = "1.98.32"; + version = "1.98.43"; src = fetchurl { # See https://www.aliza-dicom-viewer.com/download - url = "https://drive.google.com/uc?export=download&id=1nggavPhY_633T-AW9PdkcAgbWtzv3QKG"; - sha256 = "00vbgv8ca9ckgkicyyngrb01yhhcqc8hygg2bls7b44c47hcc8zz"; + url = "https://drive.google.com/uc?export=download&id=1HiDYUVN30oSWZWt3HBp7gNRBCLLtJM1I"; + sha256 = "0d70q67j2q0wdn4m2fxljqb97jwmscqgg3rm1rkb77fi2ik206ra"; name = "aliza.rpm"; }; From 91ab20dfa273de913f459ff467a7af7d4ff88fc2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 11:14:35 +0000 Subject: [PATCH 04/37] coolreader: 3.2.49 -> 3.2.51 --- pkgs/applications/misc/coolreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix index d3f3eb6fcf5..5b310373eee 100644 --- a/pkgs/applications/misc/coolreader/default.nix +++ b/pkgs/applications/misc/coolreader/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "coolreader"; - version = "3.2.49"; + version = "3.2.51"; src = fetchFromGitHub { owner = "buggins"; repo = pname; rev = "cr${version}"; - sha256 = "10i3w4zjlilz3smjzbwm50d91ns3w0wlgmsf38fn2lv76zczv8ia"; + sha256 = "sha256-rRWZHkuSNhAHwxKjpRgcNXO9vs/MDAgEuhRs8mRPjP4="; }; nativeBuildInputs = [ cmake pkg-config ]; From 6ee5348b5531d8621130686e4e4060ffe3ab009f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Tue, 2 Feb 2021 12:35:46 +0100 Subject: [PATCH 05/37] nixos/tests: add keepassxc Test whether KeePassXC launches correctly. --- nixos/tests/all-tests.nix | 1 + nixos/tests/keepassxc.nix | 34 +++++++++++++++++++ pkgs/applications/misc/keepassx/community.nix | 4 +++ 3 files changed, 39 insertions(+) create mode 100644 nixos/tests/keepassxc.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4ea2dc44d5a..775413080eb 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -185,6 +185,7 @@ in k3s = handleTest ./k3s.nix {}; kafka = handleTest ./kafka.nix {}; keepalived = handleTest ./keepalived.nix {}; + keepassxc = handleTest ./keepassxc.nix {}; kerberos = handleTest ./kerberos/default.nix {}; kernel-latest = handleTest ./kernel-latest.nix {}; kernel-lts = handleTest ./kernel-lts.nix {}; diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix new file mode 100644 index 00000000000..98902187f6a --- /dev/null +++ b/nixos/tests/keepassxc.nix @@ -0,0 +1,34 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +{ + name = "keepassxc"; + meta = with pkgs.lib.maintainers; { + maintainers = [ turion ]; + }; + + machine = { ... }: + + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + services.xserver.enable = true; + test-support.displayManager.auto.user = "alice"; + environment.systemPackages = [ pkgs.keepassxc ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + start_all() + machine.wait_for_x() + + # start KeePassXC window + machine.execute("su - alice -c keepassxc &") + + machine.wait_for_text("KeePassXC ${pkgs.keepassxc.version}") + machine.screenshot("KeePassXC") + ''; +}) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index c7e87dbbfd4..af259c199d8 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -34,6 +34,8 @@ , withKeePassNetworking ? true , withKeePassTouchID ? true , withKeePassFDOSecrets ? true + +, nixosTests }: with lib; @@ -118,6 +120,8 @@ stdenv.mkDerivation rec { wrapQtApp $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC ''; + passthru.tests = nixosTests.keepassxc; + meta = { description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)."; From 340148fa8df61963b21af65095ebf56b88508722 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Feb 2021 06:57:57 +0000 Subject: [PATCH 06/37] gtk4: 4.0.2 -> 4.0.3 --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 59b0b080a52..0038341bc2b 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -55,7 +55,7 @@ assert cupsSupport -> cups != null; stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.0.2"; + version = "4.0.3"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "115w3mzwm1xsi1q85qvwfm2yxpsjs2rcajgddzbnwhjicyn0frv2"; + sha256 = "18mJNyV5C1C9mjuyeIVtnVQ7RLa5uVHXtg573swTGJA="; }; nativeBuildInputs = [ From a429b3f0951de9b2b8c6da51bb236c774d7c1bef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Feb 2021 19:25:59 +0000 Subject: [PATCH 07/37] evolution: 3.38.3 -> 3.38.4 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index b8aaabca0fb..f6bea3c8357 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.38.3"; + version = "3.38.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kfshljvkpbh965rjlyy1qjjm0ic3rdxisyy9c5jjvv2qlk65b3z"; + sha256 = "NB+S0k4rRMJ4mwA38aiU/xZUh9qksAuA+uMTii4Fr9Q="; }; nativeBuildInputs = [ From 996b6dc766ce394377bec0375923ea17fdc45717 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Feb 2021 23:12:42 +0000 Subject: [PATCH 08/37] gnome3.gnome-getting-started-docs: 3.38.0 -> 3.38.1 --- .../gnome-3/apps/gnome-getting-started-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 93a036228c3..82c40fc429d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-getting-started-docs"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ficf4i4njqrx3dn5rdkvpvcys5mwfma4zkgfmfkq964jxpwzqvw"; + sha256 = "EPviPyw85CdTmk4wekYWlNOHCyMgBGT3BbfYGvmTyFk="; }; passthru = { From 23d566def262f0f18801ecc6ad23429a9d64635a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 10:47:45 +0100 Subject: [PATCH 09/37] python3Packages.aqualogic: 2.3 -> 2.5 --- pkgs/development/python-modules/aqualogic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix index dbd29f3d110..a6081858afb 100644 --- a/pkgs/development/python-modules/aqualogic/default.nix +++ b/pkgs/development/python-modules/aqualogic/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aqualogic"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "swilson"; repo = pname; rev = version; - sha256 = "0101lni458y88yrw1wri3pz2cn5jlxln03pa3q2pxaybcyklb9qk"; + sha256 = "sha256-yxd+A5dsB9gBwVlPNjz+IgDHKTktNky84bWZMhA/xa4="; }; propagatedBuildInputs = [ pyserial ]; From c4550b2b8dbb3592ec4d3f2841bd3e473714d786 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 12:36:04 +0100 Subject: [PATCH 10/37] python3Packages.xknx: 0.16.3 -> 0.17.0 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 221076fae84..841348339a7 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.16.3"; + version = "0.17.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-toB66woREkFUv3J14wwquRo+uAOgXKO+cwFgyw4Mma8="; + sha256 = "sha256-fzLqkeCfeLNu13R9cp1XVh8fE2B3L47UDpuWOod33gU="; }; propagatedBuildInputs = [ From 7e771d4d3353e99459eec6db3fccf471499ab95e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 13:55:46 +0100 Subject: [PATCH 11/37] python3Packages.pyalmond: init at 0.0.3 --- .../python-modules/pyalmond/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pyalmond/default.nix diff --git a/pkgs/development/python-modules/pyalmond/default.nix b/pkgs/development/python-modules/pyalmond/default.nix new file mode 100644 index 00000000000..59a9339c264 --- /dev/null +++ b/pkgs/development/python-modules/pyalmond/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyalmond"; + version = "0.0.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stanford-oval"; + repo = pname; + rev = "v${version}"; + sha256 = "0d1w83lr7k2wxcs846iz4mjyqn1ximnw6155kgl515v10fqyrhgk"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Tests require a running Almond instance + doCheck = false; + pythonImportsCheck = [ "pyalmond" ]; + + meta = with lib; { + description = "Python client for the Almond API"; + homepage = "https://github.com/stanford-oval/pyalmond"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdff2fce152..b621eadd7f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5229,6 +5229,8 @@ in { pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; + pyalmond = callPackage ../development/python-modules/pyalmond { }; + pyamf = callPackage ../development/python-modules/pyamf { }; pyamg = callPackage ../development/python-modules/pyamg { }; From 214163c8b60d147655c5e5fd39a6e78be7b0f4b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 14:00:11 +0100 Subject: [PATCH 12/37] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ce7fbfb6064..5f6bc8cf565 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -23,7 +23,7 @@ "alarmdecoder" = ps: with ps; [ adext ]; "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ aiohttp-cors ]; - "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond + "almond" = ps: with ps; [ aiohttp-cors pyalmond ]; "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage "amazon_polly" = ps: with ps; [ boto3 ]; "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; From 712bd27c139a8d5b3e25638ac65d7c7513676e4c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 14:34:29 +0100 Subject: [PATCH 13/37] python3Packages.pymitv: init at 1.4.3 --- .../python-modules/pymitv/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/pymitv/default.nix diff --git a/pkgs/development/python-modules/pymitv/default.nix b/pkgs/development/python-modules/pymitv/default.nix new file mode 100644 index 00000000000..ffaabb04a29 --- /dev/null +++ b/pkgs/development/python-modules/pymitv/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pymitv"; + version = "1.4.3"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jbs1zhqpnsyad3pd8cqy1byv8m5bq17ydc6crmrfkjbp6xvvg3x"; + }; + + propagatedBuildInputs = [ requests ]; + + # Projec thas no tests + doCheck = false; + pythonImportsCheck = [ "pymitv" ]; + + meta = with lib; { + description = "Python client the Mi Tv 3"; + homepage = "https://github.com/simse/pymitv"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e9824fe901..1af9c70969d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5694,6 +5694,8 @@ in { pymetno = callPackage ../development/python-modules/pymetno { }; + pymitv = callPackage ../development/python-modules/pymitv { }; + pymodbus = callPackage ../development/python-modules/pymodbus { }; pymongo = callPackage ../development/python-modules/pymongo { }; From 71a1f1d8d9de20396a5ad8088606a92a063f4a23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 14:37:43 +0100 Subject: [PATCH 14/37] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3c244696f1f..15940802806 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -950,7 +950,7 @@ "xiaomi" = ps: with ps; [ ha-ffmpeg ]; "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco zeroconf ]; "xiaomi_miio" = ps: with ps; [ construct python-miio ]; - "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv + "xiaomi_tv" = ps: with ps; [ pymitv ]; "xmpp" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient From db100ec834f2d00ad7babff90bfb734e949ec949 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 14:51:49 +0100 Subject: [PATCH 15/37] python3Packages.python-twitch-client: init at 0.7.1 --- .../python-twitch-client/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/python-twitch-client/default.nix diff --git a/pkgs/development/python-modules/python-twitch-client/default.nix b/pkgs/development/python-modules/python-twitch-client/default.nix new file mode 100644 index 00000000000..30f6ab9a0a7 --- /dev/null +++ b/pkgs/development/python-modules/python-twitch-client/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "python-twitch-client"; + version = "0.7.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tsifrer"; + repo = pname; + rev = version; + sha256 = "10wwkam3dw0nqr3v9xzigx1zjlrnrhzr7jvihddvzi84vjb6j443"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "twitch" ]; + + meta = with lib; { + description = "Python wrapper for the Twitch API"; + homepage = "https://github.com/tsifrer/python-twitch-client"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e9824fe901..0fe19a69e61 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6487,6 +6487,8 @@ in { python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + python-twitch-client = callPackage ../development/python-modules/python-twitch-client { }; + python-twitter = callPackage ../development/python-modules/python-twitter { }; python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; From a73ab65d0a68439e8ff6d76acdf579b09e43185d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 14:53:54 +0100 Subject: [PATCH 16/37] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3c244696f1f..f1425fdedb8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -871,7 +871,7 @@ "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "twinkly" = ps: with ps; [ ]; # missing inputs: twinkly-client - "twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client + "twitch" = ps: with ps; [ python-twitch-client ]; "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI "ubus" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ]; From 4c02c66275eb6653da51479719affdfd17286ab1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 16:20:40 +0100 Subject: [PATCH 17/37] python3Packages.tuyaha: init at 0.0.10 --- .../python-modules/tuyaha/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/tuyaha/default.nix diff --git a/pkgs/development/python-modules/tuyaha/default.nix b/pkgs/development/python-modules/tuyaha/default.nix new file mode 100644 index 00000000000..a53124783d1 --- /dev/null +++ b/pkgs/development/python-modules/tuyaha/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "tuyaha"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "PaulAnnekov"; + repo = pname; + rev = version; + sha256 = "0n08mqrz76zv1cyqky6ibs6im1fqcywkiyvfmfabml0vzvr43awf"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tuyaha" ]; + + meta = with lib; { + description = "Python module with the Tuya API"; + homepage = "https://github.com/PaulAnnekov/tuyaha"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e9824fe901..6bd45f71fb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7983,6 +7983,8 @@ in { tumpa = callPackage ../development/python-modules/tumpa { }; + tuyaha = callPackage ../development/python-modules/tuyaha { }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; tvnamer = callPackage ../development/python-modules/tvnamer { }; From e81a4a4f9fcbf9f6778c0f766f198bbec5a1ac5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 16:21:04 +0100 Subject: [PATCH 18/37] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3c244696f1f..d972276d431 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -865,7 +865,7 @@ "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy "trend" = ps: with ps; [ numpy ]; "tts" = ps: with ps; [ aiohttp-cors mutagen ]; - "tuya" = ps: with ps; [ ]; # missing inputs: tuyaha + "tuya" = ps: with ps; [ tuyaha ]; "twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu "twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; From 7273115cc1e2a321f59fd034221f31543ec810cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 16:24:25 +0100 Subject: [PATCH 19/37] python3Packages.wiffi: init at 1.0.1 --- .../python-modules/wiffi/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/wiffi/default.nix diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix new file mode 100644 index 00000000000..a3da3f2f027 --- /dev/null +++ b/pkgs/development/python-modules/wiffi/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "wiffi"; + version = "1.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mampfes"; + repo = "python-wiffi"; + rev = version; + sha256 = "1bsx8dcmbkajh7hdgxg6wdnyxz4bfnd45piiy3yzyvszfdyvxw0f"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "wiffi" ]; + + meta = with lib; { + description = "Python module to interface with STALL WIFFI devices"; + homepage = "https://github.com/mampfes/python-wiffi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e9824fe901..fd8e4b388a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8356,6 +8356,8 @@ in { widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; + wiffi = callPackage ../development/python-modules/wiffi { }; + willow = callPackage ../development/python-modules/willow { }; winacl = callPackage ../development/python-modules/winacl { }; From 81fdd23144164be072c4d5bb8d6d666abc146752 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 16:24:54 +0100 Subject: [PATCH 20/37] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3c244696f1f..07393077fe9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -928,7 +928,7 @@ "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ python-whois ]; - "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi + "wiffi" = ps: with ps; [ wiffi ]; "wilight" = ps: with ps; [ pywilight ]; "wink" = ps: with ps; [ aiohttp-cors pubnubsub-handler python-wink ]; "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy From e2abd532869a1a0efb25bf6ee16ec0352e3cce7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 16:26:49 +0100 Subject: [PATCH 21/37] python3Packages.pyvolumio: init 0.1.3 --- .../python-modules/pyvolumio/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pyvolumio/default.nix diff --git a/pkgs/development/python-modules/pyvolumio/default.nix b/pkgs/development/python-modules/pyvolumio/default.nix new file mode 100644 index 00000000000..da3ac35c462 --- /dev/null +++ b/pkgs/development/python-modules/pyvolumio/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyvolumio"; + version = "0.1.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "OnFreund"; + repo = "PyVolumio"; + rev = "v${version}"; + sha256 = "0x2dzmd9lwnak2iy6v54y24qjq37y3nlfhsvx7hddgv8jj1klvap"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyvolumio" ]; + + meta = with lib; { + description = "Python module to control Volumio"; + homepage = "https://github.com/OnFreund/PyVolumio"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e9824fe901..78b49de4eca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6600,6 +6600,8 @@ in { pyvmomi = callPackage ../development/python-modules/pyvmomi { }; + pyvolumio = callPackage ../development/python-modules/pyvolumio { }; + pyvoro = callPackage ../development/python-modules/pyvoro { }; pywal = callPackage ../development/python-modules/pywal { }; From 3d7db73a37368e445dee8d4358f9b88f2cb0aea1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 16:27:14 +0100 Subject: [PATCH 22/37] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3c244696f1f..ab30541140a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -911,7 +911,7 @@ "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ volkszaehler ]; - "volumio" = ps: with ps; [ ]; # missing inputs: pyvolumio + "volumio" = ps: with ps; [ pyvolumio ]; "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 From 6ef71992224875abfce549e3ac711f6916a15947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Feb 2021 19:13:58 +0100 Subject: [PATCH 23/37] pythonPackages.launchpadlib: fix tests by using pytestCheckHook, update license --- pkgs/development/python-modules/launchpadlib/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix index 6c5112312bb..e39e313baa7 100644 --- a/pkgs/development/python-modules/launchpadlib/default.nix +++ b/pkgs/development/python-modules/launchpadlib/default.nix @@ -10,6 +10,7 @@ , six , testresources , wadllib +, pytestCheckHook }: buildPythonPackage rec { @@ -32,6 +33,8 @@ buildPythonPackage rec { wadllib ]; + checkInputs = [ pytestCheckHook ]; + preCheck = '' export HOME=$TMPDIR ''; @@ -41,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Script Launchpad through its web services interfaces. Officially supported"; homepage = "https://help.launchpad.net/API/launchpadlib"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = [ maintainers.marsam ]; }; } From d292f8272647b596ab275b9d3d0037e366e88ea8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 17:29:05 +0100 Subject: [PATCH 24/37] python3Packages.tahoma-api: init at 0.0.17 --- .../python-modules/tahoma-api/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/tahoma-api/default.nix diff --git a/pkgs/development/python-modules/tahoma-api/default.nix b/pkgs/development/python-modules/tahoma-api/default.nix new file mode 100644 index 00000000000..44021822311 --- /dev/null +++ b/pkgs/development/python-modules/tahoma-api/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "tahoma-api"; + version = "0.0.17"; + + src = fetchFromGitHub { + owner = "philklei"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YwOKSBlN4lNyS+hfdbQDUq1gc14FBof463ofxtUVLC4="; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tahoma_api" ]; + + meta = with lib; { + description = "Python module to interface with Tahoma REST API"; + homepage = "https://github.com/philklei/tahoma-api/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e9824fe901..91f47a1daa6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7679,6 +7679,8 @@ in { tag-expressions = callPackage ../development/python-modules/tag-expressions { }; + tahoma-api = callPackage ../development/python-modules/tahoma-api { }; + tarman = callPackage ../development/python-modules/tarman { }; tasklib = callPackage ../development/python-modules/tasklib { }; From c175f68a175768c6b9fa8f15e421e1e9e2e6deab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 17:30:14 +0100 Subject: [PATCH 25/37] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3c244696f1f..92dad9d96f0 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -815,7 +815,7 @@ "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ python-tado ]; "tag" = ps: with ps; [ ]; - "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api + "tahoma" = ps: with ps; [ tahoma-api ]; "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility "tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff From ce981a9ddd6d57522d2645eebf0c3a774ec6412e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 18:32:15 +0100 Subject: [PATCH 26/37] python3Packages.ratelimit: init at 2.2.1 --- .../python-modules/ratelimit/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/ratelimit/default.nix diff --git a/pkgs/development/python-modules/ratelimit/default.nix b/pkgs/development/python-modules/ratelimit/default.nix new file mode 100644 index 00000000000..f706d043bf8 --- /dev/null +++ b/pkgs/development/python-modules/ratelimit/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ratelimit"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "tomasbasham"; + repo = pname; + rev = "v${version}"; + sha256 = "04hy3hhh5xdqcsz0lx8j18zbj88kh5ik4wyi5d3a5sfy2hx70in2"; + }; + + postPatch = '' + sed -i "/--cov/d" pytest.ini + ''; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests" ]; + + pythonImportsCheck = [ "ratelimit" ]; + + meta = with lib; { + description = "Python API Rate Limit Decorator"; + homepage = "https://github.com/tomasbasham/ratelimit"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e9824fe901..d8a7077232d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6739,6 +6739,8 @@ in { rasterio = callPackage ../development/python-modules/rasterio { gdal = pkgs.gdal_2; }; # gdal 3.0 not supported yet + ratelimit = callPackage ../development/python-modules/ratelimit { }; + ratelimiter = callPackage ../development/python-modules/ratelimiter { }; raven = callPackage ../development/python-modules/raven { }; From 7522c4a1a1d772463cb6a3c8fa75d921b5a08289 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 18:36:49 +0100 Subject: [PATCH 27/37] python3Packages.pyflume: init at 0.6.2 --- .../python-modules/pyflume/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/pyflume/default.nix diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix new file mode 100644 index 00000000000..a1d36670a39 --- /dev/null +++ b/pkgs/development/python-modules/pyflume/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, pyjwt +, ratelimit +, pytz +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "pyflume"; + version = "0.6.2"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ChrisMandich"; + repo = "PyFlume"; + rev = "v${version}"; + sha256 = "0i181c8722j831bjlcjwv5ccy20hl8zzlv7bfp8w0976gdmv4iz8"; + }; + + propagatedBuildInputs = [ + pyjwt + ratelimit + pytz + requests + ]; + + checkInputs = [ + requests-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyflume" ]; + + meta = with lib; { + description = "Python module to work with Flume sensors"; + homepage = "https://github.com/ChrisMandich/PyFlume"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d8a7077232d..a318a373a87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5462,6 +5462,8 @@ in { pyflakes = callPackage ../development/python-modules/pyflakes { }; + pyflume = callPackage ../development/python-modules/pyflume { }; + pyfma = callPackage ../development/python-modules/pyfma { }; pyfribidi = callPackage ../development/python-modules/pyfribidi { }; From 412690ab43fac88704b50838b6d97f21ca4965fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Feb 2021 18:38:19 +0100 Subject: [PATCH 28/37] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3c244696f1f..537d137f787 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -264,7 +264,7 @@ "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; - "flume" = ps: with ps; [ ]; # missing inputs: pyflume + "flume" = ps: with ps; [ pyflume ]; "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou "flux" = ps: with ps; [ ]; "flux_led" = ps: with ps; [ flux-led ]; From 6e31c70928175249b37935f583edc2eb356044b1 Mon Sep 17 00:00:00 2001 From: Manoj Karthick Date: Sat, 20 Feb 2021 12:57:52 -0800 Subject: [PATCH 29/37] reddsaver: 0.3.0 -> 0.3.1 --- pkgs/applications/misc/reddsaver/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 86208c484a0..bdb589d8f95 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -8,22 +8,22 @@ rustPlatform.buildRustPackage rec { pname = "reddsaver"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "reddsaver"; rev = "v${version}"; - sha256 = "0wiyzbl9vqx5aq3lpaaqkm3ivj77lqd8bmh8ipgshdflgm1z6yvp"; + sha256 = "0kww3abgvxr7azr7yb8aiw28fz13qb4sn3x7nnz1ihmd4yczi9fg"; }; - cargoSha256 = "0kw5gk7pf4xkmjffs2jxm6sc4chybns88cii2wlgpyvgn4c3cwaa"; + cargoSha256 = "09xm22vgmd3dc0wr6n3jczxvhwpcsijwfbv50dz1lnsx57g8mgmd"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - # package does not contain tests as of v0.3.0 + # package does not contain tests as of v0.3.1 docCheck = false; meta = with lib; { From 0f9a5212f5b92c315f9289d5fdf7752c90423d26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Feb 2021 21:27:08 +0000 Subject: [PATCH 30/37] gdu: 4.6.2 -> 4.6.3 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 7b0b45fedb0..1051d48b8a5 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q26NnHSnJ8vVWHwXtFJ90/8xr772x/gW6BRG29wsIeI="; + sha256 = "sha256-vz8qqsFc1CETnrqStLyiGZ6w0jy+y5GlwQQgxdyJ5aY="; }; vendorSha256 = "sha256-kIMd0xzQ+c+jCpX2+qdD/GcFEirR15PMInbEV184EBU="; From da26156bdf868181fbbce89b8a9e15266dd6598f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Feb 2021 21:48:46 +0000 Subject: [PATCH 31/37] gleam: 0.13.2 -> 0.14.0 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 78a335f1b7b..4f724929232 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ka1GxukX3HR40fMeiiXHguyPKrpGngG2tXDColR7eQA="; + sha256 = "sha256-ujQ7emfGhzpRGeZ6RGZ57hFX4aIflTcwE9IEUMYb/ZI="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-/l54ezS68loljKNh7AdYMIuCiyIbsMI3jqD9ktjZLfc="; + cargoSha256 = "sha256-/SudEQynLkLl7Y731Uqm9AkEugTCnq4PFFRQcwz+qL8="; meta = with lib; { description = "A statically typed language for the Erlang VM"; From 7e711976bfbe93807dcd60dae81dca0fdc176a15 Mon Sep 17 00:00:00 2001 From: Daniel Duan Date: Sat, 20 Feb 2021 15:44:54 -0800 Subject: [PATCH 32/37] tre-command: 0.3.3 -> 0.3.4 Release note: https://github.com/dduan/tre/releases/tag/v0.3.4 --- pkgs/tools/system/tre-command/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index 638caa3c62b..f9e0e80478d 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tre-command"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "dduan"; repo = "tre"; rev = "v${version}"; - sha256 = "10c8mpqzpw7m3vrm2vl2rx678z3c37hxpqyh3fn83dlh9f4f0j87"; + sha256 = "0syvhpnw9c5csxv8c4gdfwif9a9vl4rjkwj4mfglgxk227k1y53q"; }; - cargoSha256 = "0jd6cfs2zi2n34kirpsy12l76whaqwm1pkqa57w1ms5z658z07wj"; + cargoSha256 = "056wlxz8hzky8315rnn65nh7dd2yhx5323y3hq64g6aqj52vd734"; nativeBuildInputs = [ installShellFiles ]; From f428bb03f2dd4e74fd748fa33d436d8738280586 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 21 Feb 2021 02:37:08 +0100 Subject: [PATCH 33/37] nix-output-monitor: 0.1.0.2 -> 1.0.0.0 --- pkgs/tools/nix/nix-output-monitor/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index b177b9a233a..a846bc0b444 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,21 +1,21 @@ { mkDerivation, ansi-terminal, async, attoparsec, base, containers -, directory, HUnit, mtl, nix-derivation, process, relude, lib -, stm, text, time, unix, fetchFromGitHub +, cassava, directory, HUnit, mtl, nix-derivation, process, relude, lib +, stm, terminal-size, text, time, unix, wcwidth, fetchFromGitHub }: mkDerivation { pname = "nix-output-monitor"; - version = "0.1.0.2"; + version = "1.0.0.0"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "0r4348cbmnpawbfa20qw3wnywiqp0jkl5svzl27jrm2yk2g51509"; - rev = "5bf7534"; + sha256 = "0hmrlkanippxhspi6vrqkpp1yc3ix2bnskfn5wispq9939k1m01v"; + rev = "1.0.0.0"; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal async attoparsec base containers directory mtl - nix-derivation relude stm text time unix + ansi-terminal async attoparsec base cassava containers directory mtl + nix-derivation relude stm terminal-size text time unix wcwidth ]; executableHaskellDepends = [ ansi-terminal async attoparsec base containers directory mtl From ae012d706d798d3f647e0c6eb852080c74d3ef73 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 21 Feb 2021 04:20:33 +0100 Subject: [PATCH 34/37] nix-output-monitor: 1.0.0.0 -> 1.0.1.0 --- pkgs/tools/nix/nix-output-monitor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index a846bc0b444..1aa6117c295 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -4,12 +4,12 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "1.0.0.0"; + version = "1.0.1.0"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "0hmrlkanippxhspi6vrqkpp1yc3ix2bnskfn5wispq9939k1m01v"; - rev = "1.0.0.0"; + sha256 = "10a3sn5isdb9q13yzdclng35jwfaf4lxrkdxwbhwms1k2ll08qk6"; + rev = "1.0.1.0"; }; isLibrary = true; isExecutable = true; From b62c3665766f99208fa1d3e4c61b41fefa11a6c2 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 20 Feb 2021 20:11:42 -0800 Subject: [PATCH 35/37] enigma: stdenv.lib -> lib --- pkgs/games/enigma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/enigma/default.nix b/pkgs/games/enigma/default.nix index 1912f870275..1c623e36ad8 100644 --- a/pkgs/games/enigma/default.nix +++ b/pkgs/games/enigma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, pkg-config, gettext, imagemagick, curl, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, xercesc, xdg_utils, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, gettext, imagemagick, curl, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, xercesc, xdg_utils, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "enigma"; version = "1.30-alpha"; @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { postInstall = '' rm -r $out/include - wrapProgram $out/bin/enigma --prefix PATH : "${stdenv.lib.makeBinPath [ xdg_utils ]}" + wrapProgram $out/bin/enigma --prefix PATH : "${lib.makeBinPath [ xdg_utils ]}" ''; meta = with lib; { description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga"; - license = with licenses; [ gpl2 free ]; # source + bundles libs + art + license = with licenses; [ gpl2 free ]; # source + bundles libs + art platforms = platforms.unix; broken = stdenv.targetPlatform.isDarwin; maintainers = with maintainers; [ iblech ]; From 27d72106cc73d20bb5c6261f528c46d72ff49d9f Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 20 Feb 2021 20:32:48 -0800 Subject: [PATCH 36/37] enigma: xdg_utils -> xdg-utils --- pkgs/games/enigma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/enigma/default.nix b/pkgs/games/enigma/default.nix index 1c623e36ad8..131bd00e185 100644 --- a/pkgs/games/enigma/default.nix +++ b/pkgs/games/enigma/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, gettext, imagemagick, curl, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, xercesc, xdg_utils, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, gettext, imagemagick, curl, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, xercesc, xdg-utils, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "enigma"; version = "1.30-alpha"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config gettext makeWrapper imagemagick ]; - buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng xercesc curl xdg_utils ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng xercesc curl xdg-utils ]; # For some reason (might be related to the alpha status), some includes # which are required by lib-src/enigma-core are not picked up by the @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postInstall = '' rm -r $out/include - wrapProgram $out/bin/enigma --prefix PATH : "${lib.makeBinPath [ xdg_utils ]}" + wrapProgram $out/bin/enigma --prefix PATH : "${lib.makeBinPath [ xdg-utils ]}" ''; meta = with lib; { From 92d319d5d549b8f621042caa3ba6624d5210d2fd Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 15 Dec 2020 02:07:47 +0700 Subject: [PATCH 37/37] doc/stdenv/platform-notes: convert to markdown --- doc/manual.xml | 2 +- doc/stdenv/platform-notes.chapter.md | 62 +++++++++++++++++++++ doc/stdenv/platform-notes.xml | 83 ---------------------------- 3 files changed, 63 insertions(+), 84 deletions(-) create mode 100644 doc/stdenv/platform-notes.chapter.md delete mode 100644 doc/stdenv/platform-notes.xml diff --git a/doc/manual.xml b/doc/manual.xml index 8cecb01fc22..b0490ec74ae 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -19,7 +19,7 @@ - + Builders diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md new file mode 100644 index 00000000000..03e61e333f8 --- /dev/null +++ b/doc/stdenv/platform-notes.chapter.md @@ -0,0 +1,62 @@ +# Platform Notes {#chap-platform-notes} + +## Darwin (macOS) {#sec-darwin} + +Some common issues when packaging software for Darwin: + +- The Darwin `stdenv` uses clang instead of gcc. When referring to the compiler `$CC` or `cc` will work in both cases. Some builds hardcode gcc/g++ in their build scripts, that can usually be fixed with using something like `makeFlags = [ "CC=cc" ];` or by patching the build scripts. + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + buildPhase = '' + $CC -o hello hello.c + ''; + } + ``` + +- On Darwin, libraries are linked using absolute paths, libraries are resolved by their `install_name` at link time. Sometimes packages won’t set this correctly causing the library lookups to fail at runtime. This can be fixed by adding extra linker flags or by running `install_name_tool -id` during the `fixupPhase`. + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + makeFlags = lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; + } + ``` + +- Even if the libraries are linked using absolute paths and resolved via their `install_name` correctly, tests can sometimes fail to run binaries. This happens because the `checkPhase` runs before the libraries are installed. + + This can usually be solved by running the tests after the `installPhase` or alternatively by using `DYLD_LIBRARY_PATH`. More information about this variable can be found in the *dyld(1)* manpage. + + ``` + dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib + Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq + Reason: image not found + ./tests/jqtest: line 5: 75779 Abort trap: 6 + ``` + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + doInstallCheck = true; + installCheckTarget = "check"; + } + ``` + +- Some packages assume xcode is available and use `xcrun` to resolve build tools like `clang`, etc. This causes errors like `xcode-select: error: no developer tools were found at '/Applications/Xcode.app'` while the build doesn’t actually depend on xcode. + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + prePatch = '' + substituteInPlace Makefile \ + --replace '/usr/bin/xcrun clang' clang + ''; + } + ``` + + The package `xcbuild` can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues. diff --git a/doc/stdenv/platform-notes.xml b/doc/stdenv/platform-notes.xml deleted file mode 100644 index cc8efaece12..00000000000 --- a/doc/stdenv/platform-notes.xml +++ /dev/null @@ -1,83 +0,0 @@ - - Platform Notes -
- Darwin (macOS) - - - Some common issues when packaging software for Darwin: - - - - - - The Darwin stdenv uses clang instead of gcc. When referring to the compiler $CC or cc will work in both cases. Some builds hardcode gcc/g++ in their build scripts, that can usually be fixed with using something like makeFlags = [ "CC=cc" ]; or by patching the build scripts. - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - buildPhase = '' - $CC -o hello hello.c - ''; -} - - - - - On Darwin, libraries are linked using absolute paths, libraries are resolved by their install_name at link time. Sometimes packages won't set this correctly causing the library lookups to fail at runtime. This can be fixed by adding extra linker flags or by running install_name_tool -id during the fixupPhase. - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - makeFlags = lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; -} - - - - - Even if the libraries are linked using absolute paths and resolved via their install_name correctly, tests can sometimes fail to run binaries. This happens because the checkPhase runs before the libraries are installed. - - - This can usually be solved by running the tests after the installPhase or alternatively by using DYLD_LIBRARY_PATH. More information about this variable can be found in the - dyld - 1 manpage. - - -dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib -Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq -Reason: image not found -./tests/jqtest: line 5: 75779 Abort trap: 6 - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - doInstallCheck = true; - installCheckTarget = "check"; -} - - - - - Some packages assume xcode is available and use xcrun to resolve build tools like clang, etc. This causes errors like xcode-select: error: no developer tools were found at '/Applications/Xcode.app' while the build doesn't actually depend on xcode. - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - prePatch = '' - substituteInPlace Makefile \ - --replace '/usr/bin/xcrun clang' clang - ''; -} - - - The package xcbuild can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues. - - - -
-