diff --git a/pkgs/by-name/ac/acquire/package.nix b/pkgs/by-name/ac/acquire/package.nix new file mode 100644 index 0000000000000..04dbb74ba59d1 --- /dev/null +++ b/pkgs/by-name/ac/acquire/package.nix @@ -0,0 +1,4 @@ +{ + python3Packages, +}: +python3Packages.toPythonApplication python3Packages.acquire diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/by-name/ac/acquire/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/acquire/default.nix rename to pkgs/by-name/ac/acquire/unwrapped.nix diff --git a/pkgs/development/python-modules/actdiag/fix_test_generate.patch b/pkgs/by-name/ac/actdiag/fix_test_generate.patch similarity index 100% rename from pkgs/development/python-modules/actdiag/fix_test_generate.patch rename to pkgs/by-name/ac/actdiag/fix_test_generate.patch diff --git a/pkgs/by-name/ac/actdiag/package.nix b/pkgs/by-name/ac/actdiag/package.nix new file mode 100644 index 0000000000000..bba6abed40cfe --- /dev/null +++ b/pkgs/by-name/ac/actdiag/package.nix @@ -0,0 +1,4 @@ +{ + python3Packages, +}: +python3Packages.toPythonApplication python3Packages.actdiag diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/by-name/ac/actdiag/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/actdiag/default.nix rename to pkgs/by-name/ac/actdiag/unwrapped.nix diff --git a/pkgs/by-name/ai/aioblescan/package.nix b/pkgs/by-name/ai/aioblescan/package.nix new file mode 100644 index 0000000000000..819a0b96d27a9 --- /dev/null +++ b/pkgs/by-name/ai/aioblescan/package.nix @@ -0,0 +1,4 @@ +{ + python3Packages, +}: +python3Packages.toPythonApplication python3Packages.aioblescan diff --git a/pkgs/development/python-modules/aioblescan/default.nix b/pkgs/by-name/ai/aioblescan/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/aioblescan/default.nix rename to pkgs/by-name/ai/aioblescan/unwrapped.nix diff --git a/pkgs/by-name/ao/aocd/package.nix b/pkgs/by-name/ao/aocd/package.nix new file mode 100644 index 0000000000000..91ced33d32215 --- /dev/null +++ b/pkgs/by-name/ao/aocd/package.nix @@ -0,0 +1,4 @@ +{ + python3Packages, +}: +python3Packages.toPythonApplication python3Packages.aocd diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/by-name/ao/aocd/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/aocd/default.nix rename to pkgs/by-name/ao/aocd/unwrapped.nix diff --git a/pkgs/by-name/au/auditwheel/package.nix b/pkgs/by-name/au/auditwheel/package.nix new file mode 100644 index 0000000000000..2ba1bf3d9d662 --- /dev/null +++ b/pkgs/by-name/au/auditwheel/package.nix @@ -0,0 +1,4 @@ +{ + python3Packages, +}: +python3Packages.toPythonApplication python3Packages.auditwheel diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/by-name/au/auditwheel/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/auditwheel/default.nix rename to pkgs/by-name/au/auditwheel/unwrapped.nix diff --git a/pkgs/by-name/bl/blocksat-cli/package.nix b/pkgs/by-name/bl/blocksat-cli/package.nix new file mode 100644 index 0000000000000..ffb132806d9b5 --- /dev/null +++ b/pkgs/by-name/bl/blocksat-cli/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.blocksat-cli diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/by-name/bl/blocksat-cli/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/blocksat-cli/default.nix rename to pkgs/by-name/bl/blocksat-cli/unwrapped.nix diff --git a/pkgs/by-name/bl/bloodhound-py/package.nix b/pkgs/by-name/bl/bloodhound-py/package.nix new file mode 100644 index 0000000000000..30deae3045338 --- /dev/null +++ b/pkgs/by-name/bl/bloodhound-py/package.nix @@ -0,0 +1,4 @@ +{ + python3Packages, +}: +python3Packages.toPythonApplication python3Packages.bloodhound-py diff --git a/pkgs/development/python-modules/bloodhound-py/default.nix b/pkgs/by-name/bl/bloodhound-py/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/bloodhound-py/default.nix rename to pkgs/by-name/bl/bloodhound-py/unwrapped.nix diff --git a/pkgs/by-name/bu/bump2version/package.nix b/pkgs/by-name/bu/bump2version/package.nix new file mode 100644 index 0000000000000..2d90ad21646fd --- /dev/null +++ b/pkgs/by-name/bu/bump2version/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.bump2version diff --git a/pkgs/development/python-modules/bump2version/default.nix b/pkgs/by-name/bu/bump2version/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/bump2version/default.nix rename to pkgs/by-name/bu/bump2version/unwrapped.nix diff --git a/pkgs/by-name/cv/cve/package.nix b/pkgs/by-name/cv/cve/package.nix new file mode 100644 index 0000000000000..f09a850894d3d --- /dev/null +++ b/pkgs/by-name/cv/cve/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.cvelib diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/by-name/cv/cve/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/cvelib/default.nix rename to pkgs/by-name/cv/cve/unwrapped.nix diff --git a/pkgs/by-name/da/datalad-gooey/package.nix b/pkgs/by-name/da/datalad-gooey/package.nix new file mode 100644 index 0000000000000..1d908cc0d5fb6 --- /dev/null +++ b/pkgs/by-name/da/datalad-gooey/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.datalad-gooey diff --git a/pkgs/development/python-modules/datalad-gooey/setuptools.patch b/pkgs/by-name/da/datalad-gooey/setuptools.patch similarity index 100% rename from pkgs/development/python-modules/datalad-gooey/setuptools.patch rename to pkgs/by-name/da/datalad-gooey/setuptools.patch diff --git a/pkgs/development/python-modules/datalad-gooey/default.nix b/pkgs/by-name/da/datalad-gooey/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/datalad-gooey/default.nix rename to pkgs/by-name/da/datalad-gooey/unwrapped.nix diff --git a/pkgs/by-name/da/datalad/package.nix b/pkgs/by-name/da/datalad/package.nix new file mode 100644 index 0000000000000..e129ee2f39333 --- /dev/null +++ b/pkgs/by-name/da/datalad/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.datalad diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/by-name/da/datalad/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/datalad/default.nix rename to pkgs/by-name/da/datalad/unwrapped.nix diff --git a/pkgs/by-name/de/dehinter/package.nix b/pkgs/by-name/de/dehinter/package.nix new file mode 100644 index 0000000000000..84057bf8048cd --- /dev/null +++ b/pkgs/by-name/de/dehinter/package.nix @@ -0,0 +1,4 @@ +{ + python3Packages, +}: +python3Packages.toPythonApplication python3Packages.dehinter diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/by-name/de/dehinter/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/dehinter/default.nix rename to pkgs/by-name/de/dehinter/unwrapped.nix diff --git a/pkgs/by-name/di/dinghy/package.nix b/pkgs/by-name/di/dinghy/package.nix new file mode 100644 index 0000000000000..9ed1fe5934132 --- /dev/null +++ b/pkgs/by-name/di/dinghy/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.dinghy diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/by-name/di/dinghy/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/dinghy/default.nix rename to pkgs/by-name/di/dinghy/unwrapped.nix diff --git a/pkgs/by-name/dn/dnf-plugins-core/package.nix b/pkgs/by-name/dn/dnf-plugins-core/package.nix new file mode 100644 index 0000000000000..d4affcf7d1c6d --- /dev/null +++ b/pkgs/by-name/dn/dnf-plugins-core/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.dnf-plugins-core diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/by-name/dn/dnf-plugins-core/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/dnf-plugins-core/default.nix rename to pkgs/by-name/dn/dnf-plugins-core/unwrapped.nix diff --git a/pkgs/by-name/fo/font-v/package.nix b/pkgs/by-name/fo/font-v/package.nix new file mode 100644 index 0000000000000..f22f39dd53278 --- /dev/null +++ b/pkgs/by-name/fo/font-v/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.font-v diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/by-name/fo/font-v/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/font-v/default.nix rename to pkgs/by-name/fo/font-v/unwrapped.nix diff --git a/pkgs/by-name/fo/fontbakery/package.nix b/pkgs/by-name/fo/fontbakery/package.nix new file mode 100644 index 0000000000000..1448ebe4d1329 --- /dev/null +++ b/pkgs/by-name/fo/fontbakery/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.fontbakery diff --git a/pkgs/development/python-modules/fontbakery/tests.nix b/pkgs/by-name/fo/fontbakery/tests.nix similarity index 100% rename from pkgs/development/python-modules/fontbakery/tests.nix rename to pkgs/by-name/fo/fontbakery/tests.nix diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/by-name/fo/fontbakery/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/fontbakery/default.nix rename to pkgs/by-name/fo/fontbakery/unwrapped.nix diff --git a/pkgs/by-name/gh/ghrepo-stats/package.nix b/pkgs/by-name/gh/ghrepo-stats/package.nix new file mode 100644 index 0000000000000..d5856c2f3668f --- /dev/null +++ b/pkgs/by-name/gh/ghrepo-stats/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.ghrepo-stats diff --git a/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/by-name/gh/ghrepo-stats/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/ghrepo-stats/default.nix rename to pkgs/by-name/gh/ghrepo-stats/unwrapped.nix diff --git a/pkgs/by-name/gi/git-filter-repo/package.nix b/pkgs/by-name/gi/git-filter-repo/package.nix new file mode 100644 index 0000000000000..b0a6f685ae0aa --- /dev/null +++ b/pkgs/by-name/gi/git-filter-repo/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.git-filter-repo diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/by-name/gi/git-filter-repo/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/git-filter-repo/default.nix rename to pkgs/by-name/gi/git-filter-repo/unwrapped.nix diff --git a/pkgs/by-name/gi/git-revise/package.nix b/pkgs/by-name/gi/git-revise/package.nix new file mode 100644 index 0000000000000..aa9ad1833d48c --- /dev/null +++ b/pkgs/by-name/gi/git-revise/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.git-revise diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/by-name/gi/git-revise/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/git-revise/default.nix rename to pkgs/by-name/gi/git-revise/unwrapped.nix diff --git a/pkgs/by-name/ma/magika/package.nix b/pkgs/by-name/ma/magika/package.nix new file mode 100644 index 0000000000000..1c93348953f5c --- /dev/null +++ b/pkgs/by-name/ma/magika/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.magika diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/by-name/ma/magika/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/magika/default.nix rename to pkgs/by-name/ma/magika/unwrapped.nix diff --git a/pkgs/by-name/ol/oletools/package.nix b/pkgs/by-name/ol/oletools/package.nix new file mode 100644 index 0000000000000..73e0401541faf --- /dev/null +++ b/pkgs/by-name/ol/oletools/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.oletools diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/by-name/ol/oletools/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/oletools/default.nix rename to pkgs/by-name/ol/oletools/unwrapped.nix diff --git a/pkgs/by-name/py/py65/package.nix b/pkgs/by-name/py/py65/package.nix new file mode 100644 index 0000000000000..c751645493be9 --- /dev/null +++ b/pkgs/by-name/py/py65/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.py65 diff --git a/pkgs/development/python-modules/py65/default.nix b/pkgs/by-name/py/py65/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/py65/default.nix rename to pkgs/by-name/py/py65/unwrapped.nix diff --git a/pkgs/by-name/py/py7zr/package.nix b/pkgs/by-name/py/py7zr/package.nix new file mode 100644 index 0000000000000..8eba72424f270 --- /dev/null +++ b/pkgs/by-name/py/py7zr/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.py7zr diff --git a/pkgs/development/python-modules/py7zr/default.nix b/pkgs/by-name/py/py7zr/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/py7zr/default.nix rename to pkgs/by-name/py/py7zr/unwrapped.nix diff --git a/pkgs/by-name/sd/sdkmanager/package.nix b/pkgs/by-name/sd/sdkmanager/package.nix new file mode 100644 index 0000000000000..82d3a69f19d09 --- /dev/null +++ b/pkgs/by-name/sd/sdkmanager/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.sdkmanager diff --git a/pkgs/development/python-modules/sdkmanager/default.nix b/pkgs/by-name/sd/sdkmanager/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/sdkmanager/default.nix rename to pkgs/by-name/sd/sdkmanager/unwrapped.nix diff --git a/pkgs/by-name/sh/shaperglot/package.nix b/pkgs/by-name/sh/shaperglot/package.nix new file mode 100644 index 0000000000000..6b1d792f64d79 --- /dev/null +++ b/pkgs/by-name/sh/shaperglot/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.shaperglot diff --git a/pkgs/development/python-modules/shaperglot/default.nix b/pkgs/by-name/sh/shaperglot/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/shaperglot/default.nix rename to pkgs/by-name/sh/shaperglot/unwrapped.nix diff --git a/pkgs/by-name/tw/twine/package.nix b/pkgs/by-name/tw/twine/package.nix new file mode 100644 index 0000000000000..2c44a0100523d --- /dev/null +++ b/pkgs/by-name/tw/twine/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.twine diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/by-name/tw/twine/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/twine/default.nix rename to pkgs/by-name/tw/twine/unwrapped.nix diff --git a/pkgs/by-name/uf/ufolint/package.nix b/pkgs/by-name/uf/ufolint/package.nix new file mode 100644 index 0000000000000..f90f689cb1b4e --- /dev/null +++ b/pkgs/by-name/uf/ufolint/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.ufolint diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/by-name/uf/ufolint/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/ufolint/default.nix rename to pkgs/by-name/uf/ufolint/unwrapped.nix diff --git a/pkgs/by-name/vp/vprof/package.nix b/pkgs/by-name/vp/vprof/package.nix new file mode 100644 index 0000000000000..fb067fdc7ecb0 --- /dev/null +++ b/pkgs/by-name/vp/vprof/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.vprof diff --git a/pkgs/development/python-modules/vprof/default.nix b/pkgs/by-name/vp/vprof/unwrapped.nix similarity index 100% rename from pkgs/development/python-modules/vprof/default.nix rename to pkgs/by-name/vp/vprof/unwrapped.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6ef0add7e5f0..6d4f102dacf49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -273,11 +273,6 @@ with pkgs; # addDriverRunpath is the preferred package name, as this enables # many more scenarios than just opengl now. - aocd = with python3Packages; toPythonApplication aocd; - - cve = with python3Packages; toPythonApplication cvelib; - - bloodhound-py = with python3Packages; toPythonApplication bloodhound-py; # Zip file format only allows times after year 1980, which makes e.g. Python # wheel building fail with: @@ -331,8 +326,6 @@ with pkgs; dhallToNix = callPackage ../build-support/dhall/to-nix.nix { }; - dinghy = with python3Packages; toPythonApplication dinghy; - djgpp = djgpp_i586; djgpp_i586 = callPackage ../development/compilers/djgpp { targetArchitecture = "i586"; @@ -345,8 +338,6 @@ with pkgs; } ); - dnf-plugins-core = with python3Packages; toPythonApplication dnf-plugins-core; - dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { }; ebpf-verifier = callPackage ../tools/networking/ebpf-verifier { @@ -375,8 +366,6 @@ with pkgs; octodns-providers = octodns.providers; - oletools = with python3.pkgs; toPythonApplication oletools; - ollama-cpu = callPackage ../by-name/ol/ollama/package.nix { acceleration = false; }; ollama-rocm = callPackage ../by-name/ol/ollama/package.nix { acceleration = "rocm"; }; ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; }; @@ -494,8 +483,6 @@ with pkgs; prefer-remote-fetch = import ../build-support/prefer-remote-fetch; - magika = with python3Packages; toPythonApplication magika; - mysql-shell = mysql-shell_8; inherit @@ -977,18 +964,12 @@ with pkgs; _7zz-rar = _7zz.override { enableUnfree = true; }; - acquire = with python3Packages; toPythonApplication acquire; - - actdiag = with python3.pkgs; toPythonApplication actdiag; - opnplug = adlplug.override { type = "OPN"; }; aflplusplus = callPackage ../tools/security/aflplusplus { wine = null; }; libdislocator = callPackage ../tools/security/aflplusplus/libdislocator.nix { }; - aioblescan = with python3Packages; toPythonApplication aioblescan; - inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { })) akku akkuPackages @@ -997,25 +978,17 @@ with pkgs; alice-tools-qt5 = alice-tools.override { withQt5 = true; }; alice-tools-qt6 = alice-tools.override { withQt6 = true; }; - auditwheel = with python3Packages; toPythonApplication auditwheel; - btrsync = with python3Packages; toPythonApplication btrsync; davinci-resolve-studio = callPackage ../by-name/da/davinci-resolve/package.nix { studioVariant = true; }; - dehinter = with python3Packages; toPythonApplication dehinter; - gamescope-wsi = callPackage ../by-name/ga/gamescope/package.nix { enableExecutable = false; enableWsi = true; }; - font-v = with python3Packages; toPythonApplication font-v; - - fontbakery = with python3Packages; toPythonApplication fontbakery; - genealogos-api = genealogos-cli.override { crate = "api"; }; @@ -1042,18 +1015,10 @@ with pkgs; withUsdView = true; }; - py7zr = with python3Packages; toPythonApplication py7zr; - qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { }; inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2; - sdkmanager = with python3Packages; toPythonApplication sdkmanager; - - shaperglot = with python3Packages; toPythonApplication shaperglot; - - ufolint = with python3Packages; toPythonApplication ufolint; - ventoy-full = ventoy.override { withCryptsetup = true; withXfs = true; @@ -1069,8 +1034,6 @@ with pkgs; defaultGuiType = "qt5"; }; - vprof = with python3Packages; toPythonApplication vprof; - waydroid-nftables = waydroid.override { withNftables = true; }; winbox = winbox3; @@ -1111,14 +1074,8 @@ with pkgs; withpcre2 = false; }; - bump2version = with python3Packages; toPythonApplication bump2version; - cgit = callPackage ../applications/version-management/cgit { }; - datalad = with python3Packages; toPythonApplication datalad; - - datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; - forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; github-cli = gh; @@ -1168,12 +1125,6 @@ with pkgs; git-autofixup = perlPackages.GitAutofixup; - ghrepo-stats = with python3Packages; toPythonApplication ghrepo-stats; - - git-filter-repo = with python3Packages; toPythonApplication git-filter-repo; - - git-revise = with python3Packages; toPythonApplication git-revise; - ### APPLICATIONS/EMULATORS _86box-with-roms = _86box.override { @@ -1257,8 +1208,6 @@ with pkgs; in ppsspp.override argset; - py65 = with python3.pkgs; toPythonApplication py65; - rmg-wayland = callPackage ../by-name/rm/rmg/package.nix { withWayland = true; }; @@ -1342,8 +1291,6 @@ with pkgs; }; termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - twine = with python3Packages; toPythonApplication twine; - inherit (callPackages ../development/tools/ammonite { }) ammonite_2_12 ammonite_2_13 @@ -1434,8 +1381,6 @@ with pkgs; bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { }; - blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; - bucklespring-x11 = callPackage ../by-name/bu/bucklespring-libinput/package.nix { legacy = true; }; bucklespring = bucklespring-x11; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e27fb27d8d67..5e22089443858 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -55,11 +55,11 @@ self: super: with self; { acme-tiny = callPackage ../development/python-modules/acme-tiny { }; - acquire = callPackage ../development/python-modules/acquire { }; + acquire = callPackage ../by-name/ac/acquire/unwrapped.nix { }; acres = callPackage ../development/python-modules/acres { }; - actdiag = callPackage ../development/python-modules/actdiag { }; + actdiag = callPackage ../by-name/ac/actdiag/unwrapped.nix { }; actron-neo-api = callPackage ../development/python-modules/actron-neo-api { }; @@ -230,7 +230,7 @@ self: super: with self; { aiobiketrax = callPackage ../development/python-modules/aiobiketrax { }; - aioblescan = callPackage ../development/python-modules/aioblescan { }; + aioblescan = callPackage ../by-name/ai/aioblescan/unwrapped.nix { }; aioboto3 = callPackage ../development/python-modules/aioboto3 { }; @@ -826,7 +826,7 @@ self: super: with self; { anywidget = callPackage ../development/python-modules/anywidget { }; - aocd = callPackage ../development/python-modules/aocd { }; + aocd = callPackage ../by-name/ao/aocd/unwrapped.nix { }; aocd-example-parser = callPackage ../development/python-modules/aocd-example-parser { }; @@ -1215,7 +1215,7 @@ self: super: with self; { auditok = callPackage ../development/python-modules/auditok { }; - auditwheel = callPackage ../development/python-modules/auditwheel { + auditwheel = callPackage ../by-name/au/auditwheel/unwrapped.nix { inherit (pkgs) bzip2 gnutar @@ -2144,9 +2144,9 @@ self: super: with self; { blockfrost-python = callPackage ../development/python-modules/blockfrost-python { }; - blocksat-cli = callPackage ../development/python-modules/blocksat-cli { }; + blocksat-cli = callPackage ../by-name/bl/blocksat-cli/unwrapped.nix { }; - bloodhound-py = callPackage ../development/python-modules/bloodhound-py { }; + bloodhound-py = callPackage ../by-name/bl/bloodhound-py/unwrapped.nix { }; bloodyad = callPackage ../development/python-modules/bloodyad { }; @@ -2363,7 +2363,7 @@ self: super: with self; { bump-my-version = callPackage ../development/python-modules/bump-my-version { }; - bump2version = callPackage ../development/python-modules/bump2version { }; + bump2version = callPackage ../by-name/bu/bump2version/unwrapped.nix { }; bumpfontversion = callPackage ../development/python-modules/bumpfontversion { }; @@ -3422,7 +3422,7 @@ self: super: with self; { cv2-enumerate-cameras = callPackage ../development/python-modules/cv2-enumerate-cameras { }; - cvelib = callPackage ../development/python-modules/cvelib { }; + cvelib = callPackage ../by-name/cv/cve/unwrapped.nix { }; cvss = callPackage ../development/python-modules/cvss { }; @@ -3612,9 +3612,9 @@ self: super: with self; { protoc = pkgs.protobuf; }; - datalad = callPackage ../development/python-modules/datalad { }; + datalad = callPackage ../by-name/da/datalad/unwrapped.nix { }; - datalad-gooey = callPackage ../development/python-modules/datalad-gooey { }; + datalad-gooey = callPackage ../by-name/da/datalad-gooey/unwrapped.nix { }; datalad-next = callPackage ../development/python-modules/datalad-next { }; @@ -3796,7 +3796,7 @@ self: super: with self; { defusedxml = callPackage ../development/python-modules/defusedxml { }; - dehinter = callPackage ../development/python-modules/dehinter { }; + dehinter = callPackage ../by-name/de/dehinter/unwrapped.nix { }; deid = callPackage ../development/python-modules/deid { }; @@ -3920,7 +3920,7 @@ self: super: with self; { dill = callPackage ../development/python-modules/dill { }; - dinghy = callPackage ../development/python-modules/dinghy { }; + dinghy = callPackage ../by-name/di/dinghy/unwrapped.nix { }; dingz = callPackage ../development/python-modules/dingz { }; @@ -4505,7 +4505,7 @@ self: super: with self; { dncil = callPackage ../development/python-modules/dncil { }; - dnf-plugins-core = callPackage ../development/python-modules/dnf-plugins-core { }; + dnf-plugins-core = callPackage ../by-name/dn/dnf-plugins-core/unwrapped.nix { }; dnf4 = callPackage ../development/python-modules/dnf4 { }; @@ -5809,11 +5809,11 @@ self: super: with self; { folium = callPackage ../development/python-modules/folium { }; - font-v = callPackage ../development/python-modules/font-v { }; + font-v = callPackage ../by-name/fo/font-v/unwrapped.nix { }; fontawesomefree = callPackage ../development/python-modules/fontawesomefree { }; - fontbakery = callPackage ../development/python-modules/fontbakery { }; + fontbakery = callPackage ../by-name/fo/fontbakery/unwrapped.nix { }; fontfeatures = callPackage ../development/python-modules/fontfeatures { }; @@ -6226,7 +6226,7 @@ self: super: with self; { ghp-import = callPackage ../development/python-modules/ghp-import { }; - ghrepo-stats = callPackage ../development/python-modules/ghrepo-stats { }; + ghrepo-stats = callPackage ../by-name/gh/ghrepo-stats/unwrapped.nix { }; gibberish-detector = callPackage ../development/python-modules/gibberish-detector { }; @@ -6246,11 +6246,11 @@ self: super: with self; { git-dummy = callPackage ../development/python-modules/git-dummy { }; - git-filter-repo = callPackage ../development/python-modules/git-filter-repo { }; + git-filter-repo = callPackage ../by-name/gi/git-filter-repo/unwrapped.nix { }; git-find-repos = callPackage ../development/python-modules/git-find-repos { }; - git-revise = callPackage ../development/python-modules/git-revise { }; + git-revise = callPackage ../by-name/gi/git-revise/unwrapped.nix { }; git-sweep = callPackage ../development/python-modules/git-sweep { }; @@ -9379,7 +9379,7 @@ self: super: with self; { magicgui = callPackage ../development/python-modules/magicgui { }; - magika = callPackage ../development/python-modules/magika { }; + magika = callPackage ../by-name/ma/magika/unwrapped.nix { }; mahotas = callPackage ../development/python-modules/mahotas { }; @@ -11327,7 +11327,7 @@ self: super: with self; { olefile = callPackage ../development/python-modules/olefile { }; - oletools = callPackage ../development/python-modules/oletools { }; + oletools = callPackage ../by-name/ol/oletools/unwrapped.nix { }; ollama = callPackage ../development/python-modules/ollama { }; @@ -13112,9 +13112,9 @@ self: super: with self; { py4j = callPackage ../development/python-modules/py4j { }; - py65 = callPackage ../development/python-modules/py65 { }; + py65 = callPackage ../by-name/py/py65/unwrapped.nix { }; - py7zr = callPackage ../development/python-modules/py7zr { }; + py7zr = callPackage ../by-name/py/py7zr/unwrapped.nix { }; pyabpoa = toPythonModule ( pkgs.abpoa.override { @@ -17242,7 +17242,7 @@ self: super: with self; { sdjson = callPackage ../development/python-modules/sdjson { }; - sdkmanager = callPackage ../development/python-modules/sdkmanager { }; + sdkmanager = callPackage ../by-name/sd/sdkmanager/unwrapped.nix { }; sdnotify = callPackage ../development/python-modules/sdnotify { }; @@ -17426,7 +17426,7 @@ self: super: with self; { shapely = callPackage ../development/python-modules/shapely { }; - shaperglot = callPackage ../development/python-modules/shaperglot { }; + shaperglot = callPackage ../by-name/sh/shaperglot/unwrapped.nix { }; shared = callPackage ../development/python-modules/shared { }; @@ -19645,7 +19645,7 @@ self: super: with self; { twill = callPackage ../development/python-modules/twill { }; - twine = callPackage ../development/python-modules/twine { }; + twine = callPackage ../by-name/tw/twine/unwrapped.nix { }; twinkly-client = callPackage ../development/python-modules/twinkly-client { }; @@ -20238,7 +20238,7 @@ self: super: with self; { ufolib2 = callPackage ../development/python-modules/ufolib2 { }; - ufolint = callPackage ../development/python-modules/ufolint { }; + ufolint = callPackage ../by-name/uf/ufolint/unwrapped.nix { }; ufomerge = callPackage ../development/python-modules/ufomerge { }; @@ -20662,7 +20662,7 @@ self: super: with self; { vpk = callPackage ../development/python-modules/vpk { }; - vprof = callPackage ../development/python-modules/vprof { }; + vprof = callPackage ../by-name/vp/vprof/unwrapped.nix { }; vqgan-jax = callPackage ../development/python-modules/vqgan-jax { };