diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index 8c5b6e5e0cbc..7021a2c80f85 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -24,6 +24,7 @@ in imports = [ (mkRenamedOptionModule [ "services" "mingetty" ] [ "services" "getty" ]) + (mkRemovedOptionModule [ "services" "getty" "serialSpeed" ] ''set non-standard baudrates with `boot.kernelParams` i.e. boot.kernelParams = ["console=ttyS2,1500000"];'') ]; options = { @@ -92,17 +93,6 @@ in ''; }; - serialSpeed = mkOption { - type = types.listOf types.int; - default = [ 115200 57600 38400 9600 ]; - example = [ 38400 9600 ]; - description = '' - Bitrates to allow for agetty's listening on serial ports. Listing more - bitrates gives more interoperability but at the cost of long delays - for getting a sync on the line. - ''; - }; - }; }; @@ -124,10 +114,9 @@ in }; systemd.services."serial-getty@" = - let speeds = concatStringsSep "," (map toString config.services.getty.serialSpeed); in { serviceConfig.ExecStart = [ "" # override upstream default with an empty ExecStart - (gettyCmd "%I --keep-baud ${speeds} $TERM") + (gettyCmd "%I --keep-baud $TERM") ]; restartIfChanged = false; }; diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index ffd2d926b63c..f9cef2898bfc 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -1,21 +1,21 @@ { buildGoModule , fetchFromGitHub , lib -, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" ] +, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ] }: buildGoModule rec { pname = "lnd"; - version = "0.13.4-beta"; + version = "0.14.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "1ykvhbl5i0kqlh0fpzpjass55clys8bpa28brg7d9fs72zv2ks6x"; + sha256 = "0pf84l46cfhbmbzjdkpmqp494wqix8715zawm537mm94k3q25bis"; }; - vendorSha256 = "13cjb188bzgd3m3p73szxffkab6l7n6wmbvqvicvi9k3mixn5qql"; + vendorSha256 = "1481zscd9lrnzxsaxkpaaa8fjazmfynhim13f8lj2yd9d21j5d31"; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 0c2776778b53..d1447b864efa 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0dwpczbxqy3rsqprdiakmqv6s3jzcg2wqxnf1znarx2qffb4ii9x"; - x86_64-darwin = "0si76v80r0vhl76gbdwbykk6acifhifz8sb8wiyiiywkinlxs19w"; - aarch64-linux = "0nwgdvvsblh2r72ys2ng5b084wizkdjd00mm73506mgbs8pzcky4"; - aarch64-darwin = "0qivq4077g5a4gwkskvvzxaa60w1gpgl67pmdyqn81rina04rdqs"; - armv7l-linux = "0myf96s1vdpllnw0vz0rpmyv2pfirv3p8pqgxxnpw860s2c26f2f"; + x86_64-linux = "0wf8bmzag49n81kjb46kj2nkksimm8f7cf4ihpqcw8k5iwasn3j9"; + x86_64-darwin = "1s7i5087bvckg66mcb32krv12vxhaw7ii9vm3i6p72wr0sv7dddh"; + aarch64-linux = "0yzh5javinvas3zz0lliyc77vbcs1jrmxbkr7nic4snscg6wjhcd"; + aarch64-darwin = "13l6ymz7v18s7ikxbwvkwb0f5ff2j82j5pfj04yy75kq9b5gh0vx"; + armv7l-linux = "129wffj9cidk9ysjpq3p0ddn6liwkmrkxhxgz7bqzj8sdhwyq8pz"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.2"; + version = "1.62.3"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index f5ea3f6f1af4..3fce492a9932 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "461"; + version = "462"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-fVqMSzQ4VhiRh6gDFApln1jioIDs80ceyV+ClNRhjKA="; + sha256 = "sha256-eHUztpnDs1kxaBlTO7BRbO3eH+On9m7aJtbNw2b9Ado="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/applications/networking/browsers/kristall/default.nix index 4028f8622c3c..1435d2472635 100644 --- a/pkgs/applications/networking/browsers/kristall/default.nix +++ b/pkgs/applications/networking/browsers/kristall/default.nix @@ -1,31 +1,44 @@ -{ lib, mkDerivation, fetchFromGitHub, qtbase, qtmultimedia }: +{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, qmake, qtmultimedia }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kristall"; version = "0.3"; + src = fetchFromGitHub { owner = "MasterQ32"; repo = "kristall"; - rev = "V" + version; + rev = "V${version}"; sha256 = "07nf7w6ilzs5g6isnvsmhh4qa1zsprgjyf0zy7rhpx4ikkj8c8zq"; }; - buildInputs = [ qtbase qtmultimedia ]; + postPatch = lib.optionalString stdenv.cc.isClang '' + sed -i '1i #include ' src/browsertab.cpp + ''; + + nativeBuildInputs = [ wrapQtAppsHook qmake ]; + + buildInputs = [ qtmultimedia ]; qmakeFlags = [ "src/kristall.pro" ]; - installPhase = '' + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv kristall.app $out/Applications + '' else '' install -Dt $out/bin kristall install -D Kristall.desktop $out/share/applications/net.random-projects.kristall.desktop + install -D src/icons/kristall.svg $out/share/icons/hicolor/scalable/apps/net.random-projects.kristall.svg + for size in 16 32 64 128; do + install -D src/icons/kristall-''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/net.random-projects.kristall.png + done ''; - meta = with lib; - src.meta // { - description = - "Graphical small-internet client, supports gemini, http, https, gopher, finger"; - homepage = "https://random-projects.net/projects/kristall.gemini"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.gpl3; - inherit (qtmultimedia.meta) platforms; - }; + meta = with lib; { + description = + "Graphical small-internet client, supports gemini, http, https, gopher, finger"; + homepage = "https://random-projects.net/projects/kristall.gemini"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.gpl3Only; + inherit (qtmultimedia.meta) platforms; + }; } diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index bc192fe4218b..ab5e54dab777 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.20.1"; + version = "3.21.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-GTOdJ4dxR491WU6WM47xLHO7RGUGXkdHuQIDxJvVvFE="; + sha256 = "sha256-w0frk1Nd1/HTo94VAbD7QjVuT8laPbmgd8ENTb0+89c="; }; hardeningDisable = [ "format" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The ultimate desktop calculator"; homepage = "http://qalculate.github.io"; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner doronbehar ]; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 3ea90b348ed0..19f44d8d165e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -20,30 +20,15 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0cv97c0qrhqisyghy9a9qr4ffcx3g4bkswxm6rn4r2wfg4gvljri"; + sha256 = "sha256-FHZ4YhGLqGTz5Po2XFJvnWuAi1eHKcT9zzgJFHic02E="; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/wingpanel-indicator-sound/pull/216 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-sound/commit/df816104c15e4322c1077313b1f43114cdaf710e.patch"; - sha256 = "029z7l467jz1ymxwrzrf874062r6xmskl7mldpq39jh110fijy5l"; - }) - # Fix build with vala 0.54 - # https://github.com/elementary/wingpanel-indicator-sound/pull/221 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-sound/commit/398d181eabe3dd803dc0ba335ac629902ec5b5ab.patch"; - sha256 = "1r2x3n6ws56jk7xcgk60am8mc5dgf8pz5ipsydxvmlrmipkjxyqi"; - }) - ]; - nativeBuildInputs = [ libxml2 meson diff --git a/pkgs/development/interpreters/octave/build-octave-package.nix b/pkgs/development/interpreters/octave/build-octave-package.nix index 73a67769d6a6..065992f91271 100644 --- a/pkgs/development/interpreters/octave/build-octave-package.nix +++ b/pkgs/development/interpreters/octave/build-octave-package.nix @@ -54,7 +54,23 @@ let requiredOctavePackages' = computeRequiredOctavePackages requiredOctavePackages; -in stdenv.mkDerivation { + # Must use attrs.nativeBuildInputs before they are removed by the removeAttrs + # below, or everything fails. + nativeBuildInputs' = [ + octave + writeRequiredOctavePackagesHook + ] + ++ nativeBuildInputs; + + # This step is required because when + # a = { test = [ "a" "b" ]; }; b = { test = [ "c" "d" ]; }; + # (a // b).test = [ "c" "d" ]; + # This used to mean that if a package defined extra nativeBuildInputs, it + # would override the ones for building an Octave package (the hook and Octave + # itself, causing everything to fail. + attrs' = builtins.removeAttrs attrs [ "nativeBuildInputs" ]; + +in stdenv.mkDerivation ({ packageName = "${fullLibName}"; # The name of the octave package ends up being # "octave-version-package-version" @@ -77,11 +93,7 @@ in stdenv.mkDerivation { requiredOctavePackages = requiredOctavePackages'; - nativeBuildInputs = [ - octave - writeRequiredOctavePackagesHook - ] - ++ nativeBuildInputs; + nativeBuildInputs = nativeBuildInputs'; buildInputs = buildInputs ++ requiredOctavePackages'; @@ -110,4 +122,4 @@ in stdenv.mkDerivation { dontInstall = true; inherit meta; -} +} // attrs') diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index c7d26362f00f..60ca2e9b18b5 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut -, Cocoa, OpenGL +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libGLU +, libGL +, freeglut +, Cocoa +, OpenGL }: stdenv.mkDerivation rec { @@ -37,6 +44,7 @@ stdenv.mkDerivation rec { "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework" "-DBUILD_BULLET2_DEMOS=OFF" "-DBUILD_UNIT_TESTS=OFF" + "-DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF" ]; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index 5d86dd12246b..1935c7d947ff 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config }: +{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }: stdenv.mkDerivation rec { version = "20201230"; @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib openssl libuuid ]; + buildInputs = [ zlib openssl libuuid ] + ++ lib.optionals stdenv.isDarwin [ bzip2 ]; meta = { description = "Library for support of the Expert Witness Compression Format"; diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index f36b5436d69c..b19eee6ccf88 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu, Foundation }: stdenv.mkDerivation rec { pname = "phonenumber"; - version = "8.11.3"; + version = "8.12.37"; src = fetchFromGitHub { owner = "googlei18n"; repo = "libphonenumber"; rev = "v${version}"; - sha256 = "06y3mh1d1mks6d0ynxp3980g712nkf8l5nyljpybsk326b246hg9"; + sha256 = "sha256-xLxadSxVY3DjFDQrqj3BuOvdMaKdFSLjocfzovJCBB0="; }; nativeBuildInputs = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { boost protobuf icu - ]; + ] ++ lib.optional stdenv.isDarwin Foundation; cmakeDir = "../cpp"; @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Google's i18n library for parsing and using phone numbers"; + homepage = "https://github.com/google/libphonenumber"; license = licenses.asl20; maintainers = with maintainers; [ illegalprime ]; }; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index c7253364fd0c..a148807b80c6 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An advanced calculator library"; homepage = "http://qalculate.github.io"; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner doronbehar ]; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/development/octave-modules/audio/default.nix b/pkgs/development/octave-modules/audio/default.nix index 0cb03746085a..c0b4551ceca7 100644 --- a/pkgs/development/octave-modules/audio/default.nix +++ b/pkgs/development/octave-modules/audio/default.nix @@ -9,11 +9,11 @@ buildOctavePackage rec { pname = "audio"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "18lyvwmdy4b9pcv5sm7g17n3is32q23daw8fcsalkf4rj6cc6qdk"; + sha256 = "1431pf7mhxsrnzrx8r3hsy537kha7jhaligmp2rghwyxhq25hs0r"; }; nativeBuildInputs = [ diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix index b69343b1b4bb..79dbb99fadff 100644 --- a/pkgs/development/octave-modules/control/default.nix +++ b/pkgs/development/octave-modules/control/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "control"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "1yksifligq2z3siqw701iq2ydgnj7pnkcw42bfmydcf6fc4drlvy"; + sha256 = "0vndbzix34vfzdlsz57bgkyg31as4kv6hfg9pwrcqn75bzzjsivw"; }; nativeBuildInputs = [ diff --git a/pkgs/development/octave-modules/nan/default.nix b/pkgs/development/octave-modules/nan/default.nix index f492d4440b19..3a972b76fdc6 100644 --- a/pkgs/development/octave-modules/nan/default.nix +++ b/pkgs/development/octave-modules/nan/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "nan"; - version = "3.5.3"; + version = "3.6.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "1jailahbrh847875vszibn68lp4n5sdy68q51i7hd64qix8rmmpx"; + sha256 = "1zxdg0yg5jnwq6ppnikd13zprazia6w6zpgw99f62mc03iqk5c4q"; }; buildInputs = [ diff --git a/pkgs/development/octave-modules/sparsersb/default.nix b/pkgs/development/octave-modules/sparsersb/default.nix index ecea6c0f62e4..507ed1100a42 100644 --- a/pkgs/development/octave-modules/sparsersb/default.nix +++ b/pkgs/development/octave-modules/sparsersb/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "sparsersb"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "0nl7qppa1cm51188hqhbfswlih9hmy1yz7v0f5i07z0g0kbd62xw"; + sha256 = "0jyy2m7wylzyjqj9n6mjizhj0ccq8xnxm2g6pdlrmncxq1401khd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/octave-modules/tsa/default.nix b/pkgs/development/octave-modules/tsa/default.nix index a6320f0fc01c..985612fa8c7a 100644 --- a/pkgs/development/octave-modules/tsa/default.nix +++ b/pkgs/development/octave-modules/tsa/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "tsa"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "0p2cjszzjwhp4ih3q3r67qnikgxc0fwxc12p3727jbdvzq2h10mn"; + sha256 = "1pbxq77xc7pn0ki6rpijlq9v7inn0hn2adkx1skgwffl7pivrwsl"; }; requiredOctavePackages = [ diff --git a/pkgs/development/octave-modules/zeromq/default.nix b/pkgs/development/octave-modules/zeromq/default.nix index 7a8f7f6d16a1..557a43a9820c 100644 --- a/pkgs/development/octave-modules/zeromq/default.nix +++ b/pkgs/development/octave-modules/zeromq/default.nix @@ -2,17 +2,32 @@ , lib , fetchurl , zeromq +, pkg-config +, autoreconfHook }: buildOctavePackage rec { pname = "zeromq"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "18h1039ri7dr37jv20cvj5vhw7b57frrda0hhbvlgixinbqmn9j7"; + sha256 = "1h0pb2pqbnyiavf7r05j8bqxqd8syz16ab48hc74nlnx727anfwl"; }; + preAutoreconf = '' + cd src + ''; + + postAutoreconf = '' + cd .. + ''; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + propagatedBuildInputs = [ zeromq ]; diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index 1bba2b30be55..6c943d5ae57c 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ + disabledTestPaths = [ # disable tests which require being connected to the satellite - "--ignore=blocksatcli/test_satip.py" - "--ignore=blocksatcli/api/test_listen.py" - "--ignore=blocksatcli/api/test_msg.py" - "--ignore=blocksatcli/api/test_net.py" + "blocksatcli/test_satip.py" + "blocksatcli/api/test_listen.py" + "blocksatcli/api/test_msg.py" + "blocksatcli/api/test_net.py" # disable tests which require being online - "--ignore=blocksatcli/api/test_order.py" + "blocksatcli/api/test_order.py" ]; pythonImportsCheck = [ "blocksatcli" ]; diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index dd22bc5be65b..2ba18dd92e4e 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, poppler }: +{ lib, stdenv, buildPythonPackage, fetchPypi, poppler }: buildPythonPackage rec { pname = "pdftotext"; @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "a067c121654917ecbe07fbd71c807c34bbdb1ea029e269ddd11925ee7e191d3f"; }; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py \ + --replace '= brew_poppler_include()' '= "${lib.getDev poppler}/include", "${lib.getLib poppler}/lib"' + ''; + buildInputs = [ poppler ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 53adc24e3331..af8ead494583 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.1.9.9"; + version = "0.2.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-dhYzzsGNVS8qFymBhFWWacWBXVS7fZHZYtQTeTecYsk="; + sha256 = "sha256-aXqq3a+3PopW4vNA+O0K5OxpcHyJu2YMBJgEya0HKI0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index a66afe76fd4a..854af36e5bcd 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , scipy @@ -52,6 +53,13 @@ buildPythonPackage rec { export FONTCONFIG_FILE=${fontsConf} ''; + disabledTests = lib.optionals (!(stdenv.isi686 || stdenv.isx86_64)) [ + # small precision-related differences on other architectures, + # upstream doesn't consider it serious. + # https://github.com/pyqtgraph/pyqtgraph/issues/2110 + "test_PolyLineROI" + ]; + meta = with lib; { description = "Scientific Graphics and GUI Library for Python"; homepage = "https://www.pyqtgraph.org/"; diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index a201633e0633..d85a2b7136ce 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { # Reading the changelog I don't expect an API break in pycodestyle and pyflakes substituteInPlace setup.py \ --replace "pycodestyle>=2.6.0,<2.7.0" "pycodestyle>=2.6.0,<2.8.0" \ + --replace "jedi>=0.17.2,<0.18.0" "jedi>=0.17.2,<0.19.0" \ --replace "pyflakes>=2.2.0,<2.3.0" "pyflakes>=2.2.0,<2.4.0" ''; @@ -87,5 +88,8 @@ buildPythonPackage rec { # not compatible with jedi 0.18.0 broken = true; maintainers = [ ]; + # no longer maintained + # see https://github.com/palantir/python-language-server/pull/918#issuecomment-817361554 + broken = true; }; } diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 64301a383b42..8cbfed0b16f9 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -51,6 +51,12 @@ stdenv.mkDerivation rec { chmod -R +w libr/asm/arch/arm/v35arm64/arch-arm64 ''; + postFixup = lib.optionalString stdenv.isDarwin '' + for file in $out/bin/rasm2 $out/bin/ragg2 $out/bin/rabin2 $out/lib/libr_asm.${version}.dylib; do + install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $file + done + ''; + postInstall = '' install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm ''; @@ -59,7 +65,10 @@ stdenv.mkDerivation rec { makeFlags = [ "GITTAP=${version}" "RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib" + "CC=${stdenv.cc.targetPrefix}cc" + "HOST_CC=${stdenv.cc.targetPrefix}cc" ]; + configureFlags = [ "--with-sysmagic" "--with-syszip" @@ -94,11 +103,11 @@ stdenv.mkDerivation rec { xxHash ]; - meta = { + meta = with lib; { description = "unix-like reverse engineering framework and commandline tools"; - homepage = "http://radare.org/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin makefu mic92 ]; - platforms = with lib.platforms; linux; + homepage = "https://radare.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin makefu mic92 arkivm ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 9a6b16fd4308..96a98222caaa 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.42.1"; + version = "0.43.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-ASQuMWH6stUupJkfOpzVMs+c+xq7OWbVxGh6IY2zd70="; + sha256 = "0vrfxmqnwwgij8hrcbzp3j0vg90w55r6kw4zhqmjsnnsg29gc82s"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index b85cccf18386..f1ba40574837 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # Get rid of sbin sed -i 's/sbin/bin/g' $out/lib/icinga2/safe-reload - sed -i 's/sbin/bin/g' $out/bin/icinga2 + sed -i "2s:.*:ICINGA2_BIN=$out/bin/icinga2:" $out/bin/icinga2 rm $out/sbin ${lib.optionalString withMysql '' diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index 385806e444c0..f20e2899f185 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -25,6 +25,8 @@ let url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.assoc"; sha256 = "1smcbyv6srrhnpl7ic9nqds9nz3g2dgqngmhzkrdlwmvcpvakp1v"; }; + + iconvBin = if stdenv.isDarwin then libiconv else buildPackages.stdenv.cc.libc; in stdenv.mkDerivation { @@ -49,7 +51,7 @@ stdenv.mkDerivation { for src in $srcs; do dst=$out/share/$(dictname $src) echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line - ${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv \ + ${lib.getBin iconvBin}/bin/iconv \ -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst done diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 205a9b25841e..7177b1891f2d 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , which , enableStatic ? stdenv.hostPlatform.isStatic }: @@ -16,6 +17,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-HkDgWwHoRWCNtWyfP4sj3veEd+KT5J7yL4J4Z/hJcrE="; }; + patches = lib.optionals stdenv.cc.isClang [ + # Fix clang configuration; remove with next release + (fetchpatch { + url = "https://github.com/rhash/RHash/commit/4dc506066cf1727b021e6352535a8bb315c3f8dc.patch"; + sha256 = "0i5jz2s37h278c8d36pzphhp8rjy660zmhpg2cqlp960f6ny8wwj"; + }) + ]; + nativeBuildInputs = [ which ]; # configure script is not autotools-based, doesn't support these options diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix index 3562d40bc3e3..92be45bbd9d7 100644 --- a/pkgs/tools/text/cmigemo/default.nix +++ b/pkgs/tools/text/cmigemo/default.nix @@ -3,6 +3,9 @@ , skk-dicts }: +let + iconvBin = if stdenv.isDarwin then libiconv else buildPackages.stdenv.cc.libc; +in stdenv.mkDerivation { pname = "cmigemo"; version = "1.3e"; @@ -25,7 +28,7 @@ stdenv.mkDerivation { makeFlags = [ "INSTALL=install" ]; preBuild = '' - makeFlagsArray+=(FILTER_UTF8="${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv -t utf-8 -f cp932") + makeFlagsArray+=(FILTER_UTF8="${lib.getBin iconvBin}/bin/iconv -t utf-8 -f cp932") ''; buildFlags = [ (if stdenv.isDarwin then "osx-all" else "gcc-all") ]; diff --git a/pkgs/tools/text/l2md/default.nix b/pkgs/tools/text/l2md/default.nix index e443cc42a2ec..758130e9f0aa 100644 --- a/pkgs/tools/text/l2md/default.nix +++ b/pkgs/tools/text/l2md/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "l2md"; - version = "unstable-2020-07-31"; + version = "unstable-2021-10-27"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git"; - rev = "2b9fae141fc2129940e0337732a35a3fc1c33455"; - sha256 = "PNNoD3a+rJwKH6wbOkvVU1IW4+xF7+zQaLFAlyLlYOI="; + rev = "9db252bc1716ebaf0abd3a47a59ea78e4e6253d6"; + sha256 = "sha256-H/leDUwQM55akyXsmTnI2YsnG4i1KQtf4bBt1fizy8E="; }; buildInputs = [ libgit2 ]; diff --git a/pkgs/tools/text/pn/default.nix b/pkgs/tools/text/pn/default.nix index 81e4c1eb358a..d77b36651d62 100644 --- a/pkgs/tools/text/pn/default.nix +++ b/pkgs/tools/text/pn/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pn"; - version = "unstable-2021-01-28"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; - rev = "41e1215397129ed0d42b5f137fb35b5e0648edda"; - sha256 = "1g8r7y230k01ghraa55g1bhz3fiz6bjdgcsddy2dfa5ih8c4s3jm"; + rev = "v${version}"; + sha256 = "sha256-vRF9MPcw/hCreHVLD6QB7g1r0wQiZv1xrfzIHj1Yf9M="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6c371358111..683bf4d7a05a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6851,6 +6851,7 @@ with pkgs; libcryptui = callPackage ../development/libraries/libcryptui { autoreconfHook = buildPackages.autoreconfHook269; + gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }; libshumate = callPackage ../development/libraries/libshumate { }; @@ -18103,7 +18104,9 @@ with pkgs; libpgf = callPackage ../development/libraries/libpgf { }; - libphonenumber = callPackage ../development/libraries/libphonenumber { }; + libphonenumber = callPackage ../development/libraries/libphonenumber { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; libplacebo = callPackage ../development/libraries/libplacebo { }; diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix index 115b38095ed1..b4aeb905280d 100644 --- a/pkgs/top-level/octave-packages.nix +++ b/pkgs/top-level/octave-packages.nix @@ -214,7 +214,7 @@ makeScope newScope (self: windows = callPackage ../development/octave-modules/windows { }; zeromq = callPackage ../development/octave-modules/zeromq { - inherit (pkgs) zeromq; + inherit (pkgs) zeromq autoreconfHook; }; })