diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/all-packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 902 |
1 files changed, 329 insertions, 573 deletions
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index c56550b68150..1e91561d1e0c 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -141,6 +141,8 @@ with pkgs; autoconf = autoconf269; }; + autorestic = callPackage ../tools/backup/autorestic { }; + autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; @@ -165,6 +167,8 @@ with pkgs; alda = callPackage ../development/interpreters/alda { }; + align = callPackage ../tools/text/align { }; + althttpd = callPackage ../servers/althttpd { }; among-sus = callPackage ../games/among-sus { }; @@ -242,6 +246,8 @@ with pkgs; clj-kondo = callPackage ../development/tools/clj-kondo { }; + cloak = callPackage ../applications/misc/cloak { }; + cmark = callPackage ../development/libraries/cmark { }; cmark-gfm = callPackage ../development/libraries/cmark-gfm { }; @@ -447,10 +453,12 @@ with pkgs; fetchfossil = callPackage ../build-support/fetchfossil { }; - fetchgit = callPackage ../build-support/fetchgit { + fetchgit = (callPackage ../build-support/fetchgit { git = buildPackages.gitMinimal; cacert = buildPackages.cacert; git-lfs = buildPackages.git-lfs; + }) // { # fetchgit is a function, so we use // instead of passthru. + tests = callPackages ../build-support/fetchgit/tests.nix {}; }; fetchgitLocal = callPackage ../build-support/fetchgitlocal { }; @@ -502,7 +510,10 @@ with pkgs; fetchhg = callPackage ../build-support/fetchhg { }; - fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon {}; + fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon { } + // { + tests = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; + }; # `fetchurl' downloads a file from the network. fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform @@ -600,6 +611,15 @@ with pkgs; installShellFiles = callPackage ../build-support/install-shell-files {}; + # See doc/builders/special/invalidateFetcherByDrvHash.section.md or + # https://nixos.org/manual/nixpkgs/unstable/#sec-pkgs-invalidateFetcherByDrvHash + invalidateFetcherByDrvHash = f: args: + let + drvPath = (f args).drvPath; + # It's safe to discard the context, because we don't access the path. + salt = builtins.unsafeDiscardStringContext (lib.substring 0 12 (baseNameOf drvPath)); + in f (args // { name = "${args.name or "source"}-salted-${salt}"; }); + lazydocker = callPackage ../tools/misc/lazydocker { }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } @@ -893,12 +913,16 @@ with pkgs; weidu = callPackage ../tools/games/weidu { }; + weylus = callPackage ../applications/graphics/weylus { }; + gfshare = callPackage ../tools/security/gfshare { }; gobgp = callPackage ../tools/networking/gobgp { }; gofu = callPackage ../applications/misc/gofu { }; + ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; + linux-router = callPackage ../tools/networking/linux-router { }; linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; @@ -960,6 +984,8 @@ with pkgs; inherit (lxqt) qtermwidget; }; + darktile = callPackage ../applications/terminal-emulators/darktile { }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); @@ -1096,6 +1122,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + amber-secret = callPackage ../tools/security/amber { + inherit (darwin.apple_sdk.frameworks) Security; + }; + inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13; @@ -2371,6 +2401,8 @@ with pkgs; chntpw = callPackage ../tools/security/chntpw { }; + cliphist = callPackage ../tools/wayland/cliphist { }; + clipman = callPackage ../tools/wayland/clipman { }; kanshi = callPackage ../tools/wayland/kanshi { }; @@ -2470,7 +2502,7 @@ with pkgs; csv2latex = callPackage ../tools/misc/csv2latex { }; - csvs-to-sqlite = with python3Packages; toPythonApplication csvs-to-sqlite; + csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; cucumber = callPackage ../development/tools/cucumber {}; @@ -2771,6 +2803,8 @@ with pkgs; firestarter = callPackage ../applications/misc/firestarter { }; + fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; + frangipanni = callPackage ../tools/text/frangipanni { }; fselect = callPackage ../tools/misc/fselect { }; @@ -2987,6 +3021,8 @@ with pkgs; inklecate = callPackage ../development/compilers/inklecate {}; + intensity-normalization = with python3Packages; toPythonApplication intensity-normalization; + interactsh = callPackage ../tools/misc/interactsh { }; interlock = callPackage ../servers/interlock {}; @@ -3222,7 +3258,7 @@ with pkgs; oci-cli = callPackage ../tools/admin/oci-cli { }; - ocrmypdf = callPackage ../tools/text/ocrmypdf { }; + ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf; ocrfeeder = callPackage ../applications/graphics/ocrfeeder { }; @@ -3303,6 +3339,8 @@ with pkgs; inherit (darwin) libiconv; }; + profetch = callPackage ../tools/misc/profetch { }; + psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; reg = callPackage ../tools/virtualization/reg { }; @@ -3601,6 +3639,8 @@ with pkgs; biblatex-check = callPackage ../tools/typesetting/biblatex-check { }; + binlore = callPackage ../development/tools/analysis/binlore { }; + birdfont = callPackage ../tools/misc/birdfont { }; xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; @@ -3624,7 +3664,7 @@ with pkgs; bud = callPackage ../tools/networking/bud { }; - bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; + bump2version = python3Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; bumpver = callPackage ../applications/version-management/bumpver { }; @@ -3972,6 +4012,11 @@ with pkgs; bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; + calyx-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { + provider = "calyx"; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; }; code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk = true; @@ -4097,7 +4142,9 @@ with pkgs; cudatoolkit_11 cudatoolkit_11_0 cudatoolkit_11_1 - cudatoolkit_11_2; + cudatoolkit_11_2 + cudatoolkit_11_3 + cudatoolkit_11_4; cudatoolkit = cudatoolkit_10; @@ -4122,7 +4169,9 @@ with pkgs; cutensor_cudatoolkit_11 cutensor_cudatoolkit_11_0 cutensor_cudatoolkit_11_1 - cutensor_cudatoolkit_11_2; + cutensor_cudatoolkit_11_2 + cutensor_cudatoolkit_11_3 + cutensor_cudatoolkit_11_4; cutensor = cutensor_cudatoolkit_10; @@ -4132,11 +4181,12 @@ with pkgs; ldapSupport = true; }; - curl = curlMinimal.override { + curl = curlMinimal.override ({ idnSupport = true; + } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { gssSupport = true; brotliSupport = true; - }; + }); curlMinimal = callPackage ../tools/networking/curl { }; @@ -4342,7 +4392,9 @@ with pkgs; dleyna-server = callPackage ../development/libraries/dleyna-server { }; - dmd = callPackage ../development/compilers/dmd { }; + dmd = callPackage ../development/compilers/dmd { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; dmg2img = callPackage ../tools/misc/dmg2img { }; @@ -4709,6 +4761,8 @@ with pkgs; endlessh = callPackage ../servers/endlessh { }; + ericw-tools = callPackage ../applications/misc/ericw-tools { }; + cryfs = callPackage ../tools/filesystems/cryfs { }; encfs = callPackage ../tools/filesystems/encfs { @@ -4779,7 +4833,7 @@ with pkgs; expect = callPackage ../tools/misc/expect { }; - expliot = python3Packages.callPackage ../tools/security/expliot { }; + expliot = callPackage ../tools/security/expliot { }; f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; @@ -4973,6 +5027,8 @@ with pkgs; fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; + faraday-cli = callPackage ../tools/security/faraday-cli { }; + fastlane = callPackage ../tools/admin/fastlane { }; fatresize = callPackage ../tools/filesystems/fatresize {}; @@ -5485,6 +5541,8 @@ with pkgs; glab = callPackage ../applications/version-management/git-and-tools/glab { }; + glitter = callPackage ../applications/version-management/git-and-tools/glitter { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -6689,6 +6747,7 @@ with pkgs; meilisearch = callPackage ../servers/search/meilisearch { inherit (darwin.apple_sdk.frameworks) Security; + inherit pkgs; }; memtester = callPackage ../tools/system/memtester { }; @@ -7047,6 +7106,8 @@ with pkgs; ltris = callPackage ../games/ltris { }; + lunatic = callPackage ../development/interpreters/lunatic { }; + lv = callPackage ../tools/text/lv { }; lxc = callPackage ../os-specific/linux/lxc { @@ -7291,7 +7352,7 @@ with pkgs; mmixware = callPackage ../development/tools/mmixware { }; - modemmanager = callPackage ../tools/networking/modem-manager {}; + modemmanager = callPackage ../tools/networking/modemmanager {}; modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {}; @@ -7564,6 +7625,8 @@ with pkgs; nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; + nomino = callPackage ../tools/misc/nomino { }; + notable = callPackage ../applications/misc/notable { }; ntlmrecon = callPackage ../tools/security/ntlmrecon { }; @@ -7630,6 +7693,8 @@ with pkgs; npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; + npiet = callPackage ../development/interpreters/npiet { }; + npth = callPackage ../development/libraries/npth {}; nmap = callPackage ../tools/security/nmap { }; @@ -7691,6 +7756,8 @@ with pkgs; nttcp = callPackage ../tools/networking/nttcp { }; + ntttcp = callPackage ../tools/networking/ntttcp { }; + nuttcp = callPackage ../tools/networking/nuttcp { }; nssmdns = callPackage ../tools/networking/nss-mdns { }; @@ -7906,6 +7973,8 @@ with pkgs; operator-sdk = callPackage ../development/tools/operator-sdk { }; + owncast = callPackage ../servers/owncast { }; + update-dotdee = with python3Packages; toPythonApplication update-dotdee; update-nix-fetchgit = haskell.lib.justStaticExecutables haskellPackages.update-nix-fetchgit; @@ -7969,7 +8038,7 @@ with pkgs; ovito = libsForQt5.callPackage ../applications/graphics/ovito { }; - owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; + owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; oxefmsynth = callPackage ../applications/audio/oxefmsynth { }; @@ -8007,6 +8076,8 @@ with pkgs; pamtester = callPackage ../tools/security/pamtester { }; + pantheon-tweaks = callPackage ../applications/system/pantheon-tweaks { }; + paperless-ng = callPackage ../applications/office/paperless-ng { }; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; @@ -8057,6 +8128,8 @@ with pkgs; pick = callPackage ../tools/misc/pick { }; + pipe-rename = callPackage ../tools/misc/pipe-rename { }; + pitivi = callPackage ../applications/video/pitivi { }; prism = callPackage ../applications/video/prism { }; @@ -8343,6 +8416,8 @@ with pkgs; proxychains = callPackage ../tools/networking/proxychains { }; + proxychains-ng = callPackage ../tools/networking/proxychains-ng { }; + proxify = callPackage ../tools/networking/proxify { }; proxytunnel = callPackage ../tools/misc/proxytunnel { @@ -8445,6 +8520,11 @@ with pkgs; stdenv = gccStdenv; }; + riseup-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { + provider = "riseup"; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rtaudio = callPackage ../development/libraries/audio/rtaudio { @@ -8738,6 +8818,7 @@ with pkgs; rpm = callPackage ../tools/package-management/rpm { python = python3; + lua = lua5_4; }; rpm-ostree = callPackage ../tools/misc/rpm-ostree { @@ -8786,6 +8867,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + rust-code-analysis = callPackage ../development/tools/rust-code-analysis { }; + + rust-petname = callPackage ../tools/text/rust-petname { }; + rustscan = callPackage ../tools/security/rustscan { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9053,7 +9138,7 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { inherit (ocaml-ng.ocamlPackages_4_02) ocaml camlp4; }; + sks = callPackage ../servers/sks { }; skydns = callPackage ../servers/skydns { }; @@ -9143,6 +9228,8 @@ with pkgs; ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { }; + ssh-to-age = callPackage ../tools/security/ssh-to-age { }; + ssh-to-pgp = callPackage ../tools/security/ssh-to-pgp { }; suricata = callPackage ../applications/networking/ids/suricata { @@ -9708,6 +9795,10 @@ with pkgs; trebleshot = libsForQt5.callPackage ../applications/networking/trebleshot { }; + trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { + inherit (xorg) libXxf86vm; + }; + trickle = callPackage ../tools/networking/trickle {}; inherit (nodePackages) triton; @@ -10512,6 +10603,8 @@ with pkgs; yajsv = callPackage ../tools/misc/yajsv { }; + yallback = callPackage ../development/tools/analysis/yallback { }; + yapf = with python3Packages; toPythonApplication yapf; yarn = callPackage ../development/tools/yarn { }; @@ -10670,24 +10763,24 @@ with pkgs; any-nix-shell = callPackage ../shells/any-nix-shell { }; - bash = lowPrio (callPackage ../shells/bash/4.4.nix { + bash_4 = lowPrio (callPackage ../shells/bash/4.4.nix { binutils = stdenv.cc.bintools; }); - bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix { + bash = lowPrio (callPackage ../shells/bash/5.1.nix { binutils = stdenv.cc.bintools; }); - bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix { + # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed + bashInteractive = callPackage ../shells/bash/5.1.nix { binutils = stdenv.cc.bintools; interactive = true; withDocs = true; - }); + }; - # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed - bashInteractive = callPackage ../shells/bash/4.4.nix { + bashInteractive_4 = lowPrio (callPackage ../shells/bash/4.4.nix { binutils = stdenv.cc.bintools; interactive = true; withDocs = true; - }; + }); bash-completion = callPackage ../shells/bash/bash-completion { }; @@ -12150,6 +12243,7 @@ with pkgs; inherit (callPackages ../development/compilers/nim { }) nim-unwrapped nimble-unwrapped nim; + nimPackages = recurseIntoAttrs nim.pkgs; nrpl = callPackage ../development/tools/nrpl { }; @@ -12287,19 +12381,19 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm_10 = llvmPackages_10.libllvm; }; - rust_1_53 = callPackage ../development/compilers/rust/1_53.nix { + rust_1_55 = callPackage ../development/compilers/rust/1_55.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm_12 = llvmPackages_12.libllvm; }; - rust = rust_1_53; + rust = rust_1_55; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_53 = rust_1_53.packages.stable; - rustPackages = rustPackages_1_53; + rustPackages_1_55 = rust_1_55.packages.stable; + rustPackages = rustPackages_1_55; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -12323,6 +12417,7 @@ with pkgs; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; cargo-about = callPackage ../tools/package-management/cargo-about { }; + cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { }; cargo-audit = callPackage ../tools/package-management/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12334,6 +12429,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; + cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12345,6 +12443,7 @@ with pkgs; cargo-kcov = callPackage ../tools/package-management/cargo-kcov { }; cargo-graph = callPackage ../tools/package-management/cargo-graph { }; cargo-license = callPackage ../tools/package-management/cargo-license { }; + cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; cargo-outdated = callPackage ../tools/package-management/cargo-outdated {}; cargo-release = callPackage ../tools/package-management/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; @@ -12372,6 +12471,10 @@ with pkgs; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { + inherit (darwin.apple_sdk.frameworks) Security; + }; + cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -12406,8 +12509,15 @@ with pkgs; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; cargo-sort = callPackage ../development/tools/rust/cargo-sort { }; + cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { }; + cargo-supply-chain = callPackage ../development/tools/rust/cargo-supply-chain { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; + cargo-tally = callPackage ../development/tools/rust/cargo-tally { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; + }; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; @@ -12434,7 +12544,11 @@ with pkgs; maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; }; + panamax = callPackage ../development/tools/rust/panamax { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rhack = callPackage ../development/tools/rust/rhack { }; inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { @@ -12451,6 +12565,7 @@ with pkgs; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { inherit (darwin.apple_sdk.frameworks) Security; }; + rust-script = callPackage ../development/tools/rust/rust-script { }; rustup = callPackage ../development/tools/rust/rustup { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -13043,7 +13158,7 @@ with pkgs; pipewire = callPackage ../development/libraries/pipewire {}; pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; - pyradio = callPackage ../applications/radio/pyradio {}; + pyradio = callPackage ../applications/audio/pyradio {}; pyrex = pyrex095; @@ -13151,7 +13266,10 @@ with pkgs; self = pkgsi686Linux.callPackage ../development/interpreters/self { }; - spark = callPackage ../applications/networking/cluster/spark { }; + inherit (callPackages ../applications/networking/cluster/spark { hadoop = hadoop_3_1; }) + spark3 + spark2; + spark = spark3; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; @@ -13311,6 +13429,8 @@ with pkgs; abi-dumper = callPackage ../development/tools/misc/abi-dumper { }; + abuild = callPackage ../development/tools/abuild { }; + adtool = callPackage ../tools/admin/adtool { }; inherit (callPackage ../development/tools/alloy { @@ -13725,10 +13845,15 @@ with pkgs; cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; cmakeMinimal = libsForQt5.callPackage ../development/tools/build-managers/cmake { isBootstrap = true; + # There is no SystemConfiguration in bootstrapTools, so this version gets + # patched to remove that dependency. + SystemConfiguration = null; }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -13778,6 +13903,8 @@ with pkgs; css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify; + cvehound = callPackage ../development/tools/analysis/cvehound { }; + cvise = python3Packages.callPackage ../development/tools/misc/cvise { inherit (llvmPackages_11) llvm libclang; }; @@ -13984,6 +14111,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; + fundoc = callPackage ../development/tools/fundoc { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; @@ -14496,6 +14625,8 @@ with pkgs; pup = callPackage ../development/tools/pup { }; + puppet-bolt = callPackage ../tools/admin/puppet/puppet-bolt { }; + puppet-lint = callPackage ../development/tools/puppet/puppet-lint { }; puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli {}; @@ -14752,12 +14883,16 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + taoup = callPackage ../tools/misc/taoup { }; + tcptrack = callPackage ../development/tools/misc/tcptrack { }; teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { }; + tytools = libsForQt5.callPackage ../development/embedded/tytools { }; + terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; @@ -14772,6 +14907,7 @@ with pkgs; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; + texinfo6_8 = callPackage ../development/tools/misc/texinfo/6.8.nix { }; texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } @@ -14862,9 +14998,7 @@ with pkgs; vultr-cli = callPackage ../development/tools/vultr-cli { }; - vulnix = callPackage ../tools/security/vulnix { - python3Packages = python37Packages; - }; + vulnix = callPackage ../tools/security/vulnix { }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; @@ -15124,20 +15258,23 @@ with pkgs; boolstuff = callPackage ../development/libraries/boolstuff { }; - boost155 = callPackage ../development/libraries/boost/1.55.nix { }; - boost159 = callPackage ../development/libraries/boost/1.59.nix { }; + inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; }) + boost155 + boost159 + boost160 + boost165 + boost166 + boost168 + boost169 + boost170 + boost172 + boost173 + boost174 + boost175 + ; + boost15x = boost159; - boost160 = callPackage ../development/libraries/boost/1.60.nix { }; - boost165 = callPackage ../development/libraries/boost/1.65.nix { }; - boost166 = callPackage ../development/libraries/boost/1.66.nix { }; - boost168 = callPackage ../development/libraries/boost/1.68.nix { }; - boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost16x = boost169; - boost170 = callPackage ../development/libraries/boost/1.70.nix { }; - boost172 = callPackage ../development/libraries/boost/1.72.nix { }; - boost173 = callPackage ../development/libraries/boost/1.73.nix { }; - boost174 = callPackage ../development/libraries/boost/1.74.nix { }; - boost175 = callPackage ../development/libraries/boost/1.75.nix { }; boost17x = boost175; boost = boost16x; @@ -17006,7 +17143,7 @@ with pkgs; libf2c = callPackage ../development/libraries/libf2c {}; - libfabric = callPackage ../os-specific/linux/libfabric {}; + libfabric = callPackage ../development/libraries/libfabric {}; libfive = libsForQt5.callPackage ../development/libraries/libfive { }; @@ -17121,7 +17258,9 @@ with pkgs; libliftoff = callPackage ../development/libraries/libliftoff { }; - liblqr1 = callPackage ../development/libraries/liblqr-1 { }; + liblqr1 = callPackage ../development/libraries/liblqr-1 { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; liblockfile = callPackage ../development/libraries/liblockfile { }; @@ -17546,6 +17685,8 @@ with pkgs; libssh = callPackage ../development/libraries/libssh { }; libssh2 = callPackage ../development/libraries/libssh2 { }; + #FIXME: temporary attribute + libssh2_1_10 = callPackage ../development/libraries/libssh2/1_10.nix { }; libstartup_notification = callPackage ../development/libraries/startup-notification { }; @@ -17907,6 +18048,16 @@ with pkgs; mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; + memorymapping = callPackage ../development/libraries/memorymapping { }; + memorymappingHook = makeSetupHook { + deps = [ memorymapping ]; + } ../development/libraries/memorymapping/setup-hook.sh; + + memstream = callPackage ../development/libraries/memstream { }; + memstreamHook = makeSetupHook { + deps = [ memstream ]; + } ../development/libraries/memstream/setup-hook.sh; + menu-cache = callPackage ../development/libraries/menu-cache { }; mergerfs = callPackage ../tools/filesystems/mergerfs { }; @@ -18438,8 +18589,9 @@ with pkgs; python = python37; }; - protobuf = protobuf3_17; + protobuf = protobuf3_18; + protobuf3_18 = callPackage ../development/libraries/protobuf/3.18.nix { }; protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; protobuf3_16 = callPackage ../development/libraries/protobuf/3.16.nix { }; protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { }; @@ -18981,9 +19133,7 @@ with pkgs; srt = callPackage ../development/libraries/srt { }; - srtp = callPackage ../development/libraries/srtp { - libpcap = if stdenv.isLinux then libpcap else null; - }; + srtp = callPackage ../development/libraries/srtp { }; stb = callPackage ../development/libraries/stb { }; @@ -19513,6 +19663,8 @@ with pkgs; yubikey-agent = callPackage ../tools/security/yubikey-agent { }; + yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { }; + zchunk = callPackage ../development/libraries/zchunk { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; @@ -19572,6 +19724,10 @@ with pkgs; }; agda = agdaPackages.agda; + ### DEVELOPMENT / LIBRARIES / BASH + + bash-preexec = callPackage ../development/libraries/bash/bash-preexec { }; + ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; @@ -19869,11 +20025,11 @@ with pkgs; cassandra = cassandra_3_11; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { - java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + java = jre; }; apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix { - java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + java = jre; }; apcupsd = callPackage ../servers/apcupsd { }; @@ -20131,10 +20287,12 @@ with pkgs; leafnode = callPackage ../servers/news/leafnode { }; - lemmy = callPackage ../servers/web-apps/lemmy { + lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix { inherit (darwin.apple_sdk.frameworks) Security; }; + lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { }; + lighttpd = callPackage ../servers/http/lighttpd { }; livepeer = callPackage ../servers/livepeer { }; @@ -20422,10 +20580,12 @@ with pkgs; rpcsvc-proto = callPackage ../tools/misc/rpcsvc-proto { }; - libmysqlclient = libmysqlclient_3_1; + libmysqlclient = libmysqlclient_3_2; libmysqlclient_3_1 = mariadb-connector-c_3_1; - mariadb-connector-c = mariadb-connector-c_3_1; + libmysqlclient_3_2 = mariadb-connector-c_3_2; + mariadb-connector-c = mariadb-connector-c_3_2; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; + mariadb-connector-c_3_2 = callPackage ../servers/sql/mariadb/connector-c/3_2.nix { }; mariadb-galera = callPackage ../servers/sql/mariadb/galera { asio = asio_1_10; @@ -21095,6 +21255,10 @@ with pkgs; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; + cpupower-gui = python3Packages.callPackage ../os-specific/linux/cpupower-gui { + inherit (pkgs) meson; + }; + cpuset = callPackage ../os-specific/linux/cpuset { pythonPackages = python3Packages; }; @@ -21237,6 +21401,10 @@ with pkgs; inherit (darwin) IOKit; }; + btop = callPackage ../tools/system/btop { + stdenv = gcc11Stdenv; + }; + nmon = callPackage ../os-specific/linux/nmon { }; hwdata = callPackage ../os-specific/linux/hwdata { }; @@ -21353,463 +21521,31 @@ with pkgs; tgt = callPackage ../tools/networking/tgt { }; - # -- Linux kernel expressions ------------------------------------------------ - lkl = callPackage ../applications/virtualization/lkl { }; inherit (callPackages ../os-specific/linux/kernel-headers { }) linuxHeaders makeLinuxHeaders; - kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; - klibc = callPackage ../os-specific/linux/klibc { }; klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); - linux_mptcp = linux_mptcp_95; - - linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { - kernelPatches = linux_4_19.kernelPatches; - }; - - linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 1; - }; - - linux_rpi2 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 2; - }; - - linux_rpi3 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 3; - }; - - linux_rpi4 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 4; - }; - - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.4" - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.9" - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.rtl8761b_support - ]; - }; - - linux-rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export-rt-sched-migrate - ]; - }; - - linux-rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export-rt-sched-migrate - ]; - }; - - linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_13; - kernelPatches = kernel.kernelPatches; - }; - - linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_xanmod = callPackage ../os-specific/linux/kernel/linux-xanmod.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - /* Linux kernel modules are inherently tied to a specific kernel. So - rather than provide specific instances of those packages for a - specific kernel, we have a function that builds those packages - for a specific kernel. This function can then be called for - whatever kernel you're using. */ - - linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; { - callPackage = newScope self; - - kernel = kernel_; - inherit (kernel) stdenv; # in particular, use the same compiler by default + linuxKernel = recurseIntoAttrs (callPackage ./linux-kernels.nix { }); - # to help determine module compatibility - inherit (kernel) isZen isHardened isLibre; - inherit (kernel) kernelOlder kernelAtLeast; + inherit (linuxKernel) buildLinux linuxConfig kernelPatches; - # Obsolete aliases (these packages do not depend on the kernel). - inherit (pkgs) odp-dpdk pktgen; # added 2018-05 + linuxPackagesFor = linuxKernel.packagesFor; - acpi_call = callPackage ../os-specific/linux/acpi-call {}; + hardenedLinuxPackagesFor = linuxKernel.hardenedPackagesFor; - akvcam = callPackage ../os-specific/linux/akvcam { }; + linuxManualConfig = linuxKernel.manualConfig; - amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; - - anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; - - apfs = callPackage ../os-specific/linux/apfs { }; - - batman_adv = callPackage ../os-specific/linux/batman-adv {}; - - bcc = callPackage ../os-specific/linux/bcc { - python = python3; - }; - - bpftrace = callPackage ../os-specific/linux/bpftrace { }; - - bbswitch = callPackage ../os-specific/linux/bbswitch {}; - - chipsec = callPackage ../tools/security/chipsec { - inherit kernel; - withDriver = true; - }; - - cryptodev = callPackage ../os-specific/linux/cryptodev { }; - - cpupower = callPackage ../os-specific/linux/cpupower { }; - - ddcci-driver = callPackage ../os-specific/linux/ddcci { }; - - digimend = callPackage ../os-specific/linux/digimend { }; - - dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; - - exfat-nofuse = callPackage ../os-specific/linux/exfat { }; - - evdi = callPackage ../os-specific/linux/evdi { }; - - fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; - - gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; - - hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { }; - - hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; - - e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; - - intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; - - ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; - - it87 = callPackage ../os-specific/linux/it87 {}; - - asus-wmi-sensors = callPackage ../os-specific/linux/asus-wmi-sensors {}; - - ena = callPackage ../os-specific/linux/ena {}; - - v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; - - lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; - - broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { }; - - tbs = callPackage ../os-specific/linux/tbs { }; - - mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { }; - - nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - - nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); - - nvidia_x11_legacy340 = nvidiaPackages.legacy_340; - nvidia_x11_legacy390 = nvidiaPackages.legacy_390; - nvidia_x11_beta = nvidiaPackages.beta; - nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; - nvidia_x11 = nvidiaPackages.stable; - - openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; - - ply = callPackage ../os-specific/linux/ply { }; - - r8125 = callPackage ../os-specific/linux/r8125 { }; - - r8168 = callPackage ../os-specific/linux/r8168 { }; - - rtl8188eus-aircrack = callPackage ../os-specific/linux/rtl8188eus-aircrack { }; - - rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; - - rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; - - rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; - - rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; - - rtl88xxau-aircrack = callPackage ../os-specific/linux/rtl88xxau-aircrack { }; - - rtl8821au = callPackage ../os-specific/linux/rtl8821au { }; - - rtl8821ce = callPackage ../os-specific/linux/rtl8821ce { }; - - rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { }; - - rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; - - rtw88 = callPackage ../os-specific/linux/rtw88 { }; - rtlwifi_new = rtw88; - - rtw89 = callPackage ../os-specific/linux/rtw89 { }; - - openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; - openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; - # Current stable release; don't backport release updates! - openafs = openafs_1_8; - - facetimehd = callPackage ../os-specific/linux/facetimehd { }; - - tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; - - jool = callPackage ../os-specific/linux/jool { }; - - kvmfr = callPackage ../os-specific/linux/kvmfr { }; - - mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; - - mwprocapture = callPackage ../os-specific/linux/mwprocapture { }; - - mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { }; - - # compiles but has to be integrated into the kernel somehow - # Let's have it uncommented and finish it.. - ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; - - 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 = if lib.versionAtLeast kernel.version "3.12" then callPackage ../os-specific/linux/kernel/perf.nix { } else null; - - phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; - - # Disable for kernels 4.15 and above due to compatibility issues - prl-tools = if lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; - - sch_cake = callPackage ../os-specific/linux/sch_cake { }; - - isgx = callPackage ../os-specific/linux/isgx { }; - - sysdig = callPackage ../os-specific/linux/sysdig {}; - - systemtap = callPackage ../development/tools/profiling/systemtap { }; - - system76 = callPackage ../os-specific/linux/system76 { }; - - system76-acpi = callPackage ../os-specific/linux/system76-acpi { }; - - system76-power = callPackage ../os-specific/linux/system76-power { }; - - system76-io = callPackage ../os-specific/linux/system76-io { }; - - tmon = callPackage ../os-specific/linux/tmon { }; - - tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; - - turbostat = callPackage ../os-specific/linux/turbostat { }; - - usbip = callPackage ../os-specific/linux/usbip { }; - - v86d = callPackage ../os-specific/linux/v86d { }; - - veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; - - vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; - - vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; - - virtualbox = callPackage ../os-specific/linux/virtualbox { - virtualbox = pkgs.virtualboxHardened; - }; - - virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { - virtualbox = pkgs.virtualboxHardened; - }; - - wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; - - x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; - - xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; - - xpadneo = callPackage ../os-specific/linux/xpadneo { }; - - zenpower = callPackage ../os-specific/linux/zenpower { }; - - inherit (callPackages ../os-specific/linux/zfs { - configFile = "kernel"; - inherit kernel; - }) zfsStable zfsUnstable; - zfs = zfsStable; - - can-isotp = callPackage ../os-specific/linux/can-isotp { }; - } // lib.optionalAttrs (config.allowAliases or false) { - # aliases or removed packages - ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18 - }); - - # The current default kernel / kernel modules. - linuxPackages = linuxPackages_5_10; - linux = linuxPackages.kernel; - - # Update this when adding the newest kernel major version! - # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_14; - linux_latest = linuxPackages_latest.kernel; - - # Realtime kernel packages. - linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; - linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10; - linuxPackages-rt_5_11 = linuxPackagesFor pkgs.linux-rt_5_11; - linuxPackages-rt = linuxPackages-rt_5_4; - linuxPackages-rt_latest = linuxPackages-rt_5_11; - linux-rt = linuxPackages-rt.kernel; - linux-rt_latest = linuxPackages-rt_latest.kernel; - - linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; - linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1; - linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2; - linuxPackages_rpi3 = linuxPackagesFor pkgs.linux_rpi3; - linuxPackages_rpi4 = linuxPackagesFor pkgs.linux_rpi4; - # Build kernel modules for some of the kernels. - linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); - linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); - linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); - linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); - linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); - linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); - linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14); - - # When adding to the list above: - # - Update linuxPackages_latest to the latest version - # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. - - # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. - linuxPackages_testing = linuxPackagesFor pkgs.linux_testing; - - linuxPackages_custom = { version, src, configfile, allowImportFromDerivation ? true }: - recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { - inherit version src configfile lib stdenv allowImportFromDerivation; - })); + linuxPackages_custom = linuxKernel.customPackage; # This serves as a test for linuxPackages_custom linuxPackages_custom_tinyconfig_kernel = let base = pkgs.linuxPackages.kernel; - tinyLinuxPackages = pkgs.linuxPackages_custom { + tinyLinuxPackages = linuxKernel.customPackage { inherit (base) version src; allowImportFromDerivation = false; configfile = pkgs.linuxConfig { @@ -21819,92 +21555,64 @@ with pkgs; }; in tinyLinuxPackages.kernel; - # Build a kernel with bcachefs module - linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); - - # Hardened Linux - hardenedLinuxPackagesFor = kernel: overrides: - linuxPackagesFor (kernel.override { - structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit lib; - inherit (kernel) version; - }; - kernelPatches = kernel.kernelPatches ++ [ - kernelPatches.hardened.${kernel.meta.branch} - ]; - modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; - isHardened = true; - }); + # The current default kernel / kernel modules. + linuxPackages = linuxKernel.packageAliases.linux_default; + linux = linuxPackages.kernel; - linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { }); - linux_hardened = linuxPackages_hardened.kernel; + linuxPackages_latest = linuxKernel.packageAliases.linux_latest; + linux_latest = linuxPackages_latest.kernel; - linuxPackages_4_14_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_4_14 { }); - linux_4_14_hardened = linuxPackages_4_14_hardened.kernel; + # Testing (rc) kernel + linuxPackages_testing = linuxKernel.packages.linux_testing; + linux_testing = linuxKernel.kernels.linux_testing; - linuxPackages_4_19_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_4_19 { }); - linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; + linuxPackages_testing_bcachefs = linuxKernel.packages.linux_testing_bcachefs; + linux_testing_bcachefs = linuxKernel.kernels.linux_testing_bcachefs; - linuxPackages_5_4_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_4 { }); - linux_5_4_hardened = linuxPackages_5_4_hardened.kernel; + # kernel with mtcp support + linuxPackages_mptcp = linuxKernel.packageAliases.linux_mptcp; + linux_mptcp = linuxPackages_mptcp.kernel; - linuxPackages_5_10_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_10 { }); - linux_5_10_hardened = linuxPackages_5_10_hardened.kernel; + # Realtime kernel + linuxPackages-rt = linuxKernel.packageAliases.linux_rt_default; + linuxPackages-rt_latest = linuxKernel.packageAliases.linux_rt_latest; + linux-rt = linuxPackages-rt.kernel; + linux-rt_latest = linuxPackages-rt_latest.kernel; - linuxPackages_5_13_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_13 { }); - linux_5_13_hardened = linuxPackages_5_13_hardened.kernel; + # hardened kernels + linuxPackages_hardened = linuxKernel.packages.linux_hardened; + linux_hardened = linuxPackages_hardened.kernel; + linuxPackages_4_14_hardened = linuxKernel.packages.linux_4_14_hardened; + linux_4_14_hardened = linuxPackages_4_14_hardened.kernel; + linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened; + linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; + linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; + linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; + linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; + linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; + linuxPackages_5_13_hardened = linuxKernel.packages.linux_5_13_hardened; + linux_5_13_hardened = linuxKernel.kernels.linux_5_13_hardened; + linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened; + linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened; # Hardkernel (Odroid) kernels. - linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); - linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; + linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; linux_hardkernel_latest = linuxPackages_hardkernel_latest.kernel; # GNU Linux-libre kernels - linuxPackages-libre = recurseIntoAttrs (linuxPackagesFor linux-libre); - linux-libre = callPackage ../os-specific/linux/kernel/linux-libre.nix {}; - linuxPackages_latest-libre = recurseIntoAttrs (linuxPackagesFor linux_latest-libre); - linux_latest-libre = linux-libre.override { linux = linux_latest; }; + linuxPackages-libre = linuxKernel.packages.linux_libre; + linux-libre = linuxPackages-libre.kernel; + linuxPackages_latest-libre = linuxKernel.packages.linux_latest_libre; + linux_latest-libre = linuxPackages_latest-libre.kernel; # zen-kernel - linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); - linuxPackages_lqx = recurseIntoAttrs (linuxPackagesFor pkgs.linux_lqx); + linuxPackages_zen = linuxKernel.packages.linux_zen; + linuxPackages_lqx = linuxKernel.packages.linux_lqx; # XanMod kernel - linuxPackages_xanmod = recurseIntoAttrs (linuxPackagesFor pkgs.linux_xanmod); - - # A function to build a manually-configured kernel - linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); - - # Derive one of the default .config files - linuxConfig = { - src, - version ? (builtins.parseDrvName src.name).version, - makeTarget ? "defconfig", - name ? "kernel.config", - }: stdenvNoCC.mkDerivation { - inherit name src; - depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; - postPatch = '' - patchShebangs scripts/ - ''; - buildPhase = '' - ( - set -x - make \ - ARCH=${stdenv.hostPlatform.linuxArch} \ - HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \ - ${makeTarget} - ) - ''; - installPhase = '' - cp .config $out - ''; - }; + linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; - buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; - - cryptodev = linuxPackages_4_9.cryptodev; + cryptodev = linuxKernel.packages.linux_4_9.cryptodev; dpdk = callPackage ../os-specific/linux/dpdk { kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod @@ -22246,6 +21954,8 @@ with pkgs; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; + qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { }; + radeontools = callPackage ../os-specific/linux/radeontools { }; radeontop = callPackage ../os-specific/linux/radeontop { }; @@ -22263,6 +21973,8 @@ with pkgs; riscv-pk = callPackage ../misc/riscv-pk { }; + ristate = callPackage ../tools/misc/ristate { }; + roccat-tools = callPackage ../os-specific/linux/roccat-tools { }; rtsp-simple-server = callPackage ../servers/rtsp-simple-server { }; @@ -22366,9 +22078,11 @@ with pkgs; withCryptsetup = false; withDocumentation = false; withEfi = false; + withFido2 = false; withHostnamed = false; withHwdb = false; withImportd = false; + withLibBPF = false; withLocaled = false; withLogind = false; withMachined = false; @@ -22382,6 +22096,7 @@ with pkgs; withShellCompletions = false; withTimedated = false; withTimesyncd = false; + withTpm2Tss = false; withUserDb = false; glib = null; libgcrypt = null; @@ -22651,6 +22366,8 @@ with pkgs; cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; + chonburi-font = callPackage ../data/fonts/chonburi { }; + cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { }; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; @@ -23113,6 +22830,10 @@ with pkgs; open-sans = callPackage ../data/fonts/open-sans { }; + openmoji-color = callPackage ../data/fonts/openmoji { variant = "color"; }; + + openmoji-black = callPackage ../data/fonts/openmoji { variant = "black"; }; + openzone-cursors = callPackage ../data/themes/openzone { }; oranchelo-icon-theme = callPackage ../data/icons/oranchelo-icon-theme { }; @@ -23216,6 +22937,8 @@ with pkgs; seshat = callPackage ../data/fonts/seshat { }; + session-desktop-appimage = callPackage ../applications/networking/instant-messengers/session-desktop-appimage { }; + shaderc = callPackage ../development/compilers/shaderc { }; shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; @@ -23963,6 +23686,8 @@ with pkgs; cipher = callPackage ../applications/misc/cipher { }; + clapper = callPackage ../applications/video/clapper { }; + claws-mail-gtk2 = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; useGtk3 = false; @@ -24132,7 +23857,7 @@ with pkgs; }; datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { }; datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { - python = python27; + python = python3; extraIntegrations = extras; }; @@ -24464,6 +24189,8 @@ with pkgs; keepass-otpkeyprov = callPackage ../applications/misc/keepass-plugins/otpkeyprov { }; + kerbrute = callPackage ../tools/security/kerbrute { }; + exrdisplay = callPackage ../applications/graphics/exrdisplay { }; exrtools = callPackage ../applications/graphics/exrtools { }; @@ -24776,7 +24503,9 @@ with pkgs; fbida = callPackage ../applications/graphics/fbida { }; - fclones = callPackage ../tools/misc/fclones { }; + fclones = callPackage ../tools/misc/fclones { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; fcp = callPackage ../tools/misc/fcp { }; @@ -24813,6 +24542,7 @@ with pkgs; firefox-beta-unwrapped = firefoxPackages.firefox-beta; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + inherit (gnome) adwaita-icon-theme; channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; }; @@ -24824,6 +24554,7 @@ with pkgs; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { + inherit (gnome) adwaita-icon-theme; channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; }; @@ -24835,6 +24566,7 @@ with pkgs; }; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + inherit (gnome) adwaita-icon-theme; channel = "devedition"; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; }; @@ -25018,7 +24750,7 @@ with pkgs; gitolite = callPackage ../applications/version-management/gitolite { }; gitoxide = callPackage ../applications/version-management/gitoxide { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; inherit (gnome) gitg; @@ -25029,6 +24761,8 @@ with pkgs; goffice = callPackage ../development/libraries/goffice { }; + gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; + hydrus = python3Packages.callPackage ../applications/graphics/hydrus { inherit miniupnpc_2 swftools; inherit (qt5) wrapQtAppsHook; @@ -25291,6 +25025,10 @@ with pkgs; gtk = gtk3; }; + hors = callPackage ../development/tools/hors { + inherit (darwin.apple_sdk.frameworks) Security; + }; + hover = callPackage ../development/tools/hover { }; hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; @@ -25744,6 +25482,8 @@ with pkgs; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; + kappanhang = callPackage ../applications/radio/kappanhang { }; + okteta = libsForQt5.callPackage ../applications/editors/okteta { }; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; @@ -25899,11 +25639,7 @@ with pkgs; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; - kupfer = callPackage ../applications/misc/kupfer { - # using python36 as there appears to be a waf issue with python37 - # see https://github.com/NixOS/nixpkgs/issues/60498 - python3Packages = python36Packages; - }; + kupfer = callPackage ../applications/misc/kupfer { }; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; @@ -26602,6 +26338,8 @@ with pkgs; piper = callPackage ../os-specific/linux/piper { }; + pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer {}; + plank = callPackage ../applications/misc/plank { }; playonlinux = callPackage ../applications/misc/playonlinux @@ -26636,6 +26374,8 @@ with pkgs; prevo-data = callPackage ../applications/misc/prevo/data.nix { }; prevo-tools = callPackage ../applications/misc/prevo/tools.nix { }; + psi-notify = callPackage ../applications/misc/psi-notify { }; + ptex = callPackage ../development/libraries/ptex {}; pyright = nodePackages.pyright; @@ -27480,7 +27220,7 @@ with pkgs; rsclock = callPackage ../applications/misc/rsclock { }; - rstudio = libsForQt514.callPackage ../applications/editors/rstudio { + rstudio = libsForQt5.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -27567,6 +27307,8 @@ with pkgs; shutter = callPackage ../applications/graphics/shutter { }; + sic-image-cli = callPackage ../tools/graphics/sic-image-cli { }; + simple-scan = gnome.simple-scan; siproxd = callPackage ../applications/networking/siproxd { }; @@ -27715,6 +27457,8 @@ with pkgs; super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; + super-slicer-staging = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).staging; + robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; @@ -29600,6 +29344,11 @@ with pkgs; fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; + fishfight = callPackage ../games/fishfight { + inherit (xorg) libX11 libXi; + inherit (darwin.apple_sdk.frameworks) AudioToolbox Cocoa CoreAudio CoreFoundation IOKit OpenGL; + }; + flightgear = libsForQt5.callPackage ../games/flightgear { }; flock = callPackage ../development/tools/flock { }; @@ -30134,6 +29883,8 @@ with pkgs; steamcmd = steamPackages.steamcmd; + steam-acf = callPackage ../tools/games/steam-acf { }; + protontricks = python3Packages.callPackage ../tools/package-management/protontricks { winetricks = winetricks.override { # Remove default build of wine to reduce closure size. @@ -30842,6 +30593,8 @@ with pkgs; nota = haskellPackages.callPackage ../applications/science/math/nota { }; + notus-scanner = with python3Packages; toPythonApplication notus-scanner; + openblas = callPackage ../development/libraries/science/math/openblas { }; # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with @@ -32092,9 +31845,10 @@ with pkgs; nix-info = callPackage ../tools/nix/info { }; nix-info-tested = nix-info.override { doCheck = true; }; - nix-index = callPackage ../tools/package-management/nix-index { + nix-index-unwrapped = callPackage ../tools/package-management/nix-index { inherit (darwin.apple_sdk.frameworks) Security; }; + nix-index = callPackage ../tools/package-management/nix-index/wrapper.nix { }; nix-linter = haskell.lib.justStaticExecutables (haskellPackages.nix-linter); @@ -32469,6 +32223,8 @@ with pkgs; sumneko-lua-language-server = callPackage ../development/tools/sumneko-lua-language-server { }; + sysz = callPackage ../tools/misc/sysz { }; + go-swag = callPackage ../development/tools/go-swag { }; go-swagger = callPackage ../development/tools/go-swagger { }; |