diff options
Diffstat (limited to 'pkgs/applications')
76 files changed, 129 insertions, 229 deletions
diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix index 4662002c95e89..5a3d9949f8c50 100644 --- a/pkgs/applications/audio/blanket/default.nix +++ b/pkgs/applications/audio/blanket/default.nix @@ -31,13 +31,13 @@ python3Packages.buildPythonApplication rec { pkg-config wrapGAppsHook4 desktop-file-utils + gobject-introspection ]; buildInputs = [ glib gtk4 libadwaita - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -48,9 +48,6 @@ python3Packages.buildPythonApplication rec { pygobject3 ]; - # Broken with gobject-introspection setup hook - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; format = "other"; postPatch = '' diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index 6398141c86dd4..8f7461683be17 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -24,11 +24,6 @@ python3Packages.buildPythonApplication rec { pname = "cozy"; version = "1.2.1"; - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/57029 - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - src = fetchFromGitHub { owner = "geigi"; repo = pname; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index a6164189c1dbd..d79aa713f0866 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -27,17 +27,12 @@ python3Packages.buildPythonApplication rec { intltool wrapGAppsHook glibcLocales + gobject-introspection ]; - # as of 2021-07, the gobject-introspection setup hook does not - # work with `strictDeps` enabled, thus for proper `wrapGAppsHook` - # it needs to be disabled explicitly. https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - buildInputs = [ python3 gtk3 - gobject-introspection gnome.adwaita-icon-theme ]; diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 384718f1db541..5358750b13e28 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication { notify2 pyroute2 pygobject3 - PyChromecast + pychromecast lxml setuptools zeroconf diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 9eae394488e28..78c17d09e0de3 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -39,10 +39,6 @@ in buildPythonApplication rec { setuptools ]; - # Otherwise the setup hook for gobject-introspection is not run: - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - postPatch = '' # Remove "Local MPD" tab which is not suitable for NixOS. sed -i '/localmpd/d' sonata/consts.py diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index d469c9689a5d8..39de4728f3da1 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -70,15 +70,11 @@ python3Packages.buildPythonApplication rec { requests semver ] - ++ lib.optional chromecastSupport PyChromecast + ++ lib.optional chromecastSupport pychromecast ++ lib.optional keyringSupport keyring ++ lib.optional serverSupport bottle ; - # hook for gobject-introspection doesn't like strictDeps - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeCheckInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index db7851d9e1547..984938a7b4e21 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { plexapi pulsectl pycairo - PyChromecast + pychromecast pylast pygobject3 pylyrics diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 700a65f3a58d4..3ecf6e9eb48a2 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -18,7 +18,7 @@ , zlib }: let - py3 = python3.withPackages (p: [ p.Mako ]); + py3 = python3.withPackages (p: [ p.mako ]); in stdenv.mkDerivation rec { pname = "clightning"; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 2018e1d5e2af1..abbfefce52933 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -30,10 +30,6 @@ buildPythonApplication rec { "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ]; - # Until gobject-introspection in nativeBuildInputs is supported. - # https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-472568643 - strictDeps = false; - meta = with lib; { homepage = "https://rednotebook.sourceforge.io/"; changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index 51aa407b04a4a..33b9182a4805b 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -130,7 +130,7 @@ in python.pkgs.buildPythonApplication rec { vobject werkzeug xlrd - XlsxWriter + xlsxwriter xlwt zeep ]; diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index f63b3b1709c04..13a8ef1a02bd5 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -22,7 +22,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ cadquery - Logbook + logbook pyqt5 pyparsing pyqtgraph diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/applications/graphics/curtail/default.nix index 118703afc60e4..1d7df76c214e6 100644 --- a/pkgs/applications/graphics/curtail/default.nix +++ b/pkgs/applications/graphics/curtail/default.nix @@ -37,24 +37,30 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config + gobject-introspection ]; - propagatedBuildInputs = [ + buildInputs = [ appstream-glib - python3.pkgs.pygobject3 - gobject-introspection gettext + gtk3 ]; - # Currently still required for the gobject-introspection setup hook - strictDeps = false; + propagatedBuildInputs = [ + python3.pkgs.pygobject3 + ]; preInstall = '' patchShebangs ../build-aux/meson/postinstall.py ''; - postInstall = '' - wrapProgram $out/bin/curtail --prefix PATH : ${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]} + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]}" + ) ''; meta = with lib; { diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix index 6b8f465a10614..58b8777bb223d 100644 --- a/pkgs/applications/graphics/eddy/default.nix +++ b/pkgs/applications/graphics/eddy/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook python3Packages.setuptools python3Packages.rfc3987 - python3Packages.JPype1 + python3Packages.jpype1 python3Packages.pyqt5 ]; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index fbc80d0da6d5e..2cec147fb30a6 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -25,17 +25,13 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU="; }; - buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; - nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ gtk3 gdk-pixbuf ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]); # Tests are broken doCheck = false; - # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943 - # until https://github.com/NixOS/nixpkgs/pull/102613 - strictDeps = false; - # prevent double wrapping dontWrapGApps = true; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index 0d3a86663b30b..774a8b19dd349 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -37,10 +37,6 @@ buildPythonPackage rec { gtk3 ]; - # https://github.com/NixOS/nixpkgs/issues/56943 - # this must be false, otherwise the gobject-introspection hook doesn't run - strictDeps = false; - preDistPhases = [ "fixupIconPath" ]; fixupIconPath = '' diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8a031a220068f..a6ea64724051a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -99,11 +99,11 @@ stdenv.mkDerivation rec { setupPyBuildFlags = [ "--enable=load_extension" ]; })) beautifulsoup4 - cchardet css-parser cssselect python-dateutil dnspython + faust-cchardet feedparser html2text html5-parser diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 55bca8aa80585..a1430a8b5e396 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -13,7 +13,7 @@ , pango , gst-python , kiss-headers -, Logbook +, logbook , pillow , poetry-core , pygobject3 @@ -47,7 +47,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ gst-python kiss-headers - Logbook + logbook pillow poetry-core pygobject3 diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index db18ec5d131de..9ae6e96d5d290 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -7,7 +7,7 @@ }: rustPlatform.buildRustPackage rec { - name = "cotp"; + pname = "cotp"; version = "1.2.3"; src = fetchFromGitHub { @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Pg07iq2jj8cUA4iQsY52cujmUZLYrbTG5Zj+lITxpls="; }; - cargoHash = "sha256-gH9axiM0Qgl2TdJUpnDONHtU2I5l03SrKEe+2l5V21Y="; + cargoHash = "sha256-9jOrDFLnzjxqN2h6e1/qKRn5RQKlfyeKKmjZthQX3jM="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 0644471c5fa89..16eb89cb5a845 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { cython trezor keepkey - btchip + btchip-python hidapi pyopenssl pyscard diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 40f67c02c7522..08d887f7e9269 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng # plugins - btchip + btchip-python ckcc-protocol keepkey trezor diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index a4166a3fe641d..fd1e6706e440c 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng # plugins - btchip + btchip-python ckcc-protocol keepkey trezor diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index abb88796ddd0e..ed573d1322d5a 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng # plugins - btchip + btchip-python ckcc-protocol keepkey trezor diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index 1b8a7e706dde7..676a19641bdb1 100644 --- a/pkgs/applications/misc/gnome-secrets/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -18,7 +18,6 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; version = "7.2"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index dbf7e1aee746e..925d246ba8448 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool +{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3 , wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { pango gdk-pixbuf atk + gtk3 ]; propagatedBuildInputs = with python3Packages; [ @@ -37,10 +38,6 @@ python3Packages.buildPythonApplication rec { dbus-python ]; - # Setup hooks have trouble with strict deps. - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - dontWrapGApps = true; # Arguments to be passed to `makeWrapper`, only used by buildPython* diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 47e310fb7658f..fbb33c7e096fe 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -11,6 +11,8 @@ , shared-mime-info , wrapGAppsHook , wafHook +, bash +, dbus }: with python3Packages; @@ -33,14 +35,12 @@ buildPythonApplication rec { itstool # for help pages desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info + docutils # for rst2man + dbus # for detection of dbus-send during build ]; - buildInputs = [ docutils libwnck keybinder3 ]; + buildInputs = [ libwnck keybinder3 bash ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; - # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk' - # see https://github.com/NixOS/nixpkgs/issues/56943 for details - strictDeps = false; - postInstall = '' gappsWrapperArgs+=( "--prefix" "PYTHONPATH" : "${makePythonPath propagatedBuildInputs}" diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index d476024553ba3..35dbf1fcb440d 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -84,13 +84,12 @@ buildPythonApplication rec { sha256 = "sha256-rsiXm7L/M85ot6NrTyy//lMRFlLPJYve9y6Erg9Ugxg="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ atk gdk-pixbuf glib-networking gnome-desktop - gobject-introspection gtk3 libnotify pango @@ -139,9 +138,6 @@ buildPythonApplication rec { "--prefix PATH : ${lib.makeBinPath requiredTools}" "\${gappsWrapperArgs[@]}" ]; - # needed for glib-schemas to work correctly (will crash on dialogues otherwise) - # see https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; meta = with lib; { homepage = "https://lutris.net"; diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index 743c92407e799..4dffe9e08eb6e 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -31,18 +31,14 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; - # Cannot find GSettings schemas when opening settings, - # probably https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeBuildInputs = [ gettext wrapGAppsHook + gobject-introspection ]; buildInputs = [ glib-networking - gobject-introspection gtk3 ]; @@ -64,6 +60,7 @@ python3Packages.buildPythonApplication rec { ]; # Run Linux games using the Steam Runtime by using steam-run in the wrapper + # FIXME: not working with makeBinaryWrapper postFixup = '' sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy ''; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index c1a4f6aec9228..4c740852f6af9 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -38,6 +38,17 @@ let nativeBuildInputs = [ ]; format = "setuptools"; outputs = [ "out" ]; + patches = [ ]; + }); + # downgrade needed for flask-babel 2.0.0 + babel = super.babel.overridePythonAttrs (oldAttrs: rec { + version = "2.11.0"; + src = super.fetchPypi { + pname = "Babel"; + inherit version; + hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y="; + }; + propagatedBuildInputs = [ self.pytz ]; }); } ) diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 472af0caf484e..9d88d6331c1da 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -108,9 +108,6 @@ python3.pkgs.buildPythonApplication rec { python3.pkgs.nose ]; - # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - doCheck = false; preBuild = '' diff --git a/pkgs/applications/misc/openlp/lib.nix b/pkgs/applications/misc/openlp/lib.nix index 4a61ab65376db..045211c3af6a6 100644 --- a/pkgs/applications/misc/openlp/lib.nix +++ b/pkgs/applications/misc/openlp/lib.nix @@ -4,7 +4,7 @@ # python deps , python, buildPythonPackage -, alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant +, alembic, beautifulsoup4, chardet, lxml, mako, pyenchant , pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate }: @@ -37,7 +37,7 @@ buildPythonPackage rec { beautifulsoup4 chardet lxml - Mako + mako pyenchant pyqt5_with_qtwebkit pyxdg diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 7ae8662e2c199..546c0544cffa4 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -32,8 +32,6 @@ python3Packages.buildPythonApplication rec { ''; dontWrapGApps = true; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 2af5e9d692db4..f7f94d9940ab4 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -26,7 +26,7 @@ let src = self.fetchPypi { pname = "Flask-Migrate"; inherit version; - sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; + hash = "sha256-ri8FZxWIdi3YOiHYsYxR/jVehng+JFlJlf+Nc4Df/jg="; }; }); flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec { @@ -43,7 +43,7 @@ let version = "1.0.1"; src = old.src.override { inherit version; - sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + hash = "sha256-bICx5a02ZSkOo5MguR4b4eDV9gZSuWSjBwIW3oPS5Hw="; }; nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ requests @@ -55,18 +55,18 @@ let version = "2.11.3"; src = old.src.override { inherit version; - sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; + hash = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; }; patches = [ # python 3.10 compat fixes. In later upstream releases, but these # are not compatible with flask 1 which we need here :( (fetchpatch { url = "https://github.com/thmo/jinja/commit/1efb4cc918b4f3d097c376596da101de9f76585a.patch"; - sha256 = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; + hash = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; }) (fetchpatch { url = "https://github.com/mkrizek/jinja/commit/bd8bad37d1c0e2d8995a44fd88e234f5340afec5.patch"; - sha256 = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; + hash = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; excludes = [ "CHANGES.rst" ]; }) ]; @@ -76,21 +76,21 @@ let version = "2.0.1"; src = old.src.override { inherit version; - sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; + hash = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; }; }); itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { version = "1.1.0"; src = old.src.override { inherit version; - sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; + hash = "sha256-MhsDPQfypBNtPsdi6snxahDM1g9TwMka+QIXrOe6Hxk="; }; }); flask = super.flask.overridePythonAttrs (old: rec { version = "1.1.4"; src = old.src.override { inherit version; - sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196"; + hash = "sha256-D762GA04OpGG0NbtlU4AQq2fGODo3giLK0GdUmkn0ZY="; }; }); sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { @@ -100,13 +100,13 @@ let version = "7.1.2"; src = old.src.override { inherit version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); # Now requires `lingua` as check input that requires a newer `click`, # however `click-7` is needed by the older flask we need here. Since it's just # for the test-suite apparently, let's skip it for now. - Mako = super.Mako.overridePythonAttrs (lib.const { + mako = super.mako.overridePythonAttrs (lib.const { nativeCheckInputs = []; doCheck = false; }); @@ -165,7 +165,7 @@ python3'.pkgs.buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; + hash = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index f51f53e9b72d2..86aaae625c3e9 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,5 +1,5 @@ { lib -, python3 +, python310 , fetchFromGitHub , gdk-pixbuf , gnome @@ -17,11 +17,19 @@ }: let - python = python3.override { + python = python310.override { packageOverrides = (self: super: { matplotlib = super.matplotlib.override { enableGtk3 = true; }; + sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { + version = "1.4.46"; + src = self.fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + }; + }); }); }; in python.pkgs.buildPythonApplication rec { @@ -77,7 +85,7 @@ in python.pkgs.buildPythonApplication rec { TZ=Europe/Kaliningrad \ LC_ALL=en_US.UTF-8 \ xvfb-run -s '-screen 0 800x600x24' \ - ${python3.interpreter} setup.py test + ${python.interpreter} setup.py test ''; meta = with lib; { diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix index c3e5a505722c4..00cd8dcf0518a 100644 --- a/pkgs/applications/misc/wike/default.nix +++ b/pkgs/applications/misc/wike/default.nix @@ -12,7 +12,6 @@ python3.pkgs.buildPythonApplication rec { pname = "wike"; version = "1.7.1"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "hugolabe"; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 948b321724894..55dca4661ee77 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -471,9 +471,6 @@ buildStdenv.mkDerivation ({ separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; - # tests were disabled in configureFlags doCheck = false; @@ -500,41 +497,6 @@ buildStdenv.mkDerivation ({ gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped") ''; - # Workaround: The separateDebugInfo hook skips artifacts whose build ID's length is not 40. - # But we got 16-length build ID here. The function body is mainly copied from pkgs/build-support/setup-hooks/separate-debug-info.sh - # Remove it when https://github.com/NixOS/nixpkgs/pull/146275 is merged. - preFixup = lib.optionalString enableDebugSymbols '' - _separateDebugInfo() { - [ -e "$prefix" ] || return 0 - - local dst="''${debug:-$out}" - if [ "$prefix" = "$dst" ]; then return 0; fi - - dst="$dst/lib/debug/.build-id" - - # Find executables and dynamic libraries. - local i - while IFS= read -r -d $'\0' i; do - if ! isELF "$i"; then continue; fi - - # Extract the Build ID. FIXME: there's probably a cleaner way. - local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" - if [[ -z "$id" ]]; then - echo "could not find build ID of $i, skipping" >&2 - continue - fi - - # Extract the debug info. - echo "separating debug info from $i (build ID $id)" - mkdir -p "$dst/''${id:0:2}" - $OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug" - - # Also a create a symlink <original-name>.debug. - ln -sfn ".build-id/''${id:0:2}/''${id:2}.debug" "$dst/../$(basename "$i")" - done < <(find "$prefix" -type f -print0) - } - ''; - postFixup = lib.optionalString crashreporterSupport '' patchelf --add-rpath "${lib.makeLibraryPath [ curl ]}" $out/lib/${binaryName}/crashreporter ''; diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index f80be45ebd1f7..7563e8c22d782 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -66,9 +66,6 @@ python3.pkgs.buildPythonApplication rec { requests ]; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - dontWrapGApps = true; preFixup = '' diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index fbb73dbd968bf..7cca113fde923 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.txt - APScheduler + apscheduler beautifulsoup4 click colorama @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { packaging psutil pynzb - PyRSS2Gen + pyrss2gen python-dateutil pyyaml rebulk diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index 60c2ad8262caf..3e10a61a63f44 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -64,9 +64,6 @@ python3.pkgs.buildPythonApplication rec { --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; - # Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - meta = with lib; { description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind"; maintainers = with maintainers; [ dasj19 ]; diff --git a/pkgs/applications/networking/gossa/default.nix b/pkgs/applications/networking/gossa/default.nix index 4a14571b23ffe..4e77b387a84ea 100644 --- a/pkgs/applications/networking/gossa/default.nix +++ b/pkgs/applications/networking/gossa/default.nix @@ -5,7 +5,7 @@ }: buildGoModule rec { - name = "gossa"; + pname = "gossa"; version = "0.2.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 142bd5e38272f..b31accd2861d1 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - name = "cinny-desktop"; + pname = "cinny-desktop"; version = "2.2.4"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 6a1b5086bc936..d80d2b2f4df5a 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -51,7 +51,7 @@ buildPythonApplication rec { dbus-python pyxdg python-olm - ]; + ] ++ matrix-nio.optional-dependencies.e2e; meta = with lib; { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index bfe11b27218e5..b6c9f61f821eb 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -66,7 +66,7 @@ mkDerivation rec { watchgod dbus-python matrix-nio - ]; + ] ++ matrix-nio.optional-dependencies.e2e; qmakeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 10d2cb87f8b55..dbe944d189b6b 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, - attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, + attrs, aiohttp, appdirs, click, keyring, logbook, peewee, janus, prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, setuptools, installShellFiles, nixosTests, @@ -29,12 +29,14 @@ buildPythonApplication rec { click janus keyring - Logbook + logbook matrix-nio peewee prompt-toolkit setuptools - ] ++ lib.optionals enableDbusUi [ + ] + ++ matrix-nio.optional-dependencies.e2e + ++ lib.optionals enableDbusUi [ dbus-python notify2 pygobject3 diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 1342e0f7e983d..da599367af3a2 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -8,7 +8,7 @@ , future , atomicwrites , attrs -, Logbook +, logbook , pygments , matrix-nio , aiohttp @@ -45,12 +45,12 @@ in buildPythonPackage { future atomicwrites attrs - Logbook + logbook pygments matrix-nio aiohttp requests - ]; + ] ++ matrix-nio.optional-dependencies.e2e; passthru.scripts = [ "matrix.py" ]; diff --git a/pkgs/applications/networking/mailreaders/bubblemail/default.nix b/pkgs/applications/networking/mailreaders/bubblemail/default.nix index 612762207565b..bd5783a5c656c 100644 --- a/pkgs/applications/networking/mailreaders/bubblemail/default.nix +++ b/pkgs/applications/networking/mailreaders/bubblemail/default.nix @@ -13,6 +13,7 @@ , glib , gobject-introspection , folks +, bash }: python3Packages.buildPythonApplication rec { @@ -39,6 +40,7 @@ python3Packages.buildPythonApplication rec { libsecret gnome-online-accounts folks + bash ]; nativeBuildInputs = [ @@ -59,9 +61,6 @@ python3Packages.buildPythonApplication rec { # See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped dontWrapGApps = true; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index 58f381f7a4ea5..de08620cf8a31 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; ([ - PyChromecast + pychromecast psutil mutagen flask diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix index 3ba4f6ac57f39..4398c771e535e 100644 --- a/pkgs/applications/networking/opsdroid/default.nix +++ b/pkgs/applications/networking/opsdroid/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec { aiohttp matrix-api-async aioredis aiosqlite arrow pyyaml motor regex mattermostdriver setuptools voluptuous ibm-watson tailer multidict watchgod get-video-properties appdirs bitstring matrix-nio - ]; + ] ++ matrix-nio.optional-dependencies.e2e; passthru.python = python3Packages.python; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 507d2a282e4bc..dee7cde6fd3f1 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -27,7 +27,7 @@ let propagatedBuildInputs = with pypkgs; [ twisted - Mako + mako chardet pyxdg pyopenssl diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index a4b78e250d5c2..016ff2aa5e00d 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { ipy pyperclip ] ++ - lib.optional useGeoIP GeoIP; + lib.optional useGeoIP geoip; dontBuild = true; doCheck = false; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 98f7ac541a785..14844161d18e2 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -41,8 +41,6 @@ buildPythonApplication rec { ]; buildInputs = [ - # To avoid enabling strictDeps = false (#56943) - gobject-introspection librsvg pango webkitgtk diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 8165cc381c112..44aaa6c7146e0 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -67,7 +67,6 @@ python3Packages.buildPythonApplication rec { ''; format = "other"; - strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943) checkPhase = "xvfb-run pytest ../tests/"; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 73c94f7339c68..c20c9449ae842 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -14,9 +14,8 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U="; }; - buildInputs = [ gtk3 gobject-introspection gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; - # see https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663 nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; dontWrapGApps = true; diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 641bda8fb8618..76c18839bff7c 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -6,7 +6,7 @@ , php}: stdenvNoCC.mkDerivation rec { - name = "cloudlog"; + pname = "cloudlog"; version = "2.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index e6461c924489d..725f531dd0720 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -41,7 +41,7 @@ gnuradio.pkgs.mkDerivation rec { cmake pkg-config gnuradio.unwrapped.python - gnuradio.unwrapped.python.pkgs.Mako + gnuradio.unwrapped.python.pkgs.mako gnuradio.unwrapped.python.pkgs.six ]; nativeCheckInputs = [ diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 1dbdbaa7225f8..6220d36980cf4 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -67,7 +67,7 @@ let # building with boost 1.7x fails ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ - Mako + mako six ]; }; @@ -118,7 +118,7 @@ let gnuradio-companion = { pythonRuntime = with python.pkgs; [ pyyaml - Mako + mako numpy pygobject3 ]; diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index baf86ca434276..12b8ef003d9c1 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -71,7 +71,7 @@ let # building with boost 1.7x fails ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ - Mako + mako six ]; }; @@ -118,7 +118,7 @@ let gnuradio-companion = { pythonRuntime = with python.pkgs; [ pyyaml - Mako + mako numpy pygobject3 ]; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index e06e3437281cf..80d534a351a99 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -73,7 +73,7 @@ let # building with boost 1.7x fails ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ - Mako + mako six ]; }; @@ -120,7 +120,7 @@ let gnuradio-companion = { pythonRuntime = with python.pkgs; [ pyyaml - Mako + mako numpy pygobject3 ]; diff --git a/pkgs/applications/radio/uhd/3.5.nix b/pkgs/applications/radio/uhd/3.5.nix index c0cb7b62aac44..5f34597ea2743 100644 --- a/pkgs/applications/radio/uhd/3.5.nix +++ b/pkgs/applications/radio/uhd/3.5.nix @@ -85,8 +85,8 @@ stdenv.mkDerivation rec { ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] ; - # Python + Mako are always required for the build itself but not necessary for runtime. - pythonEnv = python3.withPackages (ps: with ps; [ Mako ] + # Python + mako are always required for the build itself but not necessary for runtime. + pythonEnv = python3.withPackages (ps: with ps; [ mako ] ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] ++ optionals (enableUtils) [ requests six ] ); diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 6fa8462ec10c0..a7b88707eb2ab 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -83,8 +83,8 @@ stdenv.mkDerivation rec { ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] ; - # Python + Mako are always required for the build itself but not necessary for runtime. - pythonEnv = python3.withPackages (ps: with ps; [ Mako ] + # Python + mako are always required for the build itself but not necessary for runtime. + pythonEnv = python3.withPackages (ps: with ps; [ mako ] ++ optionals (enablePythonApi) [ numpy setuptools ] ++ optionals (enableUtils) [ requests six ] ); diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index c555a30b15a8d..05c445b6cd08d 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ biopython psutil - XlsxWriter + xlsxwriter ]); # Tests rely on some of the databases being available, which is not bundled diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index 99d13d1ab8953..86219f35f95a3 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "muscle"; + pname = "muscle"; version = "5.1.0"; src = fetchFromGitHub { owner = "rcedgar"; - repo = "${name}"; + repo = pname; rev = "${version}"; hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk="; }; diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix index d5d4c6231e699..f85f93055289d 100644 --- a/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "veryfasttree"; + pname = "veryfasttree"; version = "3.1.1"; src = fetchFromGitHub { owner = "citiususc"; - repo = "${name}"; + repo = pname; rev = "v${version}"; hash = "sha256-AOzbxUnrn1qgscjdOKf4dordnSKtIg3nSVaYWK1jbuc="; }; diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 25efbd754b2a5..02b2d2d61ac02 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -46,7 +46,7 @@ in python.pkgs.buildPythonApplication rec { numpy packaging pyqt4 - Rtree + rtree scipy setuptools shapely diff --git a/pkgs/applications/science/engineering/strictdoc/default.nix b/pkgs/applications/science/engineering/strictdoc/default.nix index c81652c5ae7e6..aaf944fdd01e0 100644 --- a/pkgs/applications/science/engineering/strictdoc/default.nix +++ b/pkgs/applications/science/engineering/strictdoc/default.nix @@ -19,7 +19,7 @@ , setuptools , textx , xlrd -, XlsxWriter +, xlsxwriter , pytestCheckHook }: @@ -70,7 +70,7 @@ buildPythonApplication rec { setuptools textx xlrd - XlsxWriter + xlsxwriter ]; nativeCheckInputs = [ diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index e58674f344971..efbf80ba16ed2 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }: stdenv.mkDerivation rec { - name = "readstat"; + pname = "readstat"; version = "1.1.9"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 76495f5cae150..7ad542402b58b 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; version = "0.8.0"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "RogerCrocker"; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index ee28a25047815..d030c7add9660 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -26,11 +26,6 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU="; }; - # Strict deps breaks guake - # See https://github.com/NixOS/nixpkgs/issues/59930 - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index a5c98cb7df812..5eb565227a944 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "378"; + version = "379"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-ZJ37/V7dDtnkfPjk2VO0sNPDC8KAFm38T/0Ulz/sPpI="; + hash = "sha256-p93ydO6EuX+xKDZ1AJ1Tyi0CoP/VzlpRGNr8NiPrsxA="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 121a0cdf7731e..224efe8c1ac23 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -52,10 +52,6 @@ python3.pkgs.buildPythonApplication rec { pycairo ]; - # gobject-introspection and some other similar setup hooks do not currently work with strictDeps. - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - postPatch = '' patchShebangs meson_shebang_normalisation.py ''; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 7e1157fc4a67f..88513fc50a395 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -21,11 +21,11 @@ let version = "7.1.2"; src = oldAttrs.src.override { inherit version; - sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); - PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec { + pychromecast = super.pychromecast.overridePythonAttrs (oldAttrs: rec { version = "9.2.0"; src = oldAttrs.src.override { inherit version; @@ -40,6 +40,7 @@ with py.pkgs; buildPythonApplication rec { pname = "catt"; version = "0.12.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -49,7 +50,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ click ifaddr - PyChromecast + pychromecast protobuf requests yt-dlp diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index e8fa11c9147cc..800edd4792cc0 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -15,17 +15,8 @@ in buildPythonApplication rec { sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg"; }; - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/61578 - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeBuildInputs = [ gettext wrapGAppsHook - - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/61578 - # and https://github.com/NixOS/nixpkgs/issues/56943 gobject-introspection ]; diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 335b8c1917229..635d91ca54e22 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; propagatedBuildInputs = [ - PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python + pychromecast bottle pycaption paste html5lib pygobject3 dbus-python gtk3 gobject-introspection ]; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 4ba0fe98df051..e44949f54ba61 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -40,9 +40,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pygobject3 pyxdg pycairo dbus-python xlib ]; - # workaround https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - patches = [ # Fix paths (substituteAll { diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 5406b7dfa8a85..7e6f89855ed2f 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -44,10 +44,10 @@ python3.pkgs.buildPythonApplication rec { itstool python3 wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk3 libpeas librsvg @@ -78,12 +78,6 @@ python3.pkgs.buildPythonApplication rec { patchShebangs ./getenvvar.py ''; - # Fixes error - # Couldn’t recognize the image file format for file ".../share/pitivi/pixmaps/asset-proxied.svg" - # at startup, see https://github.com/NixOS/nixpkgs/issues/56943 - # and https://github.com/NixOS/nixpkgs/issues/89691#issuecomment-714398705. - strictDeps = false; - passthru = { updateScript = gnome.updateScript { packageName = "pitivi"; diff --git a/pkgs/applications/virtualization/docker/compose_1.nix b/pkgs/applications/virtualization/docker/compose_1.nix index 4e692eb51b118..54e0d737bf2de 100644 --- a/pkgs/applications/virtualization/docker/compose_1.nix +++ b/pkgs/applications/virtualization/docker/compose_1.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc="; + hash = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc="; }; # lots of networking and other fails diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index e5d5a1fbfe7cc..1a9fe490af85d 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 - gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ lib.optional spiceSupport spice-gtk; propagatedBuildInputs = with python3.pkgs; [ |