diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 70 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 3 |
4 files changed, 47 insertions, 57 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 95fc867172e55..db1973e884284 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -34,6 +34,12 @@ let dontDistribute alias else alias; + transmission3Warning = { prefix ? "", suffix ? "" }: let + p = "${prefix}transmission${suffix}"; + p3 = "${prefix}transmission_3${suffix}"; + p4 = "${prefix}transmission_4${suffix}"; + in "${p} has been renamed to ${p3} since ${p4} is also available. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; + # Make sure that we are not shadowing something from all-packages.nix. checkInPkgs = n: alias: if builtins.hasAttr n super @@ -244,7 +250,16 @@ mapAliases ({ clang_10 = throw "clang_10 has been removed from nixpkgs"; # Added 2024-01-26 clang_11 = throw "clang_11 has been removed from nixpkgs"; # Added 2023-01-24 + clang-tools_12 = llvmPackages_12.clang-tools; # Added 2024-04-22 + clang-tools_13 = llvmPackages_13.clang-tools; # Added 2024-04-22 + clang-tools_14 = llvmPackages_14.clang-tools; # Added 2024-04-22 + clang-tools_15 = llvmPackages_15.clang-tools; # Added 2024-04-22 + clang-tools_16 = llvmPackages_16.clang-tools; # Added 2024-04-22 + clang-tools_17 = llvmPackages_17.clang-tools; # Added 2024-04-22 + clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22 + cq-editor = throw "cq-editor has been removed, as it use a dependency that was disabled since python 3.8 and was last updated in 2021"; # Added 2024-05-13 + ### D ### dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 @@ -1248,6 +1263,7 @@ mapAliases ({ solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 soundOfSorting = sound-of-sorting; # Added 2023-07-07 soundux = throw "'soundux' has been removed, as it is unmaintained."; # Added on 2024-02-14 + SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 SPAdes = spades; # Added 2024-06-12 spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 @@ -1327,6 +1343,10 @@ mapAliases ({ tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tootle = throw "'tootle' has been removed as it is not maintained upstream. Consider using 'tuba' instead"; # Added 2024-02-11 tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 + transmission = lib.warn (transmission3Warning {}) transmission_3; # Added 2024-06-10 + transmission-gtk = lib.warn (transmission3Warning {suffix = "-gtk";}) transmission_3-gtk; # Added 2024-06-10 + transmission-qt = lib.warn (transmission3Warning {suffix = "-qt";}) transmission_3-qt; # Added 2024-06-10 + libtransmission = lib.warn (transmission3Warning {prefix = "lib";}) libtransmission_3; # Added 2024-06-10 transfig = fig2dev; # Added 2022-02-15 transifex-client = transifex-cli; # Added 2023-12-29 trezor_agent = trezor-agent; # Added 2024-01-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab567c421e6c5..e10722915f3af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4070,10 +4070,12 @@ with pkgs; androidenv = callPackage ../development/mobile/androidenv { }; - androidndkPkgs = androidndkPkgs_21; + androidndkPkgs = androidndkPkgs_26; androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21"; androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b"; androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24"; + androidndkPkgs_25 = (callPackage ../development/androidndk-pkgs {})."25"; + androidndkPkgs_26 = (callPackage ../development/androidndk-pkgs {})."26"; androidsdk = androidenv.androidPkgs.androidsdk; @@ -7377,7 +7379,7 @@ with pkgs; dropbear = callPackage ../tools/networking/dropbear { }; - dsview = qt6Packages.callPackage ../applications/science/electronics/dsview { }; + dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; @@ -7878,8 +7880,6 @@ with pkgs; flashbench = callPackage ../os-specific/linux/flashbench { }; - flatpak = callPackage ../development/libraries/flatpak { }; - flatpak-builder = callPackage ../development/tools/flatpak-builder { binutils = binutils-unwrapped; }; @@ -12063,8 +12063,6 @@ with pkgs; raysession = python3Packages.callPackage ../applications/audio/raysession {}; - revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { }; - rbw = callPackage ../tools/security/rbw { }; remarshal = with python3Packages; toPythonApplication remarshal; @@ -15179,31 +15177,7 @@ with pkgs; clang_16 = llvmPackages_16.clang; clang_17 = llvmPackages_17.clang; - clang-tools = callPackage ../development/tools/clang-tools { }; - - clang-tools_12 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_12; - }; - - clang-tools_13 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_13; - }; - - clang-tools_14 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_14; - }; - - clang-tools_15 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_15; - }; - - clang-tools_16 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_16; - }; - - clang-tools_17 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_17; - }; + clang-tools = llvmPackages.clang-tools; clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { llvmPackages = llvmPackages_14; @@ -15955,8 +15929,6 @@ with pkgs; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - hvm = darwin.apple_sdk_11_0.callPackage ../development/compilers/hvm { }; - iay = callPackage ../tools/misc/iay { inherit (darwin.apple_sdk.frameworks) AppKit Security Foundation Cocoa; }; @@ -16278,17 +16250,12 @@ with pkgs; lld_18 = llvmPackages_18.lld; lldb_18 = llvmPackages_18.lldb; llvm_18 = llvmPackages_18.llvm; - - clang-tools_18 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_18; - }; }) llvmPackages_18 clang_18 lld_18 lldb_18 - llvm_18 - clang-tools_18; + llvm_18; lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -26564,8 +26531,6 @@ with pkgs; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; - vmagent = callPackage ../servers/monitoring/vmagent { }; - vsftpd = callPackage ../servers/ftp/vsftpd { }; wallabag = callPackage ../servers/web-apps/wallabag { }; @@ -28004,8 +27969,6 @@ with pkgs; vendir = callPackage ../development/tools/vendir { }; - vndr = callPackage ../development/tools/vndr { }; - vdo = callPackage ../os-specific/linux/vdo { }; windows = callPackages ../os-specific/windows {}; @@ -31524,7 +31487,7 @@ with pkgs; pixeluvo = callPackage ../applications/graphics/pixeluvo { }; - pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { }; planner = callPackage ../applications/office/planner { }; @@ -32009,11 +31972,9 @@ with pkgs; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; - klee = callPackage ../applications/science/logic/klee (with llvmPackages_13; { - clang = clang; - llvm = llvm; - stdenv = stdenv; - }); + klee = callPackage ../applications/science/logic/klee { + llvmPackages = llvmPackages_13; + }; kmetronome = qt6Packages.callPackage ../applications/audio/kmetronome { }; @@ -34759,15 +34720,14 @@ with pkgs; transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { }; - libtransmission = transmission.override { + libtransmission_3 = transmission_3.override { installLib = true; enableDaemon = false; enableCli = false; }; - transmission-gtk = transmission.override { enableGTK3 = true; }; - transmission-qt = transmission.override { enableQt = true; }; - transmission_noSystemd = transmission.override { enableSystemd = false; }; + transmission_3-gtk = transmission_3.override { enableGTK3 = true; }; + transmission_3-qt = transmission_3.override { enableQt = true; }; + transmission_3_noSystemd = transmission_3.override { enableSystemd = false; }; # Needs macOS >= 10.14.6 transmission_4 = darwin.apple_sdk_11_0.callPackage ../applications/networking/p2p/transmission/4.nix { @@ -39666,8 +39626,6 @@ with pkgs; sndio = callPackage ../misc/sndio { }; - SP800-90B_EntropyAssessment = callPackage ../tools/misc/SP800-90B_EntropyAssessment { }; - sticky = callPackage ../applications/misc/sticky { }; stork = darwin.apple_sdk_11_0.callPackage ../applications/misc/stork { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1580a92a22f4..340825d1867ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -313,6 +313,8 @@ self: super: with self; { aiomcache = callPackage ../development/python-modules/aiomcache { }; + aiomealie = callPackage ../development/python-modules/aiomealie { }; + aiomisc = callPackage ../development/python-modules/aiomisc { }; aiomisc-pytest = callPackage ../development/python-modules/aiomisc-pytest { }; @@ -4081,6 +4083,11 @@ self: super: with self; { ezyrb = callPackage ../development/python-modules/ezyrb { }; + f3d = toPythonModule (pkgs.f3d.override { + withPythonBinding = true; + python3Packages = self; + }); + f5-icontrol-rest = callPackage ../development/python-modules/f5-icontrol-rest { }; f5-sdk = callPackage ../development/python-modules/f5-sdk { }; @@ -7782,6 +7789,8 @@ self: super: with self; { motionblinds = callPackage ../development/python-modules/motionblinds { }; + motionblindsble = callPackage ../development/python-modules/motionblindsble { }; + motioneye-client = callPackage ../development/python-modules/motioneye-client { }; moto = callPackage ../development/python-modules/moto { }; @@ -13111,6 +13120,8 @@ self: super: with self; { ramlfications = callPackage ../development/python-modules/ramlfications { }; + random-user-agent = callPackage ../development/python-modules/random-user-agent { }; + random2 = callPackage ../development/python-modules/random2 { }; randomfiletree = callPackage ../development/python-modules/randomfiletree { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 4f95c7d084ef3..04f10bb0fac13 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -125,7 +125,8 @@ let jobs.gimp.x86_64-darwin jobs.emacs.x86_64-darwin jobs.wireshark.x86_64-darwin - jobs.transmission-gtk.x86_64-darwin + jobs.transmission_3-gtk.x86_64-darwin + jobs.transmission_4-gtk.x86_64-darwin # Tests /* |