diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 120 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
5 files changed, 64 insertions, 78 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7d9153a782b1b..0ae26c42a5981 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1301,12 +1301,6 @@ mapAliases ({ redis-desktop-manager = throw "'redis-desktop-manager' has been renamed to/replaced by 'resp-app'"; # Added 2022-11-10 redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07 - - # 3 resholve aliases below added 2022-04-08; drop after 2022-11-30? - resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation"; - resholveScript = throw "resholveScript has been renamed to resholve.writeScript"; - resholveScriptBin = throw "resholveScriptBin has been renamed to resholve.writeScriptBin"; - residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27 retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19 retroshare06 = retroshare; @@ -1532,6 +1526,7 @@ mapAliases ({ ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11 ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22 unicorn-emu = unicorn; # Added 2020-10-29 + unifi-poller = unpoller; # Added 2022-11-24 unifiStable = unifi6; # Added 2020-12-28 unity3d = throw "'unity3d' is unmaintained, has seen no updates in years and depends on deprecated GTK2"; # Added 2022-06-16 untrunc = untrunc-anthwlock; # Added 2021-02-01 @@ -1646,7 +1641,7 @@ mapAliases ({ youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead"; # Added 2021-03-08 - yubioath-desktop = throw "yubioath-desktop has been deprecated by upstream in favor of https://github.com/Yubico/yubioath-flutter"; # Added 2022-11-22 + yubioath-desktop = throw "yubioath-desktop has been deprecated by upstream in favor of yubioath-flutter"; # Added 2022-11-22 yuzu-ea = yuzu-early-access; # Added 2022-08-18 yuzu = yuzu-mainline; # Added 2021-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7c6ef8661de1..878b25bef4208 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1138,6 +1138,8 @@ with pkgs; _9pfs = callPackage ../tools/filesystems/9pfs { }; + aaa = callPackage ../tools/misc/aaa {}; + aardvark-dns = callPackage ../tools/networking/aardvark-dns { }; a2ps = callPackage ../tools/text/a2ps { }; @@ -1598,7 +1600,7 @@ with pkgs; gita = python3Packages.callPackage ../applications/version-management/git-and-tools/gita { }; - gitoxide = callPackage ../applications/version-management/gitoxide { + gitoxide = callPackage ../applications/version-management/git-and-tools/gitoxide { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -1617,7 +1619,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-aggregator = callPackage ../development/tools/git-aggregator { }; + git-aggregator = callPackage ../applications/version-management/git-and-tools/git-aggregator { }; git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-and-tools/git-annex-metadata-gui { inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; @@ -1649,7 +1651,7 @@ with pkgs; git-appraise = callPackage ../applications/version-management/git-and-tools/git-appraise { }; - git-backup = callPackage ../applications/version-management/git-backup { + git-backup = callPackage ../applications/version-management/git-and-tools/git-backup { openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -1678,7 +1680,7 @@ with pkgs; git-cola = callPackage ../applications/version-management/git-and-tools/git-cola { }; - git-crecord = callPackage ../applications/version-management/git-crecord { }; + git-crecord = callPackage ../applications/version-management/git-and-tools/git-crecord { }; git-credential-1password = callPackage ../applications/version-management/git-and-tools/git-credential-1password { }; @@ -1696,15 +1698,15 @@ with pkgs; git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { }; - git-fire = callPackage ../tools/misc/git-fire { }; + git-fire = callPackage ../applications/version-management/git-and-tools/git-fire { }; - git-ftp = callPackage ../development/tools/git-ftp { }; + git-ftp = callPackage ../applications/version-management/git-and-tools/git-ftp { }; git-gone = callPackage ../applications/version-management/git-and-tools/git-gone { inherit (darwin.apple_sdk.frameworks) Security; }; - git-hound = callPackage ../tools/security/git-hound { }; + git-hound = callPackage ../applications/version-management/git-and-tools/git-hound { }; git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; @@ -1716,7 +1718,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); + git-lfs = lowPrio (callPackage ../applications/version-management/git-and-tools/git-lfs { }); git-my = callPackage ../applications/version-management/git-and-tools/git-my { }; @@ -1730,11 +1732,11 @@ with pkgs; git-open = callPackage ../applications/version-management/git-and-tools/git-open { }; - git-privacy = callPackage ../development/tools/git-privacy { }; + git-privacy = callPackage ../applications/version-management/git-and-tools/git-privacy { }; git-publish = python3Packages.callPackage ../applications/version-management/git-and-tools/git-publish { }; - git-quick-stats = callPackage ../development/tools/git-quick-stats { }; + git-quick-stats = callPackage ../applications/version-management/git-and-tools/git-quick-stats { }; git-quickfix = callPackage ../applications/version-management/git-and-tools/git-quickfix { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; @@ -1748,9 +1750,12 @@ with pkgs; git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-and-tools/git-remote-codecommit { }; - git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; + gitRepo = git-repo; + git-repo = callPackage ../applications/version-management/git-and-tools/git-repo { }; + + git-repo-updater = python3Packages.callPackage ../applications/version-management/git-and-tools/git-repo-updater { }; - git-review = python3Packages.callPackage ../applications/version-management/git-review { }; + git-review = python3Packages.callPackage ../applications/version-management/git-and-tools/git-review { }; git-remote-gcrypt = callPackage ../applications/version-management/git-and-tools/git-remote-gcrypt { }; @@ -1762,11 +1767,11 @@ with pkgs; git-secrets = callPackage ../applications/version-management/git-and-tools/git-secrets { }; - git-series = callPackage ../development/tools/git-series { + git-series = callPackage ../applications/version-management/git-and-tools/git-series { openssl = openssl_1_1; }; - git-sizer = callPackage ../applications/version-management/git-sizer { }; + git-sizer = callPackage ../applications/version-management/git-and-tools/git-sizer { }; git-standup = callPackage ../applications/version-management/git-and-tools/git-standup { }; @@ -1787,14 +1792,14 @@ with pkgs; git-test = callPackage ../applications/version-management/git-and-tools/git-test { }; - git-town = callPackage ../tools/misc/git-town { }; + git-town = callPackage ../applications/version-management/git-and-tools/git-town { }; git-trim = callPackage ../applications/version-management/git-and-tools/git-trim { openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; - git-up = callPackage ../applications/version-management/git-up { + git-up = callPackage ../applications/version-management/git-and-tools/git-up { pythonPackages = python3Packages; }; @@ -1810,25 +1815,23 @@ with pkgs; git2cl = callPackage ../applications/version-management/git-and-tools/git2cl { }; - gitRepo = callPackage ../applications/version-management/git-repo { }; - gitbatch = callPackage ../applications/version-management/git-and-tools/gitbatch { }; gitflow = callPackage ../applications/version-management/git-and-tools/gitflow { }; gitfs = callPackage ../tools/filesystems/gitfs { }; - gitless = callPackage ../applications/version-management/gitless { }; + gitless = callPackage ../applications/version-management/git-and-tools/gitless { }; - gitlint = python3Packages.callPackage ../tools/misc/gitlint { }; + gitlint = python3Packages.callPackage ../applications/version-management/git-and-tools/gitlint { }; - gitls = callPackage ../tools/security/gitls { }; + gitls = callPackage ../applications/version-management/git-and-tools/gitls { }; gitnuro = callPackage ../applications/version-management/git-and-tools/gitnuro { }; - gitsign = callPackage ../tools/security/gitsign { }; + gitsign = callPackage ../applications/version-management/git-and-tools/gitsign { }; - gitstats = callPackage ../applications/version-management/gitstats { }; + gitstats = callPackage ../applications/version-management/git-and-tools/gitstats { }; gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { }; @@ -1850,7 +1853,7 @@ with pkgs; hut = callPackage ../applications/version-management/git-and-tools/hut { }; - josh = callPackage ../applications/version-management/josh { }; + josh = callPackage ../applications/version-management/git-and-tools/josh { }; lab = callPackage ../applications/version-management/git-and-tools/lab { }; @@ -2763,6 +2766,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + asusctl = callPackage ../applications/system/asusctl { }; + autorevision = callPackage ../tools/misc/autorevision { }; automirror = callPackage ../tools/misc/automirror { }; @@ -3327,6 +3332,8 @@ with pkgs; sshs = callPackage ../development/tools/sshs { }; + supergfxctl = callPackage ../applications/system/supergfxctl { }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -5098,6 +5105,8 @@ with pkgs; oci-cli = callPackage ../tools/admin/oci-cli { }; + oci-seccomp-bpf-hook = callPackage ../os-specific/linux/oci-seccomp-bpf-hook { }; + ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf; ocrfeeder = callPackage ../applications/graphics/ocrfeeder { }; @@ -10841,7 +10850,7 @@ with pkgs; pympress = callPackage ../applications/office/pympress { }; - pyocd = python3Packages.callPackage ../development/embedded/pyocd { }; + pyocd = with python3Packages; toPythonApplication pyocd; pypass = with python3Packages; toPythonApplication pypass; @@ -12641,6 +12650,8 @@ with pkgs; vkBasalt32 = pkgsi686Linux.vkBasalt; }; + vkmark = callPackage ../tools/graphics/vkmark { }; + vncrec = callPackage ../tools/video/vncrec { }; vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { }; @@ -16509,7 +16520,8 @@ with pkgs; electron_18 electron_19 electron_20 - electron_21; + electron_21 + electron_22; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -16760,10 +16772,15 @@ with pkgs; bpftools = callPackage ../os-specific/linux/bpftools { }; bcc = callPackage ../os-specific/linux/bcc { - python = pkgs.python3; + python = python3; + libbpf = libbpf_1; + llvmPackages = llvmPackages_14; }; - bpftrace = callPackage ../os-specific/linux/bpftrace { }; + bpftrace = callPackage ../os-specific/linux/bpftrace { + libbpf = libbpf_1; + llvmPackages = llvmPackages_14; + }; bpm-tools = callPackage ../tools/audio/bpm-tools { }; @@ -22493,44 +22510,7 @@ with pkgs; skjold = callPackage ../development/tools/skjold { }; - skawarePackages = recurseIntoAttrs rec { - buildManPages = callPackage ../development/skaware-packages/build-skaware-man-pages.nix { }; - buildPackage = callPackage ../development/skaware-packages/build-skaware-package.nix { - inherit cleanPackaging; - }; - cleanPackaging = callPackage ../development/skaware-packages/clean-packaging.nix { }; - - execline = callPackage ../development/skaware-packages/execline { }; - execline-man-pages = callPackage ../development/skaware-packages/execline-man-pages { - inherit buildManPages; - }; - - mdevd = callPackage ../development/skaware-packages/mdevd { }; - nsss = callPackage ../development/skaware-packages/nsss { }; - sdnotify-wrapper = callPackage ../development/skaware-packages/sdnotify-wrapper { }; - utmps = callPackage ../development/skaware-packages/utmps { }; - - skalibs = callPackage ../development/skaware-packages/skalibs { }; - skalibs_2_10 = callPackage ../development/skaware-packages/skalibs/2_10.nix { }; - - s6 = callPackage ../development/skaware-packages/s6 { }; - s6-dns = callPackage ../development/skaware-packages/s6-dns { }; - s6-linux-init = callPackage ../development/skaware-packages/s6-linux-init { }; - s6-linux-utils = callPackage ../development/skaware-packages/s6-linux-utils { }; - s6-networking = callPackage ../development/skaware-packages/s6-networking { }; - s6-portable-utils = callPackage ../development/skaware-packages/s6-portable-utils { }; - s6-rc = callPackage ../development/skaware-packages/s6-rc { }; - - s6-man-pages = callPackage ../development/skaware-packages/s6-man-pages { - inherit buildManPages; - }; - s6-networking-man-pages = callPackage ../development/skaware-packages/s6-networking-man-pages { - inherit buildManPages; - }; - s6-portable-utils-man-pages = callPackage ../development/skaware-packages/s6-portable-utils-man-pages { - inherit buildManPages; - }; - }; + skawarePackages = recurseIntoAttrs (callPackage ../development/skaware-packages { }); inherit (skawarePackages) execline @@ -23263,6 +23243,8 @@ with pkgs; yubihsm-shell = callPackage ../tools/security/yubihsm-shell { }; + yubioath-flutter = callPackage ../applications/misc/yubioath-flutter { }; + zchunk = callPackage ../development/libraries/zchunk { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; @@ -27998,6 +27980,8 @@ with pkgs; cozy-drive = callPackage ../applications/networking/cozy-drive {}; + cplay-ng = callPackage ../applications/audio/cplay-ng { }; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; @@ -31070,6 +31054,8 @@ with pkgs; pythonPackages = python3Packages; }; + notmuch-mailmover = callPackage ../applications/networking/mailreaders/notmuch/notmuch-mailmover.nix { }; + notejot = callPackage ../applications/misc/notejot { }; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; @@ -38092,7 +38078,7 @@ with pkgs; texlive = texlive.combined.scheme-medium; }; - unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; + unpoller = callPackage ../servers/monitoring/unpoller {}; fac-build = callPackage ../development/tools/build-managers/fac { inherit (darwin.apple_sdk.frameworks) CoreServices; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 760e3b1f20bf2..166f09f6e49a1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -254,6 +254,7 @@ in { # Obsolete aliases (these packages do not depend on the kernel). inherit (pkgs) odp-dpdk pktgen; # added 2018-05 inherit (pkgs) bcc bpftrace; # added 2021-12 + inherit (pkgs) oci-seccomp-bpf-hook; # added 2022-11 acpi_call = callPackage ../os-specific/linux/acpi-call {}; @@ -421,8 +422,6 @@ in { netatop = callPackage ../os-specific/linux/netatop { }; - oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; - perf = callPackage ../os-specific/linux/kernel/perf { }; phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 642eb11d674c3..e0cecf43d2645 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12507,11 +12507,11 @@ let ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.50"; + version = "12.51"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg="; + hash = "sha256-76meNQp9c0Z+81gNSMnDTtJmd/qOGu4uqeHsGhTnDkQ="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd9817e84073f..71957ca136d5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4565,6 +4565,8 @@ self: super: with self; { intreehooks = callPackage ../development/python-modules/intreehooks { }; + invisible-watermark = callPackage ../development/python-modules/invisible-watermark { }; + invocations = callPackage ../development/python-modules/invocations { }; invoke = callPackage ../development/python-modules/invoke { }; @@ -8264,6 +8266,8 @@ self: super: with self; { pyobihai = callPackage ../development/python-modules/pyobihai { }; + pyocd = callPackage ../development/python-modules/pyocd { }; + pyocr = callPackage ../development/python-modules/pyocr { tesseract = pkgs.tesseract4; }; @@ -12398,4 +12402,6 @@ self: super: with self; { zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { }; zxcvbn = callPackage ../development/python-modules/zxcvbn { }; + + zxing_cpp = callPackage ../development/python-modules/zxing_cpp { }; } |