From 89ea599a5478f0d4a7c025ae6c4ab2ce3666e6ae Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Tue, 18 Jun 2024 03:01:31 +0800 Subject: [PATCH 001/229] ejabberd: 23.10 -> 24.02 --- pkgs/servers/xmpp/ejabberd/default.nix | 146 ++++++++------- pkgs/servers/xmpp/ejabberd/rebar-deps.nix | 208 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 291 insertions(+), 65 deletions(-) create mode 100644 pkgs/servers/xmpp/ejabberd/rebar-deps.nix diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 37830973fbe9..84d1b7de9885 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,7 +1,12 @@ -{ stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp +{ stdenv, makeWrapper, lib, fetchurl, libpng, libjpeg, libwebp , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd -, flock, autoreconfHook +, autoreconfHook , gawk +, rebar3WithPlugins +, fetchFromGitHub +, fetchgit +, fetchHex +, beamPackages , nixosTests , withMysql ? false , withPgsql ? false @@ -15,13 +20,76 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep gawk coreutils util-linux procps ]; + + provider_asn1 = beamPackages.buildRebar3 { + name = "provider_asn1"; + version = "0.3.0"; + src = fetchHex { + pkg = "provider_asn1"; + version = "0.3.0"; + sha256 = "sha256-MuelWYZi01rBut8jM6a5alMZizPGZoBE/LveSRu/+wU="; + }; + beamDeps = [ ]; + }; + rebar3_hex = beamPackages.buildRebar3 { + name = "rebar3_hex"; + version = "7.0.7"; + src = fetchHex { + pkg = "rebar3_hex"; + version = "7.0.7"; + sha256 = "sha256-1S2igSwiInATUgULZ1E6e2dK6YI5gvRffHRfF1Gg5Ok="; + }; + beamDeps = [ ]; + }; + + beamDeps = import ./rebar-deps.nix { # TODO(@chuangzhu) add updateScript + inherit fetchHex fetchgit fetchFromGitHub; + builder = lib.makeOverridable beamPackages.buildRebar3; + + overrides = final: prev: { + jiffy = prev.jiffy.override { buildPlugins = [ beamPackages.pc ]; }; + cache_tab = prev.cache_tab.override { buildPlugins = [ beamPackages.pc ]; }; + mqtree = prev.mqtree.override { buildPlugins = [ beamPackages.pc ]; }; + stringprep = prev.stringprep.override { buildPlugins = [ beamPackages.pc ]; }; + p1_acme = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; }; + eimp = prev.eimp.override { + buildInputs = [ gd libwebp libpng libjpeg ]; + buildPlugins = [ beamPackages.pc ]; + }; + ezlib = prev.ezlib.override { + buildInputs = [ zlib ]; + buildPlugins = [ beamPackages.pc ]; + }; + fast_tls = prev.fast_tls.override { + buildInputs = [ openssl ]; + buildPlugins = [ beamPackages.pc ]; + }; + fast_xml = prev.fast_xml.override { + buildInputs = [ expat ]; + buildPlugins = [ beamPackages.pc ]; + }; + fast_yaml = prev.fast_yaml.override { + buildInputs = [ libyaml ]; + buildPlugins = [ beamPackages.pc ]; + }; + xmpp = prev.xmpp.override { + buildPlugins = [ beamPackages.pc provider_asn1 ]; + }; + }; + }; + in stdenv.mkDerivation rec { pname = "ejabberd"; - version = "23.10"; + version = "24.02"; - nativeBuildInputs = [ makeWrapper autoreconfHook ]; + nativeBuildInputs = [ + makeWrapper + autoreconfHook + (rebar3WithPlugins { plugins = [ provider_asn1 rebar3_hex ]; }) + ]; - buildInputs = [ erlang openssl expat libyaml gd ] + buildInputs = [ erlang ] + ++ builtins.attrValues beamDeps ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib @@ -29,63 +97,14 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/ejabberd-${version}.tar.gz"; - hash = "sha256-DW5/DYLZHNqJ4lddmag1B0E9ov/eObIVGASUeioPolg="; - # remember to update the deps FOD hash & its pinned ejabberd-po commit + hash = "sha256-ttSNO/K+82jpMh41Q2OByG14REuQQmScbEqrAIk5XAc="; + # remember to update rebar-deps.nix }; passthru.tests = { inherit (nixosTests) ejabberd; }; - deps = stdenv.mkDerivation { - pname = "ejabberd-deps"; - - inherit src version; - - # pin ejabberd-po dep - # update: curl -L api.github.com/repos/processone/ejabberd-po/branches/main | jq .commit.sha -r - postPatch = '' - substituteInPlace rebar.config \ - --replace \ - '{git, "https://github.com/processone/ejabberd-po", {branch, "main"}}' \ - '{git, "https://github.com/processone/ejabberd-po", {tag, "26d6463386588d39f07027dabff3cb8dd938bf6b"}}' - ''; - - configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ]; - - nativeBuildInputs = [ - git erlang openssl expat libyaml sqlite pam zlib autoreconfHook - ]; - - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - makeFlags = [ "deps" ]; - - installPhase = '' - for i in deps/*; do - ( cd $i - git reset --hard - git clean -ffdx - git describe --always --tags > .rev - rm -rf .git .github - ) - done - # not a typo; comes from `make deps` - rm deps/.got - - cp -r deps $out - ''; - - dontPatchELF = true; - dontStrip = true; - # avoid /nix/store references in the source - dontPatchShebangs = true; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-HrLu3wTF+cUxpGX0yK3nbB57SRM2ND3Crlxs5/8FIwI="; - }; - configureFlags = [ (lib.enableFeature withMysql "mysql") (lib.enableFeature withPgsql "pgsql") @@ -99,21 +118,20 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; postPatch = '' - cp -r $deps deps - chmod -R +w deps patchShebangs . + mkdir -p _build/default/lib + touch _build/default/lib/.got + touch _build/default/lib/.built ''; + REBAR_IGNORE_DEPS = 1; + postInstall = '' sed -i \ -e '2iexport PATH=${ctlpath}:$PATH' \ - -e 's,\(^ *FLOCK=\).*,\1${flock}/bin/flock,' \ - -e 's,\(^ *JOT=\).*,\1,' \ - -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ + -e "s,\(^ *ERL_LIBS=.*\),\1:$ERL_LIBS," \ $out/sbin/ejabberdctl - wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" ${lib.optionalString withImagemagick ''wrapProgram $out/lib/ejabberd-*/priv/bin/captcha.sh --prefix PATH : "${lib.makeBinPath [ imagemagick ]}"''} - rm $out/bin/{mix,iex,elixir} ''; meta = with lib; { @@ -122,6 +140,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = "https://www.ejabberd.im"; platforms = platforms.linux; - maintainers = with maintainers; [ sander abbradar ]; + maintainers = with maintainers; [ sander abbradar chuangzhu ]; }; } diff --git a/pkgs/servers/xmpp/ejabberd/rebar-deps.nix b/pkgs/servers/xmpp/ejabberd/rebar-deps.nix new file mode 100644 index 000000000000..f87561d7ecb1 --- /dev/null +++ b/pkgs/servers/xmpp/ejabberd/rebar-deps.nix @@ -0,0 +1,208 @@ +# Generated by rebar3_nix +let fetchOnly = { src, ... }: src; +in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }: +let + self = packages // (overrides self packages); + packages = with self; { + unicode_util_compat = builder { + name = "unicode_util_compat"; + version = "0.4.1"; + src = fetchHex { + pkg = "unicode_util_compat"; + version = "0.4.1"; + sha256 = "sha256-HRhIxASHzbCzDo7ZdeNOAlhgwC5BnLYV0lWEnzQnQ50="; + }; + beamDeps = [ ]; + }; + ezlib = builder { + name = "ezlib"; + version = "1.0.12"; + src = fetchHex { + pkg = "ezlib"; + version = "1.0.12"; + sha256 = "sha256-MOlDVftCJgqrbhJYLLDFa/IzUV5lXIrq9Idg51YeTrs="; + }; + beamDeps = [ p1_utils ]; + }; + yconf = builder { + name = "yconf"; + version = "1.0.15"; + src = fetchHex { + pkg = "yconf"; + version = "1.0.15"; + sha256 = "sha256-f/KrJNPJgzhCcWuaqqAaj5ZkGnaVy7cBsDRFxN7wERc="; + }; + beamDeps = [ fast_yaml ]; + }; + xmpp = builder { + name = "xmpp"; + version = "1.8.1"; + src = fetchHex { + pkg = "xmpp"; + version = "1.8.1"; + sha256 = "sha256-MtSjCKZhPk5BVfpOguzNyIMwltD6jZnI1CjIAGEeWdM="; + }; + beamDeps = [ ezlib fast_tls fast_xml idna p1_utils stringprep ]; + }; + stun = builder { + name = "stun"; + version = "1.2.12"; + src = fetchHex { + pkg = "stun"; + version = "1.2.12"; + sha256 = "sha256-ogVQMrbTONBFQUIAS8sS+vsMZKsfJz8dDGkj67yO3kA="; + }; + beamDeps = [ fast_tls p1_utils ]; + }; + stringprep = builder { + name = "stringprep"; + version = "1.0.29"; + src = fetchHex { + pkg = "stringprep"; + version = "1.0.29"; + sha256 = "sha256-ko66MEwwBusVEhEOvXuH2xY7AIWaCTdaHkRmFSxsRio="; + }; + beamDeps = [ p1_utils ]; + }; + pkix = builder { + name = "pkix"; + version = "1.0.9"; + src = fetchHex { + pkg = "pkix"; + version = "1.0.9"; + sha256 = "sha256-2qssCc3U7aBcm0WlwA6ZShpfJ2NJKeE3fi5ZtwcQPjo="; + }; + beamDeps = [ ]; + }; + p1_utils = builder { + name = "p1_utils"; + version = "1.0.25"; + src = fetchHex { + pkg = "p1_utils"; + version = "1.0.25"; + sha256 = "sha256-khkhRCjyxuXTGH/465qHg2lcJCdCC+miWYQOB62jKEc="; + }; + beamDeps = [ ]; + }; + p1_oauth2 = builder { + name = "p1_oauth2"; + version = "0.6.14"; + src = fetchHex { + pkg = "p1_oauth2"; + version = "0.6.14"; + sha256 = "sha256-H9OsR05Dci2dWofG34029pjth697uBy7tmNhRR2Zro8="; + }; + beamDeps = [ ]; + }; + p1_acme = builder { + name = "p1_acme"; + version = "1.0.22"; + src = fetchHex { + pkg = "p1_acme"; + version = "1.0.22"; + sha256 = "sha256-wrJaeylaQ12sTyeKc9hBf/KwAgxF4Wg1BOhpLvA+IFc="; + }; + beamDeps = [ base64url idna jiffy jose yconf ]; + }; + mqtree = builder { + name = "mqtree"; + version = "1.0.16"; + src = fetchHex { + pkg = "mqtree"; + version = "1.0.16"; + sha256 = "sha256-yH0clVddtlrym3lcnao77UP1wb+EByp0RpZZvPU1lOs="; + }; + beamDeps = [ p1_utils ]; + }; + jose = builder { + name = "jose"; + version = "1.11.5"; + src = fetchHex { + pkg = "jose"; + version = "1.11.5"; + sha256 = "sha256-3NOyFbr+Aup8WyPa/T64Bipc2PLZBP2cqjI9NwNKs4Q="; + }; + beamDeps = [ ]; + }; + jiffy = builder { + name = "jiffy"; + version = "1.1.1"; + src = fetchHex { + pkg = "jiffy"; + version = "1.1.1"; + sha256 = "sha256-YuHwWBw8GcM6clx4HfqIQQ2L/xu6/DiFolUihrR4XEw="; + }; + beamDeps = [ ]; + }; + idna = builder { + name = "idna"; + version = "6.0.0"; + src = fetchHex { + pkg = "idna"; + version = "6.0.0"; + sha256 = "sha256-S90wXrZOGLAnOGSSBpXLGNeiAh8xoRucX7zZolP5NuI="; + }; + beamDeps = [ unicode_util_compat ]; + }; + fast_yaml = builder { + name = "fast_yaml"; + version = "1.0.36"; + src = fetchHex { + pkg = "fast_yaml"; + version = "1.0.36"; + sha256 = "sha256-Gr6PdY/CqGsI7f+Au8aHz9QevBQSz+wO9KCs/NAyBS8="; + }; + beamDeps = [ p1_utils ]; + }; + fast_xml = builder { + name = "fast_xml"; + version = "1.1.51"; + src = fetchHex { + pkg = "fast_xml"; + version = "1.1.51"; + sha256 = "sha256-f85Bt9GkukOKLXoIjavnSjygc58a8qvLd+Ytr0PgQJo="; + }; + beamDeps = [ p1_utils ]; + }; + fast_tls = builder { + name = "fast_tls"; + version = "1.1.19"; + src = fetchHex { + pkg = "fast_tls"; + version = "1.1.19"; + sha256 = "sha256-2zQyLIeC1MUTnMuAcJ2OyMOAibRCYu3QwvZgrElb04k="; + }; + beamDeps = [ p1_utils ]; + }; + eimp = builder { + name = "eimp"; + version = "1.0.22"; + src = fetchHex { + pkg = "eimp"; + version = "1.0.22"; + sha256 = "sha256-s7n/sdml9KK6iKxBioGRZJMtmp06L8PTLKM4zoVcQ5I="; + }; + beamDeps = [ p1_utils ]; + }; + cache_tab = builder { + name = "cache_tab"; + version = "1.0.30"; + src = fetchHex { + pkg = "cache_tab"; + version = "1.0.30"; + sha256 = "sha256-bYpeANj4TEJidwam2+2wLjTVhJXz7WGTXIR1ygUxzaA="; + }; + beamDeps = [ p1_utils ]; + }; + base64url = builder { + name = "base64url"; + version = "1.0.1"; + src = fetchHex { + pkg = "base64url"; + version = "1.0.1"; + sha256 = "sha256-+bOt1HMaAqmwQQOYtHWzPnVmppU2Ujemve4btEdxn1w="; + }; + beamDeps = [ ]; + }; + }; +in self diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bcad71a6425..808a3a204ed1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25330,7 +25330,7 @@ with pkgs; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; etcd_3_5 = callPackage ../servers/etcd/3.5 { }; - ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlang_24; }; + ejabberd = callPackage ../servers/xmpp/ejabberd { }; exhaustive = callPackage ../development/tools/exhaustive { }; From 6f5510289ed010967cb9e684ed09fd6cdf841f8c Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Tue, 18 Jun 2024 05:17:07 +0800 Subject: [PATCH 002/229] nixos/tests/ejabberd: fix tests It seems that SASL SCRAM in ejabberd now requires TLS to work, even if disable_sasl_scram_downgrade_protection is true. The certificate generation code is copied from nixos/tests/prosody. --- nixos/tests/xmpp/ejabberd.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix index 1a807b27b6f6..a31a1b8eeab8 100644 --- a/nixos/tests/xmpp/ejabberd.nix +++ b/nixos/tests/xmpp/ejabberd.nix @@ -1,3 +1,10 @@ +let + cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com' -days 36500 + mkdir -p $out + cp key.pem cert.pem $out + ''; +in import ../make-test-python.nix ({ pkgs, ... }: { name = "ejabberd"; meta = with pkgs.lib.maintainers; { @@ -5,6 +12,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { }; nodes = { client = { nodes, pkgs, ... }: { + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; networking.extraHosts = '' ${nodes.server.config.networking.primaryIPAddress} example.com ''; @@ -14,6 +22,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { ]; }; server = { config, pkgs, ... }: { + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; networking.extraHosts = '' ${config.networking.primaryIPAddress} example.com ''; @@ -23,6 +32,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { configFile = "/etc/ejabberd.yml"; }; + systemd.services.ejabberd.serviceConfig.TimeoutStartSec = "15min"; environment.etc."ejabberd.yml" = { user = "ejabberd"; mode = "0600"; @@ -40,6 +50,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { max_stanza_size: 65536 shaper: c2s_shaper access: c2s + starttls: true - port: 5269 ip: "::" @@ -56,6 +67,10 @@ import ../make-test-python.nix ({ pkgs, ... }: { request_handlers: "/upload": mod_http_upload + certfiles: + - ${cert pkgs}/key.pem + - ${cert pkgs}/cert.pem + ## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text ## password storage (see auth_password_format option). disable_sasl_mechanisms: "digest-md5" From 90484c7f6813e1d98eac231647fa3d31059005a0 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Tue, 18 Jun 2024 07:57:24 +0800 Subject: [PATCH 003/229] ejabberd: handle optional deps --- pkgs/servers/xmpp/ejabberd/default.nix | 38 ++++++++-- pkgs/servers/xmpp/ejabberd/rebar-deps.nix | 90 ++++++++++++++++++++--- 2 files changed, 110 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 84d1b7de9885..d5956bc5eae6 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -13,6 +13,8 @@ , withSqlite ? false, sqlite , withPam ? false, pam , withZlib ? true, zlib +, withSip ? false +, withLua ? false , withTools ? false , withRedis ? false , withImagemagick ? false, imagemagick @@ -42,7 +44,7 @@ let beamDeps = [ ]; }; - beamDeps = import ./rebar-deps.nix { # TODO(@chuangzhu) add updateScript + allBeamDeps = import ./rebar-deps.nix { # TODO(@chuangzhu) add updateScript inherit fetchHex fetchgit fetchFromGitHub; builder = lib.makeOverridable beamPackages.buildRebar3; @@ -56,10 +58,6 @@ let buildInputs = [ gd libwebp libpng libjpeg ]; buildPlugins = [ beamPackages.pc ]; }; - ezlib = prev.ezlib.override { - buildInputs = [ zlib ]; - buildPlugins = [ beamPackages.pc ]; - }; fast_tls = prev.fast_tls.override { buildInputs = [ openssl ]; buildPlugins = [ beamPackages.pc ]; @@ -75,9 +73,26 @@ let xmpp = prev.xmpp.override { buildPlugins = [ beamPackages.pc provider_asn1 ]; }; + # Optional deps + sqlite3 = prev.sqlite3.override { + buildInputs = [ sqlite ]; + buildPlugins = [ beamPackages.pc ]; + }; + p1_mysql = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; }; + epam = prev.epam.override { + buildInputs = [ pam ]; + buildPlugins = [ beamPackages.pc ]; + }; + esip = prev.esip.override { buildPlugins = [ beamPackages.pc ]; }; + ezlib = prev.ezlib.override { + buildInputs = [ zlib ]; + buildPlugins = [ beamPackages.pc ]; + }; }; }; + beamDeps = builtins.removeAttrs allBeamDeps [ "sqlite3" "p1_pgsql" "p1_mysql" "luerl" "esip" "eredis" "epam" "ezlib" ]; + in stdenv.mkDerivation rec { pname = "ejabberd"; version = "24.02"; @@ -90,9 +105,14 @@ in stdenv.mkDerivation rec { buildInputs = [ erlang ] ++ builtins.attrValues beamDeps - ++ lib.optional withSqlite sqlite - ++ lib.optional withPam pam - ++ lib.optional withZlib zlib + ++ lib.optional withMysql allBeamDeps.p1_mysql + ++ lib.optional withPgsql allBeamDeps.p1_pgsql + ++ lib.optional withSqlite allBeamDeps.sqlite3 + ++ lib.optional withPam allBeamDeps.epam + ++ lib.optional withZlib allBeamDeps.ezlib + ++ lib.optional withSip allBeamDeps.esip + ++ lib.optional withLua allBeamDeps.luerl + ++ lib.optional withRedis allBeamDeps.eredis ; src = fetchurl { @@ -111,6 +131,8 @@ in stdenv.mkDerivation rec { (lib.enableFeature withSqlite "sqlite") (lib.enableFeature withPam "pam") (lib.enableFeature withZlib "zlib") + (lib.enableFeature withSip "sip") + (lib.enableFeature withLua "lua") (lib.enableFeature withTools "tools") (lib.enableFeature withRedis "redis") ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}"; diff --git a/pkgs/servers/xmpp/ejabberd/rebar-deps.nix b/pkgs/servers/xmpp/ejabberd/rebar-deps.nix index f87561d7ecb1..d82087dc9577 100644 --- a/pkgs/servers/xmpp/ejabberd/rebar-deps.nix +++ b/pkgs/servers/xmpp/ejabberd/rebar-deps.nix @@ -14,16 +14,6 @@ let }; beamDeps = [ ]; }; - ezlib = builder { - name = "ezlib"; - version = "1.0.12"; - src = fetchHex { - pkg = "ezlib"; - version = "1.0.12"; - sha256 = "sha256-MOlDVftCJgqrbhJYLLDFa/IzUV5lXIrq9Idg51YeTrs="; - }; - beamDeps = [ p1_utils ]; - }; yconf = builder { name = "yconf"; version = "1.0.15"; @@ -64,6 +54,16 @@ let }; beamDeps = [ p1_utils ]; }; + sqlite3 = builder { + name = "sqlite3"; + version = "1.1.14"; + src = fetchHex { + pkg = "sqlite3"; + version = "1.1.14"; + sha256 = "sha256-hQVLbKKXNDwVntZ5Skc/8sjuq9hUtv4C9xHAv9NzzoY="; + }; + beamDeps = [ ]; + }; pkix = builder { name = "pkix"; version = "1.0.9"; @@ -84,6 +84,16 @@ let }; beamDeps = [ ]; }; + p1_pgsql = builder { + name = "p1_pgsql"; + version = "1.1.25"; + src = fetchHex { + pkg = "p1_pgsql"; + version = "1.1.25"; + sha256 = "sha256-tlTB4H0+d1tia0B+dpbKz9iNF76D5xaLnYnDgy2RPec="; + }; + beamDeps = [ xmpp ]; + }; p1_oauth2 = builder { name = "p1_oauth2"; version = "0.6.14"; @@ -94,6 +104,16 @@ let }; beamDeps = [ ]; }; + p1_mysql = builder { + name = "p1_mysql"; + version = "1.0.23"; + src = fetchHex { + pkg = "p1_mysql"; + version = "1.0.23"; + sha256 = "sha256-nO+YJl+yhzdOe2S/QCLE317GYZbKMc9L7XPGfEW/gk4="; + }; + beamDeps = [ ]; + }; p1_acme = builder { name = "p1_acme"; version = "1.0.22"; @@ -114,6 +134,16 @@ let }; beamDeps = [ p1_utils ]; }; + luerl = builder { + name = "luerl"; + version = "1.1.1"; + src = fetchHex { + pkg = "luerl"; + version = "1.1.1"; + sha256 = "sha256-4X7yRqf/h27JDmh5KjlwiXlBYATU6s/op2QyBrlHB3M="; + }; + beamDeps = [ ]; + }; jose = builder { name = "jose"; version = "1.11.5"; @@ -174,6 +204,46 @@ let }; beamDeps = [ p1_utils ]; }; + ezlib = builder { + name = "ezlib"; + version = "1.0.12"; + src = fetchHex { + pkg = "ezlib"; + version = "1.0.12"; + sha256 = "sha256-MOlDVftCJgqrbhJYLLDFa/IzUV5lXIrq9Idg51YeTrs="; + }; + beamDeps = [ p1_utils ]; + }; + esip = builder { + name = "esip"; + version = "1.0.52"; + src = fetchHex { + pkg = "esip"; + version = "1.0.52"; + sha256 = "sha256-bwAWU5WQBQCqJizgKXFi2Tkxx4wUZNif0O3G49a8AR8="; + }; + beamDeps = [ fast_tls p1_utils stun ]; + }; + eredis = builder { + name = "eredis"; + version = "1.2.0"; + src = fetchHex { + pkg = "eredis"; + version = "1.2.0"; + sha256 = "sha256-2bWr7ywsirqPMqoBggPgs9yLEVd3OyVKsdTCACMX8eE="; + }; + beamDeps = [ ]; + }; + epam = builder { + name = "epam"; + version = "1.0.14"; + src = fetchHex { + pkg = "epam"; + version = "1.0.14"; + sha256 = "sha256-LzRJ5yiFpypsKoQ/VhrdD8L3DXoh9hRWkwpUdHPU2Yk="; + }; + beamDeps = [ ]; + }; eimp = builder { name = "eimp"; version = "1.0.22"; From 845ef6049853b4d483ef85efed25ae50444e4549 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Fri, 28 Jun 2024 20:29:40 +0800 Subject: [PATCH 004/229] ejabberd: 24.02 -> 24.06 --- pkgs/servers/xmpp/ejabberd/default.nix | 4 +- pkgs/servers/xmpp/ejabberd/rebar-deps.nix | 99 ++++++++++++----------- 2 files changed, 54 insertions(+), 49 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index d5956bc5eae6..c6e1d0bec3fe 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -95,7 +95,7 @@ let in stdenv.mkDerivation rec { pname = "ejabberd"; - version = "24.02"; + version = "24.06"; nativeBuildInputs = [ makeWrapper @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/ejabberd-${version}.tar.gz"; - hash = "sha256-ttSNO/K+82jpMh41Q2OByG14REuQQmScbEqrAIk5XAc="; + hash = "sha256-NO9WNw05vcmjxY13daZaLB1OjFLmqoDneoQ11BTdqB4="; # remember to update rebar-deps.nix }; diff --git a/pkgs/servers/xmpp/ejabberd/rebar-deps.nix b/pkgs/servers/xmpp/ejabberd/rebar-deps.nix index d82087dc9577..116647d563b3 100644 --- a/pkgs/servers/xmpp/ejabberd/rebar-deps.nix +++ b/pkgs/servers/xmpp/ejabberd/rebar-deps.nix @@ -6,11 +6,21 @@ let packages = with self; { unicode_util_compat = builder { name = "unicode_util_compat"; - version = "0.4.1"; + version = "0.7.0"; src = fetchHex { pkg = "unicode_util_compat"; - version = "0.4.1"; - sha256 = "sha256-HRhIxASHzbCzDo7ZdeNOAlhgwC5BnLYV0lWEnzQnQ50="; + version = "0.7.0"; + sha256 = "sha256-Je7m1n32GWDPanlCOVZlmbCeF+Zo03ACR7xJhjgVJSE="; + }; + beamDeps = [ ]; + }; + base64url = builder { + name = "base64url"; + version = "1.0.1"; + src = fetchHex { + pkg = "base64url"; + version = "1.0.1"; + sha256 = "sha256-+bOt1HMaAqmwQQOYtHWzPnVmppU2Ujemve4btEdxn1w="; }; beamDeps = [ ]; }; @@ -26,11 +36,12 @@ let }; xmpp = builder { name = "xmpp"; - version = "1.8.1"; - src = fetchHex { - pkg = "xmpp"; - version = "1.8.1"; - sha256 = "sha256-MtSjCKZhPk5BVfpOguzNyIMwltD6jZnI1CjIAGEeWdM="; + version = "git"; + src = fetchFromGitHub { + owner = "processone"; + repo = "xmpp"; + rev = "a1fb778bd385d832f913e564558152ea507dac37"; + sha256 = "1k4rbn9nxb94md1amdi58svxmdr16iqka885ahn3nb1kl1q49g6d"; }; beamDeps = [ ezlib fast_tls fast_xml idna p1_utils stringprep ]; }; @@ -66,11 +77,12 @@ let }; pkix = builder { name = "pkix"; - version = "1.0.9"; - src = fetchHex { - pkg = "pkix"; - version = "1.0.9"; - sha256 = "sha256-2qssCc3U7aBcm0WlwA6ZShpfJ2NJKeE3fi5ZtwcQPjo="; + version = "git"; + src = fetchFromGitHub { + owner = "processone"; + repo = "pkix"; + rev = "03be27c7168449bdfeb8c5b6cc0f800f71f8cfe9"; + sha256 = "0m83jjdvs37989qf8hami1g9sq2j1wx0idj75l68610viqxx5f93"; }; beamDeps = [ ]; }; @@ -86,11 +98,12 @@ let }; p1_pgsql = builder { name = "p1_pgsql"; - version = "1.1.25"; - src = fetchHex { - pkg = "p1_pgsql"; - version = "1.1.25"; - sha256 = "sha256-tlTB4H0+d1tia0B+dpbKz9iNF76D5xaLnYnDgy2RPec="; + version = "git"; + src = fetchFromGitHub { + owner = "processone"; + repo = "p1_pgsql"; + rev = "fe0bb2a2a2ae21cd9fc48b81520cfce508520a56"; + sha256 = "0cn36n6sjfirgpl3lflsa1k1awhvynjshvvkq9h801rpg3gvwcnj"; }; beamDeps = [ xmpp ]; }; @@ -106,21 +119,23 @@ let }; p1_mysql = builder { name = "p1_mysql"; - version = "1.0.23"; - src = fetchHex { - pkg = "p1_mysql"; - version = "1.0.23"; - sha256 = "sha256-nO+YJl+yhzdOe2S/QCLE317GYZbKMc9L7XPGfEW/gk4="; + version = "git"; + src = fetchFromGitHub { + owner = "processone"; + repo = "p1_mysql"; + rev = "0dccb755a60cda61d41e7b092b344d38d1ebc802"; + sha256 = "0pdggllh9y9k57hykyi0l4zbq2w5d1c7lw8077q6jfajs80p6ajm"; }; beamDeps = [ ]; }; p1_acme = builder { name = "p1_acme"; - version = "1.0.22"; - src = fetchHex { - pkg = "p1_acme"; - version = "1.0.22"; - sha256 = "sha256-wrJaeylaQ12sTyeKc9hBf/KwAgxF4Wg1BOhpLvA+IFc="; + version = "git"; + src = fetchFromGitHub { + owner = "processone"; + repo = "p1_acme"; + rev = "176b4a8c67627c3229fbea3c05d82a5d567e6e49"; + sha256 = "1g30sc2rzfrkh5c7771z7nl79w3shq8faag437q3ca7k1jjwqf19"; }; beamDeps = [ base64url idna jiffy jose yconf ]; }; @@ -136,21 +151,21 @@ let }; luerl = builder { name = "luerl"; - version = "1.1.1"; + version = "1.2.0"; src = fetchHex { pkg = "luerl"; - version = "1.1.1"; - sha256 = "sha256-4X7yRqf/h27JDmh5KjlwiXlBYATU6s/op2QyBrlHB3M="; + version = "1.2.0"; + sha256 = "sha256-nK/U9glP8PWp0nj9gdYNPgJsggvftsrNSxvZCfIbUl0="; }; beamDeps = [ ]; }; jose = builder { name = "jose"; - version = "1.11.5"; + version = "1.11.10"; src = fetchHex { pkg = "jose"; - version = "1.11.5"; - sha256 = "sha256-3NOyFbr+Aup8WyPa/T64Bipc2PLZBP2cqjI9NwNKs4Q="; + version = "1.11.10"; + sha256 = "sha256-DWzTb/i6F02ykUj8EStYQhhraKkM6fwrPsOv52WT5hQ="; }; beamDeps = [ ]; }; @@ -166,11 +181,11 @@ let }; idna = builder { name = "idna"; - version = "6.0.0"; + version = "6.1.1"; src = fetchHex { pkg = "idna"; - version = "6.0.0"; - sha256 = "sha256-S90wXrZOGLAnOGSSBpXLGNeiAh8xoRucX7zZolP5NuI="; + version = "6.1.1"; + sha256 = "sha256-kjdut4lEEu0ZrEdeSob3tBPBufu1vRbczVeTQVeUTOo="; }; beamDeps = [ unicode_util_compat ]; }; @@ -264,15 +279,5 @@ let }; beamDeps = [ p1_utils ]; }; - base64url = builder { - name = "base64url"; - version = "1.0.1"; - src = fetchHex { - pkg = "base64url"; - version = "1.0.1"; - sha256 = "sha256-+bOt1HMaAqmwQQOYtHWzPnVmppU2Ujemve4btEdxn1w="; - }; - beamDeps = [ ]; - }; }; in self From 8fefd4d617366c10d5653516dd9a87b2910aa0ba Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Fri, 19 Jul 2024 02:44:12 +0800 Subject: [PATCH 005/229] ejabberd: 24.06 -> 24.07 --- pkgs/servers/xmpp/ejabberd/default.nix | 4 +- pkgs/servers/xmpp/ejabberd/rebar-deps.nix | 153 +++++++++++----------- 2 files changed, 76 insertions(+), 81 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index c6e1d0bec3fe..d6dab1fef44b 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -95,7 +95,7 @@ let in stdenv.mkDerivation rec { pname = "ejabberd"; - version = "24.06"; + version = "24.07"; nativeBuildInputs = [ makeWrapper @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/ejabberd-${version}.tar.gz"; - hash = "sha256-NO9WNw05vcmjxY13daZaLB1OjFLmqoDneoQ11BTdqB4="; + hash = "sha256-wPt0asuoGl20Hel8A5aMH2gaE7G2waiVtxguM4IMGNk="; # remember to update rebar-deps.nix }; diff --git a/pkgs/servers/xmpp/ejabberd/rebar-deps.nix b/pkgs/servers/xmpp/ejabberd/rebar-deps.nix index 116647d563b3..db5899e27115 100644 --- a/pkgs/servers/xmpp/ejabberd/rebar-deps.nix +++ b/pkgs/servers/xmpp/ejabberd/rebar-deps.nix @@ -14,6 +14,16 @@ let }; beamDeps = [ ]; }; + jiffy = builder { + name = "jiffy"; + version = "1.1.2"; + src = fetchHex { + pkg = "jiffy"; + version = "1.1.2"; + sha256 = "sha256-u2G8Qqcgu9M8sJpBDki7eaYQEsdMuLPnXybZiEhc84E="; + }; + beamDeps = [ ]; + }; base64url = builder { name = "base64url"; version = "1.0.1"; @@ -26,84 +36,81 @@ let }; yconf = builder { name = "yconf"; - version = "1.0.15"; + version = "1.0.16"; src = fetchHex { pkg = "yconf"; - version = "1.0.15"; - sha256 = "sha256-f/KrJNPJgzhCcWuaqqAaj5ZkGnaVy7cBsDRFxN7wERc="; + version = "1.0.16"; + sha256 = "sha256-6UeBMnPzhxHHsuWo5KzJpRx7voVPdEo0X2AwCzhYbIk="; }; beamDeps = [ fast_yaml ]; }; xmpp = builder { name = "xmpp"; - version = "git"; - src = fetchFromGitHub { - owner = "processone"; - repo = "xmpp"; - rev = "a1fb778bd385d832f913e564558152ea507dac37"; - sha256 = "1k4rbn9nxb94md1amdi58svxmdr16iqka885ahn3nb1kl1q49g6d"; + version = "1.8.3"; + src = fetchHex { + pkg = "xmpp"; + version = "1.8.3"; + sha256 = "sha256-7XAGX5qJqBjc/0O3TAgMnn9PFBThBRvt23KA24Ca9xE="; }; beamDeps = [ ezlib fast_tls fast_xml idna p1_utils stringprep ]; }; stun = builder { name = "stun"; - version = "1.2.12"; + version = "1.2.14"; src = fetchHex { pkg = "stun"; - version = "1.2.12"; - sha256 = "sha256-ogVQMrbTONBFQUIAS8sS+vsMZKsfJz8dDGkj67yO3kA="; + version = "1.2.14"; + sha256 = "sha256-4TSAext6jf/ZTmTu/uAOZce0BC89FOFvj0NWbSA3FYM="; }; beamDeps = [ fast_tls p1_utils ]; }; stringprep = builder { name = "stringprep"; - version = "1.0.29"; + version = "1.0.30"; src = fetchHex { pkg = "stringprep"; - version = "1.0.29"; - sha256 = "sha256-ko66MEwwBusVEhEOvXuH2xY7AIWaCTdaHkRmFSxsRio="; + version = "1.0.30"; + sha256 = "sha256-9vybM4SgOHeDD4my84WAyvP0onRIpKMz1qjDl1wiC5o="; }; beamDeps = [ p1_utils ]; }; sqlite3 = builder { name = "sqlite3"; - version = "1.1.14"; + version = "1.1.15"; src = fetchHex { pkg = "sqlite3"; - version = "1.1.14"; - sha256 = "sha256-hQVLbKKXNDwVntZ5Skc/8sjuq9hUtv4C9xHAv9NzzoY="; + version = "1.1.15"; + sha256 = "sha256-PAuk4TMiwq1J3k4t3SgxE2at3lS+ro26nZ44iPadKFc="; }; beamDeps = [ ]; }; pkix = builder { name = "pkix"; - version = "git"; - src = fetchFromGitHub { - owner = "processone"; - repo = "pkix"; - rev = "03be27c7168449bdfeb8c5b6cc0f800f71f8cfe9"; - sha256 = "0m83jjdvs37989qf8hami1g9sq2j1wx0idj75l68610viqxx5f93"; + version = "1.0.10"; + src = fetchHex { + pkg = "pkix"; + version = "1.0.10"; + sha256 = "sha256-4CFk+DCUyxJMQbGrKJiKYV1Uua3DhXXwDxmll6OsXQ4="; }; beamDeps = [ ]; }; p1_utils = builder { name = "p1_utils"; - version = "1.0.25"; + version = "1.0.26"; src = fetchHex { pkg = "p1_utils"; - version = "1.0.25"; - sha256 = "sha256-khkhRCjyxuXTGH/465qHg2lcJCdCC+miWYQOB62jKEc="; + version = "1.0.26"; + sha256 = "sha256-0DeejBFWuYvWT4Epwd4CL8yk8v23SGznO/DtLDN2sEw="; }; beamDeps = [ ]; }; p1_pgsql = builder { name = "p1_pgsql"; - version = "git"; - src = fetchFromGitHub { - owner = "processone"; - repo = "p1_pgsql"; - rev = "fe0bb2a2a2ae21cd9fc48b81520cfce508520a56"; - sha256 = "0cn36n6sjfirgpl3lflsa1k1awhvynjshvvkq9h801rpg3gvwcnj"; + version = "1.1.27"; + src = fetchHex { + pkg = "p1_pgsql"; + version = "1.1.27"; + sha256 = "sha256-jk0adgLLaHgOVdidxamy4arKP08e49GiXy+MPSNk/7k="; }; beamDeps = [ xmpp ]; }; @@ -119,33 +126,31 @@ let }; p1_mysql = builder { name = "p1_mysql"; - version = "git"; - src = fetchFromGitHub { - owner = "processone"; - repo = "p1_mysql"; - rev = "0dccb755a60cda61d41e7b092b344d38d1ebc802"; - sha256 = "0pdggllh9y9k57hykyi0l4zbq2w5d1c7lw8077q6jfajs80p6ajm"; + version = "1.0.24"; + src = fetchHex { + pkg = "p1_mysql"; + version = "1.0.24"; + sha256 = "sha256-8FiGX2Qlf1B6LGpa/zabE3XbyzCz1CWNrU8bPq/7ZV8="; }; beamDeps = [ ]; }; p1_acme = builder { name = "p1_acme"; - version = "git"; - src = fetchFromGitHub { - owner = "processone"; - repo = "p1_acme"; - rev = "176b4a8c67627c3229fbea3c05d82a5d567e6e49"; - sha256 = "1g30sc2rzfrkh5c7771z7nl79w3shq8faag437q3ca7k1jjwqf19"; + version = "1.0.23"; + src = fetchHex { + pkg = "p1_acme"; + version = "1.0.23"; + sha256 = "sha256-jOGW8m49IuoQt4CRIpUEZYeMEn+Adn4yUgeu1+jQ3Vk="; }; beamDeps = [ base64url idna jiffy jose yconf ]; }; mqtree = builder { name = "mqtree"; - version = "1.0.16"; + version = "1.0.17"; src = fetchHex { pkg = "mqtree"; - version = "1.0.16"; - sha256 = "sha256-yH0clVddtlrym3lcnao77UP1wb+EByp0RpZZvPU1lOs="; + version = "1.0.17"; + sha256 = "sha256-X+i3z4+8R4PQ/OuUZUrCu/MkKljNA5fSSd7YrgIb4qM="; }; beamDeps = [ p1_utils ]; }; @@ -169,16 +174,6 @@ let }; beamDeps = [ ]; }; - jiffy = builder { - name = "jiffy"; - version = "1.1.1"; - src = fetchHex { - pkg = "jiffy"; - version = "1.1.1"; - sha256 = "sha256-YuHwWBw8GcM6clx4HfqIQQ2L/xu6/DiFolUihrR4XEw="; - }; - beamDeps = [ ]; - }; idna = builder { name = "idna"; version = "6.1.1"; @@ -191,51 +186,51 @@ let }; fast_yaml = builder { name = "fast_yaml"; - version = "1.0.36"; + version = "1.0.37"; src = fetchHex { pkg = "fast_yaml"; - version = "1.0.36"; - sha256 = "sha256-Gr6PdY/CqGsI7f+Au8aHz9QevBQSz+wO9KCs/NAyBS8="; + version = "1.0.37"; + sha256 = "sha256-jehochv34hckFPfTFI7eDzySK0lkVc1iXdXEQpUVp2k="; }; beamDeps = [ p1_utils ]; }; fast_xml = builder { name = "fast_xml"; - version = "1.1.51"; + version = "1.1.52"; src = fetchHex { pkg = "fast_xml"; - version = "1.1.51"; - sha256 = "sha256-f85Bt9GkukOKLXoIjavnSjygc58a8qvLd+Ytr0PgQJo="; + version = "1.1.52"; + sha256 = "sha256-eVGSOQ4G0rZQFqaZC7+lcn9KJtKRSAixw8mjLu3NG/0="; }; beamDeps = [ p1_utils ]; }; fast_tls = builder { name = "fast_tls"; - version = "1.1.19"; + version = "1.1.21"; src = fetchHex { pkg = "fast_tls"; - version = "1.1.19"; - sha256 = "sha256-2zQyLIeC1MUTnMuAcJ2OyMOAibRCYu3QwvZgrElb04k="; + version = "1.1.21"; + sha256 = "sha256-ExVCkTk3Al5IzYCqgfADWWhtVQG3ViHnICaoe1IpUFs="; }; beamDeps = [ p1_utils ]; }; ezlib = builder { name = "ezlib"; - version = "1.0.12"; + version = "1.0.13"; src = fetchHex { pkg = "ezlib"; - version = "1.0.12"; - sha256 = "sha256-MOlDVftCJgqrbhJYLLDFa/IzUV5lXIrq9Idg51YeTrs="; + version = "1.0.13"; + sha256 = "sha256-nuYqs/jtVaD9EalWn8uORYaD+VV1QXJyGSsGnwkqv7s="; }; beamDeps = [ p1_utils ]; }; esip = builder { name = "esip"; - version = "1.0.52"; + version = "1.0.54"; src = fetchHex { pkg = "esip"; - version = "1.0.52"; - sha256 = "sha256-bwAWU5WQBQCqJizgKXFi2Tkxx4wUZNif0O3G49a8AR8="; + version = "1.0.54"; + sha256 = "sha256-gYevgZ1yWc2t2vaXJsI572BMmwsCmKXy0+aHv14iN+4="; }; beamDeps = [ fast_tls p1_utils stun ]; }; @@ -261,21 +256,21 @@ let }; eimp = builder { name = "eimp"; - version = "1.0.22"; + version = "1.0.23"; src = fetchHex { pkg = "eimp"; - version = "1.0.22"; - sha256 = "sha256-s7n/sdml9KK6iKxBioGRZJMtmp06L8PTLKM4zoVcQ5I="; + version = "1.0.23"; + sha256 = "sha256-kHx4ACPLKJPk/Evb5qTwLDVZE4Yqxn8OzCZgXoFrYoo="; }; beamDeps = [ p1_utils ]; }; cache_tab = builder { name = "cache_tab"; - version = "1.0.30"; + version = "1.0.31"; src = fetchHex { pkg = "cache_tab"; - version = "1.0.30"; - sha256 = "sha256-bYpeANj4TEJidwam2+2wLjTVhJXz7WGTXIR1ygUxzaA="; + version = "1.0.31"; + sha256 = "sha256-hYK2CkoJskfvhjVbqeB/zp4R7cA0WndckXH5cccrY1E="; }; beamDeps = [ p1_utils ]; }; From 268db320794c93e632614a88d77955085c823007 Mon Sep 17 00:00:00 2001 From: diniamo Date: Mon, 2 Sep 2024 16:47:25 +0200 Subject: [PATCH 006/229] ani-skip: init at 1.0.1 --- pkgs/by-name/an/ani-skip/package.nix | 55 ++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/by-name/an/ani-skip/package.nix diff --git a/pkgs/by-name/an/ani-skip/package.nix b/pkgs/by-name/an/ani-skip/package.nix new file mode 100644 index 000000000000..6302ec58ec2e --- /dev/null +++ b/pkgs/by-name/an/ani-skip/package.nix @@ -0,0 +1,55 @@ +{ + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + gnugrep, + gnused, + curl, + fzf, + lib, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "ani-skip"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "synacktraa"; + repo = "ani-skip"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-VEEG3d6rwTAS7/+gBKHFKIg9zFfBu5eBOu6Z23621gM="; + }; + + nativeBuildInputs = [ makeWrapper ]; + runtimeInputs = [ + gnugrep + gnused + curl + fzf + ]; + + installPhase = '' + runHook preInstall + + install -D skip.lua $out/share/mpv/scripts/skip.lua + install -Dm 755 ani-skip $out/bin/ani-skip + + runHook postInstall + ''; + + postFixup = '' + substituteInPlace $out/bin/ani-skip \ + --replace-fail '--script-opts=%s' "--script=$out/share/mpv/scripts/skip.lua --script-opts=%s" + + wrapProgram $out/bin/ani-skip \ + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs} + ''; + + meta = { + homepage = "https://github.com/synacktraa/ani-skip"; + description = "Automated solution to bypassing anime opening and ending sequences"; + mainProgram = "ani-skip"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.diniamo ]; + platforms = lib.platforms.unix; + }; +}) From 0769507dfd160d94f9af3e115d43ff03e4c12e82 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 20 Sep 2024 21:54:04 +0100 Subject: [PATCH 007/229] libzip: 1.10.1 -> 1.11.1 Changes: https://github.com/nih-at/libzip/releases/tag/v1.11.1 --- pkgs/development/libraries/libzip/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 453722ccf49b..759edc288e47 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , cmake -, fetchpatch2 , fetchurl , perl , zlib @@ -18,22 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libzip"; - version = "1.10.1"; + version = "1.11.1"; src = fetchurl { url = "https://libzip.org/download/libzip-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-lmmuXf46xbOJdTbchGaodMjPLA47H90I11snOIQpk2M="; + hash = "sha256-wOb6UqYroR79MCYikNxpcJR67zLgzClO5Q6QBc6sCSo="; }; - patches = [ - # https://github.com/nih-at/libzip/issues/404 - (fetchpatch2 { - name = "Check-for-zstd_TARGET-before-using-it-in-a-regex.patch"; - url = "https://github.com/nih-at/libzip/commit/c719428916b4d19e838f873b1a177b126a080d61.patch"; - hash = "sha256-4ksbXEM8kNvs3wtbIaXLEQNSKaxl0es/sIg0EINaTHE="; - }) - ]; - outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ cmake perl groff ]; From 95c13a1dc1afccf6620ada5e6ec3e7ff80512ccc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 22 Sep 2024 11:33:46 +0100 Subject: [PATCH 008/229] pax-utils: 1.3.7 -> 1.3.8 --- pkgs/os-specific/linux/pax-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index dcecfa4c13b8..eab7d3db4b43 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.3.7"; + version = "1.3.8"; src = fetchgit { url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; rev = "v${version}"; - hash = "sha256-WyNng+UtfRz1+Eu4gwXLxUvBAg+m3mdrc8GdEPYRKVE="; + hash = "sha256-fOdiZcS1ZWGN8U5v65LzGIZJD6hCl5dbLMHDpSyms+8="; }; strictDeps = true; From 565c85576bcac014cabddf1221551998e629fc75 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 15 Jul 2024 11:54:42 +0300 Subject: [PATCH 009/229] python312Packages.pythonqwt: init at 0.12.7 --- .../python-modules/pythonqwt/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/pythonqwt/default.nix diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix new file mode 100644 index 000000000000..1eb3e3e2aedc --- /dev/null +++ b/pkgs/development/python-modules/pythonqwt/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + numpy, + qtpy, + + # tests + pyqt6, + qt6, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pythonqwt"; + version = "0.12.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PlotPyStack"; + repo = "PythonQwt"; + rev = "refs/tags/v${version}"; + hash = "sha256-Am7XYumq9PAOmT2ZTC+AAE4VM6/yNF11WLXoTFSbDh4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + qtpy + numpy + ]; + nativeCheckInputs = [ + pytestCheckHook + # Not propagating this, to allow one to choose to either choose a pyqt / + # pyside implementation + pyqt6 + ]; + + preCheck = '' + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + ''; + + pythonImportsCheck = [ "qwt" ]; + + meta = { + description = "Qt plotting widgets for Python (pure Python reimplementation of Qwt C++ library)"; + homepage = "https://github.com/PlotPyStack/PythonQwt"; + changelog = "https://github.com/PlotPyStack/PythonQwt/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32b58b06c195..2e8daa5361b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13320,6 +13320,8 @@ self: super: with self; { qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; + pythonqwt = callPackage ../development/python-modules/pythonqwt { }; + r2pipe = callPackage ../development/python-modules/r2pipe { }; rachiopy = callPackage ../development/python-modules/rachiopy { }; From fbfa8e21e6e5600ed6f4ebec2bfdabd5321cd5db Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 15 Jul 2024 11:48:18 +0300 Subject: [PATCH 010/229] python312Packages.guidata: init at 3.6.3 --- .../python-modules/guidata/default.nix | 96 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 98 insertions(+) create mode 100644 pkgs/development/python-modules/guidata/default.nix diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix new file mode 100644 index 000000000000..5ff6a5f37243 --- /dev/null +++ b/pkgs/development/python-modules/guidata/default.nix @@ -0,0 +1,96 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + numpy, + qtpy, + h5py, + requests, + tomli, + + # tests + pytestCheckHook, + qt6, + pyqt6, + + # passthru.tests + guidata, + pyside6, + qt5, + pyqt5, + pyside2, +}: + +buildPythonPackage rec { + pname = "guidata"; + version = "3.6.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PlotPyStack"; + repo = "guidata"; + rev = "refs/tags/v${version}"; + hash = "sha256-KfeA6XNbzHZM4dyvAYlPOQIwWHwFT3Akj34zmgf8tb8="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + qtpy + h5py + requests + tomli + ]; + + nativeCheckInputs = [ + pytestCheckHook + # Not propagating this, to allow one to choose to choose a pyqt / pyside + # implementation. + pyqt6 + ]; + + preCheck = '' + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + ''; + + pythonImportsCheck = [ "guidata" ]; + + passthru = { + tests = { + # Should be compatible with all of these Qt implementations + withPyQt6 = guidata.override { + pyqt6 = pyqt6; + qt6 = qt6; + }; + withPySide6 = guidata.override { + pyqt6 = pyside6; + qt6 = qt6; + }; + withPyQt5 = guidata.override { + pyqt6 = pyqt5; + qt6 = qt5; + }; + withPySide2 = guidata.override { + pyqt6 = pyside2; + qt6 = qt5; + }; + }; + }; + + meta = { + description = "Python library generating graphical user interfaces for easy dataset editing and display"; + homepage = "https://github.com/PlotPyStack/guidata"; + changelog = "https://github.com/PlotPyStack/guidata/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e8daa5361b8..edd0f1ca7aab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5486,6 +5486,8 @@ self: super: with self; { guidance = callPackage ../development/python-modules/guidance { }; + guidata = callPackage ../development/python-modules/guidata { }; + gumath = callPackage ../development/python-modules/gumath { }; gunicorn = callPackage ../development/python-modules/gunicorn { }; From 97fb6ff0a6572b4ca9ca926565310cc74197c1eb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Sep 2024 09:46:53 +0300 Subject: [PATCH 011/229] python312Packages.plotpy: init at 2.6.3 --- .../python-modules/plotpy/default.nix | 117 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 119 insertions(+) create mode 100644 pkgs/development/python-modules/plotpy/default.nix diff --git a/pkgs/development/python-modules/plotpy/default.nix b/pkgs/development/python-modules/plotpy/default.nix new file mode 100644 index 000000000000..081a9bc25f95 --- /dev/null +++ b/pkgs/development/python-modules/plotpy/default.nix @@ -0,0 +1,117 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython_0, + setuptools, + + # dependencies + guidata, + numpy, + pillow, + pythonqwt, + scikit-image, + scipy, + tifffile, + + # tests + pytestCheckHook, + qt6, + pyqt6, + + # passthru.tests + plotpy, + pyside6, + qt5, + pyqt5, + pyside2, +}: + +buildPythonPackage rec { + pname = "plotpy"; + version = "2.6.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PlotPyStack"; + repo = "PlotPy"; + rev = "refs/tags/v${version}"; + hash = "sha256-kMVq8X6XP18B5x35BTuC7Q5uFFwds1JxCaxlDuD/UfE="; + }; + + build-system = [ + cython_0 + setuptools + ]; + # Both numpy versions are supported, see: + # https://github.com/PlotPyStack/PlotPy/blob/v2.6.2/pyproject.toml#L8-L9 + postConfigure = '' + substituteInPlace pyproject.toml \ + --replace-fail 'numpy >= 2.0.0' numpy + ''; + + dependencies = [ + guidata + numpy + pillow + pythonqwt + scikit-image + scipy + tifffile + ]; + + nativeCheckInputs = [ + pytestCheckHook + # Not propagating this, to allow one to choose to choose a pyqt / pyside + # implementation. + pyqt6 + ]; + + preCheck = '' + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + # https://github.com/NixOS/nixpkgs/issues/255262 + cd $out + ''; + + pythonImportsCheck = [ + "plotpy" + "plotpy.tests" + ]; + + passthru = { + tests = { + # Upstream doesn't officially supports all of them, although they use + # qtpy, see: https://github.com/PlotPyStack/PlotPy/issues/20 . When this + # package was created, all worked besides withPySide2, with which there + # was a peculiar segmentation fault during the tests. In anycase, PySide2 + # shouldn't be used for modern applications. + withPyQt6 = plotpy.override { + pyqt6 = pyqt6; + qt6 = qt6; + }; + withPySide6 = plotpy.override { + pyqt6 = pyside6; + qt6 = qt6; + }; + withPyQt5 = plotpy.override { + pyqt6 = pyqt5; + qt6 = qt5; + }; + withPySide2 = plotpy.override { + pyqt6 = pyside2; + qt6 = qt5; + }; + }; + }; + + meta = { + description = "Curve and image plotting tools for Python/Qt applications"; + homepage = "https://github.com/PlotPyStack/PlotPy"; + changelog = "https://github.com/PlotPyStack/PlotPy/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index edd0f1ca7aab..1aa9e781b6df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10459,6 +10459,8 @@ self: super: with self; { plotly = callPackage ../development/python-modules/plotly { }; + plotpy = callPackage ../development/python-modules/plotpy { }; + plotnine = callPackage ../development/python-modules/plotnine { }; pluggy = callPackage ../development/python-modules/pluggy { }; From 1c88e6d36de04fe93aa6baedffa77c6ffd91a597 Mon Sep 17 00:00:00 2001 From: kittydoor Date: Fri, 4 Oct 2024 19:52:40 +0200 Subject: [PATCH 012/229] 1password-gui: 8.10.40 -> 8.10.46 (beta 8.10.44-21 -> 8.10.48-17) --- .../misc/1password-gui/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index cecb229ce13f..d91f48f82de5 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -10,43 +10,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.40" else "8.10.44-21.BETA"; + version = if channel == "stable" then "8.10.46" else "8.10.48-17.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-viY0SOUhrOvmue6Nolau356rIqwDo2nLzMilFFmNb9g="; + hash = "sha256-oewS90rSBqxA0V+ttcmUXznUZ3+mb5FKtmYD4kUDmTk="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-7lUZiS3TSsIVqPoN5A6YqyVaaaRI9BliT51FHkwOPyw="; + hash = "sha256-tHQIhLPTD2dFRK542kFnpExg36paaNuzyOED8ZKyIYk="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-xK/B8J3VP8y1xw3KorzZzPf/LjYmYdOIjDECMJnVv6I="; + hash = "sha256-pnAE1UTMXX89wshEI/wzhySb1NZY5ke5bSYmUjvU/pc="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-iqdK6K7dcypZFGseYal2KjOaqJtUjXeCzbDdx7pDv8A="; + hash = "sha256-MmHUa96keBV9+E2GQdgz/aCTXeFkVNqHV0eH8/WhvhY="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-enorJfbn+xJVy1fG3wjhO3LkSsMncHA9/yA13kG+h4Y="; + hash = "sha256-4SPZJP/ebnyAMEWrIGonb+5nYXuM8KCPK9modC/Cr/Y="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-EUnIIi6DB5kBVid9ExBpNApKItHnRKQziBy/GFt0xag="; + hash = "sha256-V5Nt81Trw6l7DAUtCX2Yv/fL2wBJpJER0iaOBmMfQ5o="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-U14CjoUJUpd4wWidZz6xGErhHI/VPChqG8cwBTBYoYc="; + hash = "sha256-UfSUPqZgbYdWyrfw41SdnnI1IeA+dYsfBAu/UQl0vVI="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-DD1M2EFSHqG9OHX5Q/CmZLZIKYrBMS4cnX/6tLVi7H0="; + hash = "sha256-ynkDnJtoKMAtegeilB0XIH+YrSS9EKYV1ceN0Ecls+A="; }; }; }; From 1dd45da83f7eb852855729c9ee15d5168d5a2cfc Mon Sep 17 00:00:00 2001 From: nartsisss Date: Sun, 6 Oct 2024 23:20:52 +0300 Subject: [PATCH 013/229] cargo-hakari: 0.9.30 -> 0.9.33 --- pkgs/development/tools/rust/cargo-hakari/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix index c8429896be45..ff148aab88ba 100644 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.30"; + version = "0.9.33"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; rev = "cargo-hakari-${version}"; - sha256 = "sha256-fwqMV8oTEYqS0Y/IXar1DSZ0Gns1qJ9oGhbdehScrgw="; + sha256 = "sha256-oJZiGXsOl00Bim/olYYSqt/p3j6dTw25IURcwdXYrAo="; }; - cargoHash = "sha256-DkPnQcoiytIYz780veSAhPnk70qkP3QvTJJ41csUThY="; + cargoHash = "sha256-V9QmaZYBXj26HJrP8gABwhhUPwBxnyLoO4O45lnPyew="; cargoBuildFlags = [ "-p" From 83e6cbda1ab5942982f7c64496c2c672ac8a1d2c Mon Sep 17 00:00:00 2001 From: nartsisss Date: Sun, 6 Oct 2024 23:25:08 +0300 Subject: [PATCH 014/229] cargo-hakari: refactor meta --- pkgs/development/tools/rust/cargo-hakari/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix index ff148aab88ba..cfdf5d6e65a3 100644 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { "cargo-hakari" ]; - meta = with lib; { + meta = { description = "Manage workspace-hack packages to speed up builds in large workspaces"; mainProgram = "cargo-hakari"; longDescription = '' @@ -36,11 +36,11 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://crates.io/crates/cargo-hakari"; changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit asl20 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ figsoda macalinao ]; From dd94c734bf9f9312e3913ca6bccae21ddb99a721 Mon Sep 17 00:00:00 2001 From: JulianFP Date: Mon, 7 Oct 2024 05:02:45 +0200 Subject: [PATCH 015/229] maintainers: add JulianFP --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60ab3903eb82..d3cc24d10cad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10682,6 +10682,12 @@ githubId = 79042825; name = "Jan Kremer"; }; + JulianFP = { + name = "Julian Partanen"; + github = "JulianFP"; + githubId = 70963316; + keys = [ { fingerprint = "C61D 7747 43DE EF05 4E4A 3AC1 6FE2 79EB 5C9F 3466"; } ]; + }; juliendehos = { email = "dehos@lisic.univ-littoral.fr"; github = "juliendehos"; From 1070635c99b31871a60f367186a32ca28d71e09e Mon Sep 17 00:00:00 2001 From: JulianFP Date: Mon, 7 Oct 2024 05:04:54 +0200 Subject: [PATCH 016/229] python312Packages.sphinx-mdinclude: fix build --- .../python-modules/sphinx-mdinclude/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index f938f267eb65..397a3270582d 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -10,6 +10,7 @@ docutils, mistune, pygments, + sphinx, # tests pytestCheckHook, @@ -32,12 +33,12 @@ buildPythonPackage rec { docutils mistune pygments + sphinx ]; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { - broken = true; # https://github.com/omnilib/sphinx-mdinclude/issues/22 homepage = "https://github.com/omnilib/sphinx-mdinclude"; changelog = "https://github.com/omnilib/sphinx-mdinclude/blob/v${version}/CHANGELOG.md"; description = "Sphinx extension for including or writing pages in Markdown format"; @@ -50,6 +51,9 @@ buildPythonPackage rec { sphinx-mdinclude is a fork of m2r and m2r2, focused only on providing a Sphinx extension. ''; license = licenses.mit; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ + flokli + JulianFP + ]; }; } From 6ffc520d0d6238340e097753b7f83273689c1430 Mon Sep 17 00:00:00 2001 From: JulianFP Date: Mon, 7 Oct 2024 05:05:38 +0200 Subject: [PATCH 017/229] python312Packages.sphinx-mdinclude: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/sphinx-mdinclude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index 397a3270582d..85c30a91a48c 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; - version = "0.6.1"; + version = "0.6.2"; format = "pyproject"; src = fetchPypi { pname = "sphinx_mdinclude"; inherit version; - hash = "sha256-7OPYEuLVWbTn5H9ntqh7Dipom2svURR5XI7Uf/s5wWk="; + hash = "sha256-RHRi6Cy4vmFASiIEIn+SB2nrkj0vV2COMyXzu4goa0w="; }; nativeBuildInputs = [ flit-core ]; From 750afb7250756e56deddc15fff3754ba3642f3a8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 25 Sep 2024 22:22:38 +0100 Subject: [PATCH 018/229] lowdown: 1.1.0 -> 1.1.2 Changes: - https://github.com/kristapsdz/lowdown/releases/tag/VERSION_1_1_1 - https://github.com/kristapsdz/lowdown/releases/tag/VERSION_1_1_2 --- pkgs/tools/typesetting/lowdown/default.nix | 48 +++++----------------- 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 7449be94e12c..d5b529b75594 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook -, fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic , enableDarwinSandbox ? true @@ -9,49 +8,15 @@ stdenv.mkDerivation rec { pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}"; - version = "1.1.0"; + version = "1.1.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - hash = "sha512-EpAWTz7Zy+2qqJGgzLrt0tK7WEZ+hHbdyqzAmMiaqc6uNXscR88git6/UbTjvB9Yanvetvw9huSuyhcORCEIug=="; + hash = "sha512-KHQi5NpMU6Kw4Ij+BoGE52aU0vIP1pgMhjnBAUdMh6GV/xHCxfTXJduqh9bSfVMeOim08aZSIM7iq1io0VS8LA=="; }; - patches = [ - # Improve UTF-8 handling on macOS by not treating bytes >=0x80, which tend to be - # UTF-8 continuation bytes, as control characters. - # - # This leaves control characters U+0080 through U+009F in the output - # (incorrectly) but doesn't mangle other UTF-8 characters, so it's a net - # win. - # - # See: https://github.com/kristapsdz/lowdown/pull/140 - (fetchpatch { - url = "https://github.com/kristapsdz/lowdown/commit/5a02866dd682363a8e4f6b344c223cfe8b597da9.diff"; - hash = "sha256-7tGhZJQQySeBv4h6A4r69BBbQkPRX/3JTw/80A8YXjQ="; - }) - (fetchpatch { - url = "https://github.com/kristapsdz/lowdown/commit/c033a6886e4d6efb948782fbc389fe5f673acf36.diff"; - hash = "sha256-7DvKFerAMoPifuTn7rOX4ru888HfBkpspH1opIbzj08="; - }) - - # Don't output a newline after .SH - # - # This fixes `makewhatis` output on macOS and (as a result) `man` - # completions for `fish` on macOS. - # - # See: https://github.com/kristapsdz/lowdown/pull/138 - (fetchpatch { - url = "https://github.com/kristapsdz/lowdown/commit/e05929a09a697de3d2eb14d0f0a087a6fae22e11.diff"; - hash = "sha256-P03W+hFeBKwfJB+DhGCPq0DtiOiLLc+0ZvWrWqXFvVU="; - }) - (fetchpatch { - url = "https://github.com/kristapsdz/lowdown/commit/9906f8ceac586c54eb39ae78105fd84653a89c33.diff"; - hash = "sha256-nBnAgTb8RDe/QpUhow3lyeR7UIVJX2o4lmP78e2fw/E="; - }) - ]; - nativeBuildInputs = [ which dieHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; @@ -70,6 +35,13 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + # Fix rpath change on darwin to avoid failure like: + # error: install_name_tool: changing install names or + # rpaths can't be redone for: liblowdown.1.dylib (for architecture + # arm64) because larger + # https://github.com/NixOS/nixpkgs/pull/344532#issuecomment-238475791 + env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; + makeFlags = [ "bins" # prevents shared object from being built unnecessarily ]; @@ -109,8 +81,10 @@ stdenv.mkDerivation rec { installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) '' runHook preInstallCheck + echo '# TEST' > test.md $out/bin/lowdown test.md + runHook postInstallCheck ''; From ca07e930b67652eb03efb9f0c8fdbf9f1d36efcb Mon Sep 17 00:00:00 2001 From: Honnip Date: Tue, 8 Oct 2024 23:17:17 +0900 Subject: [PATCH 019/229] nushellPlugins.query: fix homepage --- pkgs/shells/nushell/plugins/query.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 55bd221c8b54..ba8a0c449e12 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -11,7 +11,7 @@ curl, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "nushell_plugin_query"; inherit (nushell) version src; cargoHash = "sha256-7E4CCs4xyNGwjk6B2CwIFf1x0o5uNQArZpyxXEKLXMI="; @@ -37,15 +37,15 @@ rustPlatform.buildRustPackage { extraArgs = [ "--version=skip" ]; }; - meta = with lib; { + meta = { description = "Nushell plugin to query JSON, XML, and various web data"; mainProgram = "nu_plugin_query"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_query"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada aidalgol ]; - platforms = with platforms; all; + platforms = lib.platforms.all; }; } From 8c78777bac4d62bedb8905a6c6e527b2aebe7087 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Tue, 8 Oct 2024 22:38:23 +0200 Subject: [PATCH 020/229] python312Packages.imgtool: remove This is already packaged as a proper Python application in mcuboot-imgtool. An alias redirects existing users. --- .../python-modules/imgtool/default.nix | 45 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/development/python-modules/imgtool/default.nix diff --git a/pkgs/development/python-modules/imgtool/default.nix b/pkgs/development/python-modules/imgtool/default.nix deleted file mode 100644 index ba083666336f..000000000000 --- a/pkgs/development/python-modules/imgtool/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pythonOlder, - setuptools, - cbor2, - click, - cryptography, - intelhex, - pyyaml, -}: - -buildPythonPackage rec { - pname = "imgtool"; - version = "2.1.0"; - pyproject = true; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-T3+831PETqqmImUEUQzLUvfvAMmXUDz5STSzMMlge2A="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - cbor2 - click - cryptography - intelhex - pyyaml - ]; - - pythonImportsCheck = [ "imgtool" ]; - - meta = with lib; { - description = "MCUboot's image signing and key management"; - mainProgram = "imgtool"; - homepage = "https://github.com/mcu-tools/mcuboot"; - license = licenses.asl20; - maintainers = with maintainers; [ samueltardieu ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1898c65622b1..6ee4d6464333 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -268,6 +268,7 @@ mapAliases ({ imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 image-match = throw "image-match has been removed because it is no longer maintained"; # added 2023-06-10 imgaug = throw "imgaug has been removed as it is no longer maintained"; # added 2023-07-10 + imgtool = throw "imgtool has been promoted to a top-level attribute name: `mcuboot-imgtool`"; # added 2024-10-09 intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 ipdbplugin = throw "ipdbplugin has been removed because it has no longer maintained for 6 years"; # added 2024-05-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ec548731554..9c4ca666b447 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6039,8 +6039,6 @@ self: super: with self; { imgsize = callPackage ../development/python-modules/imgsize { }; - imgtool = callPackage ../development/python-modules/imgtool { }; - imgw-pib = callPackage ../development/python-modules/imgw-pib { }; imia = callPackage ../development/python-modules/imia { }; From 8d26e1dafc2cba4e98856575524309e493cdfe21 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Sat, 17 Feb 2024 12:43:16 +0800 Subject: [PATCH 021/229] git-branchless: improve for cross compiling In a previous commit d5a849cb0fc23af09f1a668e46d20510cf446884, the `postInstall` hook invokes the host binary `git-branchless`, which would probably fail when cross compiling. In this commit, we simply disable the hook in these cases. Also, add myself to meta.maintainers. --- .../applications/version-management/git-branchless/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index 0e83d17d33a7..fd835a3b924b 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - postInstall = '' + postInstall = lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) '' $out/bin/git-branchless install-man-pages $out/share/man ''; @@ -63,6 +63,7 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ nh2 hmenke + bryango ]; }; } From fedeefb48a62bd36f69ff7a0ed219ffa8c2d6356 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Fri, 11 Oct 2024 09:37:00 +0200 Subject: [PATCH 022/229] libnvidia-container: move to pkgs/by-name --- .../li}/libnvidia-container/inline-c-struct.patch | 0 .../libnvidia-container/libnvc-ldconfig-and-path-fixes.patch | 0 .../li}/libnvidia-container/modprobe.patch | 0 .../default.nix => by-name/li/libnvidia-container/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/virtualization => by-name/li}/libnvidia-container/inline-c-struct.patch (100%) rename pkgs/{applications/virtualization => by-name/li}/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch (100%) rename pkgs/{applications/virtualization => by-name/li}/libnvidia-container/modprobe.patch (100%) rename pkgs/{applications/virtualization/libnvidia-container/default.nix => by-name/li/libnvidia-container/package.nix} (100%) diff --git a/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch b/pkgs/by-name/li/libnvidia-container/inline-c-struct.patch similarity index 100% rename from pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch rename to pkgs/by-name/li/libnvidia-container/inline-c-struct.patch diff --git a/pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch b/pkgs/by-name/li/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch similarity index 100% rename from pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch rename to pkgs/by-name/li/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch diff --git a/pkgs/applications/virtualization/libnvidia-container/modprobe.patch b/pkgs/by-name/li/libnvidia-container/modprobe.patch similarity index 100% rename from pkgs/applications/virtualization/libnvidia-container/modprobe.patch rename to pkgs/by-name/li/libnvidia-container/modprobe.patch diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/by-name/li/libnvidia-container/package.nix similarity index 100% rename from pkgs/applications/virtualization/libnvidia-container/default.nix rename to pkgs/by-name/li/libnvidia-container/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fff5e8a232b1..09ecc11f02af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5386,8 +5386,6 @@ with pkgs; libnvme = callPackage ../os-specific/linux/libnvme { }; - libnvidia-container = callPackage ../applications/virtualization/libnvidia-container { }; - librenms = callPackage ../servers/monitoring/librenms { }; libxnd = callPackage ../development/libraries/libxnd { }; From 60b56abc6df0c712626ac21f3f5ccbfaa5cff3c9 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Fri, 11 Oct 2024 09:40:20 +0200 Subject: [PATCH 023/229] libnvidia-container: 1.9.0 -> 1.16.2 --- ...ixes.patch => fix-library-resolving.patch} | 77 ++++++++++------- .../li/libnvidia-container/modprobe.patch | 17 ++-- .../li/libnvidia-container/package.nix | 85 +++++++++++++------ 3 files changed, 113 insertions(+), 66 deletions(-) rename pkgs/by-name/li/libnvidia-container/{libnvc-ldconfig-and-path-fixes.patch => fix-library-resolving.patch} (76%) diff --git a/pkgs/by-name/li/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch b/pkgs/by-name/li/libnvidia-container/fix-library-resolving.patch similarity index 76% rename from pkgs/by-name/li/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch rename to pkgs/by-name/li/libnvidia-container/fix-library-resolving.patch index d4638791a01c..9bae2b87e61f 100644 --- a/pkgs/by-name/li/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch +++ b/pkgs/by-name/li/libnvidia-container/fix-library-resolving.patch @@ -1,9 +1,22 @@ +From 8799541f99785d2bd881561386676fb0985e939e Mon Sep 17 00:00:00 2001 +From: Moritz Sanft <58110325+msanft@users.noreply.github.com> +Date: Thu, 10 Oct 2024 14:32:42 +0200 +Subject: [PATCH] fix library resolving + +Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> +--- + src/ldcache.c | 46 +++++++++++++++++----------------------------- + src/ldcache.h | 2 +- + src/nvc_info.c | 10 +++------- + src/nvc_ldcache.c | 2 +- + 4 files changed, 22 insertions(+), 38 deletions(-) + diff --git a/src/ldcache.c b/src/ldcache.c -index 38bab05..e1abc89 100644 +index 38bab055..8cd30a0f 100644 --- a/src/ldcache.c +++ b/src/ldcache.c -@@ -108,40 +108,27 @@ ldcache_close(struct ldcache *ctx) - +@@ -108,40 +108,28 @@ ldcache_close(struct ldcache *ctx) + int ldcache_resolve(struct ldcache *ctx, uint32_t arch, const char *root, const char * const libs[], - char *paths[], size_t size, ldcache_select_fn select, void *select_ctx) @@ -14,26 +27,17 @@ index 38bab05..e1abc89 100644 - int override; + char dir[PATH_MAX]; + char lib[PATH_MAX]; - + - h = (struct header_libc6 *)ctx->ptr; memset(paths, 0, size * sizeof(*paths)); - + - for (uint32_t i = 0; i < h->nlibs; ++i) { - int32_t flags = h->libs[i].flags; - char *key = (char *)ctx->ptr + h->libs[i].key; - char *value = (char *)ctx->ptr + h->libs[i].value; - - if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch) -+ for (size_t j = 0; j < size; ++j) { -+ snprintf(dir, 100, "/run/opengl-driver%s/lib", -+ arch == LD_I386_LIB32 ? "-32" : ""); -+ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100)) -+ strcat(dir, "/vdpau"); -+ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version); -+ if (path_resolve_full(ctx->err, path, "/", lib) < 0) -+ return (-1); -+ if (!file_exists(ctx->err, path)) - continue; +- continue; - - for (size_t j = 0; j < size; ++j) { - if (!str_has_prefix(key, libs[j])) @@ -52,6 +56,17 @@ index 38bab05..e1abc89 100644 - } - break; - } ++ for (size_t j = 0; j < size; ++j) { ++ snprintf(dir, 100, "@driverLink@/lib"); ++ ++ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100)) ++ strcat(dir, "/vdpau"); ++ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version); ++ if (path_resolve_full(ctx->err, path, "/", lib) < 0) ++ return (-1); ++ if (!file_exists(ctx->err, path)) ++ continue; ++ + paths[j] = xstrdup(ctx->err, path); + if (paths[j] == NULL) + return (-1); @@ -59,7 +74,7 @@ index 38bab05..e1abc89 100644 return (0); } diff --git a/src/ldcache.h b/src/ldcache.h -index 33d78dd..2b087db 100644 +index 33d78dd7..2b087dbc 100644 --- a/src/ldcache.h +++ b/src/ldcache.h @@ -50,6 +50,6 @@ void ldcache_init(struct ldcache *, struct error *, const char *); @@ -68,19 +83,19 @@ index 33d78dd..2b087db 100644 int ldcache_resolve(struct ldcache *, uint32_t, const char *, const char * const [], - char *[], size_t, ldcache_select_fn, void *); + char *[], size_t, const char*); - + #endif /* HEADER_LDCACHE_H */ diff --git a/src/nvc_info.c b/src/nvc_info.c -index 30e3cfd..6d12a50 100644 +index b7b8adfa..d42f2beb 100644 --- a/src/nvc_info.c +++ b/src/nvc_info.c -@@ -167,15 +167,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -217,15 +217,13 @@ find_library_paths(struct error *err, struct dxcore_context *dxcore, struct nvc_ if (path_resolve_full(err, path, root, ldcache) < 0) return (-1); ldcache_init(&ld, err, path); - if (ldcache_open(&ld) < 0) - return (-1); - + info->nlibs = size; info->libs = array_new(err, size); if (info->libs == NULL) @@ -89,9 +104,9 @@ index 30e3cfd..6d12a50 100644 - info->libs, info->nlibs, select_libraries_fn, info) < 0) + info->libs, info->nlibs, info->nvrm_version) < 0) goto fail; - + info->nlibs32 = size; -@@ -183,13 +181,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -233,13 +231,11 @@ find_library_paths(struct error *err, struct dxcore_context *dxcore, struct nvc_ if (info->libs32 == NULL) goto fail; if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, @@ -99,32 +114,34 @@ index 30e3cfd..6d12a50 100644 + info->libs32, info->nlibs32, info->nvrm_version) < 0) goto fail; rv = 0; - + fail: - if (ldcache_close(&ld) < 0) - return (-1); return (rv); } - -@@ -203,7 +199,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r + +@@ -253,7 +249,7 @@ find_binary_paths(struct error *err, struct dxcore_context* dxcore, struct nvc_d char path[PATH_MAX]; int rv = -1; - + - if ((env = secure_getenv("PATH")) == NULL) { + if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) { error_setx(err, "environment variable PATH not found"); return (-1); } diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c -index 6ff380f..cbe6a69 100644 +index db3b2f69..ae5def43 100644 --- a/src/nvc_ldcache.c +++ b/src/nvc_ldcache.c -@@ -340,7 +340,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) +@@ -367,7 +367,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) if (validate_args(ctx, cnt != NULL) < 0) return (-1); - -- argv = (char * []){cnt->cfg.ldconfig, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL}; + +- argv = (char * []){cnt->cfg.ldconfig, "-f", "/etc/ld.so.conf", "-C", "/etc/ld.so.cache", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL}; + argv = (char * []){cnt->cfg.ldconfig, "-f", "/tmp/ld.so.conf.nvidia-host", "-C", "/tmp/ld.so.cache.nvidia-host", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL}; if (*argv[0] == '@') { /* * We treat this path specially to be relative to the host filesystem. +-- +2.46.0 diff --git a/pkgs/by-name/li/libnvidia-container/modprobe.patch b/pkgs/by-name/li/libnvidia-container/modprobe.patch index c28b6bad291d..1e0f8bdddc22 100644 --- a/pkgs/by-name/li/libnvidia-container/modprobe.patch +++ b/pkgs/by-name/li/libnvidia-container/modprobe.patch @@ -1,7 +1,7 @@ diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c ---- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000 -+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000 -@@ -840,10 +840,10 @@ +--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2021-11-13 14:36:58.096684602 +0000 ++++ nvidia-modprobe-@modprobeVersion@-patched/modprobe-utils/nvidia-modprobe-utils.c 2021-11-13 14:43:40.965146390 +0000 +@@ -959,10 +959,10 @@ return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH); } @@ -17,13 +17,14 @@ diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils char field[32]; FILE *fp; diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h ---- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000 -+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000 -@@ -81,6 +81,7 @@ +--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2021-11-13 14:36:58.096684602 +0000 ++++ nvidia-modprobe-@modprobeVersion@-patched/modprobe-utils/nvidia-modprobe-utils.h 2021-11-13 14:38:34.078700961 +0000 +@@ -87,6 +87,7 @@ int nvidia_nvswitch_get_file_state(int minor); int nvidia_cap_mknod(const char* cap_file_path, int *minor); int nvidia_cap_get_file_state(const char* cap_file_path); +int nvidia_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name); + int nvidia_cap_imex_channel_mknod(int minor); + int nvidia_cap_imex_channel_file_state(int minor); int nvidia_get_chardev_major(const char *name); - - #endif /* NV_LINUX */ + int nvidia_msr_modprobe(void); diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix index 28ea0a675b17..9b3023813c3f 100644 --- a/pkgs/by-name/li/libnvidia-container/package.nix +++ b/pkgs/by-name/li/libnvidia-container/package.nix @@ -1,25 +1,27 @@ -{ stdenv -, lib -, addDriverRunpath -, fetchFromGitHub -, pkg-config -, elfutils -, libcap -, libseccomp -, rpcsvc-proto -, libtirpc -, makeWrapper -, substituteAll -, removeReferencesTo -, go +{ + stdenv, + lib, + addDriverRunpath, + fetchFromGitHub, + pkg-config, + elfutils, + libcap, + libseccomp, + rpcsvc-proto, + libtirpc, + makeWrapper, + substituteAll, + removeReferencesTo, + replaceVars, + go, }: let - modprobeVersion = "495.44"; + modprobeVersion = "550.54.14"; nvidia-modprobe = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; rev = modprobeVersion; - sha256 = "sha256-Y3ZOfge/EcmhqI19yWO7UfPqkvY1CHHvFC5l9vYyGuU="; + sha256 = "sha256-iBRMkvOXacs/llTtvc/ZC5i/q9gc8lMuUHxMbu8A+Kg="; }; modprobePatch = substituteAll { src = ./modprobe.patch; @@ -28,21 +30,25 @@ let in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.9.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "NVIDIA"; - repo = pname; + repo = "libnvidia-container"; rev = "v${version}"; - sha256 = "sha256-7OTawWwjeKU8wIa8I/+aSvAJli4kEua94nJSNyCajpE="; + sha256 = "sha256-hX+2B+0kHiAC2lyo6kwe7DctPLJWgRdbhlc316OO3r8="; }; patches = [ - # locations of nvidia-driver libraries are not resolved via ldconfig which - # doesn't get used on NixOS. Additional support binaries like nvidia-smi + # Locations of nvidia driver libraries are not resolved via ldconfig which + # doesn't get used on NixOS. + # TODO: The latter doesn't really apply anymore. + # Additional support binaries like nvidia-smi # are not resolved via the environment PATH but via the derivation output # path. - ./libnvc-ldconfig-and-path-fixes.patch + (replaceVars ./fix-library-resolving.patch { + inherit (addDriverRunpath) driverLink; + }) # fix bogus struct declaration ./inline-c-struct.patch @@ -54,6 +60,11 @@ stdenv.mkDerivation rec { -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \ mk/common.mk + sed -i \ + -e 's/^GIT_TAG ?=.*/GIT_TAG = ${version}/' \ + -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.rev}/' \ + versions.mk + mkdir -p deps/src/nvidia-modprobe-${modprobeVersion} cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modprobeVersion} chmod -R u+w deps/src @@ -84,12 +95,26 @@ stdenv.mkDerivation rec { HOME="$(mktemp -d)" ''; - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getInclude libtirpc}/include/tirpc" ]; + NIX_LDFLAGS = [ + "-L${lib.getLib libtirpc}/lib" + "-ltirpc" + ]; - nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper removeReferencesTo ]; + nativeBuildInputs = [ + pkg-config + go + rpcsvc-proto + makeWrapper + removeReferencesTo + ]; - buildInputs = [ elfutils libcap libseccomp libtirpc ]; + buildInputs = [ + elfutils + libcap + libseccomp + libtirpc + ]; makeFlags = [ "WITH_LIBELF=yes" @@ -103,10 +128,14 @@ stdenv.mkDerivation rec { postInstall = let inherit (addDriverRunpath) driverLink; - libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ]; + libraryPath = lib.makeLibraryPath [ + "$out" + driverLink + "${driverLink}-32" + ]; in '' - remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.1.9.0 + remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.${version} wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath} ''; disallowedReferences = [ go ]; From 2b41b2c756bc5e52f90077e85d3866467e82f5fc Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 14 Oct 2024 12:12:04 -0300 Subject: [PATCH 024/229] kubent: 0.7.2 -> 0.7.3 Release: https://github.com/doitintl/kube-no-trouble/releases/tag/0.7.3 * convert sha256 to hash * remove nested with * nixfmt format --- .../networking/cluster/kubent/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/applications/networking/cluster/kubent/default.nix index 75f4244ee142..df26d5e2cb50 100644 --- a/pkgs/applications/networking/cluster/kubent/default.nix +++ b/pkgs/applications/networking/cluster/kubent/default.nix @@ -1,20 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, kubent }: +{ + buildGoModule, + fetchFromGitHub, + kubent, + lib, + testers, +}: buildGoModule rec { pname = "kubent"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "doitintl"; repo = "kube-no-trouble"; rev = version; - sha256 = "sha256-/gCbj0RDwV5E8kNkEu+37ilzw/A0BAXiYfHGPdkCsRs="; + hash = "sha256-7bn7DxbZ/Nqob7ZEWRy1UVg97FiJN5JWEgpH1CDz6jQ="; }; - vendorHash = "sha256-6hp7mzE45Tlmt4ybhpdJLYCv+WqQ9ak2S47kJTwyGVI="; + vendorHash = "sha256-+V+/TK60V8NYUDfF5/EgSZg4CLBn6Mt57diiyXm179k="; ldflags = [ - "-w" "-s" + "-w" + "-s" "-X main.version=v${version}" ]; @@ -26,11 +33,11 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { - homepage = "https://github.com/doitintl/kube-no-trouble"; + meta = { description = "Easily check your cluster for use of deprecated APIs"; + homepage = "https://github.com/doitintl/kube-no-trouble"; + license = lib.licenses.mit; mainProgram = "kubent"; - license = licenses.mit; - maintainers = with maintainers; [ peterromfeldhk ]; + maintainers = with lib.maintainers; [ peterromfeldhk ]; }; } From 797ff48ef55efc010647e017105e302ea83cb82d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 15:17:13 +0000 Subject: [PATCH 025/229] libjcat: 0.2.1 -> 0.2.2 --- pkgs/development/libraries/libjcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 79a419451de2..fac097e0d6b0 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.2.1"; + version = "0.2.2"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-tCXz62MEqYBnrx2RxlTBwKGTahfhUCVdet4VnXw5klQ="; + sha256 = "sha256-Vn5Qjyo2FHCmQC2pmb1qgU81VaFKsXnSIwlSYk/8Rig="; }; patches = [ From 32695b36869b14ac2cf04f8fb4f48f9709e84fc1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 14 Oct 2024 12:17:39 -0300 Subject: [PATCH 026/229] kubent: migrate to pkgs/by-name --- .../kubent/default.nix => by-name/ku/kubent/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster/kubent/default.nix => by-name/ku/kubent/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/by-name/ku/kubent/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubent/default.nix rename to pkgs/by-name/ku/kubent/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 491f6c861dea..2084c1322cb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30468,8 +30468,6 @@ with pkgs; kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { }; - kubent = callPackage ../applications/networking/cluster/kubent { }; - kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; kubestroyer = callPackage ../tools/security/kubestroyer { }; From 9ec4be8cea81d31b57d97f221364e342d67a9dd5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 14 Oct 2024 12:21:29 -0300 Subject: [PATCH 027/229] kubent: add meta.changelog --- pkgs/by-name/ku/kubent/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ku/kubent/package.nix b/pkgs/by-name/ku/kubent/package.nix index df26d5e2cb50..c49a00940220 100644 --- a/pkgs/by-name/ku/kubent/package.nix +++ b/pkgs/by-name/ku/kubent/package.nix @@ -35,6 +35,7 @@ buildGoModule rec { meta = { description = "Easily check your cluster for use of deprecated APIs"; + changelog = "https://github.com/doitintl/kube-no-trouble/releases/tag/${version}"; homepage = "https://github.com/doitintl/kube-no-trouble"; license = lib.licenses.mit; mainProgram = "kubent"; From 731002442edb554b9c8874e3652758a5d12679fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 16:39:38 +0000 Subject: [PATCH 028/229] risor: 1.6.0 -> 1.7.0 --- pkgs/development/interpreters/risor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/risor/default.nix b/pkgs/development/interpreters/risor/default.nix index c16eebf1e626..cbac6e69e03b 100644 --- a/pkgs/development/interpreters/risor/default.nix +++ b/pkgs/development/interpreters/risor/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "risor"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "risor-io"; repo = "risor"; rev = "v${version}"; - hash = "sha256-IUmkb23Fx+bjzXrXWfKPOo0HFt7HjtjQoCRtH77HGBg="; + hash = "sha256-QtYqepNH+c0WDGKTLtMz/VUz0oDOgCbwe4D9I4wal5s="; }; proxyVendor = true; - vendorHash = "sha256-+XYwFYbvZvk0TWoRtCKQIzbQeznQkolB+NFqUiZMkpA="; + vendorHash = "sha256-JrBuHA+u5bI2kcbWaY6/894kh5Xdix0ov6nN5r9rJRE="; subPackages = [ "cmd/risor" From 56698b568306357793c932dee01ee4b3d0e22aa6 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Tue, 15 Oct 2024 10:53:57 +0800 Subject: [PATCH 029/229] git-branchless: 0.9.0 -> 0.10.0 & fix build --- .../git-branchless/default.nix | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index fd835a3b924b..683b5fd813a2 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - hash = "sha256-4RRSffkAe0/8k4SNnlB1iiaW4gWFTuYXplVBj2aRIdU="; + hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U="; }; - cargoHash = "sha256-Jg4d7tJXr2O1sEDdB/zk+7TPBZvgHlmW8mNiXozLKV8="; + cargoHash = "sha256-AEEAHMKGVYcijA+Oget+maDZwsk/RGPhHQfiv+AT4v8="; nativeBuildInputs = [ pkg-config ]; @@ -48,11 +48,39 @@ rustPlatform.buildRustPackage rec { export TEST_GIT=${git}/bin/git export TEST_GIT_EXEC_PATH=$(${git}/bin/git --exec-path) ''; - # FIXME: these tests deadlock when run in the Nix sandbox + + # Note that upstream has disabled CI tests for git>=2.46 + # See: https://github.com/arxanas/git-branchless/issues/1416 + # https://github.com/arxanas/git-branchless/pull/1417 checkFlags = [ + # FIXME: these tests deadlock when run in the Nix sandbox "--skip=test_switch_pty" "--skip=test_next_ambiguous_interactive" "--skip=test_switch_auto_switch_interactive" + # harmless failures, also appear in upstream CI + # see e.g. https://github.com/user-attachments/files/17016948/git-branchless-job-logs.txt + "--skip=test_amend_undo" # git-branchless#1345 + # harmless, extra: "branchless: processing 1 update: ref HEAD" + "--skip=test_symbolic_transaction_ref" + "--skip=test_move_branch_on_merge_conflict_resolution" + "--skip=test_move_branches_after_move" + "--skip=test_move_delete_checked_out_branch" + "--skip=test_move_no_reapply_squashed_commits" + "--skip=test_move_orphaned_root" + "--skip=test_restore_snapshot_basic" + "--skip=test_restore_snapshot_delete_file_only_in_index" + "--skip=test_restore_snapshot_deleted_files" + "--skip=test_sync_basic" + "--skip=test_sync_no_delete_main_branch" + # probably harmless, without the extra "Check out from ... to ..." step + "--skip=test_undo_doesnt_make_working_dir_dirty" + "--skip=test_undo_move_refs" + "--skip=test_undo_noninteractive" + # probably harmless, different EventCursor::event_id + "--skip=test_undo_hide" + ]; + cargoTestFlags = [ + "--no-fail-fast" # make post-mortem easier ]; meta = with lib; { From d30181d974bad639f90a222d31791880caf0b090 Mon Sep 17 00:00:00 2001 From: Tom Westerhout <14264576+twesterhout@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:41:40 +0200 Subject: [PATCH 030/229] halide: format using nixfmt --- pkgs/development/compilers/halide/default.nix | 112 ++++++++++-------- 1 file changed, 60 insertions(+), 52 deletions(-) diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index d34ee3af9163..7540666b2e17 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -1,17 +1,18 @@ -{ stdenv -, llvmPackages -, lib -, fetchFromGitHub -, cmake -, libffi -, libpng -, libjpeg -, mesa -, libGL -, eigen -, openblas -, blas -, lapack +{ + stdenv, + llvmPackages, + lib, + fetchFromGitHub, + cmake, + libffi, + libpng, + libjpeg, + mesa, + libGL, + eigen, + openblas, + blas, + lapack, }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; @@ -27,29 +28,30 @@ stdenv.mkDerivation rec { sha256 = "sha256-lJQrXkJgBmGb/QMSxwuPkkHOSgEDowLWzIolp1km2Y8="; }; - postPatch = '' - # See https://github.com/halide/Halide/issues/7785 - substituteInPlace 'src/runtime/HalideRuntime.h' \ - --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) - #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \ - '#if defined(__x86_64__) || defined(__i386__) - #define HALIDE_CPP_COMPILER_HAS_FLOAT16' - '' - # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. - # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether - # ::aligned_alloc is available. For us, it isn't. - + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' - substituteInPlace 'src/runtime/HalideBuffer.h' \ - --replace '#ifdef __APPLE__ - #include - #include - #endif' \ - ' ' \ - --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \ - '1' \ - --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \ - '0' - ''; + postPatch = + '' + # See https://github.com/halide/Halide/issues/7785 + substituteInPlace 'src/runtime/HalideRuntime.h' \ + --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) + #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \ + '#if defined(__x86_64__) || defined(__i386__) + #define HALIDE_CPP_COMPILER_HAS_FLOAT16' + '' + # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. + # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether + # ::aligned_alloc is available. For us, it isn't. + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' + substituteInPlace 'src/runtime/HalideBuffer.h' \ + --replace '#ifdef __APPLE__ + #include + #include + #endif' \ + ' ' \ + --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \ + '1' \ + --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \ + '0' + ''; cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" @@ -74,20 +76,22 @@ stdenv.mkDerivation rec { # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas - buildInputs = [ - llvmPackages.llvm - llvmPackages.lld - llvmPackages.openmp - llvmPackages.libclang - libffi - libpng - libjpeg - eigen - openblas - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - mesa - libGL - ]; + buildInputs = + [ + llvmPackages.llvm + llvmPackages.lld + llvmPackages.openmp + llvmPackages.libclang + libffi + libpng + libjpeg + eigen + openblas + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + mesa + libGL + ]; nativeBuildInputs = [ cmake ]; @@ -96,6 +100,10 @@ stdenv.mkDerivation rec { homepage = "https://halide-lang.org"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ck3d atila twesterhout ]; + maintainers = with maintainers; [ + ck3d + atila + twesterhout + ]; }; } From 19c1507d6db6b9a4ffd38bf2852df6afd8796c5b Mon Sep 17 00:00:00 2001 From: Tom Westerhout <14264576+twesterhout@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:59:40 +0200 Subject: [PATCH 031/229] halide: 16.0.0 -> 18.0.0 --- pkgs/development/compilers/halide/default.nix | 29 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 7540666b2e17..905ed2a43d33 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -4,6 +4,7 @@ lib, fetchFromGitHub, cmake, + flatbuffers, libffi, libpng, libjpeg, @@ -19,13 +20,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation rec { pname = "halide"; - version = "16.0.0"; + version = "18.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; rev = "v${version}"; - sha256 = "sha256-lJQrXkJgBmGb/QMSxwuPkkHOSgEDowLWzIolp1km2Y8="; + hash = "sha256-BPalUh9EgdCqVaWC1HoreyyRcPQc4QMIYnLrRoNDDCI="; }; postPatch = @@ -63,15 +64,27 @@ stdenv.mkDerivation rec { # v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba) # These tests also fail to compile on Darwin because of some missing command line options... "-DWITH_TEST_FUZZ=OFF" + # Disable FetchContent for flatbuffers and use the version from nixpkgs instead + "-DFLATBUFFERS_USE_FETCHCONTENT=OFF" ]; doCheck = true; - # Note: disable mullapudi2016_fibonacci because it requires too much - # parallelism for remote builders - preCheck = '' - checkFlagsArray+=("ARGS=-E 'mullapudi2016_fibonacci'") - ''; + preCheck = + let + disabledTests = lib.strings.concatStringsSep "|" [ + # Requires too much parallelism for remote builders. + "mullapudi2016_fibonacci" + # Take too long---we don't want to run these in CI. + "adams2019_test_apps_autoscheduler" + "anderson2021_test_apps_autoscheduler" + "correctness_cross_compilation" + "correctness_simd_op_check_hvx" + ]; + in + '' + checkFlagsArray+=("ARGS=-E '${disabledTests}'") + ''; # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -93,7 +106,7 @@ stdenv.mkDerivation rec { libGL ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake flatbuffers ]; meta = with lib; { description = "C++ based language for image processing and computational photography"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 489fe0a38e1a..78f00230bb3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8387,7 +8387,7 @@ with pkgs; halibut = callPackage ../tools/typesetting/halibut { }; halide = callPackage ../development/compilers/halide { - llvmPackages = llvmPackages_16; + llvmPackages = llvmPackages_18; }; hareThirdParty = recurseIntoAttrs (callPackage ./hare-third-party.nix { }); From a90f538e38bcb322b9a2b90ff0c43156d61b97ab Mon Sep 17 00:00:00 2001 From: Tom Westerhout <14264576+twesterhout@users.noreply.github.com> Date: Tue, 15 Oct 2024 13:08:53 +0200 Subject: [PATCH 032/229] python3Packages.halide: init at 18.0.0 --- pkgs/development/compilers/halide/default.nix | 26 +++++++++++++++++-- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 905ed2a43d33..19d24f47da47 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -14,6 +14,8 @@ openblas, blas, lapack, + pythonSupport ? false, + python3Packages ? null, }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; @@ -56,7 +58,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" - "-DWITH_PYTHON_BINDINGS=OFF" + "-DWITH_PYTHON_BINDINGS=${if pythonSupport then "ON" else "OFF"}" "-DTARGET_WEBASSEMBLY=OFF" # Disable performance tests since they may fail on busy machines "-DWITH_TEST_PERFORMANCE=OFF" @@ -66,6 +68,7 @@ stdenv.mkDerivation rec { "-DWITH_TEST_FUZZ=OFF" # Disable FetchContent for flatbuffers and use the version from nixpkgs instead "-DFLATBUFFERS_USE_FETCHCONTENT=OFF" + "-DPYBIND11_USE_FETCHCONTENT=OFF" ]; doCheck = true; @@ -86,6 +89,12 @@ stdenv.mkDerivation rec { checkFlagsArray+=("ARGS=-E '${disabledTests}'") ''; + postInstall = lib.optionalString pythonSupport '' + mkdir -p $out/${builtins.dirOf python3Packages.python.sitePackages} + mv -v $out/lib/python3/site-packages $out/${python3Packages.python.sitePackages} + rmdir $out/lib/python3/ + ''; + # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas @@ -106,7 +115,20 @@ stdenv.mkDerivation rec { libGL ]; - nativeBuildInputs = [ cmake flatbuffers ]; + nativeBuildInputs = + [ + cmake + flatbuffers + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pybind11 + ]; + + propagatedBuildInputs = lib.optionals pythonSupport [ + python3Packages.numpy + python3Packages.imageio + ]; meta = with lib; { description = "C++ based language for image processing and computational photography"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c026d04370f7..43ec8628e1bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5562,6 +5562,8 @@ self: super: with self; { hakuin = callPackage ../development/python-modules/hakuin { }; + halide = toPythonModule (pkgs.halide.override { pythonSupport = true; python3Packages = self; }); + halo = callPackage ../development/python-modules/halo { }; halohome = callPackage ../development/python-modules/halohome { }; From 79c77ab335a8651c95797e3f5823e0c4ce9600d3 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 15 Oct 2024 13:32:25 +0200 Subject: [PATCH 033/229] copilot-node-server: init at 1.41.0 --- .../co/copilot-node-server/package-lock.json | 16 +++++++ .../co/copilot-node-server/package.nix | 42 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/by-name/co/copilot-node-server/package-lock.json create mode 100644 pkgs/by-name/co/copilot-node-server/package.nix diff --git a/pkgs/by-name/co/copilot-node-server/package-lock.json b/pkgs/by-name/co/copilot-node-server/package-lock.json new file mode 100644 index 000000000000..deb2875f6a5b --- /dev/null +++ b/pkgs/by-name/co/copilot-node-server/package-lock.json @@ -0,0 +1,16 @@ +{ + "name": "copilot-node-server", + "version": "1.41.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "copilot-node-server", + "version": "1.41.0", + "license": "GitHub Terms of Service", + "bin": { + "copilot-node-server": "copilot/dist/language-server.js" + } + } + } +} diff --git a/pkgs/by-name/co/copilot-node-server/package.nix b/pkgs/by-name/co/copilot-node-server/package.nix new file mode 100644 index 000000000000..9dac4e80164b --- /dev/null +++ b/pkgs/by-name/co/copilot-node-server/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "copilot-node-server"; + version = "1.41.0"; + + src = fetchFromGitHub { + owner = "jfcherng"; + repo = "copilot-node-server"; + rev = "v${version}"; + hash = "sha256-yOqA2Xo4c7u0g6RQYt9joQk8mI9KE0xTAnLjln9atmg="; + }; + + npmDepsHash = "sha256-tbcNRQBbJjN1N5ENxCvPQbfteyxTbPpi35dYmeUc4A4="; + + postPatch = '' + # Upstream doesn't provide any lock file so we provide our own: + cp ${./package-lock.json} package-lock.json + ''; + + preInstall = '' + # `npmInstallHook` requires a `node_modules/` folder but `npm + # install` doesn't generate one because the project has no + # dependencies: + mkdir node_modules/ + ''; + + forceEmptyCache = true; + dontNpmBuild = true; + + meta = with lib; { + description = "Copilot Node.js server"; + homepage = src.meta.homepage; + license = licenses.unfree; # I don't know: https://github.com/jfcherng/copilot-node-server/blob/main/LICENSE.md + maintainers = with maintainers; [ DamienCassou ]; + mainProgram = "copilot-node-server"; + }; +} From 8d7be6e3d03e3fae0ec597a312681ab61f16b0a7 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Tue, 15 Oct 2024 23:12:45 +0800 Subject: [PATCH 034/229] git-branchless: disable tests for now The previous commit is kept as a record of the currently failing tests, for future reference. --- .../git-branchless/default.nix | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index 683b5fd813a2..b5dac8816441 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -52,35 +52,14 @@ rustPlatform.buildRustPackage rec { # Note that upstream has disabled CI tests for git>=2.46 # See: https://github.com/arxanas/git-branchless/issues/1416 # https://github.com/arxanas/git-branchless/pull/1417 + # To be re-enabled once arxanas/git-branchless#1416 is resolved + doCheck = false; + checkFlags = [ # FIXME: these tests deadlock when run in the Nix sandbox "--skip=test_switch_pty" "--skip=test_next_ambiguous_interactive" "--skip=test_switch_auto_switch_interactive" - # harmless failures, also appear in upstream CI - # see e.g. https://github.com/user-attachments/files/17016948/git-branchless-job-logs.txt - "--skip=test_amend_undo" # git-branchless#1345 - # harmless, extra: "branchless: processing 1 update: ref HEAD" - "--skip=test_symbolic_transaction_ref" - "--skip=test_move_branch_on_merge_conflict_resolution" - "--skip=test_move_branches_after_move" - "--skip=test_move_delete_checked_out_branch" - "--skip=test_move_no_reapply_squashed_commits" - "--skip=test_move_orphaned_root" - "--skip=test_restore_snapshot_basic" - "--skip=test_restore_snapshot_delete_file_only_in_index" - "--skip=test_restore_snapshot_deleted_files" - "--skip=test_sync_basic" - "--skip=test_sync_no_delete_main_branch" - # probably harmless, without the extra "Check out from ... to ..." step - "--skip=test_undo_doesnt_make_working_dir_dirty" - "--skip=test_undo_move_refs" - "--skip=test_undo_noninteractive" - # probably harmless, different EventCursor::event_id - "--skip=test_undo_hide" - ]; - cargoTestFlags = [ - "--no-fail-fast" # make post-mortem easier ]; meta = with lib; { From cf17e1ba7ddaff988a4da7907a693d8fa4c8e57c Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 15 Oct 2024 12:27:33 -0700 Subject: [PATCH 035/229] mozillavpn: Fix build errors from Qt deprecations Signed-off-by: Anders Kaseorg --- pkgs/by-name/mo/mozillavpn/package.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index 828300f4e5ff..9bd0b1696689 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -4,6 +4,7 @@ cargo, cmake, fetchFromGitHub, + fetchpatch, go, lib, libcap, @@ -30,7 +31,23 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; hash = "sha256-X2rtHAZ9vbWjuOmD3B/uPasUQ1Q+b4SkNqk4MqGMaYo="; }; - patches = [ ]; + patches = [ + # Fix build errors from deprecated QByteArray::count() + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/1b358d27d4bf29567b5d58f3591146bf639b99e1.patch"; + hash = "sha256-LeDgwZaQDgS8HNf9k2fC0RYQy4nGEq0DMNjY7muNads="; + }) + # Fix build errors from deprecated QVariant::type() + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/ebdd38ce19ef6eb80f076acf93299bd7d24ae6db.patch"; + hash = "sha256-ZWl0wHH5Foxlttj/GK5phr/C6qJv39U2GWIofZR+Rto="; + }) + # Fix build errors from deprecated QEventPoint::pos and friends + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/10b1c98517dac4eacffd6890c551b817aedd4a19.patch"; + hash = "sha256-DHOtvVDEdQ+k2ggg4HGpcv1EmKzlijNRTi1yJ7a1bWU="; + }) + ]; netfilter = buildGoModule { pname = "${finalAttrs.pname}-netfilter"; From ffd457a522bc492d66449833a82d6062e5df5e07 Mon Sep 17 00:00:00 2001 From: Jacob Freeman Date: Wed, 16 Oct 2024 14:48:21 -0500 Subject: [PATCH 036/229] tensorrt: fix cudnn version --- pkgs/development/cuda-modules/tensorrt/releases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix index 976f8fab115b..e8c75b6ccdee 100644 --- a/pkgs/development/cuda-modules/tensorrt/releases.nix +++ b/pkgs/development/cuda-modules/tensorrt/releases.nix @@ -137,7 +137,7 @@ version = "10.3.0.26"; minCudaVersion = "12.0"; maxCudaVersion = "12.5"; - cudnnVersion = "8.9"; + cudnnVersion = "9.3"; filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-12.5.tar.gz"; hash = "sha256-rf8c1avl2HATgGFyNR5Y/QJOW/D8YdSe9LhM047ZkIE="; } From 73b46d8e7ff4fdf7bc5fcdd6011827c7da98f9f1 Mon Sep 17 00:00:00 2001 From: Kaleo Date: Sat, 28 Sep 2024 18:02:18 +0800 Subject: [PATCH 037/229] nltk-data: add wordnet --- pkgs/tools/text/nltk-data/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/text/nltk-data/default.nix b/pkgs/tools/text/nltk-data/default.nix index a8179541c5b8..56ec586cc397 100644 --- a/pkgs/tools/text/nltk-data/default.nix +++ b/pkgs/tools/text/nltk-data/default.nix @@ -63,4 +63,9 @@ lib.makeScope newScope (self: { location = "corpora"; hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk="; }; + wordnet = makeNltkDataPackage { + pname = "wordnet"; + location = "corpora"; + hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk="; + }; }) From 04f0101890c827877f4c1922dd56ec68809ba78f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 17 Oct 2024 09:56:15 -0400 Subject: [PATCH 038/229] keycloak: 26.0.0 -> 26.0.1 Diff: https://github.com/keycloak/keycloak/compare/26.0.0...26.0.1 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index edf194300676..f0fc72f0a09c 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "26.0.0"; + version = "26.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-BWkF5iiR4J7NskrJUFmlP0N+HEkyZLnLJbMmbXCROxo="; + hash = "sha256-8dA38Xjvr5+LqyD222mOg8RIhw3gFbilPgVxlrdiCq4="; }; nativeBuildInputs = [ makeWrapper jre ]; From dc5a8706200d94f37e39648f02f2a5d5740a06b5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 17 Oct 2024 11:59:20 -0400 Subject: [PATCH 039/229] keycloak: remove kc.sh.orig --- pkgs/servers/keycloak/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index f0fc72f0a09c..2bf5cc37a441 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { mkdir $out cp -r * $out - rm $out/bin/*.{ps1,bat} + rm $out/bin/*.{ps1,bat,orig} runHook postInstall ''; From b1f1ea0ed4a2ffe35b89419ec085f173606c9365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 16 Oct 2024 19:22:28 +1100 Subject: [PATCH 040/229] gaucheBootstrap: fix darwin build Add the required framework. --- pkgs/development/interpreters/gauche/boot.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/gauche/boot.nix b/pkgs/development/interpreters/gauche/boot.nix index 497ebba15557..04b69b524067 100644 --- a/pkgs/development/interpreters/gauche/boot.nix +++ b/pkgs/development/interpreters/gauche/boot.nix @@ -10,6 +10,7 @@ zlib, mbedtls, cacert, + darwin, }: stdenv.mkDerivation rec { @@ -28,14 +29,18 @@ stdenv.mkDerivation rec { texinfo ]; - buildInputs = [ - libiconv - gdbm - openssl - zlib - mbedtls - cacert - ]; + buildInputs = + [ + libiconv + gdbm + openssl + zlib + mbedtls + cacert + ] + ++ lib.optionals (stdenv.isDarwin) [ + darwin.apple_sdk_11_0.frameworks.CoreServices + ]; postPatch = '' patchShebangs . From 79d29ca79e068aa4cebd148aa03814ca84a23735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 5 May 2024 23:04:52 +0200 Subject: [PATCH 041/229] gshogi: fix double wrapping --- pkgs/games/gshogi/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index a4e9b903dc1c..cd678f5712bf 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -30,6 +30,12 @@ python3.pkgs.buildPythonApplication rec { pycairo ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "http://johncheetham.com/projects/gshogi/"; description = "A graphical implementation of the Shogi board game, also known as Japanese Chess"; From 8b2c339cbceb2375abc8dbdbad4fe8e0f2110794 Mon Sep 17 00:00:00 2001 From: chiroptical Date: Thu, 17 Oct 2024 19:32:42 -0400 Subject: [PATCH 042/229] erlang: 25.3.2.13 -> 25.3.2.15 --- pkgs/development/interpreters/erlang/25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index 2a5f82d6b8f3..d1c6e0aff3c9 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.13"; - sha256 = "sha256-ZBk6oOT0vFY66ttyn4G2zy7Ur5bDKkxPzlTsZPaiosc="; + version = "25.3.2.15"; + sha256 = "sha256-y1QZZ+W5jkAygTRtXVu6FyG4I98SGXXourDfPPlEfg8="; } From b66c26bd3ebc4e36012b5f73632f15f013295542 Mon Sep 17 00:00:00 2001 From: chiroptical Date: Thu, 17 Oct 2024 19:35:05 -0400 Subject: [PATCH 043/229] erlang_26: 26.2.5.1 -> 26.2.5.4 --- pkgs/development/interpreters/erlang/26.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index f5fa3522c3ed..e7c256d1de78 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2.5.1"; - sha256 = "sha256-oxOynBFW++igiJtIv1ZjoMgtmumgnsWgwyVx4buhxCo="; + version = "26.2.5.4"; + sha256 = "sha256-fvpSvsr7wWgFKa8vODVz4RUn8JKe8NuT9sjvau38B+Y="; } From e7d44d664c11f8baec82a1251b523de2467c50c3 Mon Sep 17 00:00:00 2001 From: chiroptical Date: Thu, 17 Oct 2024 19:38:53 -0400 Subject: [PATCH 044/229] erlang_27: 27.0.1 -> 27.1.2 --- pkgs/development/interpreters/erlang/27.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index bf392920d555..91845a1bc28a 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "27.0.1"; - sha256 = "sha256-Lp6J9eq6RXDi0RRjeVO/CIa4h/m7/fwOp/y0u0sTdFQ="; + version = "27.1.2"; + sha256 = "sha256-urHJMPo9XG+sIBuCaWvEhAcykGxlVSdKKem7vCiMjcg="; } From 8dac8f7bb297c4c0cd37e9837a37dbf3445a31a2 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 18 Oct 2024 07:20:27 +0200 Subject: [PATCH 045/229] CONTRIBUTING: add practical advice section heading It was under the "Conventions" heading before which didn't make sense --- CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bc9927fe10d2..70e45094f269 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -615,6 +615,11 @@ Names of files and directories should be in lowercase, with dashes between words As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild. If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`. +# Practical contributing advice + +To contribute effectively and efficiently, you need to be aware of how the contributing process generally works. +This section aims to document the process as we live it in Nixpkgs to set expectations right and give practical tips on how to work with it. + ## I opened a PR, how do I get it merged? [i-opened-a-pr-how-do-i-get-it-merged]:#i-opened-a-pr-how-do-i-get-it-merged From f0501c8ed8752beb68b64dcd763bcb2493fb67f6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 17 Oct 2024 23:39:46 +0200 Subject: [PATCH 046/229] python312Packages.torch[-bin]: 2.4.1 -> 2.5.0 Diff: https://github.com/pytorch/pytorch/compare/refs/tags/v2.4.1...2.5.0 Changelog: https://github.com/pytorch/pytorch/releases/tag/v2.5.0 --- ...ropagate-cmakeFlags-from-environment.patch | 29 ------ pkgs/development/python-modules/torch/bin.nix | 4 +- .../python-modules/torch/binary-hashes.nix | 89 ++++++++----------- .../python-modules/torch/default.nix | 21 ++--- .../passthrough-python-lib-rel-path.patch | 12 --- .../python-modules/torch/prefetch.sh | 7 +- 6 files changed, 48 insertions(+), 114 deletions(-) delete mode 100644 pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch delete mode 100644 pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch diff --git a/pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch b/pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch deleted file mode 100644 index e30f6449c7bc..000000000000 --- a/pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c5d4087519eae6f41c80bbd8ffbcc9390db44c7f Mon Sep 17 00:00:00 2001 -From: SomeoneSerge -Date: Thu, 10 Oct 2024 19:19:18 +0000 -Subject: [PATCH] cmake.py: propagate cmakeFlags from environment - ---- - tools/setup_helpers/cmake.py | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py -index 4b605fe5975..ea1d6a1ef46 100644 ---- a/tools/setup_helpers/cmake.py -+++ b/tools/setup_helpers/cmake.py -@@ -332,6 +332,12 @@ class CMake: - file=sys.stderr, - ) - print(e, file=sys.stderr) -+ -+ # Nixpkgs compat: -+ if "cmakeFlags" in os.environ: -+ import shlex -+ args.extend(shlex.split(os.environ["cmakeFlags"])) -+ - # According to the CMake manual, we should pass the arguments first, - # and put the directory as the last element. Otherwise, these flags - # may not be passed correctly. --- -2.46.0 - diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index bcd5008984fa..e5231fb746e7 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -35,7 +35,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.4.1"; + version = "2.5.0"; in buildPythonPackage { inherit version; @@ -45,7 +45,7 @@ buildPythonPackage { format = "wheel"; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); + disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13"); src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 1db23d136ba4..17416b27170a 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -7,81 +7,66 @@ version: builtins.getAttr version { - "2.4.1" = { - x86_64-linux-38 = { - name = "torch-2.4.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-y09QL5ELR+HjZsz3sjHawpZ9LvtH1LjLM/xjtLxe7tg="; - }; + "2.5.0" = { x86_64-linux-39 = { - name = "torch-2.4.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-mYatNVXd//Vekl2CmPiytJEGp9xg+BGiB2pEX+RFjis="; + name = "torch-2.5.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-Z3RdahkVnJ436sN6HAicTZ9ZTNcsIV2mFN9A/OEw3Sc="; }; x86_64-linux-310 = { - name = "torch-2.4.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-ml8LEDz+hAs1aEFqpQZ/bnuf7GfZxWWf1DsSB0UP6XU="; + name = "torch-2.5.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-uLcj9Hqgb9/rGnqsXf+PpZlL+qT9PK0GAbvw1bHBUEk="; }; x86_64-linux-311 = { - name = "torch-2.4.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-kU0Sjlq8u+ecobnrUxGxhURPGy1xF99VX+QYSH7PuJQ="; + name = "torch-2.5.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-Xj9Ke6gSUXwsFlmFe1GV8oeiiPvQUKWr+TEeA9vhoos="; }; x86_64-linux-312 = { - name = "torch-2.4.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-q0kWELFVUeCNp0urKdCTPmvxC6tE+31LEyjx6EXAWlM="; - }; - aarch64-darwin-38 = { - name = "torch-2.4.1-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-X8HU1+0mXvhTV5yvJyaG0e2Hzr3NBPKkmPgA/8U9q3E="; + name = "torch-2.5.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-EcKB2WiMNu3tBq6PYNa5fgEIMe+upKSyJErUNn4jLtc="; }; aarch64-darwin-39 = { - name = "torch-2.4.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-o43igD7mBQMJqsAyZ2U2w9O2qYBCSFN+OOCY0OFIF+w="; + name = "torch-2.5.0-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-7YScLRFY+FkflMFEeO4cPeq8H0OKAD1VwFdGJMAWJ/E="; }; aarch64-darwin-310 = { - name = "torch-2.4.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-02qO8QD1v/Ppw86pNLng1+onfLghDHFS00qabFgw6t0="; + name = "torch-2.5.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-uK9pC351HUG9Je8uqkauNUqngTgOHk006wMb+oP0tRI="; }; aarch64-darwin-311 = { - name = "torch-2.4.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-3d29iwZudDk0pCALPVQmekbbAhBodtIc8x99p6lvmOo="; + name = "torch-2.5.0-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-2nchfs0y5UxiSXmVR+7aEF67qow8dFtZGlMg4rwkNYU="; }; aarch64-darwin-312 = { - name = "torch-2.4.1-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-crSE1bbOwac1vz+locSIPQF0hpjF6c/b60/6t8eYfg0="; - }; - aarch64-linux-38 = { - name = "torch-2.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-Vq0qdgt6eIJyWh7r9WV6u7O1FE6ya8tHtSBZNXRjxUg="; + name = "torch-2.5.0-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-w6vjoAPA1XgGUi9z1euXdmg2onTYCcnKPrPnXSSIvz4="; }; aarch64-linux-39 = { - name = "torch-2.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-FJUTLzD3Iq8aCRlQCIuuo4P+OZA9sGsg5pNv2ZQCgD4="; + name = "torch-2.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-5CMassS3SgvmnicQ4/kRAs55yuCeb7saYe9yRsUHA+Q="; }; aarch64-linux-310 = { - name = "torch-2.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-+iewSNMhmM2m6c/wv3aOhoPZh0OQO35dKx9QmN7R00M="; + name = "torch-2.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-UPz/n1ucUQL5+PXLPRK9TZ8SZmUOS4wU9QpexYnh7qU="; }; aarch64-linux-311 = { - name = "torch-2.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-ML4oRNDJORYaEQc7+69kXxx8tD9i9GzG5N8cEZ+yp5g="; + name = "torch-2.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-IFoOy/hfTHhXz99Paw4HMWvZKe2SSCVp6PRSRABVmIQ="; }; aarch64-linux-312 = { - name = "torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-NhCUMrEL1xY8mzDOiW88LMobhrl2X5VqFZTw/0MJHio="; + name = "torch-2.5.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-V+B/GKTe9Sz+UETKqGG8PeRJcXn67iNvO5V7Qn/80OQ="; }; }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 36863da6759f..cd43c04d67d4 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -38,7 +38,7 @@ darwin, numactl, - # Propagated build inputs + # dependencies astunparse, fsspec, filelock, @@ -87,8 +87,6 @@ tensorboard, protobuf, - pythonOlder, - # ROCm dependencies rocmSupport ? config.rocmSupport, rocmPackages_5, @@ -225,11 +223,9 @@ in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.4.1"; + version = "2.5.0"; pyproject = true; - disabled = pythonOlder "3.8.0"; - outputs = [ "out" # output standard python package "dev" # output libtorch headers @@ -243,17 +239,11 @@ buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-x/zM/57syr46CP1TfGaefSjzvNm4jJbWFZGVGyzPMg8="; + hash = "sha256-z41VAN4l/6hyHsxNOnJORy5EQK93kSMkDHRVQrdxv7k="; }; patches = - [ - # Allow setting PYTHON_LIB_REL_PATH with an environment variable. - # https://github.com/pytorch/pytorch/pull/128419 - ./passthrough-python-lib-rel-path.patch - ./0001-cmake.py-propagate-cmakeFlags-from-environment.patch - ] - ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] + lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) @@ -537,6 +527,9 @@ buildPythonPackage rec { ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; + pythonRelaxDeps = [ + "sympy" + ]; dependencies = [ astunparse cffi diff --git a/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch b/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch deleted file mode 100644 index 629a0495c00e..000000000000 --- a/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py -index 5481ce46031c..d50d9d547399 100644 ---- a/tools/setup_helpers/cmake.py -+++ b/tools/setup_helpers/cmake.py -@@ -231,6 +231,7 @@ def generate( - "SELECTED_OP_LIST", - "TORCH_CUDA_ARCH_LIST", - "TRACING_BASED", -+ "PYTHON_LIB_REL_PATH", - ) - } - ) diff --git a/pkgs/development/python-modules/torch/prefetch.sh b/pkgs/development/python-modules/torch/prefetch.sh index 88cbfa2c346e..712edbddb52e 100755 --- a/pkgs/development/python-modules/torch/prefetch.sh +++ b/pkgs/development/python-modules/torch/prefetch.sh @@ -5,23 +5,20 @@ set -eou pipefail version=$1 -linux_cuda_version="cu121" +linux_cuda_version="cu124" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl" "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl" - "aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-311 $linux_cpu_bucket/torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" @@ -37,7 +34,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + hash=$(nix hash convert --hash-algo sha256 `nix-prefetch-url "$url" --name "$name"`) echo " $key = {" >> $hashfile echo " name = \"$name\";" >> $hashfile From 9f4888eff194b0195395c0886fd38315e3036dd3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 18 Oct 2024 00:08:28 +0200 Subject: [PATCH 047/229] python312Packages.torchvision[-bin]: 0.19.1 -> 0.20.0 Diff: https://github.com/pytorch/vision/compare/refs/tags/v0.19.1...v0.20.0 Changelog: https://github.com/pytorch/vision/releases/tag/v0.20.0 --- .../python-modules/torchvision/bin.nix | 4 +- .../torchvision/binary-hashes.nix | 89 ++++++++----------- .../python-modules/torchvision/default.nix | 4 +- .../python-modules/torchvision/prefetch.sh | 7 +- 4 files changed, 43 insertions(+), 61 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index ea03954c14d7..e2f0ea2bed6d 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -23,7 +23,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.19.1"; + version = "0.20.0"; in buildPythonPackage { inherit version; @@ -34,7 +34,7 @@ buildPythonPackage { src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); + disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13"); # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support. buildInputs = diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 43ab9f1790ba..1ca7c229c683 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,66 @@ version: builtins.getAttr version { - "0.19.1" = { - x86_64-linux-38 = { - name = "torchvision-0.19.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-MFL5ci3Dn9fwJrRKb73vk6so95UgBwEs6E0xPWeWQBE="; - }; + "0.20.0" = { x86_64-linux-39 = { - name = "torchvision-0.19.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-FFMN7gzEx8BgJPC9zJV/d94NK5DptyIZ3NYh+ilSXQA="; + name = "torchvision-0.20.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-UP9Puz3JlN21FK7WvZLJDMF1sWjGWYg4014qxTqaCos="; }; x86_64-linux-310 = { - name = "torchvision-0.19.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-uMxL84G3VSKZW2AeB6G0M7X9kl3D40p/ps0i9EnWU3k="; + name = "torchvision-0.20.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-k5Ni8WH31mqPKrExODqzeZhFjjCO4sYsnRzSdR37KEI="; }; x86_64-linux-311 = { - name = "torchvision-0.19.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-U2QXNAaUspzFTDCFB9CYsAy9zB/oaAcqNLVTvtc9nTA="; + name = "torchvision-0.20.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-O0R4ODFuAqqSFSklZbp5wT0//rBjGgkAxby4uB7iJtc="; }; x86_64-linux-312 = { - name = "torchvision-0.19.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-+wzQYi40nfhK1zutjrvqaxx08DPa3YTZqAz0opGSfq4="; - }; - aarch64-darwin-38 = { - name = "torchvision-0.19.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-TE5PWyTqawh7Au1JKrHiG7ozUsRXfi3vFCSM/GBzIzg="; + name = "torchvision-0.20.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-hGajClfLUfO0GtC+QKxc8/GijZMnMKHEEWyD0yHQfjw="; }; aarch64-darwin-39 = { - name = "torchvision-0.19.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-cx9DTZFYZ2niVbXXDtGkRX4KE5SpX0qs8OHn4h+AwJg="; + name = "torchvision-0.20.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-anDIHqUGjdex40Dr6rtlNkV22LmBlFTP34EikM8D5Fo="; }; aarch64-darwin-310 = { - name = "torchvision-0.19.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-VOhRMJnm9YY1bHD4CdNPORr3GtGC/gccwyiiivLEBgg="; + name = "torchvision-0.20.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-8WTVRZZRhv/WYBTjSpZnBtEshBmDAt1GdIyuRZhGCaQ="; }; aarch64-darwin-311 = { - name = "torchvision-0.19.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-QFFCgrSJbWJ2W44m1wkcMuF8NYF9AOxL4jYuo7o9F4c="; + name = "torchvision-0.20.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-oV3mJmo2vNENifbz17pOLdVnp6Ct1hbrxuZa6iB5Dl0="; }; aarch64-darwin-312 = { - name = "torchvision-0.19.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-J+zid/8PbNx/7QYnJ5xjLcsuWBh9p3HsoksPvPP4WQ0="; - }; - aarch64-linux-38 = { - name = "torchvision-0.19.1-cp38-cp38-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-TRC8kIPE1frdft17cpcAp75I2rT2InjfO8c/pI5IoVU="; + name = "torchvision-0.20.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-rA7bpTT7BxsrA6L9XLv5t8JZiW0XodDYMLPFt9+uB4I="; }; aarch64-linux-39 = { - name = "torchvision-0.19.1-cp39-cp39-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-4ygwm4ZwouiJsv52ocJ0SgmcEcmE2pqCI1e9nevWmaU="; + name = "torchvision-0.20.0-cp39-cp39-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-jWzqirC/cuy3GwfND+g26s9aX6mPZinSJhIS6Ql3uWM="; }; aarch64-linux-310 = { - name = "torchvision-0.19.1-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-ewYxFhZL5S/G3rR2Lef4yQv6OmX41crxf44tWq3HWgQ="; + name = "torchvision-0.20.0-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-4IT1Dsvb56nML8UeoDZ641/eRuhKlkv0BGyxx/634+Y="; }; aarch64-linux-311 = { - name = "torchvision-0.19.1-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-1xpqb+OlKByjSH1MVq1KrSD/cPgvHXx5vLbnsMKvAMg="; + name = "torchvision-0.20.0-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-Vdf0PvkS68TaS7pzoLvzh9OKa+nNUhZ5wPQFb5Vktpg="; }; aarch64-linux-312 = { - name = "torchvision-0.19.1-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-wHv0PCoUXXkuzZ0FA9bHNXcUfs5QjUVgDYqsd+TN/Pk="; + name = "torchvision-0.20.0-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-+NAhNIms+xODafJFWmiTiAwZSoGV44HBn4crJ38mVMM="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index e00846c824a9..06aa3932f5a7 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -26,7 +26,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.19.1"; + version = "0.20.0"; in buildPythonPackage { inherit pname version; @@ -35,7 +35,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-UMBFR/Vw13A+bBfr0p3rRwpCRVMq+ihdlG3C/iuOC30="; + hash = "sha256-aQ1HhWtkhA2EYPCV2vEW10kcP0m0TLNsgjA0Yiwpm9U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 47ccbd935c8a..4e5acf3a7a67 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -5,22 +5,19 @@ set -eou pipefail version=$1 -linux_cuda_version="cu121" +linux_cuda_version="cu124" linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl" "aarch64-darwin-312 $darwin_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl" - "aarch64-linux-38 $darwin_bucket/torchvision-${version}-cp38-cp38-linux_aarch64.whl torchvision-${version}-cp38-cp38-linux_aarch64.whl" "aarch64-linux-39 $darwin_bucket/torchvision-${version}-cp39-cp39-linux_aarch64.whl torchvision-${version}-cp39-cp39-linux_aarch64.whl" "aarch64-linux-310 $darwin_bucket/torchvision-${version}-cp310-cp310-linux_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl" "aarch64-linux-311 $darwin_bucket/torchvision-${version}-cp311-cp311-linux_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl" @@ -36,7 +33,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + hash=$(nix hash convert --hash-algo sha256 `nix-prefetch-url "$url" --name "$name"`) echo " $key = {" >> $hashfile echo " name = \"$name\";" >> $hashfile From 73bdba8205e52704946aea49fe9d63a2d4437881 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 18 Oct 2024 00:13:48 +0200 Subject: [PATCH 048/229] python312Packages.torchaudio[-bin]: 2.4.1 -> 2.5.0 Diff: https://github.com/pytorch/audio/compare/refs/tags/v2.4.1...v2.5.0 Changelog: https://github.com/pytorch/audio/releases/tag/v2.5.0 --- .../python-modules/torchaudio/bin.nix | 4 +- .../torchaudio/binary-hashes.nix | 89 ++++++++----------- .../python-modules/torchaudio/default.nix | 4 +- .../python-modules/torchaudio/prefetch.sh | 7 +- 4 files changed, 43 insertions(+), 61 deletions(-) diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index d9aa2b6de388..f03dd8e46043 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.4.1"; + version = "2.5.0"; format = "wheel"; src = @@ -33,7 +33,7 @@ buildPythonPackage rec { in fetchurl srcs; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); + disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13"); buildInputs = [ diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index ea62ccc724f5..ec859738d3ed 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,66 @@ version: builtins.getAttr version { - "2.4.1" = { - x86_64-linux-38 = { - name = "torchaudio-2.4.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-/PvxFpkpX2WwRYHNBDcv4CojmAbrfSXaJ0bzXeD10tk="; - }; + "2.5.0" = { x86_64-linux-39 = { - name = "torchaudio-2.4.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-cbuwbBAYeZ2zoLzAlN0IuAvCi7e18nq4sOLziwFLEcY="; + name = "torchaudio-2.5.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-EPFw0hJ5l68BebIfOHjJiR54Sx5VtWNsHRnfq1tSYlU="; }; x86_64-linux-310 = { - name = "torchaudio-2.4.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-2oyHyAocE3akjcM+7zCwO73x3yWgW9KxxiC4gRx7Gb4="; + name = "torchaudio-2.5.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-PV0jpAEMHbJGhC+ahhHNK4teEQ1dR3jME9pZfvfDqV8="; }; x86_64-linux-311 = { - name = "torchaudio-2.4.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-AbBO25E1p9YPoBAPwB/7QKCFgBD1ma5kGPQOCeiOaBs="; + name = "torchaudio-2.5.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-Y+Qe6UgenV9ViG2tBHPsTuIhKl5Ruc1lU/2dWKYvZ+E="; }; x86_64-linux-312 = { - name = "torchaudio-2.4.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-a3TXBquoHbX4OMpBTwPT9lmOqIC3IQYGXbycXTwGP+E="; - }; - aarch64-darwin-38 = { - name = "torchaudio-2.4.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-TqD9ABQv55XHW8wgowOYG1byMnx/fTIbQqj+8deKr6k="; + name = "torchaudio-2.5.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-qSgxhlE7+HATg8a8w+1tYk2kK7/WLzHHJrmulH9R7zc="; }; aarch64-darwin-39 = { - name = "torchaudio-2.4.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-OtzlUIUJArmqbNI3jM1yCsnsjPMeLrqXQ8zIT/y+dtY="; + name = "torchaudio-2.5.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-hVc/ZtwJSX0oK79Abo8rA+WSnrO9wfdqnZvEZkTUB7E="; }; aarch64-darwin-310 = { - name = "torchaudio-2.4.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-ZhkJdRkJNAsk9jdBDf7AKoiIZ4FsPbGe1PQQKuEFJEo="; + name = "torchaudio-2.5.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-q2m9/rRDQVnhaKSiwWGNHWWloUqR0X0hJW6pYPM0Bf0="; }; aarch64-darwin-311 = { - name = "torchaudio-2.4.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-YK8VMYFdImWeVBLqQBvtVSoWw4mTjElmTkRuTP1d3AY="; + name = "torchaudio-2.5.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-mC7ASUonx/Pn5oyRzJLm4a1vhv7e7sYnCWBRMJYysUk="; }; aarch64-darwin-312 = { - name = "torchaudio-2.4.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-lTlGz2EP/Ve7P90ijv+iES+lHF3+NqlmEe/8kHSj074="; - }; - aarch64-linux-38 = { - name = "torchaudio-2.4.1-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-dNGc+co9rTlK/Ku35vftmrn1nyVA1QKCbH7D4zmFJR0="; + name = "torchaudio-2.5.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-yDXadxcBsG++jhnOZD1eWH/TheX02PFAVRzgSQCxuWs="; }; aarch64-linux-39 = { - name = "torchaudio-2.4.1-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-NsfnvGs1jL9Ct2nIAgZ4D6FJfRQamFxrPndo3kRSTpo="; + name = "torchaudio-2.5.0-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-qr+MTOkZwuJKzklkHqQpNgAYgWNxo9RwQn/AKrERVsU="; }; aarch64-linux-310 = { - name = "torchaudio-2.4.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-VEMRedmpzPP+6umKrOB9ifrp/XKOK8hlbvvXDn7cxvg="; + name = "torchaudio-2.5.0-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-nf7tzvPkMBDz7C2ATI9i/kmrCe8cGeZzYyWTlmGik70="; }; aarch64-linux-311 = { - name = "torchaudio-2.4.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-dkCq/7IFbhLykGGHsDoiIooJCMh9ApX930sLkjNKKQs="; + name = "torchaudio-2.5.0-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-w1IB79KCRBUtbtvekndcEPOfWl2TRiAvB7FVTceNJaI="; }; aarch64-linux-312 = { - name = "torchaudio-2.4.1-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-W2L8exbtcIsMB9Q5MTd5fpL2P8O9VwVgfZe6app88/A="; + name = "torchaudio-2.5.0-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-WTJY8z3h+hbr5XGMlxfa82lUYNSKAYgZSlxXSnEIOMs="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 63ea30a39f62..4b11fe0dc6c1 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -76,14 +76,14 @@ let in buildPythonPackage rec { pname = "torchaudio"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-zQqIIzOW9vboP5XQSOUWB0edz6XJvz06RqbcYPO9K24="; + hash = "sha256-Swh+HnkGRzjQFt9mYO+qBq4BDTbmLGSkOrN2ZUQdNUI="; }; patches = [ ./0001-setup.py-propagate-cmakeFlags.patch ]; diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index e4a9b9c90f6c..64b5011773b1 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -5,23 +5,20 @@ set -eou pipefail version=$1 -linux_cuda_version="cu121" +linux_cuda_version="cu124" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torchaudio-${version}-cp312-cp312-linux_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl" - "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" @@ -37,7 +34,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url "$url" --name "$name")) + hash=$(nix hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) echo " $key = {" >>$hashfile echo " name = \"$name\";" >>$hashfile From 0b970852975e2d79216f747107d370823fab7134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Fri, 20 Sep 2024 00:44:55 +0300 Subject: [PATCH 049/229] python3Packages.proton-core: 0.2.0 -> 0.3.3 Update to the latest version. --- pkgs/development/python-modules/proton-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix index 12df2934bff2..91bffd81e2ce 100644 --- a/pkgs/development/python-modules/proton-core/default.nix +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "proton-core"; - version = "0.2.0"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; rev = "refs/tags/v${version}"; - hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ="; + hash = "sha256-2Drlai/PYzi1z1CtDYfNhol2wamb/HNrvUhj0XsiyHg="; }; build-system = [ setuptools ]; From 20792493c79ecc91d1bca8330377e5a27cd37718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Fri, 20 Sep 2024 12:07:36 +0300 Subject: [PATCH 050/229] python3Packages.proton-vpn-api-core: 0.32.2 -> 0.35.5 Update the package to the latest version. --- .../python-modules/proton-vpn-api-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index 219dd94b3142..e80209415c73 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.32.2"; + version = "0.35.5"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI="; + hash = "sha256-YdBsA8qKcWpR+L/I9rEFntR448kaxEjYuGDPS1ynsMU="; }; build-system = [ setuptools ]; From ef3b0b0b7e4ed28d17fbab27f497d352dc4d6ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Fri, 20 Sep 2024 14:55:00 +0300 Subject: [PATCH 051/229] python3Packages.proton-vpn-network-manager: 0.5.2 -> 0.9.1 Update to the latest versions. The proton-vpn-network-manager-wireguard and proton-vpn-network-manager-openvpn modules are now legacy: The same functionality is now in proton-vpn-network-manager module, version 0.6.3 and upwards. --- pkgs/applications/networking/protonvpn-gui/default.nix | 4 ---- .../proton-vpn-network-manager/default.nix | 9 +++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 9484a1c42dcf..c60fe44d2457 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -16,8 +16,6 @@ proton-vpn-killswitch-network-manager, proton-vpn-logger, proton-vpn-network-manager, - proton-vpn-network-manager-openvpn, - proton-vpn-network-manager-wireguard, proton-vpn-session, pycairo, pygobject3, @@ -67,8 +65,6 @@ buildPythonApplication rec { proton-vpn-killswitch-network-manager proton-vpn-logger proton-vpn-network-manager - proton-vpn-network-manager-openvpn - proton-vpn-network-manager-wireguard proton-vpn-session pycairo pygobject3 diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index fea0d2e304d0..3b5bce32a27a 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.5.2"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-hTJE9sUjPMsE9d0fIA/OhoasumtfsWuFwn0aTm10PN4="; + hash = "sha256-dwWEcLowNlIoxeVQnEpmI+PK18DQRiW4A4qfWHSqRw8="; }; nativeBuildInputs = [ @@ -54,6 +54,11 @@ buildPythonPackage rec { pytest-asyncio ]; + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; + meta = { description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; From e26315c72a9fa7d3bcb24110c4c054c4b9d08a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Thu, 10 Oct 2024 15:39:07 +0300 Subject: [PATCH 052/229] python3Packages.proton-keyring-linux: 0.0.2 -> 0.1.0 Update the package to the latest version. --- .../python-modules/proton-keyring-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index 51617e71a0f8..ee9e11857ed9 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proton-keyring-linux"; - version = "0.0.2"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU="; + hash = "sha256-feIgRC0U7d96gFcmHqRF3/8k/bsxlPJs1/K+ki7uXys="; }; build-system = [ setuptools ]; From 74cdad8aa811a70dc782b87991bfb874b2b50e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Fri, 20 Sep 2024 11:11:36 +0300 Subject: [PATCH 053/229] protonvpn-gui: 4.4.4 -> 4.6.0, deprecate obsolete dependencies Update the protonvpn-gui package to the latest version. The proton-vpn-network-manager-wireguard and proton-vpn-network-manager-openvpn modules are now legacy: The same functionality is now in proton-vpn-network-manager module, version 0.6.3 and upwards. proton-vpn-connection functionality was integrated in the proton-vpn-api-core module. proton-vpn-session functionality was integrated in the proton-vpn-api-core module. proton-vpn-killswitch functionality was integrated in the proton-vpn-api-core module. proton-keyring-linux-secretservice functionality was integrated in the proton-keyring-linux module proton-vpn-killswitch-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module proton-vpn-killswitch-network-manager functionality was integrated in the proton-vpn-network-manager module proton-vpn-logger functionality was integrated in the proton-vpn-api-core module --- .../networking/protonvpn-gui/default.nix | 18 ++--- .../default.nix | 40 ----------- .../proton-keyring-linux/default.nix | 5 +- .../proton-vpn-api-core/default.nix | 36 +++++++--- .../proton-vpn-connection/default.nix | 67 ------------------- .../default.nix | 67 ------------------- .../default.nix | 61 ----------------- .../proton-vpn-killswitch/default.nix | 40 ----------- .../proton-vpn-logger/default.nix | 47 ------------- .../default.nix | 52 -------------- .../default.nix | 57 ---------------- .../proton-vpn-network-manager/default.nix | 19 +++++- .../proton-vpn-session/default.nix | 65 ------------------ pkgs/top-level/python-aliases.nix | 9 +++ pkgs/top-level/python-packages.nix | 18 ----- 15 files changed, 58 insertions(+), 543 deletions(-) delete mode 100644 pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix delete mode 100644 pkgs/development/python-modules/proton-vpn-connection/default.nix delete mode 100644 pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix delete mode 100644 pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix delete mode 100644 pkgs/development/python-modules/proton-vpn-killswitch/default.nix delete mode 100644 pkgs/development/python-modules/proton-vpn-logger/default.nix delete mode 100644 pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix delete mode 100644 pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix delete mode 100644 pkgs/development/python-modules/proton-vpn-session/default.nix diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index c60fe44d2457..b14b63d8f72d 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -9,14 +9,9 @@ packaging, proton-core, proton-keyring-linux, - proton-keyring-linux-secretservice, proton-vpn-api-core, - proton-vpn-connection, - proton-vpn-killswitch, - proton-vpn-killswitch-network-manager, - proton-vpn-logger, + proton-vpn-local-agent, proton-vpn-network-manager, - proton-vpn-session, pycairo, pygobject3, withIndicator ? true, @@ -26,14 +21,14 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.4.4"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; rev = "refs/tags/v${version}"; - hash = "sha256-e581FgXrk1cfjsl/UaG9M+3VBYXcV0mggeLeEW9s9KM="; + hash = "sha256-GCfr6x0KbIJr2r4UcFtMjuyHZVyDLKPvgtjdpTCb5Ro="; }; nativeBuildInputs = [ @@ -58,14 +53,9 @@ buildPythonApplication rec { packaging proton-core proton-keyring-linux - proton-keyring-linux-secretservice proton-vpn-api-core - proton-vpn-connection - proton-vpn-killswitch - proton-vpn-killswitch-network-manager - proton-vpn-logger + proton-vpn-local-agent proton-vpn-network-manager - proton-vpn-session pycairo pygobject3 ]; diff --git a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix deleted file mode 100644 index 4bb419d21b20..000000000000 --- a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-keyring-linux, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-keyring-linux-secretservice"; - version = "0.0.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-keyring-linux-secretservice"; - rev = "refs/tags/v${version}"; - hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo="; - }; - - build-system = [ setuptools ]; - - dependencies = [ proton-keyring-linux ]; - - pythonImportsCheck = [ "proton.keyring_linux" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "ProtonVPN component to access Linux's keyring secret service API"; - homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux-secretservice"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index ee9e11857ed9..56bd41fea4a6 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -28,7 +28,10 @@ buildPythonPackage rec { proton-core ]; - pythonImportsCheck = [ "proton.keyring_linux.core" ]; + pythonImportsCheck = [ + "proton.keyring_linux.core" + "proton.keyring_linux" + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index e80209415c73..b98536954e8d 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -2,12 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + cryptography, setuptools, + jinja2, proton-core, - proton-vpn-connection, - proton-vpn-logger, - proton-vpn-killswitch, - proton-vpn-session, + pynacl, + aiohttp, + pyopenssl, + pytest-asyncio, + requests, sentry-sdk, distro, pytestCheckHook, @@ -26,26 +29,37 @@ buildPythonPackage rec { hash = "sha256-YdBsA8qKcWpR+L/I9rEFntR448kaxEjYuGDPS1ynsMU="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; dependencies = [ + cryptography distro + jinja2 + pynacl proton-core - proton-vpn-connection - proton-vpn-logger - proton-vpn-killswitch - proton-vpn-session sentry-sdk ]; - pythonImportsCheck = [ "proton.vpn.core" ]; + pythonImportsCheck = [ + "proton.vpn.core" + "proton.vpn.connection" + "proton.vpn.killswitch.interface" + "proton.vpn.logging" + "proton.vpn.session" + ]; nativeCheckInputs = [ + aiohttp + pyopenssl + pytest-asyncio + requests pytestCheckHook pytest-cov-stub ]; - preCheck = '' + postInstall = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) ''; diff --git a/pkgs/development/python-modules/proton-vpn-connection/default.nix b/pkgs/development/python-modules/proton-vpn-connection/default.nix deleted file mode 100644 index 7da811dc3a31..000000000000 --- a/pkgs/development/python-modules/proton-vpn-connection/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - proton-vpn-killswitch, - proton-vpn-logger, - jinja2, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-connection"; - version = "0.14.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-connection"; - rev = "refs/tags/v${version}"; - hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - jinja2 - proton-core - proton-vpn-killswitch - proton-vpn-logger - ]; - - pythonImportsCheck = [ "proton.vpn.connection" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - disabledTests = [ - # Permission denied: '/run' - "test_ensure_configuration_file_is_deleted" - "test_ensure_generate_is_returning_expected_content" - "test_ensure_same_configuration_file_in_case_of_duplicate" - "test_ensure_configuration_file_is_created" - "test_wireguard_config_content_generation" - "test_wireguard_with_malformed_credentials" - "test_wireguard_with_non_certificate" - "test_wireguard_without_settings" - # Neiter udp or tcp are working - "test_ovpnconfig_with_settings" - "test_ovpnconfig_with_missing_settings_applies_expected_defaults" - "test_ovpnconfig_with_malformed_params" - "test_ovpnconfig_with_certificate_and_malformed_credentials" - "test_ovpnconfig_with_malformed_server" - "test_ovpnconfig_with_malformed_server_and_credentials" - ]; - - meta = { - description = "Defines the interface that VPN connection backends should implement"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-connection"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix deleted file mode 100644 index 8ff9321fc57c..000000000000 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - networkmanager, - proton-vpn-api-core, - proton-vpn-killswitch, - proton-vpn-logger, - pycairo, - pygobject3, - pytestCheckHook, - iproute2, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch-network-manager-wireguard"; - version = "0.1.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch-network-manager-wireguard"; - rev = "v${version}"; - hash = "sha256-4sYD2X1U066FMjrtbTb31wvkCDWAw+eXod+pi0gGsCQ="; - }; - - nativeBuildInputs = [ - # Solves ImportError: cannot import name NM, introspection typelib not found - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - # Needed here for the NM namespace - networkmanager - proton-vpn-api-core - proton-vpn-killswitch - proton-vpn-logger - pycairo - pygobject3 - ]; - - postPatch = '' - substituteInPlace proton/vpn/killswitch/backend/linux/wireguard/killswitch_connection_handler.py \ - --replace '/usr/sbin/ip' '${iproute2}/bin/ip' - ''; - - pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.wireguard" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Implementation of the proton-vpn-killswitch interface using Network Manager with wireguard-protocol"; - homepage = "https://github.com/ProtonVPN/proton-vpn-killswitch-network-manager-wireguard"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix deleted file mode 100644 index c8d30741930c..000000000000 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - networkmanager, - proton-vpn-api-core, - proton-vpn-killswitch, - proton-vpn-logger, - pycairo, - pygobject3, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch-network-manager"; - version = "0.5.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch-network-manager"; - rev = "refs/tags/v${version}"; - hash = "sha256-iUm+hpqgI4jG+1Cd9F6pBjodxHpq9/2ovXRT877biXQ="; - }; - - nativeBuildInputs = [ - # Solves ImportError: cannot import name NM, introspection typelib not found - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - # Needed here for the NM namespace - networkmanager - proton-vpn-api-core - proton-vpn-killswitch - proton-vpn-logger - pycairo - pygobject3 - ]; - - pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.networkmanager" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Implementation of the proton-vpn-killswitch interface using Network Manager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch-network-manager"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix deleted file mode 100644 index ae83dd1e5baa..000000000000 --- a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch"; - version = "0.4.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch"; - rev = "v${version}"; - hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8="; - }; - - build-system = [ setuptools ]; - - dependencies = [ proton-core ]; - - pythonImportsCheck = [ "proton.vpn.killswitch.interface" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Defines the ProtonVPN kill switch interface"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-logger/default.nix b/pkgs/development/python-modules/proton-vpn-logger/default.nix deleted file mode 100644 index 402b6e0e4910..000000000000 --- a/pkgs/development/python-modules/proton-vpn-logger/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-logger"; - version = "0.2.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-logger"; - rev = "refs/tags/v${version}"; - hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I="; - }; - - build-system = [ - setuptools - ]; - - dependencies = [ proton-core ]; - - pythonImportsCheck = [ "proton.vpn.logging" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - preCheck = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - meta = { - description = "General purpose logging package for the entire ProtonVPN Linux client"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-logger"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix deleted file mode 100644 index 25c9715e7e6b..000000000000 --- a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - proton-core, - proton-vpn-network-manager, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-network-manager-openvpn"; - version = "0.1.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-network-manager-openvpn"; - rev = "refs/tags/v${version}"; - hash = "sha256-eDBcpuz37crfAFX6oysB4FCkSmVLyfLJ0R2L0cZgjRo="; - }; - - nativeBuildInputs = [ - # Solves Namespace NM not available - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - proton-core - proton-vpn-network-manager - ]; - - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager.protocol" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Adds support for the OpenVPN protocol using NetworkManager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-openvpn"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix deleted file mode 100644 index e32a4b5a1b88..000000000000 --- a/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - proton-core, - proton-vpn-killswitch-network-manager-wireguard, - proton-vpn-network-manager, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-network-manager-wireguard"; - version = "0.4.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-network-manager-wireguard"; - rev = "v${version}"; - hash = "sha256-DZXixcm2VwXhbN4buABlkybDgXIg/mbeUVHOpdoj0Kw="; - }; - - nativeBuildInputs = [ - # Solves Namespace NM not available - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - proton-core - proton-vpn-killswitch-network-manager-wireguard - proton-vpn-network-manager - ]; - - preCheck = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Adds support for the Wireguard protocol using NetworkManager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-wireguard"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index 3b5bce32a27a..4e32a915fad9 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -3,11 +3,13 @@ buildPythonPackage, fetchFromGitHub, gobject-introspection, + apt, + iproute2, setuptools, networkmanager, proton-core, proton-vpn-api-core, - proton-vpn-connection, + proton-vpn-local-agent, pycairo, pygobject3, pytest-asyncio, @@ -41,12 +43,23 @@ buildPythonPackage rec { networkmanager proton-core proton-vpn-api-core - proton-vpn-connection + proton-vpn-local-agent pycairo pygobject3 ]; - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager" ]; + postPatch = '' + substituteInPlace proton/vpn/backend/linux/networkmanager/killswitch/wireguard/killswitch_connection_handler.py \ + --replace '/usr/sbin/ip' '${iproute2}/bin/ip' + substituteInPlace proton/vpn/backend/linux/networkmanager/killswitch/wireguard/wgkillswitch.py \ + --replace '/usr/bin/apt' '${apt}/bin/apt' + ''; + + pythonImportsCheck = [ + "proton.vpn.backend.linux.networkmanager" + "proton.vpn.backend.linux.networkmanager.killswitch.default" + "proton.vpn.backend.linux.networkmanager.killswitch.wireguard" + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/proton-vpn-session/default.nix b/pkgs/development/python-modules/proton-vpn-session/default.nix deleted file mode 100644 index ee27bfb9b466..000000000000 --- a/pkgs/development/python-modules/proton-vpn-session/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - cryptography, - distro, - proton-core, - proton-vpn-logger, - pynacl, - aiohttp, - pyopenssl, - pytest-asyncio, - requests, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-session"; - version = "0.6.7"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-session"; - rev = "refs/tags/v${version}"; - hash = "sha256-/5ju/2bxhqK6JWchkxFe3amBKHtO98GCVQWIrUsn+nQ="; - }; - - build-system = [ - setuptools - ]; - - dependencies = [ - cryptography - distro - proton-core - proton-vpn-logger - pynacl - ]; - - pythonImportsCheck = [ "proton.vpn.session" ]; - - postInstall = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - nativeCheckInputs = [ - aiohttp - pyopenssl - pytest-asyncio - requests - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Provides utility classes to manage VPN sessions"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-session"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fe7dabf24846..59a1cca99ca5 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -415,6 +415,15 @@ mapAliases ({ prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 protonup = protonup-ng; # Added 2022-11-06 + proton-keyring-linux-secretservice = throw "proton-keyring-linux-secretservice functionality was integrated in the proton-keyring-linux module"; # added 2024-10-16 + proton-vpn-connection = throw "proton-vpn-connection functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 + proton-vpn-killswitch = throw "proton-vpn-killswitch functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 + proton-vpn-killswitch-network-manager = throw "proton-vpn-killswitch-network-manager functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-killswitch-network-manager-wireguard = throw "proton-vpn-killswitch-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-logger = throw "proton-vpn-logger functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 + proton-vpn-network-manager-openvpn = throw "proton-vpn-network-manager-openvpn functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-network-manager-wireguard = throw "proton-vpn-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-session = throw "proton-vpn-session functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 proxy_tools = proxy-tools; # added 2023-11-05 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9459619033f..216b34d2c55d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10734,28 +10734,10 @@ self: super: with self; { proton-keyring-linux = callPackage ../development/python-modules/proton-keyring-linux { }; - proton-keyring-linux-secretservice = callPackage ../development/python-modules/proton-keyring-linux-secretservice { }; - proton-vpn-api-core = callPackage ../development/python-modules/proton-vpn-api-core { }; - proton-vpn-connection = callPackage ../development/python-modules/proton-vpn-connection { }; - - proton-vpn-killswitch = callPackage ../development/python-modules/proton-vpn-killswitch { }; - - proton-vpn-killswitch-network-manager = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager { }; - - proton-vpn-killswitch-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager-wireguard { }; - - proton-vpn-logger = callPackage ../development/python-modules/proton-vpn-logger { }; - proton-vpn-network-manager = callPackage ../development/python-modules/proton-vpn-network-manager { }; - proton-vpn-network-manager-openvpn = callPackage ../development/python-modules/proton-vpn-network-manager-openvpn { }; - - proton-vpn-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-network-manager-wireguard { }; - - proton-vpn-session = callPackage ../development/python-modules/proton-vpn-session { }; - protonup-ng = callPackage ../development/python-modules/protonup-ng { }; protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib { From ef18a2aa00a556f84121697511925745b4fe82f4 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 18 Oct 2024 09:10:21 +0000 Subject: [PATCH 054/229] atlas: 0.28.0 -> 0.28.1 --- pkgs/by-name/at/atlas/package.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix index d19454e84ce5..22250150de5c 100644 --- a/pkgs/by-name/at/atlas/package.nix +++ b/pkgs/by-name/at/atlas/package.nix @@ -1,14 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, atlas }: +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + testers, + atlas, +}: buildGoModule rec { pname = "atlas"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-D6dHHTxD2eObmXwYntIOtcPsU1vP+K289n+XVoaGUVc="; + hash = "sha256-OPGPYCp878nYYujR1jiMpOg1cdLSwa3OZEIxL6JltD4="; }; modRoot = "cmd/atlas"; @@ -18,7 +25,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - ldflags = [ "-s" "-w" "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" ]; + ldflags = [ + "-s" + "-w" + "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" + ]; subPackages = [ "." ]; From ad9a406b92b3dd052efcbab6fa2101ee44fa66d0 Mon Sep 17 00:00:00 2001 From: Jack Wilsdon Date: Fri, 18 Oct 2024 10:21:54 +0100 Subject: [PATCH 055/229] clang-analyzer: use current LLVM version --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec449d917a51..52504fed7fad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14385,8 +14385,8 @@ with pkgs; clang-tools = llvmPackages.clang-tools; clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { - llvmPackages = llvmPackages_14; - inherit (llvmPackages_14) clang; + llvmPackages = llvmPackages; + inherit (llvmPackages) clang; }; clazy = callPackage ../development/tools/analysis/clazy { From 096186d8744c8c69d4b9f71374ca76ac4e97ab88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 17 Oct 2024 15:04:01 -0600 Subject: [PATCH 056/229] glycin-loaders: 1.0.1 -> 1.1.1 https://gitlab.gnome.org/sophie-h/glycin/-/compare/1.0.1...1.1.1 https://gitlab.gnome.org/sophie-h/glycin/-/blob/main/NEWS --- pkgs/by-name/gl/glycin-loaders/package.nix | 33 ++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index 7804acd778f7..80ea584a6389 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -3,29 +3,31 @@ , fetchurl , substituteAll , bubblewrap +, cairo , cargo , git +, gnome +, gtk4 +, lcms2 +, libheif +, libjxl +, librsvg +, libseccomp +, libxml2 , meson , ninja , pkg-config , rustc , rustPlatform -, gtk4 -, cairo -, libheif -, libxml2 -, libseccomp -, libjxl -, gnome }: stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "mirror://gnome/sources/glycin-loaders/${lib.versions.majorMinor finalAttrs.version}/glycin-loaders-${finalAttrs.version}.tar.xz"; - hash = "sha256-0PAiRi/1VYVuheqUBHRHC7NrN8n/y8umOgP+XpVDcM8="; + url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz"; + hash = "sha256-Vg7kIWfB7SKCZhjmHYPkkUDbW/R6Zam6js4s1z0qSqg="; }; patches = [ @@ -49,15 +51,24 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk4 # for GdkTexture cairo + lcms2 libheif libxml2 # for librsvg crate + librsvg libseccomp libjxl ]; + mesonFlags = [ + "-Dglycin-loaders=true" + "-Dlibglycin=false" + "-Dvapi=false" + ]; + passthru = { updateScript = gnome.updateScript { - packageName = "glycin-loaders"; + attrPath = "glycin-loaders"; + packageName = "glycin"; }; glycinPathsPatch = substituteAll { From 60d00382ce034aeadbf87ecd826605afd2328826 Mon Sep 17 00:00:00 2001 From: chiroptical Date: Thu, 17 Oct 2024 19:38:53 -0400 Subject: [PATCH 057/229] erlang_27: 27.0.1 -> 27.1.2 --- pkgs/development/interpreters/erlang/27.nix | 4 ++-- pkgs/development/interpreters/erlang/generic-builder.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index bf392920d555..91845a1bc28a 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "27.0.1"; - sha256 = "sha256-Lp6J9eq6RXDi0RRjeVO/CIa4h/m7/fwOp/y0u0sTdFQ="; + version = "27.1.2"; + sha256 = "sha256-urHJMPo9XG+sIBuCaWvEhAcykGxlVSdKKem7vCiMjcg="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 38af8a6e0926..2b363d4a06e6 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -98,6 +98,8 @@ stdenv.mkDerivation ({ inherit src version; + LANG = "C.UTF-8"; + nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ]; buildInputs = [ ncurses opensslPackage ] From bd4bd87293adbd04bbd89a7a09086e03388000b1 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Fri, 18 Oct 2024 20:46:15 +0200 Subject: [PATCH 058/229] mbedtls: 3.6.1 -> 3.6.2 Release notes: https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.2 Fixes CVE-2024-49195 --- pkgs/development/libraries/mbedtls/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index f8f53522db13..9655393615b9 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.6.1"; - hash = "sha256-SVWz2uOvGIplnBr4g6nwfxKMWVpzdZjusseAhw6GOJ8="; + version = "3.6.2"; + hash = "sha256-tSWhF8i0Tx9QSFmyDEHdd2xveZvpyd+HXR+8xYj2Syo="; } From bf213776214687cf87f26212c1102ccccffbdb5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Oct 2024 22:33:39 +0000 Subject: [PATCH 059/229] bmake: 20240808 -> 20240921 --- pkgs/by-name/bm/bmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index f18b65c62552..05729f8aa848 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20240808"; + version = "20240921"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-tZGJJRtIPezUSS8fdDh7KlhMA9WqRjfNSLOOxiucCEg="; + hash = "sha256-s0ZXnoLSltGk2ineqFlOPuWWEwsgeG3sDziZo+ESdcI="; }; patches = [ From 21b5e29b6e88bf30530c1dd45867d493851dd61e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 02:12:49 +0000 Subject: [PATCH 060/229] signal-desktop-beta: 7.30.0-beta.1 -> 7.30.0-beta.2 --- .../instant-messengers/signal-desktop/signal-desktop-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 26855ca78429..0cf36580bd08 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.30.0-beta.1"; + version = "7.30.0-beta.2"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-p7FhdB/GysBXKjExioe5kP3uutHgcSdFfcwI/l4Kn8E="; + hash = "sha256-mIdbaS4XNDh3wPTUHAyBqMQ67usp312e1McuFAGPrq0="; } From dc388874e2c998c34d6e86107b74926502b28532 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 18 Oct 2024 23:38:00 -0400 Subject: [PATCH 061/229] patroni: move to by-name and add updateScript --- .../pa/patroni/package.nix} | 15 +++++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 9 insertions(+), 8 deletions(-) rename pkgs/{servers/sql/patroni/default.nix => by-name/pa/patroni/package.nix} (77%) diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/by-name/pa/patroni/package.nix similarity index 77% rename from pkgs/servers/sql/patroni/default.nix rename to pkgs/by-name/pa/patroni/package.nix index 19739f2bcca2..526ba2aa87f7 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/by-name/pa/patroni/package.nix @@ -1,10 +1,11 @@ { lib -, pythonPackages +, python3Packages , fetchFromGitHub , nixosTests +, nix-update-script }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "patroni"; version = "4.0.2"; @@ -15,7 +16,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "sha256-ykTg5Zd4dU1D6dnj6QbNfGUXrSteKrQjV2hpIPhXGLU="; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ boto3 click consul @@ -34,7 +35,7 @@ pythonPackages.buildPythonApplication rec { ydiff ]; - nativeCheckInputs = with pythonPackages; [ + nativeCheckInputs = with python3Packages; [ flake8 mock pytestCheckHook @@ -47,8 +48,10 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "patroni" ]; - passthru.tests = { - patroni = nixosTests.patroni; + passthru = { + tests.patroni = nixosTests.patroni; + + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 274e605967cb..5ce611d530dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24865,8 +24865,6 @@ with pkgs; vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; - patroni = callPackage ../servers/sql/patroni { pythonPackages = python3Packages; }; - pgbouncer = callPackage ../servers/sql/pgbouncer { }; pgcat = callPackage ../servers/sql/pgcat {}; From c6127e5a171571a1746c5ce04cb517103daaf19e Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 19 Oct 2024 03:38:39 +0000 Subject: [PATCH 062/229] patroni: 4.0.2 -> 4.0.3 https://github.com/patroni/patroni/blob/v4.0.3/docs/releases.rst#version-403 --- pkgs/by-name/pa/patroni/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix index 526ba2aa87f7..f0628394addb 100644 --- a/pkgs/by-name/pa/patroni/package.nix +++ b/pkgs/by-name/pa/patroni/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "patroni"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ykTg5Zd4dU1D6dnj6QbNfGUXrSteKrQjV2hpIPhXGLU="; + sha256 = "sha256-urNTxaipM4wD+1fp7EFdT7/FGLq86O1nOfst7JyX0fc="; }; propagatedBuildInputs = with python3Packages; [ From 56ec5e83a4c55f5be5ded75640106b736d1444cf Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 19 Oct 2024 03:52:15 +0000 Subject: [PATCH 063/229] audiobookshelf: 2.15.0 -> 2.15.1 https://github.com/advplyr/audiobookshelf/releases/tag/v2.15.1 --- pkgs/by-name/au/audiobookshelf/source.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 4320f1380e02..0699cd2dde08 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "80e0cac4747e61d1fbb5374ec4ac41d3499042e2", - "hash": "sha256-gwu9AvxrfW1QSgUy3Q4di1xa964ZMZpRkgdFQlit9+4=", - "version": "2.15.0", - "depsHash": "sha256-TDZUrzVcmKn4izRn8E+uf6Mh22fRsHeVm5h+wRZAX8o=", - "clientDepsHash": "sha256-7R5+Yam9Y4+bj/8wrAE25g4sivg/sw5G0pAZFGPRpMI=" + "rev": "d80752cc9d7ace01fee57a627b7745adedc08589", + "hash": "sha256-iT2Ww+iRyGS5qBT3QcM7weiYq/6c408jTSPuZinNXgs=", + "version": "2.15.1", + "depsHash": "sha256-km/cx2IaJ2/1UxZk2uXHE46VF3MiR6hasYRuKKBitY4=", + "clientDepsHash": "sha256-3XsXCZrDMtZFs8xwqydfVouAuxarQl/KdMdHkq+Vp9A=" } From b4e0067f779db39a9369deea35da84e76f0928e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 09:48:24 +0000 Subject: [PATCH 064/229] broot: 1.44.0 -> 1.44.1 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 17c28c8f3bdd..c162829b6ec9 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.44.0"; + version = "1.44.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-0YZma3+Qk2P8lvVS7+Uma0YayuHxtK8lFTZXjTmPIuY="; + hash = "sha256-Qyc4R5hvSal82/qywriH7agluu6miAC4Y7UUM3VATCo="; }; - cargoHash = "sha256-QsUHJpSdI0Vz8hbK0Nqn3gxEpCkMGcj1R1CCgLIyEtE="; + cargoHash = "sha256-fsmwjr7EpzR/KKrGWoTeCOI7jmrlTYtjIksc205kRs8="; nativeBuildInputs = [ installShellFiles From 191301f12196ae3d424f40712e635c70f760c332 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 12:47:15 +0000 Subject: [PATCH 065/229] python312Packages.ydata-profiling: 4.10.0 -> 4.11.0 --- pkgs/development/python-modules/ydata-profiling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix index d9e88875777e..74be2546c623 100644 --- a/pkgs/development/python-modules/ydata-profiling/default.nix +++ b/pkgs/development/python-modules/ydata-profiling/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "ydata-profiling"; - version = "4.10.0"; + version = "4.11.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "ydataai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uB8E7qp1xohAdcIIt1T2DxwSu93XhJoI8/qn54fSvGY="; + hash = "sha256-3bgFPPGgLCcJfYr9vmwnHFwz3/zybRI8Aiu5VoOPsNA="; }; preBuild = '' From 56f3a51846e0cca0baea2755267770c59b743f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 19 Oct 2024 16:17:54 +0200 Subject: [PATCH 066/229] gbenchmark: fix cross compilation gtest is actually checked at build time not only at check time. When cross compiling checkInputs are also ignored, because 'doCheck = false;'. By adding it to buildInputs we can fix cross compilation. --- pkgs/development/libraries/gbenchmark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 180ff455342e..0d3a8cc360ea 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - checkInputs = [ gtest ]; + buildInputs = [ gtest ]; cmakeFlags = [ (lib.cmakeBool "BENCHMARK_USE_BUNDLED_GTEST" false) From 65dc12ea22599727459e121b7a0741be3a2392e8 Mon Sep 17 00:00:00 2001 From: euxane Date: Sat, 19 Oct 2024 16:30:38 +0200 Subject: [PATCH 067/229] visidata: 3.0.2 -> 3.1.1 Changelog: https://github.com/saulpw/visidata/releases/tag/v3.1.1 The now obsolete patches have been removed. New dependencies for the msgpack loader have been registered here. The test for the fecfile loader is disabled because we do not have the required dependency in nixpkgs. --- pkgs/applications/misc/visidata/default.nix | 25 +++++++-------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index d7a7c4d9f75f..4790d433647e 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonApplication , fetchFromGitHub -, fetchpatch # python requirements , beautifulsoup4 , boto3 @@ -23,6 +22,8 @@ , pyarrow , pyshp , pypng +, msgpack +, brotli , python-dateutil , pyyaml , requests @@ -46,29 +47,15 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "3.0.2"; + version = "3.1.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - hash = "sha256-gplrkrFTIP6TLvk1YazD5roDzsPvDtOXLlTOmTio52s="; + hash = "sha256-ICEYC9QjYrB+oTzakfjgyg4DigzDOtYnqHRTaqF7Gw0="; }; - patches = [ - # Drop when next release is out - (fetchpatch { - name = "drop-support-for-python-37.patch"; - url = "https://github.com/saulpw/visidata/commit/738bb8b43814c14b1b8a1f1f60397c1520c5ef4a.patch"; - hash = "sha256-5jDAzKMuW3s7BCGpWyLcS4Lw8GUbjNxVhF5mUKbR1YY="; - }) - (fetchpatch { - name = "update-tests-for-python-312.patch"; - url = "https://github.com/saulpw/visidata/commit/627f6f126cdd49bcdda0bbc16fab42eb5bd42103.patch"; - hash = "sha256-3FHgjLrzMHObEheJoRY8VlnDUtDZ68FqCqAyhP7333E="; - }) - ]; - propagatedBuildInputs = [ # from visidata/requirements.txt # packages not (yet) present in nixpkgs are commented @@ -86,6 +73,9 @@ buildPythonApplication rec { #mapbox-vector-tile pypng #pyconll + msgpack + brotli + #fecfile fonttools #sas7bdat #xport @@ -139,6 +129,7 @@ buildPythonApplication rec { # tests to disable because we don't have a package to load such files rm -f tests/load-conllu.vdj # no 'pyconll' rm -f tests/load-sav.vd # no 'savReaderWriter' + rm -f tests/load-fec.vdj # no 'fecfile' # tests use git to compare outputs to references git init -b "test-reference" From 8c64772d13ce2b36997412dc421f634e9af5a827 Mon Sep 17 00:00:00 2001 From: euxane Date: Sat, 19 Oct 2024 16:34:15 +0200 Subject: [PATCH 068/229] visidata: newScope -> python3Packages.callPackage --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85dc76a96bfc..4a1c405259bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13339,8 +13339,7 @@ with pkgs; vimwiki-markdown = python3Packages.callPackage ../tools/misc/vimwiki-markdown { }; - visidata = (newScope python3Packages) ../applications/misc/visidata { - }; + visidata = python3Packages.callPackage ../applications/misc/visidata { }; vit = callPackage ../applications/misc/vit { }; From 286a40b27cdd1e220984701361aa07f6a17168ed Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 19 Oct 2024 20:09:16 +0300 Subject: [PATCH 069/229] viewnior: switch to a pr which combines other PRs https://www.github.com/hellosiyan/Viewnior/pull/108 https://www.github.com/hellosiyan/Viewnior/pull/130 https://www.github.com/hellosiyan/Viewnior/pull/135 --- .../graphics/viewnior/default.nix | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index bfd707f55132..70d28b6e5aee 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,30 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms +{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk3, libpng, exiv2, lcms , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { - pname = "viewnior"; - version = "1.8"; + pname = "viewnior-gtk3"; + version = "1.8-unstable-2023-11-23"; src = fetchFromGitHub { - owner = "hellosiyan"; + #owner = "hellosiyan"; + #repo = "Viewnior"; + owner = "Artturin"; repo = "Viewnior"; - rev = "${pname}-${version}"; - hash = "sha256-LTahMmcAqgqviUxR624kTozJGTniAAGWKo1ZqXjoG5M="; + # https://github.com/hellosiyan/Viewnior/pull/142 + rev = "23ce6e5630b24509d8009f17a833ad9e59b85fab"; + hash = "sha256-+/f0+og1Dd7eJK7P83+q4lf4SjzW2g6qNk8ZTxNAuDA="; }; - patches = [ - (fetchpatch { - name = "viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/viewnior/files/viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; - hash = "sha256-O3/d7qMiOsYJmz7ekoLM6oaHcuYjEbAfPFuDUWSybfE="; - }) - (fetchpatch { - name = "viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/viewnior/files/viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; - hash = "sha256-Zjc4CIlelAkbyvX2F1yo/qJjUajtAgF4+FoHWFEIPWY="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -35,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 + gtk3 libpng exiv2 lcms From 239b78ef5d673b1e039fcbeffa9c482b9851f988 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 18:25:58 -0400 Subject: [PATCH 070/229] python312Packages.edk2-pytool-library: 0.21.12 -> 0.22.2 Diff: https://github.com/tianocore/edk2-pytool-library/compare/refs/tags/v0.21.12...v0.22.2 Changelog: https://github.com/tianocore/edk2-pytool-library/releases/tag/v0.22.2 --- .../python-modules/edk2-pytool-library/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index a5c30114c4b9..67a309fcee04 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.12"; + version = "0.22.2"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-PIQ/OrZnm+WOlvTzCHb64/bj7/JGKBEbh6lHD0Pm0ro="; + hash = "sha256-rauk8rY3i5fWUrE8lszyC9KBVjTZ7zhXO98cMhIiiz8="; }; build-system = [ From e1e4c0f4743c5c3ddc9eb0d78a0075a1664ecc39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 01:17:35 +0000 Subject: [PATCH 071/229] shpool: 0.7.1 -> 0.8.0 --- pkgs/by-name/sh/shpool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix index 2cb4489cff97..3f252a80087e 100644 --- a/pkgs/by-name/sh/shpool/package.nix +++ b/pkgs/by-name/sh/shpool/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "shpool"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "shell-pool"; repo = "shpool"; rev = "v${version}"; - hash = "sha256-0ykGGzYL29SxxT0etTaBHooIE8NEUJeTIr/6vTBgY0Q="; + hash = "sha256-pSSMC4pUtB38c6UNOj+Ma/Y1jcSfm33QV1B4tA/MyKY="; }; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; - cargoHash = "sha256-cuLscDki8Y68qtEZh7xDaLp5B6MyTkPWTQX5gHNtULQ="; + cargoHash = "sha256-NUo9Y/c4Wm3d8lbhdHEqu9Zp7tX8giq2wnYwz8SMTXo="; buildInputs = [ linux-pam From bd5149334f8208b463f4070a94fbd60fe9c865cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 02:37:20 +0000 Subject: [PATCH 072/229] altair: 7.3.6 -> 8.0.0 --- pkgs/development/tools/altair-graphql-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index c6f5739a35ab..ae2a7d30b9db 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "7.3.6"; + version = "8.0.0"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-jXFEpcmv8bkm7Yyo2GUwoakMlAwArCoZ1jIDeyF87Ms="; + sha256 = "sha256-q3AkqhE0hD6+cCv5UeZ4uyUi6Adrmxv4jMGYN7Keias="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From 0e711c555fe4893a7d68f1d61a694d8036ee9d53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:18:31 +0000 Subject: [PATCH 073/229] python312Packages.google-nest-sdm: 5.0.1 -> 6.1.0 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 699430682d4b..0c2664caa51c 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "5.0.1"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-oooWPQ4O7+FjCzIoBwm+jgGTkG7eFwekbIAEbJh44I4="; + hash = "sha256-ZSrC3GhcyraK+lm9EF+6R1ufk7aEgi9T+CxTTpeaNFE="; }; build-system = [ setuptools ]; From 28512828bb6a4acf098d6bb94b985c7e088b44df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:48:41 +0000 Subject: [PATCH 074/229] zef: 0.22.2 -> 0.22.4 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 542164aeebf4..4e0976c5ebb1 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.22.2"; + version = "0.22.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-uMVfBptiCungO+XJMlwV2Fhs2jgVNDOqUFqgJPV5RhM="; + hash = "sha256-blreXcpKvatu5Vo5YViIz5Yv2OAsQgs/SGEI2rABDoc="; }; nativeBuildInputs = [ From 275032b756da76d67809c21892d6ff651f94d282 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 05:04:07 +0000 Subject: [PATCH 075/229] step-kms-plugin: 0.11.5 -> 0.11.6 --- pkgs/tools/security/step-kms-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/tools/security/step-kms-plugin/default.nix index ba35b7c11087..9f2af377e39a 100644 --- a/pkgs/tools/security/step-kms-plugin/default.nix +++ b/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-MxGhG8ehXT7ftXfoVHMSpyIr25tWj5Yq50nZZW/q5sQ="; + hash = "sha256-PaOe24rXu6e8jhjwpuQquPQidQDSxI1WOAMYJSLjbSI="; }; - vendorHash = "sha256-5TWofXHtiBhfsSg3UgSju+7EO+t9bUktsd/WUAH5R5U="; + vendorHash = "sha256-N8Wy4DHxP6yQOfWDmyVPSi9eHj8G01SSIxQmqKujRgo="; proxyVendor = true; From 99f3585b04b4b6794660c081eaadb0c32d7ff1d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 05:20:24 +0000 Subject: [PATCH 076/229] nexttrace: 1.3.4 -> 1.3.5 --- pkgs/tools/networking/nexttrace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index c0e0a9d34820..f3051ba451f2 100644 --- a/pkgs/tools/networking/nexttrace/default.nix +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-LUIKVMI8ljPzAmrq3jYQ+ZDCGs2p+7EO8ECp1A1osUk="; + sha256 = "sha256-32QFgmvXQ+8ix1N9I6pJaIJGWOT67/FG0VVEhftwQQw="; }; - vendorHash = "sha256-1zjXy6x/IzBY7MrtAtynmoneEpjAnYv/H5IsMZtRQAo="; + vendorHash = "sha256-WRH9doQavcdH1sd2fS8QoFSmlirBMZgSzB/sj1q6cUQ="; doCheck = false; # Tests require a network connection. From 3db4a167080bf3b393f5c21934cd01b863a98bf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 05:44:42 +0000 Subject: [PATCH 077/229] misconfig-mapper: 1.9.0 -> 1.10.0 --- pkgs/by-name/mi/misconfig-mapper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index c611ccdd7eaf..f5ca00cd6294 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; rev = "refs/tags/v${version}"; - hash = "sha256-mi3lM/BQ16dCVX/kVRNhIis4sh6M0TMuK05q/pXJiS8="; + hash = "sha256-7rZwrnzoVkcXg3Z5lCMVEMyB3f5pS1t33lqogwY3I7w="; }; - vendorHash = "sha256-aABtsS39yxBBFMN98fjr4gy6QeF3dobrZqeZmmv2ywQ="; + vendorHash = "sha256-ymXpuCc1Pv12kFcBf1STT2wiUXTyT4R1DHnDCeBWbSs="; ldflags = [ "-s" From c1a2fb1eb220c4bf5f7e887453c7bf3221fe4f1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 05:49:13 +0000 Subject: [PATCH 078/229] halo: 2.19.3 -> 2.20.5 --- pkgs/by-name/ha/halo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 80abccbf1460..ff4a6ba44429 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.19.3"; + version = "2.20.5"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-Re0L+2P/Sxzj+fnuZi5uK2Hk72d8EvQGdjhglVbt41M="; + hash = "sha256-VGSSGc2caNO7+IK1ArqjZGz+LaHWZsaO68Jr06BCcfE="; }; nativeBuildInputs = [ From 0c066a943d083a766531ea56c7747d501a34e6d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 05:49:18 +0000 Subject: [PATCH 079/229] zsh-wd: 0.9.0 -> 0.9.1 --- pkgs/by-name/zs/zsh-wd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zs/zsh-wd/package.nix b/pkgs/by-name/zs/zsh-wd/package.nix index 4a80ec499e89..b7b3817021c8 100644 --- a/pkgs/by-name/zs/zsh-wd/package.nix +++ b/pkgs/by-name/zs/zsh-wd/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "wd"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "mfaerevaag"; repo = "wd"; rev = "v${version}"; - hash = "sha256-8gL0+SZwVCQRokcYwSljDHtSusYY79/T9hqJGgAK1EU="; + hash = "sha256-UjeLsc6pz1t798Qy6cliYjP0qjXvUIPotbnUm8dBrFs="; }; nativeBuildInputs = [ installShellFiles ]; From d17b5e240e5eb3075abfa8d694a87a33f5a97d76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:10:29 +0000 Subject: [PATCH 080/229] fluidd: 1.30.4 -> 1.30.5 --- pkgs/applications/misc/fluidd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 0a6e43f9e17a..906d51470505 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.30.4"; + version = "1.30.5"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-r9RYNfbMa0axxS5kVBsFmvnuznsZz4s0ZfsIJVczHlI="; + sha256 = "sha256-Ry9aD8pSFw076yIywik0ov+ZPNRsI9srM4YJBW/1bY8="; }; nativeBuildInputs = [ unzip ]; From 55dc8a5a78c11700a9be8bd2c420a25c3f943dc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:13:24 +0000 Subject: [PATCH 081/229] opengrok: 1.13.22 -> 1.13.23 --- pkgs/development/tools/misc/opengrok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 8dc6c61283be..cd1b5d574916 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.22"; + version = "1.13.23"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-zFF8cHElrWtLOa5xtO5N0520JC47rGOQ7YshEf12tCw="; + hash = "sha256-Fe4K6nBVg0l4Z3CW+k0OpUF8JEu+uINsA+jdAFJGmx8="; }; nativeBuildInputs = [ makeWrapper ]; From 5dbcb9e762a3e5e56282401772f55ef51617eced Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:31:07 +0000 Subject: [PATCH 082/229] flix: 0.51.0 -> 0.52.0 --- pkgs/development/compilers/flix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix index 2bf6b754e297..f2c075beac67 100644 --- a/pkgs/development/compilers/flix/default.nix +++ b/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.51.0"; + version = "0.52.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-JeOw9mdmFAG0mMe8G/yanKCLPbCUPJxUBluNFFqjfbA="; + sha256 = "sha256-OJBeJyF/CmLyMNRpjcx06GB7Lc4htNTm2apbi8wQKL4="; }; dontUnpack = true; From bdf394a90441cbe2508c681b471c2cd89c7e458b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:38:21 +0000 Subject: [PATCH 083/229] nats-server: 2.10.21 -> 2.10.22 --- pkgs/servers/nats-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 6bec9a2d8265..f43c3c1ea263 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.21"; + version = "2.10.22"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-d2ko6ejSdGDeroWIELrCBQjYYSobWp4R4XC58eN50xs="; + hash = "sha256-B+fSB3aTXAc/EjKSaFR2clieLNFszA2U2BdMsYJRZFE="; }; - vendorHash = "sha256-RmVDlboqwujTy8SVSwUu8mesSUmkNERi/sYQH7WAUUI="; + vendorHash = "sha256-0VkY1+3tlAfGDt+fhyMbmyT4TN0bw1HVJLi2+mivkrc="; doCheck = false; From 45e21d7f2cfae7353f1c15e9f9e1c9a48f1e9f60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:41:17 +0000 Subject: [PATCH 084/229] pupdate: 3.18.0 -> 3.19.0 --- pkgs/by-name/pu/pupdate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index b89d472dfb7b..decad3e4f75c 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "pupdate"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "mattpannella"; repo = "pupdate"; rev = "${version}"; - hash = "sha256-GTdca47Jp/q1IpX1IAMZgOgHjBPNSotFSL9O6bfTfnM="; + hash = "sha256-ogQ7pYLfeyoxg0p7nxUvYhmgDw5xtd7qkFM08B4FDBU="; }; buildInputs = [ From 9e8b94af3dd62fdd48dcc4523859de75ea3dd31e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 08:01:01 +0000 Subject: [PATCH 085/229] youtrack: 2024.2.41254 -> 2024.3.47197 --- pkgs/by-name/yo/youtrack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index 476a49f32743..358e51f8ab64 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.2.41254"; + version = "2024.3.47197"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-17IukQTBKspspVDyHpv8DtkAnuAHrB+rXenu8h7Yfno="; + hash = "sha256-/XTZERUPA7AEvWQsnjDXDVVkmiEn+0D8qgQkOzTJFaA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From ae7f1f629256543e082d99aa610f0d65d27b7445 Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Sun, 20 Oct 2024 10:16:31 +0200 Subject: [PATCH 086/229] paper-clip: 5.5 -> 5.5.1 --- pkgs/by-name/pa/paper-clip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/paper-clip/package.nix b/pkgs/by-name/pa/paper-clip/package.nix index 032bb9b5dbc4..d7376dde2226 100644 --- a/pkgs/by-name/pa/paper-clip/package.nix +++ b/pkgs/by-name/pa/paper-clip/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "paper-clip"; - version = "5.5"; + version = "5.5.1"; src = fetchFromGitHub { owner = "Diego-Ivan"; repo = "Paper-Clip"; rev = "v${finalAttrs.version}"; - hash = "sha256-WCnWWVYaKq4U2RG3S4Xfja0NvreJIqU2VUJzpX7KI/E="; + hash = "sha256-Jdsx5ZhujP0SgEtr4NMbXsTkMYrkQj7Vs+SSYziWpiw="; }; nativeBuildInputs = [ From 7cce8cc2a2a6f1cdf00dd45762beaf0d5b1c61ea Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 20 Oct 2024 14:05:05 +0530 Subject: [PATCH 087/229] vimPlugins.nvim-gomove: init at 2024-10-20 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 00f779b019e9..6ee9c21fa82d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8718,6 +8718,18 @@ final: prev: meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; + nvim-gomove = buildVimPlugin { + pname = "nvim-gomove"; + version = "2024-10-20"; + src = fetchFromGitHub { + owner = "booperlv"; + repo = "nvim-gomove"; + rev = "2b44ae7ac0804f4e3959228122f7c85bef1964e3"; + sha256 = "sha256-9YLJm/L13gTktb6VIkz2W/60cothFtF7feiKd26R5lo="; + }; + meta.homepage = "https://github.com/booperlv/nvim-gomove/"; + }; + nvim-gps = buildVimPlugin { pname = "nvim-gps"; version = "2022-07-05"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 62c215c67384..804c6d85ecef 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -732,6 +732,7 @@ https://github.com/vijaymarupudi/nvim-fzf/,, https://github.com/vijaymarupudi/nvim-fzf-commands/,, https://github.com/sakhnik/nvim-gdb/,, https://github.com/chrisgrieser/nvim-genghis/,HEAD, +https://github.com/booperlv/nvim-gomove/,HEAD, https://github.com/smiteshp/nvim-gps/,, https://github.com/brenoprata10/nvim-highlight-colors/,HEAD, https://github.com/Iron-E/nvim-highlite/,, From a7ad1c182b0452bdb62dda9994a9562ec0cc6119 Mon Sep 17 00:00:00 2001 From: "PAEPCKE, Michael" Date: Sun, 20 Oct 2024 08:49:16 +0000 Subject: [PATCH 088/229] tlsinfo: init at 0.1.41 --- pkgs/by-name/tl/tlsinfo/package.nix | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/tl/tlsinfo/package.nix diff --git a/pkgs/by-name/tl/tlsinfo/package.nix b/pkgs/by-name/tl/tlsinfo/package.nix new file mode 100644 index 000000000000..197367dd3a21 --- /dev/null +++ b/pkgs/by-name/tl/tlsinfo/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "tlsinfo"; + version = "0.1.41"; + + src = fetchFromGitHub { + owner = "paepckehh"; + repo = "tlsinfo"; + rev = "refs/tags/v${version}"; + hash = "sha256-II5/UDWVeEoupM1Ijty2A9M/qwWA2/b4Y68lTkxnJ9o="; + }; + + vendorHash = "sha256-IyinAjgK4vm+TkSGQq+XnY9BESsNvXgz84BRzNyZtJY="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + changelog = "https://github.com/paepckehh/tlsinfo/releases/tag/v${version}"; + homepage = "https://paepcke.de/tlsinfo"; + description = "Tool to analyze and troubleshoot TLS connections"; + license = lib.licenses.bsd3; + mainProgram = "tlsinfo"; + maintainers = with lib.maintainers; [ paepcke ]; + }; +} From c1be8ddb34c5bdb2adda4e3f9dff2f8b5fe43c08 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 17 Aug 2024 00:59:33 +0800 Subject: [PATCH 089/229] live-chart: init at 1.10.0 --- pkgs/by-name/li/live-chart/package.nix | 50 ++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/li/live-chart/package.nix diff --git a/pkgs/by-name/li/live-chart/package.nix b/pkgs/by-name/li/live-chart/package.nix new file mode 100644 index 000000000000..942fe3545562 --- /dev/null +++ b/pkgs/by-name/li/live-chart/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + gtk4, + libgee, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "live-chart"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "lcallarec"; + repo = "live-chart"; + rev = finalAttrs.version; + hash = "sha256-SOZJ9sVrmsZybs5BVXWmqBJ/P7SZI/X8TGWHXGvXAU8="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + gtk4 + libgee + ]; + + strictDeps = true; + + meta = { + description = "Real-time charting library for Vala and GTK4 based on Cairo"; + homepage = "https://github.com/lcallarec/live-chart"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) From 048692c8c01d9dfe8380e36796a43fabda063f94 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 17 Aug 2024 00:59:45 +0800 Subject: [PATCH 090/229] ryokucha: init at 0.3.1 --- pkgs/by-name/ry/ryokucha/package.nix | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/ry/ryokucha/package.nix diff --git a/pkgs/by-name/ry/ryokucha/package.nix b/pkgs/by-name/ry/ryokucha/package.nix new file mode 100644 index 000000000000..35ab71b0111b --- /dev/null +++ b/pkgs/by-name/ry/ryokucha/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + gtk4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ryokucha"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "ryonakano"; + repo = "ryokucha"; + rev = finalAttrs.version; + hash = "sha256-bmN8ZiFjUXtWMrZz7BJtO/9TMjcc4d3x8EpFvhvsewY="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ gtk4 ]; + + strictDeps = true; + + meta = { + description = "GTK4 library that includes customized widgets"; + homepage = "https://github.com/ryonakano/ryokucha"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) From 19524b4d3586ab6600463a92a1f5bfbe65e70e50 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 17 Aug 2024 01:07:27 +0800 Subject: [PATCH 091/229] reco: init at 5.0.2 --- pkgs/by-name/re/reco/package.nix | 57 ++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/re/reco/package.nix diff --git a/pkgs/by-name/re/reco/package.nix b/pkgs/by-name/re/reco/package.nix new file mode 100644 index 000000000000..27742087dc43 --- /dev/null +++ b/pkgs/by-name/re/reco/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook4, + libgee, + live-chart, + ryokucha, + pantheon, + gst_all_1, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "reco"; + version = "5.0.2"; + + src = fetchFromGitHub { + owner = "ryonakano"; + repo = "reco"; + rev = finalAttrs.version; + hash = "sha256-uZAcZJLQH0MTI4NSJnZvzYPBFVXGBqAhsjVLAVP/ZwI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + wrapGAppsHook4 + ]; + + buildInputs = [ + libgee + live-chart + ryokucha + pantheon.granite7 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-libav + ]; + + mesonFlags = [ (lib.mesonBool "use_submodule" false) ]; + + meta = { + description = "Audio recorder focused on being concise and simple to use"; + homepage = "https://github.com/ryonakano/reco"; + license = lib.licenses.gpl3Plus; + mainProgram = "com.github.ryonakano.reco"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) From 0b1caae80afd7f34e38a2546b09fa7b7e09e3516 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 20 Oct 2024 13:48:51 +0530 Subject: [PATCH 092/229] vimPlugins.align-nvim: init at 2024-10-20 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 00f779b019e9..9c5576ea0976 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -653,6 +653,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/align/"; }; + align-nvim = buildVimPlugin { + pname = "align.nvim"; + version = "2024-10-20"; + src = fetchFromGitHub { + owner = "Vonr"; + repo = "align.nvim"; + rev = "12ed24b34df81d57e777fea5a535611bab10a620"; + sha256 = "sha256-z8+lEs8bQS4Gz3cgQQ5Cb3oW58Et7it/tAxUtE3cLc4="; + }; + meta.homepage = "https://github.com/Vonr/align.nvim/"; + }; + alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; version = "2024-09-30"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 62c215c67384..9faf4aa45dde 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -53,6 +53,7 @@ https://github.com/joshuavial/aider.nvim/,HEAD, https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, +https://github.com/Vonr/align.nvim/,HEAD, https://github.com/goolord/alpha-nvim/,HEAD, https://github.com/anuvyklack/animation.nvim/,HEAD, https://github.com/Olical/aniseed/,, From d642ec93cfddfbc7cfb5d8e021470c2e8aad4f63 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 20 Oct 2024 15:16:24 +0530 Subject: [PATCH 093/229] vimPlugins.focus-nvim: init at 2024-10-20 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 00f779b019e9..7103f50d531f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4067,6 +4067,18 @@ final: prev: meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; }; + focus-nvim = buildVimPlugin { + pname = "focus.nvim"; + version = "2024-10-20"; + src = fetchFromGitHub { + owner = "nvim-focus"; + repo = "focus.nvim"; + rev = "3841a38df972534567e85840d7ead20d3a26faa6"; + sha256 = "sha256-mgHk4u0ab2uSUNE+7DU22IO/xS5uop9iATfFRk6l6hs="; + }; + meta.homepage = "https://github.com/nvim-focus/focus.nvim/"; + }; + fold-preview-nvim = buildVimPlugin { pname = "fold-preview.nvim"; version = "2023-01-27"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 62c215c67384..8fe52f13b00a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -338,6 +338,7 @@ https://github.com/liangxianzhe/floating-input.nvim/,HEAD, https://github.com/fhill2/floating.nvim/,, https://github.com/floobits/floobits-neovim/,, https://github.com/akinsho/flutter-tools.nvim/,HEAD, +https://github.com/nvim-focus/focus.nvim/,HEAD, https://github.com/anuvyklack/fold-preview.nvim/,HEAD, https://github.com/mhartington/formatter.nvim/,, https://github.com/megaannum/forms/,, From e63282de01db7f71182b25992b128f8d634165f1 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 20 Oct 2024 12:16:55 +0200 Subject: [PATCH 094/229] fluidd: update src.url Signed-off-by: Sefa Eyeoglu --- pkgs/applications/misc/fluidd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 906d51470505..8efda6070896 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { name = "fluidd-v${version}.zip"; - url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; + url = "https://github.com/fluidd-core/fluidd/releases/download/v${version}/fluidd.zip"; sha256 = "sha256-Ry9aD8pSFw076yIywik0ov+ZPNRsI9srM4YJBW/1bY8="; }; From 936ac723b490185ce89b3db0f809b5a3cfe9d184 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Sun, 20 Oct 2024 13:02:02 +0200 Subject: [PATCH 095/229] rshim-user-space: 2.0.32 -> 2.1.5 Notable changes include: - more robust timeouts - better BlueField 3 support - better detect install finish in bfb-install with BMC present - loose less log log messages with CLEAR_ON_READ Signed-off-by: Markus Theil --- pkgs/tools/misc/rshim-user-space/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rshim-user-space/default.nix b/pkgs/tools/misc/rshim-user-space/default.nix index 80d9b6adf516..75ff19f1bc36 100644 --- a/pkgs/tools/misc/rshim-user-space/default.nix +++ b/pkgs/tools/misc/rshim-user-space/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rshim-user-space"; - version = "2.0.32"; + version = "2.1.5"; src = fetchFromGitHub { owner = "Mellanox"; repo = pname; rev = "rshim-${version}"; - hash = "sha256-GF7cKIf72EYRBRb6d3IWONE7YJwohTLKF1RGdDMTG6c="; + hash = "sha256-moU6XxBVSAZiiR/usFfxse2CHk6+003Jb9t62szk1fk="; }; nativeBuildInputs = [ From 9ed7d6f6eb02b5e3c4a67e8b3954d2b0dceded3c Mon Sep 17 00:00:00 2001 From: chiroptical Date: Sun, 20 Oct 2024 08:30:28 -0400 Subject: [PATCH 096/229] pleroma: support darwin --- pkgs/servers/pleroma/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 565fb8ad52e3..88b0f14741fc 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, beamPackages, fetchFromGitHub, fetchFromGitLab, @@ -11,6 +12,7 @@ vips, pkg-config, glib, + darwin, ... }: @@ -91,10 +93,16 @@ beamPackages.mixRelease rec { vix = prev.vix.override { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - vips - glib.dev - ]; + buildInputs = + [ + vips + glib.dev + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Kerberos + ]; VIX_COMPILATION_MODE = "PLATFORM_PROVIDED_LIBVIPS"; }; From fe60e66a65a67d44b5118e21af72d938efcb9d70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 12:36:34 +0000 Subject: [PATCH 097/229] air: 1.52.3 -> 1.61.1 --- pkgs/development/tools/air/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index f50100bf6c81..9fd633197110 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "air"; - version = "1.52.3"; + version = "1.61.1"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; rev = "v${version}"; - hash = "sha256-TLTg9fYkIlTFDwkjRIQ7mAmKd+jA5Q9EPQ62fJ6zS9o="; + hash = "sha256-IwPUbz3JYKz0TeK/kbEUzqFp0l8u/AFu9KEAyR8zlSQ="; }; - vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; + vendorHash = "sha256-BY2KnAwlrIyqSHWFLD0QU93EXAv4ta/ibvYWiHXvYMc="; ldflags = [ "-s" From d45e7c450966c618566b457b47a8e0057a19c1f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 12:48:40 +0000 Subject: [PATCH 098/229] home-manager: 0-unstable-2024-09-26 -> 0-unstable-2024-10-20 --- pkgs/by-name/ho/home-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 34892c8a386d..0b8e16ced6ab 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -18,14 +18,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-09-26"; + version = "0-unstable-2024-10-20"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "ffe2d07e771580a005e675108212597e5b367d2d"; - hash = "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs="; + rev = "fe56302339bb28e3471632379d733547caec8103"; + hash = "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o="; }; nativeBuildInputs = [ From 1ff2ed566f43bf4d75a019c1a9bf0daed6bc9276 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Sun, 20 Oct 2024 08:58:52 -0400 Subject: [PATCH 099/229] vscode-extensions: remove `uncenter` from maintaining extensions --- .../editors/vscode/extensions/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f8fc458aef28..33bc3153b786 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -656,7 +656,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-footnotes"; homepage = "https://github.com/mjbvz/vscode-markdown-footnotes"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -689,7 +689,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-preview-github-styles"; homepage = "https://github.com/mjbvz/vscode-github-markdown-preview-style"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -710,7 +710,7 @@ let # or asl20 ]; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -727,7 +727,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmalehorn.vscode-fish"; homepage = "https://github.com/bmalehorn/vscode-fish"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -1793,7 +1793,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=fabiospampinato.vscode-open-in-github"; homepage = "https://github.com/fabiospampinato/vscode-open-in-github"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -1930,7 +1930,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=fortran-lang.linter-gfortran"; homepage = "https://github.com/fortran-lang/vscode-fortran-support"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -2844,7 +2844,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=Kravets.vscode-publint"; homepage = "https://github.com/kravetsone/vscode-publint"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -3069,7 +3069,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=meganrogge.template-string-converter"; homepage = "https://github.com/meganrogge/template-string-converter"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -3605,7 +3605,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl"; homepage = "https://code.visualstudio.com/docs/remote/wsl"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -3716,7 +3716,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=nefrob.vscode-just-syntax"; homepage = "https://github.com/nefrob/vscode-just"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -4455,7 +4455,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=sswg.swift-lang"; homepage = "https://github.com/swiftlang/vscode-swift"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -5076,7 +5076,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=vitaliymaz.vscode-svg-previewer"; homepage = "https://github.com/vitaliymaz/vscode-svg-previewer"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -5408,7 +5408,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoavbls.pretty-ts-errors"; homepage = "https://github.com/yoavbls/pretty-ts-errors"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; @@ -5495,7 +5495,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=zguolee.tabler-icons"; homepage = "https://github.com/zguolee/vscode-tabler-icons"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.uncenter ]; + maintainers = [ ]; }; }; From 2370c67b409da4f80db0701611db134d3a2afd46 Mon Sep 17 00:00:00 2001 From: CnTeng Date: Sun, 20 Oct 2024 21:19:32 +0800 Subject: [PATCH 100/229] sioyek: add qtwayland to buildInputs --- pkgs/by-name/si/sioyek/package.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index 954e7ef197e0..dc4be19cfd06 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -24,17 +24,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MOqWitXnYn8efk2LSeAOhmpcxGn6hbvjXbNTXEDdxIM="; }; - buildInputs = [ - gumbo - harfbuzz - jbig2dec - mujs - mupdf - openjpeg - qt6.qt3d - qt6.qtbase - qt6.qtspeech - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ]; + buildInputs = + [ + gumbo + harfbuzz + jbig2dec + mujs + mupdf + openjpeg + qt6.qt3d + qt6.qtbase + qt6.qtspeech + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ]; nativeBuildInputs = [ installShellFiles From 891a68c792c39a94649621e9b4c49a82b2d7b5ee Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 20 Oct 2024 16:13:31 +0800 Subject: [PATCH 101/229] fcitx5-pinyin-moegirl: 20240909 -> 20241009 Diff: https://github.com/outloudvi/mw2fcitx/compare/20240909...20241009 --- pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index 7f1abd017617..7f9bb24d6f13 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20240909"; + version = "20241009"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-+e4azEWHYSh3Gy9Xa+Y8E7f7rAA8YlWlbvbva9kNXCI="; + hash = "sha256-tb+Z7ja6yG7n6DcxSvdFhMq2xTNs6mJ6pdPfEKeRUww="; }; dontUnpack = true; From 245e5da5ec2a40e97628a552723ccfd2b7ad44e0 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 1 Oct 2024 23:11:38 +0200 Subject: [PATCH 102/229] icu: add opt-in support to build icu release candidates --- pkgs/development/libraries/icu/make-icu.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index 09e7bb3c9654..d7fe46041607 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -8,9 +8,13 @@ let pname = "icu4c"; + release = lib.replaceStrings [ "." ] [ "-" ] version; + # To test rc versions of ICU replace the line above with the line below. + #release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version); + baseAttrs = { src = fetchurl { - url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceStrings [ "." ] [ "-" ] version}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; + url = "https://github.com/unicode-org/icu/releases/download/release-${release}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; inherit hash; }; @@ -75,7 +79,7 @@ let mkdir -p $static/lib mv -v lib/*.a $static/lib '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc + sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${lib.versions.majorMinor version}/pkgdata.inc '' + (let replacements = [ { from = "\${prefix}/include"; to = "${placeholder "dev"}/include"; } # --cppflags-searchpath @@ -83,7 +87,7 @@ let { from = "\${pkglibdir}/pkgdata.inc"; to = "${placeholder "dev"}/lib/icu/pkgdata.inc"; } # --incpkgdatafile ]; in '' - rm $out/share/icu/${version}/install-sh $out/share/icu/${version}/mkinstalldirs # Avoid having a runtime dependency on bash + rm $out/share/icu/${lib.versions.majorMinor version}/install-sh $out/share/icu/${lib.versions.majorMinor version}/mkinstalldirs # Avoid having a runtime dependency on bash substituteInPlace "$dev/bin/icu-config" \ ${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements} From 2ac5b1b494d61465d8a5b0c9f48278cc26745fb1 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 1 Oct 2024 23:10:49 +0200 Subject: [PATCH 103/229] icu76: init at 76.1rc --- pkgs/development/libraries/icu/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index ed142788c765..e7ad912dc3bd 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -6,6 +6,10 @@ let }; in { + icu76 = make-icu { + version = "76.1rc"; + hash = "sha256-HMY4hRYbF4Dsf1EGx+m0NRsCUA+Q/JGRpdGIgym/A5I="; + }; icu75 = make-icu { version = "75.1"; hash = "sha256-y5aN8+TS6H6LEcSaXQHHh70TuVRSgPxmQvgmUnYYyu8="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bda58a57c3ec..f91287c97a50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20218,6 +20218,7 @@ with pkgs; icu73 icu74 icu75 + icu76 ; icu = icu74; From e0605c03698f978e8b67ed899e5920e3787c1be8 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Sun, 20 Oct 2024 16:10:01 +0200 Subject: [PATCH 104/229] bcache-tools: fix udev patch to use bash from explicit path --- .../filesystems/bcache-tools/bcache-udev-modern.patch | 2 +- pkgs/tools/filesystems/bcache-tools/default.nix | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch b/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch index bdf78dcc3cd4..1791f8a22bd1 100644 --- a/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch +++ b/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch @@ -24,7 +24,7 @@ index 9cc7f0d..6a52893 100644 LABEL="bcache_backing_found" RUN{builtin}+="kmod load bcache" -RUN+="bcache-register $tempnode" -+RUN+="/bin/sh -c 'echo $tempnode > /sys/fs/bcache/register_quiet'" ++RUN+="@shell@ -c 'echo $tempnode > /sys/fs/bcache/register_quiet'" LABEL="bcache_backing_end" # Cached devices: symlink diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index d73d17905432..84ecc7ebd9f5 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash }: +{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash, substituteAll }: stdenv.mkDerivation rec { pname = "bcache-tools"; @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { ''; patches = [ - ./bcache-udev-modern.patch + (substituteAll { + src = ./bcache-udev-modern.patch; + shell = "${bash}/bin/sh"; + }) ./fix-static.patch ]; From ade8ce43697cf9088e4d5fbfa38b714eae499051 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 20 Oct 2024 14:50:42 +0000 Subject: [PATCH 105/229] ice-bar: 0.11.9 -> 0.11.11 Changelog: https://github.com/jordanbaird/Ice/releases/tag/0.11.11 Diff: https://github.com/jordanbaird/Ice/compare/0.11.9...0.11.11 --- pkgs/by-name/ic/ice-bar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ic/ice-bar/package.nix b/pkgs/by-name/ic/ice-bar/package.nix index a55201ae0a95..0a8c9fd3b041 100644 --- a/pkgs/by-name/ic/ice-bar/package.nix +++ b/pkgs/by-name/ic/ice-bar/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "ice-bar"; - version = "0.11.9"; + version = "0.11.11"; src = fetchurl { url = "https://github.com/jordanbaird/Ice/releases/download/${finalAttrs.version}/Ice.zip"; - hash = "sha256-nC7gIF4OdkUYoacbyr1cv5xpJkWDqhFW11UNZvgrQtE="; + hash = "sha256-Iepf+mFN7ym7aZu3xnJVJoQNDZmSFvt15QTGdXtvScs="; }; sourceRoot = "."; From 2cdd2796cb8a2c705eed65662ddeecda631cf777 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 15:21:19 +0000 Subject: [PATCH 106/229] git-extras: 7.2.0 -> 7.3.0 --- pkgs/applications/version-management/git-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-extras/default.nix b/pkgs/applications/version-management/git-extras/default.nix index 2e10c633b02a..53382b2c2403 100644 --- a/pkgs/applications/version-management/git-extras/default.nix +++ b/pkgs/applications/version-management/git-extras/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "sha256-Zzk133ZJv91zbFz0U9tiv8pb0pAIBt9Y/8PYIaABMGc="; + sha256 = "sha256-0XZwEhDjh+rL6ZEWb60+GUw7hFOS3Xr32hgPNJcOL9I="; }; postPatch = '' From f6ccf622b5a1ab9d36d1bd960fb72c28e0a47abd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 20 Oct 2024 17:36:43 +0200 Subject: [PATCH 107/229] pulsar: 1.121.0 -> 1.122.0 Changelog: https://github.com/pulsar-edit/pulsar/blob/v1.122.0/CHANGELOG.md --- pkgs/by-name/pu/pulsar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index 83b1d4416a7f..8e5f9d295fb7 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -35,13 +35,13 @@ let pname = "pulsar"; - version = "1.121.0"; + version = "1.122.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-xouxKl4GTNZkT5wn8qbG2W2PbVAbsK9povmIL/Mikk4="; + x86_64-linux.hash = "sha256-Sx60cEQ2UAXqMujTaLkgN0Y3tIySg0TmaM0YroaX7nA="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-qRBX8jO5xDXkZ/6TWkgNa1NS3l+z8K/JyJDAa/3me5Q="; + aarch64-linux.hash = "sha256-Bhk1WZm9N771CC7j+TQsQCRSPwHOVTXCpleuhXC48K8="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); newLibpath = lib.makeLibraryPath [ From ca733c424fd556bb4650a32b85352d66f9eee84d Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 14 Oct 2024 15:26:34 +0800 Subject: [PATCH 108/229] ovito: 3.7.11 -> 3.11.0 Co-authored-by: Aleksana --- pkgs/applications/graphics/ovito/default.nix | 45 +++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 710460054586..aba7f561fbb6 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -1,7 +1,8 @@ -{ mkDerivation -, lib +{ lib , stdenv , fetchFromGitLab +, fetchurl +, makeDesktopItem , cmake , boost , bzip2 @@ -17,21 +18,27 @@ , qtsvg , qttools , VideoDecodeAcceleration +, wrapQtAppsHook +, copyDesktopItems +# needed to run natively on wayland +, qtwayland }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "ovito"; - version = "3.7.11"; + version = "3.11.0"; src = fetchFromGitLab { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - hash = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA="; + hash = "sha256-egiA6z1e8ZS7i4CIVjsCKJP1wQSRpmSKitoVTszu0Mc="; }; nativeBuildInputs = [ cmake + wrapQtAppsHook + copyDesktopItems ]; buildInputs = [ @@ -48,16 +55,42 @@ mkDerivation rec { qtbase qtsvg qttools + qtwayland ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoDecodeAcceleration ]; + # manually create a desktop file + desktopItems = [ (makeDesktopItem { + name = "ovito"; + comment= "Open Visualization Tool"; + exec = "ovito"; + icon = "ovito"; + terminal = false; + startupNotify = false; + desktopName = "ovito"; + startupWMClass = "Ovito"; + categories = [ "Science" ]; + })]; + + postInstall = let + icon = fetchurl { + url = "https://www.ovito.org/wp-content/uploads/logo_rgb-768x737.png"; + hash = "sha256-FOmIUeXem+4MjavQNag0UIlcR2wa2emJjivwxoJh6fI="; + }; + in '' + install -Dm644 ${icon} $out/share/pixmaps/ovito.png + ''; + meta = with lib; { description = "Scientific visualization and analysis software for atomistic and particle simulation data"; mainProgram = "ovito"; homepage = "https://ovito.org"; license = with licenses; [ gpl3Only mit ]; - maintainers = with maintainers; [ twhitehead ]; + maintainers = with maintainers; [ + twhitehead + chn + ]; broken = stdenv.hostPlatform.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=... }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a9e5eb64e4c..afa03b14bd5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10893,7 +10893,7 @@ with pkgs; oxlint = callPackage ../development/tools/oxlint { }; - ovito = libsForQt5.callPackage ../applications/graphics/ovito { + ovito = qt6Packages.callPackage ../applications/graphics/ovito { inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; }; From ff43d55fd4033ba0ef57ffceffd5497cf5456ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Oct 2024 09:24:11 -0700 Subject: [PATCH 109/229] immich: 1.118.1 -> 1.118.2 Changelog: https://github.com/immich-app/immich/releases/tag/v1.118.2 --- pkgs/by-name/im/immich/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index fb2e715428b3..b39c08613c49 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,22 +1,22 @@ { - "version": "1.118.1", - "hash": "sha256-rWBW0EwehuWnKk6qEte+dPd9l7FbLzwdkCSKMm22Orw=", + "version": "1.118.2", + "hash": "sha256-u2/Xs1SdAzmQ02pyXD9+ncamIKFcq8qMijnx7KFtrmU=", "components": { "cli": { - "npmDepsHash": "sha256-0je82BtDH6cUzoMrmeIS0jLmWPbmkdIQJ/SnmbAMtbw=", - "version": "2.2.25" + "npmDepsHash": "sha256-RwfGq0fDPYo+ZP2xv+sMKmr3Tf8szbB8506c1PqiMM0=", + "version": "2.2.26" }, "server": { - "npmDepsHash": "sha256-Jxb47Y4x9A6s4zGODIp6rze7iQ/w8Gvt31NHSATLYCM=", - "version": "1.118.1" + "npmDepsHash": "sha256-4jPvLCsI2gz+maBU3ZtrWZzJ6Zp2PTQwaCuCKr1hK/o=", + "version": "1.118.2" }, "web": { - "npmDepsHash": "sha256-BUgkdsC6raURkyy6eN31uCMKmBbL+fCbGabfHJgJn8g=", - "version": "1.118.1" + "npmDepsHash": "sha256-j6+EkcfwpaCP048v/kZv1xthp0DSylraJTeU4+LcDbw=", + "version": "1.118.2" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-Ga/aU5hojd3SgtoiM5QLsmzS5k7CRvh13a4lkC0BZA8=", - "version": "1.118.1" + "npmDepsHash": "sha256-e+7BEFc46scLZDqCJNRhrczOEydSoiK9m7vSj/2ECaE=", + "version": "1.118.2" } } } From eb4dfb90a602c5d353a0123f4d1c4c1705c59be0 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 20 Oct 2024 15:38:01 +0200 Subject: [PATCH 110/229] furnace: unpin fmt --- pkgs/by-name/fu/furnace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 47917784aa79..8b9428c6b239 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -7,7 +7,7 @@ , pkg-config , makeWrapper , fftw -, fmt_8 +, fmt , freetype , libsndfile , libX11 @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fftw - fmt_8 + fmt freetype libsndfile rtmidi From 5cdff541c3fdb0a0888693254bebd6524e757db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Fri, 9 Feb 2024 15:30:29 +0200 Subject: [PATCH 111/229] zig: fix cache folder handling - `env.ZIG_GLOBAL_CACHE_DIR` does not resolve variables, so all actions had their cache dir in the current directory, named '$TMPDIR/zig-cache'. - zig cache does not conflict, so it's totally fine to reuse it in both build and tests (thus removing `--cache-dir`). While we're at this, fix a `substituteInPlace` deprecation warning. --- pkgs/development/compilers/zig/generic.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 27c193c0567d..3da36c083bd3 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -46,7 +46,9 @@ stdenv.mkDerivation (finalAttrs: { "/System/Library/CoreServices/SystemVersion.plist" ]; - env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + preBuild = '' + export ZIG_GLOBAL_CACHE_DIR="$TMPDIR/zig-cache"; + ''; # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't # work in Nix's sandbox. Use env from our coreutils instead. @@ -55,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: { --replace "/usr/bin/env" "${coreutils}/bin/env" '' else '' substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ - --replace "/usr/bin/env" "${coreutils}/bin/env" + --replace-fail "/usr/bin/env" "${coreutils}/bin/env" ''; doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck - $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig + $out/bin/zig test -I $src/test $src/test/behavior.zig runHook postInstallCheck ''; From 4592e9f5c16110bee7f6d020abda5240532ca127 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 20 Oct 2024 19:07:10 +0200 Subject: [PATCH 112/229] =?UTF-8?q?README.md:=20mention=20that=20=E2=86=92?= =?UTF-8?q?=20can=20be=20used=20to=20signal=20version=20upgrades?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Almost 1% of contributions in nixpkgs already use the unicode "→" character instead of the two "->" ASCII characters to signal a version upgrade. The guide only mentions "->", which sometimes triggers discussions about the acceptable characters to use in commit messages, with often a reference to the current README.md. Some people prefer to use "→" because, depending on the font, it might have a more appealing visual aspect than "->" and look better aligned. Some others prefer to only write using the ASCII character set and will use "->", but nowadays everyone can display common unicode characters such as "→". Let us make everyone happy by indicating that both kind of arrows are acceptable. --- pkgs/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/README.md b/pkgs/README.md index 1e565f1b587b..052120faa089 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -132,6 +132,8 @@ Now that this is out of the way. To add a package to Nixpkgs: https://www.mozilla.org/en-US/firefox/55.0/releasenotes/ +(using "→" instead of "->" is also accepted) + ## Category Hierarchy [categories]: #category-hierarchy From 98297f0bf45c6cbbe622bca819d3639935d76dba Mon Sep 17 00:00:00 2001 From: paumr Date: Fri, 20 Sep 2024 18:34:21 +0200 Subject: [PATCH 113/229] archi: bugfix - added missing glib fixes #343272 --- pkgs/tools/misc/archi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 9f3edad29a3b..b5328e7fab28 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -4,6 +4,7 @@ , makeWrapper , jdk , libsecret +, glib , webkitgtk_4_0 , wrapGAppsHook3 , _7zz @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { install -D -m755 Archi $out/libexec/Archi makeWrapper $out/libexec/Archi $out/bin/Archi \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib webkitgtk_4_0 ])} \ --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ --prefix PATH : ${jdk}/bin '' From ef4756a52a748cec5eedf944497f3e19a0bd1cfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 17:23:32 +0000 Subject: [PATCH 114/229] python312Packages.pyvex: 9.2.122 -> 9.2.123 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index ec0f4987e6bb..a63c65ffef9d 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.122"; + version = "9.2.123"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-YfOjjDlu2bkwUGGm0Sk0QfG+uJcezYKjQvditRLYPT8="; + hash = "sha256-uojU1x4VfiYFM3ZSwSy5qPpWBSEq9CKwByk2HFAXvXA="; }; build-system = [ setuptools ]; From 40a4bd08fe59dd3c24807b28b19cecbcd48d5bc4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 19 Oct 2024 22:58:55 +0300 Subject: [PATCH 115/229] viewnior: add webp support and fix ``` (viewnior:2739789): Gtk-WARNING **: 23:12:19.403: Could not load a pixbuf from icon theme. This may indicate that pixbuf loaders or the mime database could not be found. ``` --- pkgs/applications/graphics/viewnior/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 70d28b6e5aee..8f7b72db2f50 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk3, libpng, exiv2, lcms -, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: +, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl, wrapGAppsHook3, webp-pixbuf-loader, gnome, librsvg}: stdenv.mkDerivation rec { pname = "viewnior-gtk3"; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { desktop-file-utils intltool gettext + wrapGAppsHook3 ]; buildInputs = [ @@ -35,6 +36,17 @@ stdenv.mkDerivation rec { perl ]; + postInstall = '' + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + webp-pixbuf-loader + librsvg + ]; + } + }" + ''; + meta = with lib; { description = "Fast and simple image viewer"; longDescription = From e547a1fe90d236401b1cbd98f1948a46caaab255 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 19 Oct 2024 23:07:20 +0300 Subject: [PATCH 116/229] viewnior: Use x11 --- pkgs/applications/graphics/viewnior/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 8f7b72db2f50..a38c247e7f21 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -45,6 +45,12 @@ stdenv.mkDerivation rec { ]; } }" + + # gtk3 viewnior can be launched in wayland mode and does so by default + # but moving around in a zoomed in image doesn't work + gappsWrapperArgs+=( + --set-default GDK_BACKEND x11 + ) ''; meta = with lib; { From 1fc1fb51e7a78a276d53f77c0eb9816999d236ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 18:51:04 +0000 Subject: [PATCH 117/229] python312Packages.hiyapyco: 0.6.1 -> 0.7.0 --- pkgs/development/python-modules/hiyapyco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix index 1e2b45a7dc60..e65e8e87f4eb 100644 --- a/pkgs/development/python-modules/hiyapyco/default.nix +++ b/pkgs/development/python-modules/hiyapyco/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hiyapyco"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "zerwes"; repo = pname; rev = "refs/tags/release-${version}"; - hash = "sha256-KB/KFrR7IScIWyYbsU+4BbV0+SCeeWxYDD8lbxosRLc="; + hash = "sha256-uF5DblAg4q8L1tZKopcjJ14NIQVQF5flNHdZ/jnw71M="; }; nativeBuildInputs = [ setuptools ]; From d586a185ffd5f0810c166ae1961bb4f4d0c04316 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 20 Oct 2024 14:59:07 -0400 Subject: [PATCH 118/229] wyoming-fastper-whisper: 2.1.0 -> 2.2.0 --- pkgs/tools/audio/wyoming/faster-whisper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/wyoming/faster-whisper.nix b/pkgs/tools/audio/wyoming/faster-whisper.nix index 4807e50adb42..3ed21f60d158 100644 --- a/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "wyoming-faster-whisper"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-faster-whisper"; rev = "refs/tags/v${version}"; - hash = "sha256-zWa872YkPh8B7dE//leth+ixIa1wHSRcjkvH2lXzolc="; + hash = "sha256-G46ycjpRu4MD00FiBM1H0DrPpXaaPlZ8yeoyZ7WYD48="; }; nativeBuildInputs = with python3Packages; [ From 97b7c11d88610721a346913aecc3a26cbdf30eb4 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 20 Oct 2024 14:59:33 -0400 Subject: [PATCH 119/229] python312Modules.faster-whisper: 1.0.3 -> unstable-2024-07-26 --- .../python-modules/faster-whisper/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 8dff7f5a3944..ec14d3b0dfd3 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -19,13 +19,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "1.0.3"; + version = "unstable-2024-07-26"; pyproject = true; src = fetchFromGitHub { owner = "SYSTRAN"; repo = "faster-whisper"; - rev = "refs/tags/v${version}"; + # rev = "refs/tags/v${version}"; + rev = "d57c5b40b06e59ec44240d93485a95799548af50"; hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo="; }; @@ -33,7 +34,10 @@ buildPythonPackage rec { setuptools ]; - pythonRelaxDeps = [ "tokenizers" ]; + pythonRelaxDeps = [ + "tokenizers" + "av" + ]; dependencies = [ av From f44371fc15d2733d63e78c009b4f905523525bc4 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Oct 2024 22:54:04 +0300 Subject: [PATCH 120/229] home-assistant-custom-lovelace-modules.universal-remote-card: 4.1.0 -> 4.1.1 Diff: https://github.com/Nerwyn/android-tv-card/compare/4.1.0...4.1.1 --- .../custom-lovelace-modules/universal-remote-card/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix index d515a1839bf9..edd4f6ad79d9 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -5,13 +5,13 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-ze+bsQbPeqfcZ2pWrI4aH3a1+uxus6wC2G9D+uVMrMU="; + hash = "sha256-h7U39dpgEsTboYjfpWxcdP3BkXNB2dQNuSiTCD7zPR0="; }; patches = [ ./dont-call-git.patch ]; From 0b0cbe18c613ae96f0947eaad7166ea42f5a4e02 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Oct 2024 22:55:49 +0300 Subject: [PATCH 121/229] home-assistant-custom-components.smartthinq-sensors: 0.40.1 -> 0.40.3 Diff: https://github.com/ollo69/ha-smartthinq-sensors/compare/v0.40.1...v0.40.3 Changelog: https://github.com/ollo69/ha-smartthinq-sensors/releases/tag/v0.40.3 --- .../custom-components/smartthinq-sensors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix index 348b6aa7d288..e107d1dcd5e6 100644 --- a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix +++ b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "ollo69"; domain = "smartthinq_sensors"; - version = "0.40.1"; + version = "0.40.3"; src = fetchFromGitHub { inherit owner; repo = "ha-smartthinq-sensors"; rev = "v${version}"; - hash = "sha256-15s4xQKNsjrhae8Cp6U0Ay3s/o8L9BjLvc+1Tu+ss1s="; + hash = "sha256-mcxXBnVGrlVxbSi+IwmGJiWqy5PlQmHQl+hgW6i7NFc="; }; propagatedBuildInputs = [ From 195ab8b0ee16d8db6f5c465b4c53962a59c6d947 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 20:15:11 +0000 Subject: [PATCH 122/229] cargo-expand: 1.0.90 -> 1.0.91 --- pkgs/by-name/ca/cargo-expand/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index bffa71224527..cb0b084ebf5f 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.90"; + version = "1.0.91"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-8Ls7Wklb5cnYo6acmGtjTHV1ZhSPVEQ9BsbR78a2LG0="; + hash = "sha256-ucxqC5OqBqmM9+jKnGWLd9g2GDAXjAqSl+0ouhs6evA="; }; - cargoHash = "sha256-8IKKK0xBgl5FiEoPrwO1uL/S+fOLv4Rof8KjquHJ6DI="; + cargoHash = "sha256-vDYpFJ+RFjouXgZc+ESPpkXA4sv5eHVZc93s+3KJj2g="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; From 4400a3b902f2f34cc3fdd5830e8cde77ff6a4824 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 20 Oct 2024 23:36:01 +0300 Subject: [PATCH 123/229] ananicy-cpp: add patch to fix detect cgroups --- pkgs/by-name/an/ananicy-cpp/package.nix | 2 ++ .../an/ananicy-cpp/reliable-mounts-file.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix index e34bebff8f26..424df2427495 100644 --- a/pkgs/by-name/an/ananicy-cpp/package.nix +++ b/pkgs/by-name/an/ananicy-cpp/package.nix @@ -36,6 +36,8 @@ clangStdenv.mkDerivation (finalAttrs: { hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs="; }) ./match-wrappers.patch + # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/merge_requests/27 + ./reliable-mounts-file.patch ]; strictDeps = true; diff --git a/pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch b/pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch new file mode 100644 index 000000000000..9daccc3d94e2 --- /dev/null +++ b/pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch @@ -0,0 +1,13 @@ +diff --git a/src/platform/linux/cgroups.cpp b/src/platform/linux/cgroups.cpp +index 766fd2f5247ce64eb7dfd45e5551f41773eaa18b..d27dbf724bdf5097dfda0c8d4eaaadb3e81f70b3 100644 +--- a/src/platform/linux/cgroups.cpp ++++ b/src/platform/linux/cgroups.cpp +@@ -223,7 +223,7 @@ control_groups::cgroup_info control_groups::get_cgroup_version(bool reset) { + } + + if (!info.has_value()) { +- std::ifstream mtab("/etc/mtab"); ++ std::ifstream mtab("/proc/self/mounts"); + while (mtab) { + std::string word, line; + fs::path cgroup_path; From 562ccf681464215a6237aa504d746bec99ddbfa6 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 20 Oct 2024 14:39:01 -0600 Subject: [PATCH 124/229] xournalpp: 1.2.3 -> 1.2.4 --- pkgs/applications/graphics/xournalpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 921fef456289..f2bd7e81a6e2 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; rev = "v${version}"; - sha256 = "sha256-8UAAX/kixqiY9zEYs5eva0G2K2vlfnYd1yyVHMSfSeY="; + hash = "sha256-72e47fVP0c8KioRHUqyEQIUgrLm+xMPE2Mm6+2v7pZk="; }; postPatch = '' From 49769d859555ad417828e4d277b13e42b501d03f Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 20 Oct 2024 14:39:37 -0600 Subject: [PATCH 125/229] xournalpp: format using nixfmt-rfc-style --- .../graphics/xournalpp/default.nix | 67 +++++++++++-------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index f2bd7e81a6e2..64ce75717edb 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -1,28 +1,31 @@ -{ lib, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, -, cmake -, gettext -, wrapGAppsHook3 -, pkg-config + cmake, + gettext, + wrapGAppsHook3, + pkg-config, -, adwaita-icon-theme -, alsa-lib -, binutils -, glib -, gsettings-desktop-schemas -, gtk3 -, gtksourceview4 -, librsvg -, libsndfile -, libxml2 -, libzip -, pcre -, poppler -, portaudio -, zlib -# plugins -, withLua ? true, lua + adwaita-icon-theme, + alsa-lib, + binutils, + glib, + gsettings-desktop-schemas, + gtk3, + gtksourceview4, + librsvg, + libsndfile, + libxml2, + libzip, + pcre, + poppler, + portaudio, + zlib, + # plugins + withLua ? true, + lua, }: stdenv.mkDerivation rec { @@ -41,12 +44,18 @@ stdenv.mkDerivation rec { --replace-fail "addr2line" "${binutils}/bin/addr2line" ''; - nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook3 ]; + nativeBuildInputs = [ + cmake + gettext + pkg-config + wrapGAppsHook3 + ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ [ + ] + ++ [ glib gsettings-desktop-schemas gtk3 @@ -72,11 +81,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; - homepage = "https://xournalpp.github.io/"; - changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl2Plus; + homepage = "https://xournalpp.github.io/"; + changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + platforms = platforms.unix; mainProgram = "xournalpp"; }; } From bd72d520133cbeefbbcc45cc96168d347f9c0b2f Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Tue, 15 Oct 2024 02:13:43 +0000 Subject: [PATCH 126/229] tmuxPlugins.nord: 0.3.0 -> 0.3.0-unstable-2023-03-03 Nord has... stagnated a bit. There are unreleased changes from the develop branch that have been stewing for a while, so let's provide them to Nixpkgs users. Changelog: https://github.com/nordtheme/tmux/compare/v0.3.0...develop Notable changes: - The date formatting is no longer hardcoded. - *-style configurations are now using the `bg=...;fg=...` syntax. Signed-off-by: Fernando Rodrigues --- pkgs/misc/tmux-plugins/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 9cb420ae182e..d1a5995f591e 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -378,14 +378,14 @@ in rec { }; }; - nord = mkTmuxPlugin rec { + nord = mkTmuxPlugin { pluginName = "nord"; - version = "0.3.0"; + version = "0.3.0-unstable-2023-03-03"; src = pkgs.fetchFromGitHub { owner = "nordtheme"; repo = "tmux"; - rev = "v${version}"; - hash = "sha256-s/rimJRGXzwY9zkOp9+2bAF1XCT9FcyZJ1zuHxOBsJM="; + rev = "f7b6da07ab55fe32ee5f7d62da56d8e5ac691a92"; + hash = "sha256-mcmVYNWOUoQLiu4eM/EUudRg67Gcou13xuC6zv9aMKA="; }; meta = { homepage = "https://www.nordtheme.com/ports/tmux"; @@ -399,6 +399,7 @@ in rec { theme in order to work properly. ''; license = lib.licenses.mit; + maintainers = [ lib.maintainers.sigmasquadron ]; }; }; From b51e2591bcbf94f92ec2643d7ac7961a442aaa60 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 11 Oct 2024 12:51:30 +0200 Subject: [PATCH 127/229] bun: fix cross-compilation --- pkgs/development/web/bun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 6e187aa3fe03..8e5250b5e1ef 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -33,8 +33,8 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - postPhases = [ "postPatchelf" ]; - postPatchelf = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + postPhases = lib.optionals (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) [ "postPatchelf" ]; + postPatchelf = '' completions_dir=$(mktemp -d) SHELL="bash" $out/bin/bun completions $completions_dir From 6306bf790e8e60854d76a3554031ce6e3347112f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Oct 2024 22:48:29 +0200 Subject: [PATCH 128/229] matrix-sliding-sync: drop On the 2024 matrix conference the EOL for the sliding-sync-proxy was announced to be 2024-10-15. While the repo does not yet reflect that state, we should not be taking the the sliding-sync proxy into NixOS 24.11 under any circumstances. --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + .../services/matrix/matrix-sliding-sync.nix | 107 ------------------ .../matrix-synapse/sliding-sync/default.nix | 37 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 7 files changed, 4 insertions(+), 147 deletions(-) delete mode 100644 nixos/modules/services/matrix/matrix-sliding-sync.nix delete mode 100644 pkgs/servers/matrix-synapse/sliding-sync/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index fb92e979484d..527922434033 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -365,6 +365,8 @@ - `nodePackages.coc-metals` was removed due to being deprecated upstream. `vimPlugins.nvim-metals` is its official replacement. +- `matrix-sliding-sync` was removed because it has been replaced by the simplified sliding sync functionality introduced in matrix-synapse 114.0. + - `teleport` has been upgraded from major version 15 to major version 16. Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c8678720c291..c00e31742f8f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -711,7 +711,6 @@ ./services/matrix/mjolnir.nix ./services/matrix/mx-puppet-discord.nix ./services/matrix/pantalaimon.nix - ./services/matrix/matrix-sliding-sync.nix ./services/matrix/synapse.nix ./services/misc/airsonic.nix ./services/misc/amazon-ssm-agent.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 9fdcf7c7281a..160ad91e42aa 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -87,6 +87,7 @@ in (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed") + (mkRemovedOptionModule [ "services" "matrix-sliding-sync" ] "The matrix-sliding-sync package has been removed, since matrix-synapse incorporated its functionality") (mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs") (mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mxisd" ] "The mxisd module has been removed as both mxisd and ma1sd got removed.") diff --git a/nixos/modules/services/matrix/matrix-sliding-sync.nix b/nixos/modules/services/matrix/matrix-sliding-sync.nix deleted file mode 100644 index d273bba3e52d..000000000000 --- a/nixos/modules/services/matrix/matrix-sliding-sync.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.services.matrix-sliding-sync; -in -{ - imports = [ - (lib.mkRenamedOptionModule [ "services" "matrix-synapse" "sliding-sync" ] [ "services" "matrix-sliding-sync" ]) - ]; - - options.services.matrix-sliding-sync = { - enable = lib.mkEnableOption "sliding sync"; - - package = lib.mkPackageOption pkgs "matrix-sliding-sync" { }; - - settings = lib.mkOption { - type = lib.types.submodule { - freeformType = with lib.types; attrsOf str; - options = { - SYNCV3_SERVER = lib.mkOption { - type = lib.types.str; - description = '' - The destination homeserver to talk to not including `/_matrix/` e.g `https://matrix.example.org`. - ''; - }; - - SYNCV3_DB = lib.mkOption { - type = lib.types.str; - default = "postgresql:///matrix-sliding-sync?host=/run/postgresql"; - description = '' - The postgres connection string. - Refer to . - ''; - }; - - SYNCV3_BINDADDR = lib.mkOption { - type = lib.types.str; - default = "127.0.0.1:8009"; - example = "[::]:8008"; - description = "The interface and port or path (for unix socket) to listen on."; - }; - - SYNCV3_LOG_LEVEL = lib.mkOption { - type = lib.types.enum [ "trace" "debug" "info" "warn" "error" "fatal" ]; - default = "info"; - description = "The level of verbosity for messages logged."; - }; - }; - }; - default = { }; - description = '' - Freeform environment variables passed to the sliding sync proxy. - Refer to for all supported values. - ''; - }; - - createDatabase = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether to enable and configure `services.postgres` to ensure that the database user `matrix-sliding-sync` - and the database `matrix-sliding-sync` exist. - ''; - }; - - environmentFile = lib.mkOption { - type = lib.types.str; - description = '' - Environment file as defined in {manpage}`systemd.exec(5)`. - - This must contain the {env}`SYNCV3_SECRET` variable which should - be generated with {command}`openssl rand -hex 32`. - ''; - }; - }; - - config = lib.mkIf cfg.enable { - services.postgresql = lib.optionalAttrs cfg.createDatabase { - enable = true; - ensureDatabases = [ "matrix-sliding-sync" ]; - ensureUsers = [ { - name = "matrix-sliding-sync"; - ensureDBOwnership = true; - } ]; - }; - - systemd.services.matrix-sliding-sync = rec { - after = - lib.optional cfg.createDatabase "postgresql.service" - ++ lib.optional config.services.dendrite.enable "dendrite.service" - ++ lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit; - wants = after; - wantedBy = [ "multi-user.target" ]; - environment = cfg.settings; - serviceConfig = { - DynamicUser = true; - EnvironmentFile = cfg.environmentFile; - ExecStart = lib.getExe cfg.package; - StateDirectory = "matrix-sliding-sync"; - WorkingDirectory = "%S/matrix-sliding-sync"; - RuntimeDirectory = "matrix-sliding-sync"; - Restart = "on-failure"; - RestartSec = "1s"; - }; - }; - }; -} diff --git a/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/pkgs/servers/matrix-synapse/sliding-sync/default.nix deleted file mode 100644 index 4774ea410a0d..000000000000 --- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "matrix-sliding-sync"; - version = "0.99.19"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "sliding-sync"; - rev = "refs/tags/v${version}"; - hash = "sha256-w4VL+MioNeJ/R48Ln9tYaqlfg7NvT3mQs0dWOZTHQK4="; - }; - - vendorHash = "sha256-THjvc0TepIBFOTte7t63Dmadf3HMuZ9m0YzQMI5e5Pw="; - - subPackages = [ "cmd/syncv3" ]; - - ldflags = [ - "-s" - "-w" - "-X main.GitCommit=${src.rev}" - ]; - - # requires a running matrix-synapse - doCheck = false; - - meta = with lib; { - description = "Sliding sync implementation of MSC3575 for matrix"; - homepage = "https://github.com/matrix-org/sliding-sync"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ emilylange yayayayaka ]; - mainProgram = "syncv3"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e81c4ed0645b..7b07e7b1ce1b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1026,6 +1026,7 @@ mapAliases { matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17 matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09 matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 + matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15 mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3a9536c70ec..ec305929f824 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9242,8 +9242,6 @@ with pkgs; matrix-conduit = callPackage ../servers/matrix-conduit { }; - matrix-sliding-sync = callPackage ../servers/matrix-synapse/sliding-sync { }; - matrix-synapse = callPackage ../servers/matrix-synapse/wrapper.nix { }; matrix-synapse-unwrapped = callPackage ../servers/matrix-synapse/default.nix { }; matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins; From 4d649ff22a55d332ab2960c1efa19fb683e2b632 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 20 Oct 2024 18:24:11 -0400 Subject: [PATCH 129/229] prismlauncher: 8.4 -> 9.0 --- pkgs/by-name/pr/prismlauncher-unwrapped/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index e5fb12a80c14..2a6b15caf624 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -24,8 +24,8 @@ let libnbtplusplus = fetchFromGitHub { owner = "PrismLauncher"; repo = "libnbtplusplus"; - rev = "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f"; - hash = "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug="; + rev = "23b955121b8217c1c348a9ed2483167a6f3ff4ad"; + hash = "sha256-yy0q+bky80LtK1GWzz7qpM+aAGrOqLuewbid8WT1ilk="; }; in @@ -35,13 +35,13 @@ assert lib.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "8.4"; + version = "9.0"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; - rev = finalAttrs.version; - hash = "sha256-460hB91M2hZm+uU1tywJEj20oRd5cz/NDvya8/vJdSA="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-EFpZ3V8wm7q7iwUJg0kKdZzOviWKsCji0jgYrrrKSI0="; }; postUnpack = '' @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { cmark ghc_filesystem kdePackages.qtbase + kdePackages.qtnetworkauth kdePackages.quazip tomlplusplus zlib @@ -104,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { their associated options with a simple interface. ''; homepage = "https://prismlauncher.org/"; - changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ minion3665 From af86ff668fc6f38326785c3631ebba5360dc7b4a Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 20 Oct 2024 18:29:28 -0400 Subject: [PATCH 130/229] prismlauncher: enable checks --- pkgs/by-name/pr/prismlauncher-unwrapped/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index 2a6b15caf624..b09f342e2076 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -91,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/") ]; + doCheck = true; + dontWrapQtApps = true; passthru = { From d5262c269ee23bd70d7ef61ab43bc9eda0d80bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Oct 2024 16:06:57 -0700 Subject: [PATCH 131/229] electron_33-bin: init at 33.0.0 --- pkgs/development/tools/electron/binary/info.json | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 13 insertions(+) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index a51217873b5b..98d0b01eb978 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -75,5 +75,16 @@ "x86_64-linux": "b51e5f1296f8971d7eb4ca86606b6f5d31fb3dab8caa91dcfbfa522be5679691" }, "version": "32.1.2" + }, + "33": { + "hashes": { + "aarch64-darwin": "75f3267e5517bb35cbfc11f2d5673947cfa8a510dc3a78c46356a948650027f2", + "aarch64-linux": "6c321b5f8f8fc694c09f6c904ad0a40a0eff1b84b2b771f6eae292e197e3a8c1", + "armv7l-linux": "d54e4820ab965acaa21940e15b79278fdbff4df083f162cd2a192541cf5a7063", + "headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f", + "x86_64-darwin": "945a07cec9eb2bdfa6a7ae6971f1df564447a5eeea3d533abae3ef5eac1966a1", + "x86_64-linux": "497ff71b2cacfc0a001fcfd3d852fd758e20604622ddfa2932dc32074c48af66" + }, + "version": "33.0.0" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122bfdc21701..ef922bd6592b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16916,6 +16916,7 @@ with pkgs; electron_30-bin electron_31-bin electron_32-bin + electron_33-bin ; inherit (callPackages ../development/tools/electron/chromedriver { }) @@ -16931,6 +16932,7 @@ with pkgs; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin; + electron_33 = electron_33-bin; electron = electron_32; electron-bin = electron_32-bin; electron-chromedriver = electron-chromedriver_32; From 34c5e9c983b61b8ccaf54f7ce11c5885a84cf61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Oct 2024 16:07:42 -0700 Subject: [PATCH 132/229] electron-chromedriver_33: init at 33.0.0 --- .../development/tools/electron/chromedriver/info.json | 11 +++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 3cb6b6a756c5..19d501b36dd1 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -42,5 +42,16 @@ "x86_64-linux": "d98aa7a90ebfe519700e47fa6bcb94a157483fac615920c5ee467dcc41c46702" }, "version": "32.1.2" + }, + "33": { + "hashes": { + "aarch64-darwin": "c0717f7dc5a2e3f99688389e643e9dc2e513a948df537abadc24230e1c93a1a3", + "aarch64-linux": "32887c18a8acb0d36eba6e3d9d9f763dda9155f98a948958b446681b9da63ed3", + "armv7l-linux": "c52961bcc5d2764d8a144a4fc2b9c25e904c8345deec9253dcaca7d560508a56", + "headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f", + "x86_64-darwin": "13086ff2417512f9c87982857e67f25ee05f55e3bb18b5d373264c153a50e166", + "x86_64-linux": "b07f166b53bdf64282e8ba73bf6a6bc86844dd38c183ee7ecbad5d281ee380ea" + }, + "version": "33.0.0" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef922bd6592b..fd678535cd0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16923,7 +16923,9 @@ with pkgs; electron-chromedriver_29 electron-chromedriver_30 electron-chromedriver_31 - electron-chromedriver_32; + electron-chromedriver_32 + electron-chromedriver_33 + ; electron_24 = electron_24-bin; electron_27 = electron_27-bin; From 155589d54e5522a286a4d21c0e8021677d65d6ef Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Tue, 15 Oct 2024 14:40:26 -0400 Subject: [PATCH 133/229] handlr-regex: 0.11.2 -> 0.12.0 --- pkgs/by-name/ha/handlr-regex/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ha/handlr-regex/package.nix b/pkgs/by-name/ha/handlr-regex/package.nix index 5e8e4d76ee6b..c29ea891ff5f 100644 --- a/pkgs/by-name/ha/handlr-regex/package.nix +++ b/pkgs/by-name/ha/handlr-regex/package.nix @@ -6,20 +6,21 @@ libiconv, installShellFiles, nix-update-script, + stdenv, }: rustPlatform.buildRustPackage rec { pname = "handlr-regex"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Anomalocaridid"; repo = pname; rev = "v${version}"; - hash = "sha256-xYt+pntqfq1RwaLAoTIH6zaJZWgyl58I/2xWCWe+bBs="; + hash = "sha256-xjrETTBHqekdPn2NwpGVoRoU8mf0F4jZN2yt0k8ypRA="; }; - cargoHash = "sha256-w5eZm+wHx4aU6zsNZhg8mehDSzpd6k6PpV/V7tzukIA="; + cargoHash = "sha256-V/daNs2vk2N6N5eUq1haxxuNyGMBLLBSmBx0JozaN5A="; nativeBuildInputs = [ installShellFiles @@ -32,13 +33,13 @@ rustPlatform.buildRustPackage rec { export HOME=$TEMPDIR ''; - postInstall = '' - installShellCompletion \ - --zsh assets/completions/_handlr \ - --bash assets/completions/handlr \ - --fish assets/completions/handlr.fish + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd handlr \ + --zsh <(COMPLETE=zsh $out/bin/handlr) \ + --bash <(COMPLETE=bash $out/bin/handlr) \ + --fish <(COMPLETE=fish $out/bin/handlr) - installManPage assets/manual/man1/* + installManPage target/release-tmp/build/handlr-regex-*/out/manual/man1/* ''; passthru.updateScript = nix-update-script { }; From 1463bbcc8c5195b7305b991da8f13fa018f68002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Oct 2024 16:13:50 -0700 Subject: [PATCH 134/229] electron_32-bin: 32.1.2 -> 32.2.1 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 98d0b01eb978..2ed339ff7943 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -67,14 +67,14 @@ }, "32": { "hashes": { - "aarch64-darwin": "b5f6db900997ba931c98addaef28744a0a6af0f2ec2e8e5755f7f50db2fe8bbc", - "aarch64-linux": "702326c51679ed705bc22d7e4049b29cef2d66366d3387c401836aaae0fa450c", - "armv7l-linux": "d9511449c328f90f47e499f44c6d84c6204d4a3a2caec5c5d52f176cfc77f50d", - "headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", - "x86_64-darwin": "150ac6a59e31ad516685bdbb9cee67c7e927b872ad94ffc900fbf6616433f8ab", - "x86_64-linux": "b51e5f1296f8971d7eb4ca86606b6f5d31fb3dab8caa91dcfbfa522be5679691" + "aarch64-darwin": "906fbf9e7a5ee6d49ea107fdfd0e98bc80884fbf1f6ff38d824453f58c6ec259", + "aarch64-linux": "6500fdbff988e0cda909643ba8439660a207c9a2d393fa63f680a0337e530342", + "armv7l-linux": "7ffcce19ebdb30a9db78671c7f222edde66181a37c895834682d224e459200fc", + "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm", + "x86_64-darwin": "56e2e4252b4d4e92075345f0b9dbefc8db49bdc6a4c45a87000f3cc705057907", + "x86_64-linux": "4fc58e6e79e5b5793ec9b5d35c8926fcad5352b6a1b21b3edf42343487c90185" }, - "version": "32.1.2" + "version": "32.2.1" }, "33": { "hashes": { From b01aa67a3855198ec983ec0ec5951abef4489abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Oct 2024 16:14:17 -0700 Subject: [PATCH 135/229] electron-chromedriver_32: 32.1.2 -> 32.2.1 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 19d501b36dd1..55e31c5b1641 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,14 +34,14 @@ }, "32": { "hashes": { - "aarch64-darwin": "7fb7b8736fcd9dbde92628e4aa951fd2c54d3136bf20c1821ce2a1b85fef3046", - "aarch64-linux": "405664c1b6529cd6c2af65778f2c84bfe262ad0b8d9d044a39d2eff2ed218828", - "armv7l-linux": "32682f487ed9307d0f40d35c4b998cee75272effd228093be3e008ca7b39e16e", - "headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", - "x86_64-darwin": "a9e43916cbe91c9a905f2bf38d326d5dc462c3d8a7d88f52c25c1e7c1b9ce7cc", - "x86_64-linux": "d98aa7a90ebfe519700e47fa6bcb94a157483fac615920c5ee467dcc41c46702" + "aarch64-darwin": "29acb63bb116a08e97797042505d48eecfa396f5d84a12114573aa70acaa48ec", + "aarch64-linux": "6b311318f5a537e21d2d832609ce8306b4806e4c62aaa132ee87e063d45f5b00", + "armv7l-linux": "ac1529a8f6e4c77fdae3bc92bc5bfcb40c3b19def0772de9d1874da7223517b7", + "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm", + "x86_64-darwin": "a1fd00f8634c6b4d9e28ce8ac69684ea24f5274c9f17c0e39bd149b34568b84b", + "x86_64-linux": "2329d1307729c714bef71d9f8250ed510b5a1ae07beefddee2371af70f712297" }, - "version": "32.1.2" + "version": "32.2.1" }, "33": { "hashes": { From 1d2124626cd75a5b4e48abe649fac7bf48ca6288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Mon, 21 Oct 2024 01:17:59 +0200 Subject: [PATCH 136/229] lisp-modules: skip broken systems that don't evaluate from import cl-quil and qvm are bugged on quicklisp 2024-10-12 --- .../import/repository/quicklisp.lisp | 18 ++ pkgs/development/lisp-modules/imported.nix | 208 ------------------ 2 files changed, 18 insertions(+), 208 deletions(-) diff --git a/pkgs/development/lisp-modules/import/repository/quicklisp.lisp b/pkgs/development/lisp-modules/import/repository/quicklisp.lisp index 1dd6572330da..9666fc9fba2a 100644 --- a/pkgs/development/lisp-modules/import/repository/quicklisp.lisp +++ b/pkgs/development/lisp-modules/import/repository/quicklisp.lisp @@ -68,6 +68,13 @@ (sqlite:execute-single db "select count(*) from sha256"))))) +(defparameter *broken-systems* + '( + ;; Infinite recursion through dependencies in 2024-10-12 dist + "cl-quil" "qvm" + ) + "List of broken systems, which should be omitted from the package graph") + (defmethod import-lisp-packages ((repository quicklisp-repository) (database sqlite-database)) @@ -113,6 +120,17 @@ asds 'vector)))))) + ;; Skip known broken systems and their dependents + (dolist (system *broken-systems*) + (sql-query + "with recursive broken(name) as ( + select ? + union + select s.name from quicklisp_system s, broken b + where b.name in (select value from json_each(deps)) + ) delete from quicklisp_system where name in (select name from broken)" + system)) + (sqlite:with-transaction db ;; Should these be temp tables, that then get queried by ;; system name? This looks like it uses a lot of memory. diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix index e65b626e2d9e..e788bd8bf204 100644 --- a/pkgs/development/lisp-modules/imported.nix +++ b/pkgs/development/lisp-modules/imported.nix @@ -4188,38 +4188,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - boondoggle = (build-asdf-system { - pname = "boondoggle"; - version = "20241012-git"; - asds = [ "boondoggle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz"; - sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy"; - system = "boondoggle"; - asd = "boondoggle"; - }); - systems = [ "boondoggle" ]; - lispLibs = [ (getAttr "cl-quil" self) (getAttr "command-line-arguments" self) (getAttr "drakma" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - boondoggle-tests = (build-asdf-system { - pname = "boondoggle-tests"; - version = "20241012-git"; - asds = [ "boondoggle-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz"; - sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy"; - system = "boondoggle-tests"; - asd = "boondoggle-tests"; - }); - systems = [ "boondoggle-tests" ]; - lispLibs = [ (getAttr "boondoggle" self) (getAttr "cl-quil" self) (getAttr "fiasco" self) (getAttr "sapaclisp" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); bordeaux-fft = (build-asdf-system { pname = "bordeaux-fft"; version = "20150608-http"; @@ -22868,54 +22836,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - cl-quil = (build-asdf-system { - pname = "cl-quil"; - version = "20241012-git"; - asds = [ "cl-quil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz"; - sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy"; - system = "cl-quil"; - asd = "cl-quil"; - }); - systems = [ "cl-quil" ]; - lispLibs = [ (getAttr "alexa" self) (getAttr "alexandria" self) (getAttr "cl-algebraic-data-type" self) (getAttr "cl-grnm" self) (getAttr "cl-heap" self) (getAttr "cl-permutation" self) (getAttr "clos-encounters" self) (getAttr "closer-mop" self) (getAttr "flexi-streams" self) (getAttr "global-vars" self) (getAttr "magicl" self) (getAttr "parse-float" self) (getAttr "queues_dot_priority-queue" self) (getAttr "qvm" self) (getAttr "salza2" self) (getAttr "split-sequence" self) (getAttr "trivial-garbage" self) (getAttr "yacc" self) (getAttr "yason" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - cl-quil-benchmarking = (build-asdf-system { - pname = "cl-quil-benchmarking"; - version = "20241012-git"; - asds = [ "cl-quil-benchmarking" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz"; - sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy"; - system = "cl-quil-benchmarking"; - asd = "cl-quil-benchmarking"; - }); - systems = [ "cl-quil-benchmarking" ]; - lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cl-quil" self) (getAttr "metering" self) (getAttr "qvm-app" self) (getAttr "trivial-benchmark" self) (getAttr "trivial-garbage" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - cl-quil-tests = (build-asdf-system { - pname = "cl-quil-tests"; - version = "20241012-git"; - asds = [ "cl-quil-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz"; - sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy"; - system = "cl-quil-tests"; - asd = "cl-quil-tests"; - }); - systems = [ "cl-quil-tests" ]; - lispLibs = [ (getAttr "alexa" self) (getAttr "alexandria" self) (getAttr "cl-permutation" self) (getAttr "cl-ppcre" self) (getAttr "cl-quil" self) (getAttr "fiasco" self) (getAttr "magicl" self) (getAttr "qvm" self) (getAttr "yacc" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); cl-rabbit = (build-asdf-system { pname = "cl-rabbit"; version = "20210411-git"; @@ -60484,38 +60404,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - quilc = (build-asdf-system { - pname = "quilc"; - version = "20241012-git"; - asds = [ "quilc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz"; - sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy"; - system = "quilc"; - asd = "quilc"; - }); - systems = [ "quilc" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cl-ppcre" self) (getAttr "cl-quil" self) (getAttr "cl-quil-benchmarking" self) (getAttr "cl-syslog" self) (getAttr "command-line-arguments" self) (getAttr "drakma" self) (getAttr "magicl" self) (getAttr "rpcq" self) (getAttr "split-sequence" self) (getAttr "swank" self) (getAttr "trivial-features" self) (getAttr "yason" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - quilc-tests = (build-asdf-system { - pname = "quilc-tests"; - version = "20241012-git"; - asds = [ "quilc-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz"; - sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy"; - system = "quilc-tests"; - asd = "quilc-tests"; - }); - systems = [ "quilc-tests" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "fiasco" self) (getAttr "quilc" self) (getAttr "uuid" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); quine-mccluskey = (build-asdf-system { pname = "quine-mccluskey"; version = "20141217-git"; @@ -60594,102 +60482,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - qvm = (build-asdf-system { - pname = "qvm"; - version = "20241012-git"; - asds = [ "qvm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz"; - sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v"; - system = "qvm"; - asd = "qvm"; - }); - systems = [ "qvm" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cffi" self) (getAttr "cffi-grovel" self) (getAttr "cl-quil" self) (getAttr "clos-encounters" self) (getAttr "global-vars" self) (getAttr "ieee-floats" self) (getAttr "lparallel" self) (getAttr "magicl" self) (getAttr "mt19937" self) (getAttr "static-vectors" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - qvm-app = (build-asdf-system { - pname = "qvm-app"; - version = "20241012-git"; - asds = [ "qvm-app" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz"; - sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v"; - system = "qvm-app"; - asd = "qvm-app"; - }); - systems = [ "qvm-app" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cl-fad" self) (getAttr "cl-ppcre" self) (getAttr "cl-quil" self) (getAttr "cl-syslog" self) (getAttr "command-line-arguments" self) (getAttr "drakma" self) (getAttr "global-vars" self) (getAttr "hunchentoot" self) (getAttr "ieee-floats" self) (getAttr "qvm" self) (getAttr "qvm-benchmarks" self) (getAttr "swank" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) (getAttr "yason" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - qvm-app-tests = (build-asdf-system { - pname = "qvm-app-tests"; - version = "20241012-git"; - asds = [ "qvm-app-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz"; - sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v"; - system = "qvm-app-tests"; - asd = "qvm-app-tests"; - }); - systems = [ "qvm-app-tests" ]; - lispLibs = [ (getAttr "fiasco" self) (getAttr "qvm-app" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - qvm-benchmarks = (build-asdf-system { - pname = "qvm-benchmarks"; - version = "20241012-git"; - asds = [ "qvm-benchmarks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz"; - sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v"; - system = "qvm-benchmarks"; - asd = "qvm-benchmarks"; - }); - systems = [ "qvm-benchmarks" ]; - lispLibs = [ (getAttr "cl-quil" self) (getAttr "qvm" self) (getAttr "trivial-benchmark" self) (getAttr "yason" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - qvm-examples = (build-asdf-system { - pname = "qvm-examples"; - version = "20241012-git"; - asds = [ "qvm-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz"; - sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v"; - system = "qvm-examples"; - asd = "qvm-examples"; - }); - systems = [ "qvm-examples" ]; - lispLibs = [ (getAttr "cl-grnm" self) (getAttr "cl-quil" self) (getAttr "qvm" self) (getAttr "qvm-app" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - qvm-tests = (build-asdf-system { - pname = "qvm-tests"; - version = "20241012-git"; - asds = [ "qvm-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz"; - sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v"; - system = "qvm-tests"; - asd = "qvm-tests"; - }); - systems = [ "qvm-tests" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cffi" self) (getAttr "cl-quil" self) (getAttr "fiasco" self) (getAttr "qvm" self) (getAttr "qvm-examples" self) (getAttr "trivial-garbage" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); qwt = (build-asdf-system { pname = "qwt"; version = "20210531-git"; From 0c5883bbce990809800106eaad2512f9a6d1b7eb Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 21 Oct 2024 07:20:30 +0800 Subject: [PATCH 137/229] mpiCheckPhaseHook: add parameters to bypass errors in sandbox --- .../setup-hooks/mpi-check-hook/default.nix | 4 ++++ .../setup-hooks/mpi-check-hook/mpi-check-hook.sh | 11 +++++++++++ .../setup-hooks/mpi-check-hook/topology.xml | 10 ++++++++++ 3 files changed, 25 insertions(+) create mode 100644 pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix b/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix index 2834cfcc44ff..a49e8e338bea 100644 --- a/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix @@ -2,4 +2,8 @@ makeSetupHook { name = "mpi-checkPhase-hook"; + + substitutions = { + topology = ./topology.xml; + }; } ./mpi-check-hook.sh diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh index 41b6d864c8a5..d7275b62244d 100644 --- a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh @@ -44,6 +44,17 @@ setupMpiCheck() { # Disable CPU pinning export OMPI_MCA_hwloc_base_binding_policy=none export PRTE_MCA_hwloc_default_binding_policy=none + + # OpenMPI get confused by the sandbox environment and spew errors like this (both to stdout and stderr): + # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. + # [1729458724.473282] [localhost:78 :0] tcp_iface.c:893 UCX ERROR scandir(/sys/class/net) failed: No such file or directory + # These messages contaminate test output, which makes the difftest to fail. + # The solution is to use a preset cpu topology file and disable ucx model. + + # Disable sysfs cpu topology directory discovery. + export PRTE_MCA_hwloc_use_topo_file="@topology@" + # Use the network model ob1 instead of ucx. + export OMPI_MCA_pml=ob1 ;; MPICH) # Fix to make mpich run in a sandbox diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml b/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml new file mode 100644 index 000000000000..616ed839f004 --- /dev/null +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From 161892e932643c769117d621a70e014f3b2d1563 Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 21 Oct 2024 07:20:52 +0800 Subject: [PATCH 138/229] petsc: use mpiCheckPhaseHook to bypass check in sandbox --- .../pe/petsc/filter_mpi_warnings.patch | 112 ------------------ pkgs/by-name/pe/petsc/package.nix | 8 +- 2 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 pkgs/by-name/pe/petsc/filter_mpi_warnings.patch diff --git a/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch b/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch deleted file mode 100644 index 6659f2d084d9..000000000000 --- a/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile -index fa15faad39e..7670e80931e 100644 ---- a/src/snes/tutorials/makefile -+++ b/src/snes/tutorials/makefile -@@ -13,6 +13,7 @@ ex55: ex55.o ex55k.o - # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed - testex5f: ex5f.PETSc - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ - if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ - echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ - else \ -@@ -25,6 +26,7 @@ testex5f: ex5f.PETSc - ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; - testex19: ex19.PETSc - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ - else \ -@@ -36,6 +38,7 @@ testex19: ex19.PETSc - ${RM} -f ex19_1.tmp; - testex19_mpi: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ - else \ -@@ -48,6 +51,7 @@ testex19_mpi: - #use unpreconditioned norm because HYPRE device installations use different AMG parameters - runex19_hypre: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE"; \ - else \ -@@ -57,6 +61,7 @@ runex19_hypre: - ${RM} -f ex19_1.tmp - runex19_hypre_cuda: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/CUDA"; \ - else \ -@@ -66,6 +71,7 @@ runex19_hypre_cuda: - ${RM} -f ex19_1.tmp - runex19_hypre_hip: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/HIP"; \ - else \ -@@ -75,6 +81,7 @@ runex19_hypre_hip: - ${RM} -f ex19_1.tmp - runex19_cuda: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -ksp_monitor -mg_levels_ksp_max_it 1 > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with CUDA"; \ - else \ -@@ -84,6 +91,7 @@ runex19_cuda: - ${RM} -f ex19_1.tmp - runex19_ml: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with ML"; \ - else \ -@@ -93,6 +101,7 @@ runex19_ml: - ${RM} -f ex19_1.tmp - runex19_fieldsplit_mumps: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ - if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with MUMPS"; \ - else \ -@@ -102,6 +111,7 @@ runex19_fieldsplit_mumps: - ${RM} -f ex19_6.tmp - runex19_superlu_dist: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ - if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuperLU_DIST"; \ - else \ -@@ -111,6 +121,7 @@ runex19_superlu_dist: - ${RM} -f ex19.tmp - runex19_suitesparse: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuiteSparse"; \ - else \ -@@ -120,6 +131,7 @@ runex19_suitesparse: - ${RM} -f ex19_1.tmp - runex3k_kokkos: ex3k.PETSc - -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ - if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex3k run successfully with Kokkos Kernels"; \ - else \ -diff --git a/src/vec/vec/tests/makefile b/src/vec/vec/tests/makefile -index d1f047820ec..aab400535dd 100644 ---- a/src/vec/vec/tests/makefile -+++ b/src/vec/vec/tests/makefile -@@ -5,6 +5,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules - - runex47: ex47.PETSc - -@H5OUT=`mktemp -t petsc.h5.XXXXXX`; ${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex47 -filename $${H5OUT} > ex47_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex47_1.tmp; \ - if (${DIFF} output/ex47_1.out ex47_1.tmp) then \ - echo "C/C++ example src/vec/vec/tests/ex47 run successfully with HDF5"; \ - else \ diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 498a14c96dc3..8d0db4a768db 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -9,6 +9,7 @@ lapack, mpiSupport ? true, mpi, # generic mpi dependency + mpiCheckPhaseHook, openssh, # required for openmpi tests petsc-withp4est ? false, hdf5-support ? false, @@ -52,12 +53,6 @@ stdenv.mkDerivation rec { --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool ''; - # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr): - # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. - # [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory - # These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages. - patches = [ ./filter_mpi_warnings.patch ]; - configureFlags = [ "--with-blas=1" "--with-lapack=1" @@ -112,6 +107,7 @@ stdenv.mkDerivation rec { # the library is installed and available. doInstallCheck = true; installCheckTarget = "check_install"; + nativeInstallCheckInputs = [ mpiCheckPhaseHook ]; passthru = { inherit mpiSupport; From 3aeaac6b8e65aa1561b32067c6946b052d633eed Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 21 Oct 2024 07:21:08 +0800 Subject: [PATCH 139/229] nwchem: replace nativeCheckInputs with nativeInstallCheckInputs --- pkgs/applications/science/chemistry/nwchem/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index fb24f903f522..8ea4d96a2a25 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = true; - nativeCheckInputs = [ mpiCheckPhaseHook ]; + nativeInstallCheckInputs = [ mpiCheckPhaseHook ]; installCheckPhase = '' runHook preInstallCheck From 3e08945b40e08fc0a36cf24dc73e5022c58df1d1 Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 21 Oct 2024 07:21:19 +0800 Subject: [PATCH 140/229] nwchem: mark supported on aarch64 --- pkgs/applications/science/chemistry/nwchem/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index 8ea4d96a2a25..d3d349969bb2 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open Source High-Performance Computational Chemistry"; mainProgram = "nwchem"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ sheepforce markuskowa ]; homepage = "https://nwchemgit.github.io"; license = licenses.ecl20; From c110ddcc9f6a2d5e4d02452f3befa34dd775c281 Mon Sep 17 00:00:00 2001 From: Jacob Larkin Date: Sun, 13 Oct 2024 02:23:55 +0000 Subject: [PATCH 141/229] python3Packages.dlib: use pytestCheckHook --- pkgs/development/python-modules/dlib/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index f66fe4bf484f..5faf143daab5 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, dlib, python, - pytest, + pytestCheckHook, more-itertools, sse4Support ? stdenv.hostPlatform.sse4_1Support, avxSupport ? stdenv.hostPlatform.avxSupport, @@ -24,7 +24,7 @@ buildPythonPackage { patches = [ ./build-cores.patch ]; nativeCheckInputs = [ - pytest + pytestCheckHook more-itertools ]; @@ -34,13 +34,6 @@ buildPythonPackage { --replace "pytest==3.8" "pytest" ''; - # although AVX can be enabled, we never test with it. Some Hydra machines - # fail because of this, however their build results are probably used on hardware - # with AVX support. - checkPhase = '' - ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS - ''; - setupPyBuildFlags = [ "--set USE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}" "--set USE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" From baefd488bce8f243a95168f540b75c2c814d52ba Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 18 Oct 2024 12:08:28 +0000 Subject: [PATCH 142/229] mate.mate-panel: 1.28.2 -> 1.28.4 https://github.com/mate-desktop/mate-panel/compare/v1.28.2...v1.28.4 --- pkgs/desktops/mate/mate-panel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index db6edf8df3f0..305c9e50ca78 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.28.2"; + version = "1.28.4"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Z4pD6DeqJxhJQgT93xm7kGzwfl2A/S4d3nRfJtKtujM="; + hash = "sha256-AvCesDFMKsGXtvCJlQpXHNujm/0D1sOguP13JSqWiHQ="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gtk3 - # See https://github.com/mate-desktop/mate-panel/issues/1402 + # Optionally for the ca.desrt.dconf-editor.Settings schema # This is propagated for mate_panel_applet_settings_new and applet's wrapGAppsHook3 dconf-editor ]; From 5a994fa2d84e536199c296a93048750da80dc74a Mon Sep 17 00:00:00 2001 From: nartsisss Date: Mon, 21 Oct 2024 03:00:09 +0300 Subject: [PATCH 143/229] cargo-hakari: move to pkgs/by-name --- .../default.nix => by-name/ca/cargo-hakari/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{development/tools/rust/cargo-hakari/default.nix => by-name/ca/cargo-hakari/package.nix} (100%) diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/by-name/ca/cargo-hakari/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-hakari/default.nix rename to pkgs/by-name/ca/cargo-hakari/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8cd809caae6..1f22328e733a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15699,7 +15699,6 @@ with pkgs; cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; cargo-dist = callPackage ../development/tools/rust/cargo-dist { }; cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { }; - cargo-hakari = callPackage ../development/tools/rust/cargo-hakari { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; From cb944a2fae660ebe2c08238e6607c7798a75f100 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Mon, 21 Oct 2024 03:01:45 +0300 Subject: [PATCH 144/229] cargo-hakari: add maintainer nartsiss --- pkgs/by-name/ca/cargo-hakari/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix index cfdf5d6e65a3..ba5c2e999776 100644 --- a/pkgs/by-name/ca/cargo-hakari/package.nix +++ b/pkgs/by-name/ca/cargo-hakari/package.nix @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ figsoda macalinao + nartsiss ]; }; } From 6900650847809fe479d6f4518fb83b1072e92878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Oct 2024 17:30:43 -0700 Subject: [PATCH 145/229] electron-source.electron_32: 32.1.2 -> 32.2.1 --- pkgs/development/tools/electron/info.json | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 3999b50e9888..2cd3361e03b2 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1858,7 +1858,7 @@ "version": "31.6.0" }, "32": { - "chrome": "128.0.6613.162", + "chrome": "128.0.6613.186", "chromium": { "deps": { "gn": { @@ -1868,15 +1868,15 @@ "version": "2024-06-11" } }, - "version": "128.0.6613.162" + "version": "128.0.6613.186" }, "chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=", "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-52pb9e5XYaiIpUlazoXbmEJ/3l4uPWt9sVmF0+cVBKQ=", + "hash": "sha256-6Rtd3eu9z7yvzmMaSGjvTCXt29f9cAXFc1IVT0otQ2I=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "128.0.6613.162", + "rev": "128.0.6613.186", "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { @@ -1905,10 +1905,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-RkSdNjEmXO4xsCRzp5y5suG8svNT5LSI/eVbAUDbi5c=", + "hash": "sha256-6Yt3fz2XqFoSh+V/tI9ygFdHf76p2vGOR7+6FgTnfWg=", "owner": "electron", "repo": "electron", - "rev": "v32.1.2" + "rev": "v32.2.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -2080,14 +2080,14 @@ }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6ljZh99QPH8/9JAV1tVm6BVAYsJWqkJjzlM2AG2m01g=", - "rev": "5f86f5a316f4e082b2419d8b954ebb79c2be590d", + "hash": "sha256-UTtU0GIlkOtXA3vJy0MA99wLARHl7WMM7IBNmXxE6d4=", + "rev": "a79093138c06b0ca942f99ddc39b225dafa4776d", "url": "https://dawn.googlesource.com/dawn.git" }, "src/third_party/dawn/third_party/dxc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-oIByfTUMy1EY3J0/m0iOqJbHd+DzpVAmZbaIdllcF04=", - "rev": "3ea0e7f6b5f464814d6b896eaf69cbd5ebe7fac4", + "hash": "sha256-p4DZNVQ8C4YB52BfBKEFXCqenQk0ONkzkctM9vyz4aw=", + "rev": "ee5422d3f33c0bfd8643ce7782eb3a216cf15dea", "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" }, "src/third_party/dawn/third_party/dxheaders": { @@ -2152,10 +2152,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", + "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=", "owner": "nodejs", "repo": "node", - "rev": "v20.17.0" + "rev": "v20.18.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -2569,8 +2569,8 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-B5zb35NkwR3yT58344iAOM1Kywn8Yr/TuNBSJcrxwh4=", - "rev": "938144dd79c6e3664a3c0bbd019daedddf655ffa", + "hash": "sha256-vclLETDkiiBinfvse++0CF9/1+qZeG5vcukTTmqPYiU=", + "rev": "cd98397d0c2c3eb1d5a8d76aade3c87c2e0d28ac", "url": "https://skia.googlesource.com/skia.git" }, "src/third_party/smhasher/src": { @@ -2788,14 +2788,14 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-weN8PR9qaRcws9T5PhWyJntrJJ4sKoLwP3gTSLHU574=", - "rev": "485b9d9f88ef1c4787b183b8ccc6cdcfbc07ab1a", + "hash": "sha256-VwRVnondH9YM8pYRQo0l0jM0Zb531kpQTo6ngvEPOBg=", + "rev": "d213b3bbc0ecf17ccd2849fdef3bccb1946b01b3", "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "0jb1rs1in1bp71syim7a7p0n669kbc6as90y3zi6nd0q340cwgqa", + "electron_yarn_hash": "19iw16qs4h6b1bcmkkqxhhcgxnl2r6qf57w7dr76vbl0zhmhlyf9", "modules": "128", - "node": "20.17.0", - "version": "32.1.2" + "node": "20.18.0", + "version": "32.2.1" } } From a3670a2940c20629609fdb913ee639f3acb9e639 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 03:50:42 +0000 Subject: [PATCH 146/229] thunderbird-bin-unwrapped: 128.3.1esr -> 128.3.2esr --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 58506961e8fd..716f7bd019d7 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "128.3.1esr"; + version = "128.3.2esr"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/af/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/af/thunderbird-128.3.2esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "daec0c206763600ea16dc09db4c11ed82132bf6ed4275307f5635677891f3d43"; + sha256 = "68e754e3280b0e47e2160d2538dbe959edde3b987a62f05c42bee02e554fbeeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ar/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ar/thunderbird-128.3.2esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "04801b87ddc17b059a61cf4d16e2d7eda45ca96c0de497e93e02b24be8590176"; + sha256 = "06eb5688aeab9fd9c544c45079a5a711bef6bf0710d0abfc508e33d072827ee0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ast/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ast/thunderbird-128.3.2esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "046a8218164d1dc3f7e1b7d1f134c9fb94f9fe30702e7f0ce8474145725590c3"; + sha256 = "434d20e1d20acb0aefbce5d15fb3d015eee1dc474a5b5afae90b7575308c27b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/be/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/be/thunderbird-128.3.2esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2c1bec26b01f2ac25df9537f34582c18677fc93203e94c378323f0ff161ab6bb"; + sha256 = "a4def49f05a1a479c3ac0f1267d4ab65de84d7acbcc79e1c52e55e814bad8342"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/bg/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/bg/thunderbird-128.3.2esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "64a6c820bc35b416aff30822417486104bbde4842efec785db6b2e1f35b66b70"; + sha256 = "d6d4770f6707dc8a246eafaa0c3a360fb49117eb2adbb12e99a02b4de2cf1805"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/br/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/br/thunderbird-128.3.2esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9074dd4e49c2a73f62cf0454d29e8bdd417dbf129489baca9848912cc60c8fe8"; + sha256 = "e2352aacca362ce56571b1f50009304355e5c2575e0aea3e84f81d386f7e5553"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ca/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ca/thunderbird-128.3.2esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "ded677ad4962afc9372067f8c87f0d1623275a03cc98b125fd721ef3c3df6028"; + sha256 = "67c31bb9599c181bbaf250c2479188d7fc2e208322aa51737aed83ed9f91299a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cak/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cak/thunderbird-128.3.2esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7ca0781d25f77cc72dcfc1b8ad88fa222a90c8af2fad1535c30f6e0df04cc2bd"; + sha256 = "b7b44e214374a526264522345e5907b76d080603b0fc6b2c4bae9621b78279a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cs/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cs/thunderbird-128.3.2esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e8f6bd963a49342d176c4b45ceb7038c3a18a6002060237cd06c807f27338c29"; + sha256 = "72149f69323530b8e369fb2689a8baad097f23fe3a6039bfe56b24c0a3290744"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cy/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cy/thunderbird-128.3.2esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "97486ec291bbec41a3813a1e289bd044ea3ccea71a66c9182cf13481bb17765a"; + sha256 = "207ee0a8bd84e9e8b1c759a1c9987207f701d0da2dd6c036d759475896a0f2c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/da/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/da/thunderbird-128.3.2esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2f83197baae9097bf2a13f3d781416e32e711de14f2e9e6f3be4ef909975b5c5"; + sha256 = "b69247826491468475cae337ed62c0314ce8ca4de33ed3d8630114fddcaec41a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/de/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/de/thunderbird-128.3.2esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d5164afcd92be1e64887d056b0a97a2c8b8a8e0f8b52d0d71380ab44deb54c16"; + sha256 = "a0ef4564aa205006fd448ddd8d03f398a1fd525c156bbcbcba297a6a2c932cb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/dsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/dsb/thunderbird-128.3.2esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "74552c085365a7a381b634dd2db32620acd3cdb4e3dd8d93d24344c45149d027"; + sha256 = "58eb03368703f0fdd760f04102fd3f1dddf525147fb7e5e4f1919e080935d6ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/el/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/el/thunderbird-128.3.2esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "abb4db492bf0599dc08a0af742a863729abd45b67134a450faf9bb4dc9fbd048"; + sha256 = "1a1c48242ab368a8039edb04093c64cc41aa1885cbe67567340f324ce429dbe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-CA/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-CA/thunderbird-128.3.2esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "149e106c120954f9d6c8021a426d487e482deba81aa2916cef9bbfebe100f6a4"; + sha256 = "f13a13039d3006320a71a01a6ffdcfebdfa446abd0aadc6858b4296dbbd01106"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-GB/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-GB/thunderbird-128.3.2esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "553f881b15952c5cc4ee31f7fe6d5425a8aecb2e292968972c6a920f2fea89e4"; + sha256 = "10d698906140a7b104484a3e90875b1f0fc2d1d7abe3bfcc2c82ab793a8c7992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-US/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-US/thunderbird-128.3.2esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6a4738c5b07b2c6e8668cccf2c3c24f78e2d8ae7a04a1963638e8404d96f12d4"; + sha256 = "72c185256191a6f1f8b4e497b65dde1fedd919a2251261ccad6da06c62dd627b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-AR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-AR/thunderbird-128.3.2esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9b886923b198af374e589666abe029d6cf905f5a0e77acccb35817815a3bf42e"; + sha256 = "211d5fbe5d72d5365c74153817fc95eb376d7eb2f1fba9aea1522491fe718afc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-ES/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-ES/thunderbird-128.3.2esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6fad8af3dfba46a88889a147931f202bbaecbf44db174e33237974b0e1d461aa"; + sha256 = "6fcf5a499accf6882dae1c1f1a69da600a8b8ba28a902a6c7a3b4d8de51d17e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-MX/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-MX/thunderbird-128.3.2esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "76dbaa277644f72c11b2826973253daea1cd263265aac3d393303f3d4eca736a"; + sha256 = "aeba0e0b1637ce57d8ef11e73efbc39e5843c03d1efaf2e9519e60a03d6f50de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/et/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/et/thunderbird-128.3.2esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "89a9ce893dd7002dfb6e249309f25f45bc93ee84a7895c7911d41d7934643686"; + sha256 = "04b7e75de0df9fb9ca09ea2910a618d9c6ed60d9b71c2505ec8850b183ee98a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/eu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/eu/thunderbird-128.3.2esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8743449758bd59afbb83e82bd62ea0f53c2a6c4c61ad095604d5b50a4b7323a4"; + sha256 = "5499fac8f11acc67b1590ca43dad0c136e9c0a00134ff14469265845154b791d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fi/thunderbird-128.3.2esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5a59846d72690a074f4bddafe97d7f088341e8de0c43e958a6d2df7021b016da"; + sha256 = "3254378b2ee27f7462129428176a92277315c0089915c0f3a80dfa435bd2205e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fr/thunderbird-128.3.2esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6de6c9b793215ab2b1c1ccb93bcb535a99a165085842064dadd0a5b42a57b71a"; + sha256 = "56861692b1c421d7f5a90657397b86e678cb6c162853362e69aaa7db4f28925f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fy-NL/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fy-NL/thunderbird-128.3.2esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "ae85b76c1b512ba5d062ea4f157a587056afa859c238b511f8eeb412ae583682"; + sha256 = "63dca4a0a7c71b4d717f92213d8b7524b1eca29ad50e4540edaac148badf0586"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ga-IE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ga-IE/thunderbird-128.3.2esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "59168b9e0dec31685222fd9bd8b83d0f230d3308484a4a2ea5416dacd7f49728"; + sha256 = "70ded506c128d9e7962dcf8621b772840834f44d59ab1a6a8c8c543175242858"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/gd/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/gd/thunderbird-128.3.2esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "4c35f2ea2fb781301d87649111c6d770e94f8487fbe8925f6156cd7227e50961"; + sha256 = "e65b6d02421f5b37d19c6b65cba400d12f64418b80410ffebafdc83b11758eeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/gl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/gl/thunderbird-128.3.2esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "da4c2677e61e8759c5f4ff5f51f737201f047b5166636000bf73377a0b39c0eb"; + sha256 = "a92eb0bfd1efba1f5b5efe794b915050d3a67c116e78b84b0abce563553efbd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/he/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/he/thunderbird-128.3.2esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "94085a1d0106c7ce6bad8383fa85e530a79f8a38157ad94e5352f45847c7ba31"; + sha256 = "5fe6d0a4b259ddb0e85d192659e205610a11c5f1d32498dc84ff4956ce0ecc52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hr/thunderbird-128.3.2esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "49a4dd6bc68b28a96fc59235fa16db4903561eea11a836e62e55f284a1526a23"; + sha256 = "05d9d2a86ae030b7c036292ebbdccd5095efb26c32bb9ceb618f1e049514aa94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hsb/thunderbird-128.3.2esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e9e4ca0683a0eeecdacc7d92d8a59fea75459f7cfbdfe2f4406fed041429f041"; + sha256 = "e9a807e8ac2ee94d2ff214e92e1b69cba5f00c3b9c6cbc0244fea2e9ac2386aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hu/thunderbird-128.3.2esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "379bfeb3e5554643b009d7f62074ccf6e95a6c46807f938e73054625b752f77c"; + sha256 = "0347ccb486557e961ef46979f4a221b8fed55307379d9eb3e77afafc4d07d736"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hy-AM/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hy-AM/thunderbird-128.3.2esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "37ada95839dacc8907a2dc89bdc424d7dc73aa18f9ecf6c69afd8807e4470d4e"; + sha256 = "636762093f4697a778696bd56864aa8eaae04e48c7f4a4129b116247cd78b998"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/id/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/id/thunderbird-128.3.2esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "204f8b79def7de4a490487588c2e9558259d88ae92a96754579b183639c64e8d"; + sha256 = "291f1bddffcc0dc308a7532455e232d6e587bc8e0a803b4f6dd85f6f80346135"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/is/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/is/thunderbird-128.3.2esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "17ee110e6e07d69f63b64d38ead0691a6ca521428c3716230f8a0aca6e23c800"; + sha256 = "01ace7af5465472c958e3e3ff1784c6b3978a46f3b008fe1a0a556e825d8b327"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/it/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/it/thunderbird-128.3.2esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d17a2eb22847628217e7a918c33de0ab20db2576a28ebe177f37fbd9d84bbb9b"; + sha256 = "1ba69fa4e8baaf106a3006dd651c92be6b3ba19701ca8c553fd0c3fc7e34425f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ja/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ja/thunderbird-128.3.2esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "07f36b8b7458d725c8df846f1fce58e7ed2569b4324e4b7cfa1750fbd21b0088"; + sha256 = "98c79c493f9c23a698bf2a6627975cf918bead4e2e7ae9bdf8b132e8e5e205ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ka/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ka/thunderbird-128.3.2esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d6675e3d23156b74f38b3805d3fca6fad8df6a1ec6adb311c1c783d928772531"; + sha256 = "e4e9a739ead52440b1bf0b9dc535d530c812b4d2a91bf6828cbc635f8273a8d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/kab/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/kab/thunderbird-128.3.2esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a4cc73ef677a343d49b61009de05bffacad1c8cbf368d8ac79e87fe12a24f1c8"; + sha256 = "e36858baf702c8402fa72ac4f1805852dd5d371766e47482f1bc7cb1a73c59fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/kk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/kk/thunderbird-128.3.2esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4d3d0010e55a9665a6f330e73acc8a9d924587d216c3ec2558e24ba83789194d"; + sha256 = "53e88b687cc6db2abeb3e1f90f861df946c06c6026f4a5cc05a598b3f98ea2ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ko/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ko/thunderbird-128.3.2esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "55ed9d48ec45a9cd04705a8be89701262c7cf2aa16f545f08b361d89d30bd160"; + sha256 = "6a18161a3977fe91e5c878dbf28f9de76c919f753dc1e29211168ecd0bb76ea4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/lt/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/lt/thunderbird-128.3.2esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4f84a793e672bdfca124eaf1f64c2753a2a424d2c689403ea8f06ab18d2c0922"; + sha256 = "6cf21bbaf1fee99a86f036e49c56a6c789795375db7b7c2b2d66c9cf4db2009d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/lv/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/lv/thunderbird-128.3.2esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "28e40e746c71f4d391a3fa4c640e0c248698fba1bcc4f3fa245d98774da0b393"; + sha256 = "ee6207c449bfaf50acbb8d666a87439080ddc6c151324064c6114ddbacfc03bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ms/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ms/thunderbird-128.3.2esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "fb3c86acd2353143535397dd0dc0c478ab1a77ca13a7b44f2d726bfdbacbafae"; + sha256 = "6f73ddde1f47f484819c14e80e9f91be095b6229a69b7ea584b670acfe88af74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nb-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nb-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9ed19c21dcc40642559eed238d40d39b19f6582060f92814279e111e481f72d5"; + sha256 = "64f324a7d0c3cfce88383ca8cb844e29df33f9b740bc6d02c718e8e436a555bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nl/thunderbird-128.3.2esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6ced73e12b0c29295e00f32c72d86389c586c0442cda1592a74285b2509a0a55"; + sha256 = "d7a982d8ba02c6ddad2c1891ae09f5cff5aa80b19e6d2fc26848f8df593fd1a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nn-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nn-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1b2601fd6f4ba3c5442a9108d3647be6ddfa63afb582ea12a949fc082e7ab925"; + sha256 = "0d572d3d4f79958083603e2238b3cfe1a5c7d333a1de5a55f0c320ae8415b4fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pa-IN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pa-IN/thunderbird-128.3.2esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6489cbfa303b20bd0cf44592ef4ad2594447c440694077c8987d48049aee7235"; + sha256 = "ded2cd04fec68d5639c5ebf93a9f50ebd7855cd316b8135c4be36d15dc03d6e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pl/thunderbird-128.3.2esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "db7dc4b36b5a76e9e7fbd703d02e3d6cb3fb48d2263144bb75418e59c9038f91"; + sha256 = "a7b4c48be5aaa11b836069862bf471d19f7297575b579411938cd9a1b5f19886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pt-BR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pt-BR/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "378bcb5617eccb26bc86d6357b35edb343b2f339ee4e35d114aafb788bf35261"; + sha256 = "32a1c309b143c5b2c9d9993c65f3f475ddc279c683d5c6434c1fa92176908e49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pt-PT/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pt-PT/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f33c33c70d8271061bbbafbccc325206c9b37f56637907a87e4d11aefc4675bc"; + sha256 = "9f3b43fef1200627869eeef5d0814a7831ef6be2b9893cef94f6060ac579f4f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/rm/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/rm/thunderbird-128.3.2esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "40e60095cc4f7e10b052b15a80b1e58228c94b6c77cf5f90b5fcc8cadf094472"; + sha256 = "900a77024280148075888fc3dfadeaa7944b7fbe96cbcf359e3cc4cd421ef71d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ro/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ro/thunderbird-128.3.2esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4b3d0eb8cfe07e345c2effe075b391ce82d75db4ed3c5015e25762a1919abe0d"; + sha256 = "7d556f80f1fa9b60f93ec0a9bfdcc02cb063569515ff5e285aec2b8d6ef3b0f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ru/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ru/thunderbird-128.3.2esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "76ab341bfb48acadd8ba0211be37e37912f002e5f814e60cb0c92182c6ffe5c7"; + sha256 = "bbbf234d7b1e8c7cdd71f582f1c4cf1b14ae2e9e695e9edfd56e7358ffcf9daa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sk/thunderbird-128.3.2esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "9af224be897872875d06abefb82f7d0b6230b3d10bb4ce7c33accab3a1303b7e"; + sha256 = "665f506a18615247a57c7b936d3b4f0fef7240967c2e64e206ca44fe8842f65f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sl/thunderbird-128.3.2esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c66eb160c777449c032212972200997cf3303d916f50019db88a4ab21d737126"; + sha256 = "6cb65f62b5759336d08cf4735cd4eb4a4dfa3664786e06988dc5db3fa74267b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sq/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sq/thunderbird-128.3.2esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "dfb18940364e6686a2ae369fb6f5b410e978c42efc7e506288603d0c76ce22c1"; + sha256 = "578d0542d3e0b4615653832d4474d5253ab7f11aafecc4a4bfb370ff14d09c85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sr/thunderbird-128.3.2esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0b1c98eb37db5c6ff1d216a598e352d1a77ec3a94bab7fa49790ba275714c188"; + sha256 = "69f922567c45c44c2902255c6abc58312f625d2be421cbf986a488addc96af92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sv-SE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sv-SE/thunderbird-128.3.2esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a2916749179de24c63b8f393d19a3ba4ec5f6e77584f44ac5ebc24a4b0c94ca1"; + sha256 = "338f53c983182a93febd49671b73e519da023e6d9653d16dcb1e96d62589d095"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/th/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/th/thunderbird-128.3.2esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "bb25041295fac38b2888e95c40835ca289f10be95d71ab32fedb7d0dcaee1c04"; + sha256 = "89498e7b762e95e27d5a5cb7b33cfdcb04057f7c25bbec594f02b5ba11049cd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/tr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/tr/thunderbird-128.3.2esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4a512e2bdf3ccadade3166a8acf62935244fc63b760db6e7c35a74299e49144b"; + sha256 = "e08daa81402551cada7b056d40ddcd77f19d19584552349895cb6d206fc3e3b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/uk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/uk/thunderbird-128.3.2esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "9094442afcaabeab3424972cfede908526c7d3ddd600adcae6c345450fb42be9"; + sha256 = "d008cdb485bfa80654acbda091761f31cea620b5fda06cea86df9920f807da90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/uz/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/uz/thunderbird-128.3.2esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d4969535da853732d20475bfca72d871c76f39131cdac0d00607e0bc5ccabf5c"; + sha256 = "6d73e85cc68bc9dbe519a46e217f2c62d4b002757cac6f3eee73142642259575"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/vi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/vi/thunderbird-128.3.2esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "95bc29e5c14fadafaf5598687f4242ec80cccbd5724988fe471282ea65473e18"; + sha256 = "6f7b1aa7b314f9f7a23bea9f7e5dcf654891f14eadf543603e057a62e56eb1c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/zh-CN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/zh-CN/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "bc578ed3316fa130328219d7ae34c40250b57ad47394c4e2113d2d53031c3879"; + sha256 = "4b63f9cc7e02e1048273de888df5238c4e308a5b62caa97b9177ac9daddfaef1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/zh-TW/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/zh-TW/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2ec4a508e96715026c4c4541d83e5f14b67c88c9e31e22bfb4ff6280eacbc1c7"; + sha256 = "c3697d78a62dd49b6c9c264809fa3a208edee853fd6f2371a90a3180d88e3ec8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/af/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/af/thunderbird-128.3.2esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "75b27678d06857225ad241c90101d39b1e3e42c8a1f1e17f817bc13287bf185c"; + sha256 = "d396f5bd5a22cf7e7edff3ea71cc05922c4b0326859f7460f363eb31df09ddcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ar/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ar/thunderbird-128.3.2esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e2bf282b127efea3c1deeb9a375b42b4425ba30bcd730eb911dda3cd93034a77"; + sha256 = "c095953766c3aa7f1308a8931017b202ef63783562404344efbab9a9367f38b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ast/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ast/thunderbird-128.3.2esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "035213d412786ec052430d4860278fc5c0ffe4b999a5924f3bf1a13683e73d3d"; + sha256 = "1039b107a3adcadc4d1e329416792fe668c0588a4a1e1283caed89789b2c49e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/be/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/be/thunderbird-128.3.2esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8d0aab6ed5c1cb36cc70939545ec0eee2566483bbe89a1b319c63718201ea01f"; + sha256 = "43a3da378465f4e3b7a6adcd55dfbb9a100392d06dd96e49a3d50ae756a3ca02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/bg/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/bg/thunderbird-128.3.2esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f22334ee6b9f47bb6de1623d457aa3a50932dc1f0e047037b07a86793134eca8"; + sha256 = "03be328293a1039ea0c4d05fc8ea091c073d95c4b72dfb4f348f5982647ac5db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/br/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/br/thunderbird-128.3.2esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "0c2e506a17eb9d3d23fc366212644b3e3f78be621adbe2410a1ef8ab0803d86e"; + sha256 = "11e5309a82b6ae36906d2285aefca39db32247501cf60a582bfe69a879646a9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ca/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ca/thunderbird-128.3.2esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0fc351e87d10b1f33391990716581b4417f1f9759351732ca765e29e9c077c74"; + sha256 = "9a17b59732a651b3247f7af810bd633f07e608ba66c1e7d00b341baac9f0ec69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cak/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cak/thunderbird-128.3.2esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "653eedb42f9327be63d4ccde4e9a15e431235130d70c5e1e4b90ad1766fabd65"; + sha256 = "2796ae01d6fa7b48d22837d0c6f10ba6bf00ffbd35794bb1f38e3a136c8cccb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cs/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cs/thunderbird-128.3.2esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "afab7db6f33f730ad5dcbad73c68aa679eeac995a8f87cd3dd69ffeb9cc05507"; + sha256 = "f2e65539e93222d4a7e552b7f670be776853b65aeb2f7fb144d68072b3bdd50d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cy/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cy/thunderbird-128.3.2esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d4efd6a9bde2a8177c2322ed797c73a347913c7c34eefad3c8059efa3b291e87"; + sha256 = "a59825b1692b9dffeb39bf30ea8b5f36cc30445dcd5ea184cc8487fc01fdff75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/da/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/da/thunderbird-128.3.2esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ed872e714c0ee80a9ae40ca91ef2675aeac20125ae53245b41003614c8ba2a9e"; + sha256 = "d0c8b043c86e83ccc86a728743489a48cb0cc4e46d6976bd3595752a306c0774"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/de/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/de/thunderbird-128.3.2esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3feabd14c409d43f07973ae4054ce5a3c13ce1b1023bfe9c9614bad39a36f432"; + sha256 = "917ce52fc4d81ebbe5276240b41565fbce6bdfc53ffa7753db97e7e640a2f90a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/dsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/dsb/thunderbird-128.3.2esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0f9f5e55650af7cb264b300286f426d730a9f6594a1e6a5d9f1305dfa067c767"; + sha256 = "2c6ffd2c7e140d7710e5d702008f85892761e834e81ee1dd80f561e1aa56ddf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/el/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/el/thunderbird-128.3.2esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7f399e76ed236a3067f0e179c1d902561770234a20cfbb78345b4156549a1eab"; + sha256 = "9213a7c441951f9a07766ccff191da85cab2a24fd7fbce1f19bae077387e5c08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-CA/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-CA/thunderbird-128.3.2esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0bc5ef5a3e472463ebf823b16efb36cff728c432829ec73fea7f9bed1c6fcd81"; + sha256 = "77895c740967e60406ca466afbcf294be052a6ee81d5c4b2cd531750d23fa661"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-GB/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-GB/thunderbird-128.3.2esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "22d878733613360bae796d07249fa6be2ecfb12680c7102dc7d6d3a2fb947a89"; + sha256 = "4c547974c874a4ce973b02a890fd12ac917d89c8ebf0a9d332262092ef8b9be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-US/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-US/thunderbird-128.3.2esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "0c0a466b278372a784b551922c4c47ca1af8161ee024d17588524d92e4364dbe"; + sha256 = "161b7ea35c5d4c1ecdb8cf0229fbcf3ea152c09c22543e0762eece4b7d6bb6eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-AR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-AR/thunderbird-128.3.2esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c60187c27a612747e8cd05ec3d6ad704da2c9fbf48ea4d9bf1a70be778047b43"; + sha256 = "bb83137654be3e90cd5c0836342f00b85b065663f5318f562b09bcd2714084e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-ES/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-ES/thunderbird-128.3.2esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a06dd9c977dbef9679b02a9a36ad75b0929791d7dcbd5a5c05912d338201e8df"; + sha256 = "4744ecee5a3e72560aa25efd25c793b8786764aa7d9f8ac33cf1a33ccbe28a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-MX/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-MX/thunderbird-128.3.2esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "a776bfe85b70468620ad977659908d61e79925fb8bfd36a4ace30dc06ebffcdf"; + sha256 = "6a63c009191b205ced9f8147cfe36a801e9a02d5d74a9a57f66960c78a9b3671"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/et/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/et/thunderbird-128.3.2esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c1e860a0361fdaac8811f25eb2aeaba7973ebbbdcbf769fc42791c7638aa4fae"; + sha256 = "aa2cc826ecbe7397b21a7c5b603026105a5db5ae3d8046ca806749b2133e38b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/eu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/eu/thunderbird-128.3.2esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "88383b1d46ae04586637692c6dcd3a59795519a64db0feb830bdef66b55f8f76"; + sha256 = "28762f614cc70ebbd3d4863a671257cbbccb5d60258d7d07f7d1e42ca3c1b2ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fi/thunderbird-128.3.2esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "fa11ef201144fd9f51fa36c8d7cdf3106f445bfdeed203db7f2fe50ad315527a"; + sha256 = "f5b844a279088b43538b4e3f96cfa1c8614710398022d3cf0d4c3c4fbacea456"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fr/thunderbird-128.3.2esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "5427eb293b84db327fd6002dc84f39531c5a34aff7fe3b01e591a4ff5e243b07"; + sha256 = "4e75cc4efc0bef081cf6e0b74ac7dd74f450dd87a1a0bfbabdc8cdcc383be3c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fy-NL/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fy-NL/thunderbird-128.3.2esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6a6a3e6d7f2a26f1cc70e6d26741e882e12344836b83735fe0cc15c560b3f554"; + sha256 = "11ec4e4be64feac976e21dadcca77145dc4fea225c0d00c9dceaa509ec61cabc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ga-IE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ga-IE/thunderbird-128.3.2esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ff9f0296f2694213d58c330e68b56aa657392bfcccd765ac0bf2847155ed014d"; + sha256 = "b4eaace12a57f7b24f56f476fbaa9e9606f25d1f82b34e67cb1a0e10d191e3d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/gd/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/gd/thunderbird-128.3.2esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "79a080ab46a998ae7584ba26afae53418764b206e44993bb56bed846a6317be2"; + sha256 = "1f669d83cc4caf91bfdd61b9e63e282f90f0d7cbb96c1100c0f904d003f9e076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/gl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/gl/thunderbird-128.3.2esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "19187ae587048da83c6a0a99e8f72fddf0cdc92c4481d40c534a0664a65d920a"; + sha256 = "5eb51acfb2955bc0038e299d77ed8491648b4d7293d31d8a01648b67dc1e575e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/he/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/he/thunderbird-128.3.2esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e37fd7a629ba735e5916f61a6d46ca71e5698a6d16b73442ed74534f87703ecf"; + sha256 = "87f4fb6eaf8f32e9b041a8d5e5da6072b1106492a9da75a4cac4255ccb818121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hr/thunderbird-128.3.2esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "86c8c6f34e76873060b34b33a235b5696191f3d58042be62f5de59cbb82261e9"; + sha256 = "d93a01b31369d687865d1bafca101b349c697bc7e7b48ff470831849b0444814"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hsb/thunderbird-128.3.2esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "80489dfdf52594c34798629d7fef66e67a8b5aaac3c6275e25c092ed0de015bc"; + sha256 = "78d421c94906c39d64013679d786579ae60a574adebdb4b4729a2861e392b5ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hu/thunderbird-128.3.2esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "2277897b93514a1995886d637b668a469ffed943c05e91f7e209fab23ee1232a"; + sha256 = "cb6a581fb55422aedb80ad1cf2b67dc07a82f0e3817612454bd0894522a77051"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hy-AM/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hy-AM/thunderbird-128.3.2esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b321af1421b2649d5ddc42a23e31ea76068062cf8a956495969835dd0e0fe7a7"; + sha256 = "b7f29b312f7c26fd5f876d864006eea66977e14e5ff6c761d25b00dedb520272"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/id/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/id/thunderbird-128.3.2esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4c38b3f5afb7b65a8a8089c2d258016dc4c8e60154499bb4ea2c110a29a7f7bc"; + sha256 = "b8942767658f68d76c071a3d4c22bde09e09886a036f3b1e5fb46af18ca76434"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/is/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/is/thunderbird-128.3.2esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d7c2925526dac179bf7c857b9044058818c5a49aeacca405fe120e01a0fdc28d"; + sha256 = "7023c95b4036be5a1f6d8924e746b92aef9e76e8e82726a221473bd540dc3bf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/it/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/it/thunderbird-128.3.2esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4c637d4998c5d8db04a7356401eb64cd362476f91ff037979b94487548e9f0d4"; + sha256 = "cd594a8bf3e316e9598007ede696e785013f5a11bd68b14ce742d97abb7cef8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ja/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ja/thunderbird-128.3.2esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4591a2d3b55f402fe47b2f7342f34fcc0e5ad6f5147f72929bef8fd59598cef1"; + sha256 = "c17eca728cf0a861f25fb9cb419ed2c20f979c19c15582b6a17a99544881d723"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ka/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ka/thunderbird-128.3.2esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "032fbf3360e7facac683e28a205b53e9a1db756c8bd41330a15f7120ed645b1a"; + sha256 = "495c8d23f24dd7660e9d4836d4cb18ca48c7f3b0edb255cf18daa627ad78d6ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/kab/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/kab/thunderbird-128.3.2esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5fec42cf09826f24ffeb20a3c7f0c200a1b257e4af4a8d223c4b7f98fb35eec2"; + sha256 = "6fd780bbecad88ab558c76938599a54677e93689d0d451e96beddc886569e3a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/kk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/kk/thunderbird-128.3.2esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "200e305315c566f34d2242fd37bee6f2726d8b6bacb37c74b0e5597e9296df60"; + sha256 = "92d2e2e9e80f75285aabb3ac62edc6db028b15b752a6cbcbb3795566cbeb744f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ko/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ko/thunderbird-128.3.2esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "06f60ced2c75f13ffae69cf2355089c2b343e72b9e61cd97edf01f401c11fb77"; + sha256 = "4ea9a6c97b458928a66341d86ed0fd274b27b1e3a2259971b8bf795ab36656c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/lt/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/lt/thunderbird-128.3.2esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5d3074b599a9c61357b872f041dbedba6f8667f92a833e6889e16bf2a0ba31fb"; + sha256 = "5037fd5bff06a053331b2ad6312f35af1dd881b2b017fb92ac4c433bf7c10a20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/lv/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/lv/thunderbird-128.3.2esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "dbffd3f40caa2b2a7f2201f645e27ee5060a124c304079f99055a0ba6bad513c"; + sha256 = "0498e5ae2815fcb979230f3166cfeed89d02bddc9c7ed73646600fca2eb44aec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ms/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ms/thunderbird-128.3.2esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "2fe336e4ab817e8100ba448a4888cd0bf66728e2779f8179ecfea55bc255e20c"; + sha256 = "bfbb9fa1a5c1d4aa4c9c73c7e02628c1f01c314fc252370fc6a96896a666db57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nb-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nb-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c3096875a2400685f1c4333531eeb3594f598b774f138e746c909976b16b895e"; + sha256 = "da6ce60429e87f38ff66ce975f4a63e1f2e6f8b2a7ba4f895a32760c09fa02da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nl/thunderbird-128.3.2esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3302794bdc4ba877d01b0ba80fca2661098e707f2abb0304bd2c29fc6cb3cc4b"; + sha256 = "514646876e7654bc5a7141d919cce98eff22e07180a37d6765f87629fc48724b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nn-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nn-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "770457094739c924397e643ed303f57a57b9491229abab8d98699a0507d9db1d"; + sha256 = "dda61d6545277b5d8f53100712796e2ebbf3c8b759c4bee0f5c467bf8419d9ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pa-IN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pa-IN/thunderbird-128.3.2esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8be61392ae2faeba72ae3eaf698339357a1e5112be77fafc5f104bfde3a5155b"; + sha256 = "02b524802db090431e2c1888b1fee5148d22ae7ae7a6d4a22c18afda11bf5c84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pl/thunderbird-128.3.2esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0e0c57066ef2851b6729ba1c6aa192b2b7693cc5e367e4016b458cb45871030a"; + sha256 = "43991a49c7e68753599b4b7b6e5b0d23f199d57b85824ccc56b9b4bfa2c4f7e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pt-BR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pt-BR/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "89db9f5388ab006923def3d3818e61c0d0417e26f3c3a7049da453ae82e215b2"; + sha256 = "d9af07aadc66ce20772407de1a458756545775b95b70c8c56c71a6b3ca48cd94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pt-PT/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pt-PT/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "678301cd525223c99b5b6f129fddba153bd9766478a8733ebe69ae0eaae40880"; + sha256 = "523bcc1b478dcc9e54a1f4c6743fc546ea0b18956d907149641d34598ffccc6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/rm/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/rm/thunderbird-128.3.2esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3e6f814093d3dcd8df427574bb10c56ea6bd917c1dc532d8334b8880b7e91b90"; + sha256 = "5a6fef50c1acfb0cd2e91d9e03aad4afd688436dcca5280bdb49ba144e97a439"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ro/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ro/thunderbird-128.3.2esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "39c23d82b6dacff632753ba2ba9f0a194c2891cfcc1e67efbbde1f8421085ac0"; + sha256 = "298aeaa7ae0afaa6531a566e2e8ce072adcc62f7646cf33bfbd3acc450335881"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ru/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ru/thunderbird-128.3.2esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c9d051f3faec44babcd36e6fb6c9619142dee3d775185ea86305392f88d45aeb"; + sha256 = "c017f418996a8cc7fb7bd2c4062df1ba1dcf4c2b8df7d23a44fe7e0aebd00b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sk/thunderbird-128.3.2esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "509b5a60e239d4a8cf9a6f91ef4267de44ccc21f9314b232170093fa450af44b"; + sha256 = "84079eedbd6c2a5cf4733f256a583b302209dc84a30d2305b859bd10efa87c1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sl/thunderbird-128.3.2esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "aa5b49aaa7fa64f9e9ea9a01d75da4f5c89c65449d56861b48083ca00a0822cd"; + sha256 = "99651a3c3c28cfc1d664066bf0c197951622e55b21ba4be8f157606d63c2dafb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sq/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sq/thunderbird-128.3.2esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "3ffca31bd4bf981110a55eef165d789e253eec7c206b08c880fc3a0b92da58fc"; + sha256 = "47953845a4f03c67148bb183a629a349f3e90bb4c425fc148b1b2cab9f0631e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sr/thunderbird-128.3.2esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "0e25ba5b8ba286e81bfeb481f354b69bd56fc727340ce6fde36124a7ce9d330c"; + sha256 = "266e2d380f3607a3da4e68b9567d936a47552bd49173d1a44ecce572cc7338ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sv-SE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sv-SE/thunderbird-128.3.2esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ab8be644fc47332387f67b3bbe7ad5920bd908e99bf029b85c896a44d3fe8a80"; + sha256 = "0e97466c633f662293b53e7e61b15034d1f88718232e8cfeb32797d4110dd3af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/th/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/th/thunderbird-128.3.2esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6965ca5780abcd2e8e69244e883d171ce541a4d2075a99ae6c0682f4b76c081a"; + sha256 = "18bb3e26ed34c2896a2b5e57d2f740e3870354785e762b7aa827a17b9b8d5708"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/tr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/tr/thunderbird-128.3.2esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e3fcb1b58165e4a7f3553ecf5e9c2759fb831fe25c504365ff0bcd2f0756a186"; + sha256 = "6c1d1f511ee94247f02e4b26d7125ef7e4cd839a508c1be7018127378e80915f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/uk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/uk/thunderbird-128.3.2esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "89e8999739ac1c9979c702e946130d7bd2f0d9ad209a926ee205425d54bfcf40"; + sha256 = "5b36b7f5efe32bf58d14d74d773cb4cdf092fe3e89e1f2facf63183699967d48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/uz/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/uz/thunderbird-128.3.2esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "71e9b2d9ca7dcfc1b71524e1dc0fbd17f078e690838eee5e711b753bbccc4b45"; + sha256 = "ade3f2442dcc5b6dcce7a8114209bc7bdd3730f7e1ffd9b63b71a452fd9f657a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/vi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/vi/thunderbird-128.3.2esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "13d3365e9643664cbf5006fbf0de101950ca1874283c49792d1ccff437a45158"; + sha256 = "9224b6c394daeddb695b7ccc30c21e5cbf6356db2bd1f7a6746a292a9f077b6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/zh-CN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/zh-CN/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a283f7503a4b0af6349dd87c6be3aa9f4e8227ae98754515b635d602c756569c"; + sha256 = "fe17248658dd5ebcbe3f5d3dd82fa3c20f6b2a82b49e037369d8d8fa9a331083"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/zh-TW/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/zh-TW/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ba88abbc91d4e55687eed8fe41aa0e52622b688752341430f7b32d134a750d09"; + sha256 = "057c904f9c5e37a9b43d8410f422bf5838f18c63135add2b3f3270e2c900ea09"; } ]; } From 9f3d02d510042068aee542cf27e66c1dc919e711 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 03:54:31 +0000 Subject: [PATCH 147/229] harlequin: 1.24.1 -> 1.25.0 --- pkgs/by-name/ha/harlequin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index eb5c80011081..ca41bb550b6d 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -11,14 +11,14 @@ }: python3Packages.buildPythonApplication rec { pname = "harlequin"; - version = "1.24.1"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "harlequin"; rev = "refs/tags/v${version}"; - hash = "sha256-3Rb47zkWsC6RJhk1btQc/kwxpFFWVnxY2PJooHB7IzQ="; + hash = "sha256-iRl91GqYigD6t0aVVShBg835yhlPxgfZcQCdAGUoc1k="; }; build-system = with python3Packages; [ From c6df108b6a1a3fdcbe605d2f23d6f1832da0ec10 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 19 Oct 2024 22:25:10 +0300 Subject: [PATCH 148/229] equicord: init at 1.10.4 --- pkgs/by-name/eq/equicord/package.nix | 63 ++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/eq/equicord/package.nix diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix new file mode 100644 index 000000000000..1e1772934fb0 --- /dev/null +++ b/pkgs/by-name/eq/equicord/package.nix @@ -0,0 +1,63 @@ +{ + fetchFromGitHub, + git, + lib, + nodejs, + pnpm_9, + stdenv, + buildWebExtension ? false, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "equicord"; + version = "1.10.4"; # from package.json + + src = fetchFromGitHub { + owner = "Equicord"; + repo = "Equicord"; + rev = "440b68ea82b6fd44bf5ec70b759a0207ee9f4ca7"; + hash = "sha256-9GIw8g2HZ6/5Lb4gtDyuBqZWi5YK5Uz0lo+u+LrIZwI="; + }; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-kGLF6uIr0xxlB5LaSqKiBKESbmWN7PzDErrCmiT6vXA="; + }; + + nativeBuildInputs = [ + git + nodejs + pnpm_9.configHook + ]; + + env = { + EQUICORD_REMOTE = "${finalAttrs.src.owner}/${finalAttrs.src.repo}"; + EQUICORD_HASH = "${finalAttrs.src.rev}"; + }; + + buildPhase = '' + runHook preBuild + + pnpm run ${if buildWebExtension then "buildWeb" else "build"} \ + -- --standalone --disable-updater + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist/${lib.optionalString buildWebExtension "chromium-unpacked/"} $out + + runHook postInstall + ''; + + meta = { + description = "The other cutest Discord client mod"; + homepage = "https://github.com/Equicord/Equicord"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = [ + lib.maintainers.NotAShelf + ]; + }; +}) From 50d67ba2689f24cdeb7e5490e107663eba2b7312 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 19 Oct 2024 23:55:32 +0300 Subject: [PATCH 149/229] equibop: init at 2.0.9 --- .../eq/equibop/disable_update_checking.patch | 16 ++ pkgs/by-name/eq/equibop/package.nix | 153 ++++++++++++++++++ .../eq/equibop/use_system_equicord.patch | 17 ++ 3 files changed, 186 insertions(+) create mode 100644 pkgs/by-name/eq/equibop/disable_update_checking.patch create mode 100644 pkgs/by-name/eq/equibop/package.nix create mode 100644 pkgs/by-name/eq/equibop/use_system_equicord.patch diff --git a/pkgs/by-name/eq/equibop/disable_update_checking.patch b/pkgs/by-name/eq/equibop/disable_update_checking.patch new file mode 100644 index 000000000000..6b2a9a4cb577 --- /dev/null +++ b/pkgs/by-name/eq/equibop/disable_update_checking.patch @@ -0,0 +1,16 @@ +diff --git i/src/main/index.ts w/src/main/index.ts +index 23ea0d6..1ef465f 100644 +--- i/src/main/index.ts ++++ w/src/main/index.ts +@@ -32,7 +32,9 @@ if (process.platform === "linux") { + if (IS_DEV) { + require("source-map-support").install(); + } else { +- autoUpdater.checkForUpdatesAndNotify(); ++ console.log("Update checking is disabled. Skipping..."); ++ // autoUpdater.checkForUpdatesAndNotify(); ++ + } + + // Make the Vencord files use our DATA_DIR + diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix new file mode 100644 index 000000000000..dd5688115b09 --- /dev/null +++ b/pkgs/by-name/eq/equibop/package.nix @@ -0,0 +1,153 @@ +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + equicord, + electron, + libicns, + pipewire, + libpulseaudio, + autoPatchelfHook, + pnpm_9, + nodejs, + nix-update-script, + withTTS ? true, + withMiddleClickScroll ? false, + # Enables the use of Equicord from nixpkgs instead of + # letting Equibop manage it's own version + withSystemEquicord ? false, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "equibop"; + version = "2.0.9"; + + src = fetchFromGitHub { + owner = "Equicord"; + repo = "Equibop"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-mK/zoW8Km6xlppxJnVbuas4yE1rpAOd9QnjETlxxnsE="; + }; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) + pname + version + src + patches + ; + hash = "sha256-TSdkHSZTbFf3Nq0QHDNTeUHmd6N+L1N1kSiKt0uNF6s="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + # XXX: Equibop *does not* ship venmic as a prebuilt node module. The package + # seems to build with or without this hook, but I (NotAShelf) don't have the + # time to test the consequences of removing this hook. Please open a pull + # request if this bothers you in some way. + autoPatchelfHook + copyDesktopItems + # we use a script wrapper here for environment variable expansion at runtime + # https://github.com/NixOS/nixpkgs/issues/172583 + makeWrapper + ]; + + buildInputs = [ + libpulseaudio + pipewire + stdenv.cc.cc.lib + ]; + + patches = + [ ./disable_update_checking.patch ] + ++ lib.optional withSystemEquicord (substituteAll { + inherit equicord; + src = ./use_system_equicord.patch; + }); + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + + buildPhase = '' + runHook preBuild + + pnpm build + pnpm exec electron-builder \ + --dir \ + -c.asarUnpack="**/*.node" \ + -c.electronDist=${electron.dist} \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + postBuild = '' + pushd build + ${libicns}/bin/icns2png -x icon.icns + popd + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/opt/Equibop + cp -r dist/*unpacked/resources $out/opt/Equibop/ + + for file in build/icon_*x32.png; do + file_suffix=''${file//build\/icon_} + install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/equibop.png + done + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/equibop \ + --add-flags $out/opt/Equibop/resources/app.asar \ + ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + ''; + + desktopItems = makeDesktopItem { + name = "equibop"; + desktopName = "Equibop"; + exec = "equibop %U"; + icon = "equibop"; + startupWMClass = "Equibop"; + genericName = "Internet Messenger"; + keywords = [ + "discord" + "equibop" + "electron" + "chat" + ]; + categories = [ + "Network" + "InstantMessaging" + "Chat" + ]; + }; + + passthru = { + inherit (finalAttrs) pnpmDeps; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Custom Discord App aiming to give you better performance and improve linux support"; + homepage = "https://github.com/Equicord/Equibop"; + changelog = "https://github.com/Equicord/Equibop/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.gpl3Only; + maintainers = [ + lib.maintainers.NotAShelf + ]; + mainProgram = "equibop"; + # I am not confident in my ability to support Darwin, please PR if this is important to you + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/eq/equibop/use_system_equicord.patch b/pkgs/by-name/eq/equibop/use_system_equicord.patch new file mode 100644 index 000000000000..3321b72bb5e2 --- /dev/null +++ b/pkgs/by-name/eq/equibop/use_system_equicord.patch @@ -0,0 +1,17 @@ +diff --git i/src/main/constants.ts w/src/main/constants.ts +index afb171f..c6a014e 100644 +--- i/src/main/constants.ts ++++ w/src/main/constants.ts +@@ -47,10 +47,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes"); + + // needs to be inline require because of circular dependency + // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised +-export const VENCORD_DIR = (() => { +- const { State } = require("./settings") as typeof import("./settings"); +- return State.store.vencordDir ? join(State.store.vencordDir, "equibop") : join(SESSION_DATA_DIR, "equicord.asar"); +-})(); ++export const VENCORD_DIR = "@equicord@"; + + export const USER_AGENT = `Equibop/${app.getVersion()} (https://github.com/Equicord/Equibop)`; + + From 18db67388e7052fb08d6b1fbc4114421c069095e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 04:41:52 +0000 Subject: [PATCH 150/229] oscavmgr: 0.4.1 -> 0.4.2 --- pkgs/by-name/os/oscavmgr/Cargo.lock | 134 +++++++++++++-------------- pkgs/by-name/os/oscavmgr/package.nix | 6 +- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/pkgs/by-name/os/oscavmgr/Cargo.lock b/pkgs/by-name/os/oscavmgr/Cargo.lock index 0abdf26f72f6..61e7f98c4fd4 100644 --- a/pkgs/by-name/os/oscavmgr/Cargo.lock +++ b/pkgs/by-name/os/oscavmgr/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aho-corasick" @@ -28,8 +28,8 @@ dependencies = [ [[package]] name = "alvr_common" -version = "20.10.0" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +version = "20.11.1" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" dependencies = [ "anyhow", "backtrace", @@ -45,8 +45,8 @@ dependencies = [ [[package]] name = "alvr_events" -version = "20.10.0" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +version = "20.11.1" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" dependencies = [ "alvr_common", "alvr_packets", @@ -57,8 +57,8 @@ dependencies = [ [[package]] name = "alvr_filesystem" -version = "20.10.0" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +version = "20.11.1" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" dependencies = [ "dirs", "once_cell", @@ -66,8 +66,8 @@ dependencies = [ [[package]] name = "alvr_packets" -version = "20.10.0" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +version = "20.11.1" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" dependencies = [ "alvr_common", "alvr_session", @@ -77,8 +77,8 @@ dependencies = [ [[package]] name = "alvr_session" -version = "20.10.0" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +version = "20.11.1" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" dependencies = [ "alvr_common", "alvr_filesystem", @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" dependencies = [ "backtrace", ] @@ -155,17 +155,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -200,9 +200,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] @@ -226,15 +226,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "cc" -version = "1.1.16" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "shlex", ] @@ -247,9 +247,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -257,9 +257,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -269,9 +269,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", @@ -623,15 +623,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glam" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" +checksum = "c28091a37a5d09b555cb6628fd954da299b536433834f5b8e59eba78e0cbbf8a" dependencies = [ "mint", "serde", @@ -722,9 +722,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -800,9 +800,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is_terminal_polyfill" @@ -871,9 +871,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "mdns-sd" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b18c39a781e986434d14398b94993f3d7659ea4b255a79b00ed40a31f4a97d" +checksum = "35d1967e64b4ca7bba8af2458d0b9dd50471d541959ca2120cb9cc965946ef61" dependencies = [ "flume", "if-addrs", @@ -902,11 +902,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -1061,7 +1061,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "oscavmgr" -version = "0.4.1" +version = "0.4.2" dependencies = [ "alvr_common", "alvr_events", @@ -1180,9 +1180,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" [[package]] name = "ppv-lite86" @@ -1263,9 +1263,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -1365,9 +1365,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.36" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -1390,11 +1390,11 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1418,9 +1418,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -1437,18 +1437,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -1786,24 +1786,24 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "url" diff --git a/pkgs/by-name/os/oscavmgr/package.nix b/pkgs/by-name/os/oscavmgr/package.nix index 5267ac08ff1e..ed74ddd5bc17 100644 --- a/pkgs/by-name/os/oscavmgr/package.nix +++ b/pkgs/by-name/os/oscavmgr/package.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "oscavmgr"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "galister"; repo = "oscavmgr"; rev = "refs/tags/v${version}"; - hash = "sha256-1cpisSevAU2zGNrpVEGvulBcWB5rWkWAIYI/0vjzRQE="; + hash = "sha256-mOa9eUI/p0ErePza6wXy1jUcHg5Q9tvC7/lThQabU94="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "alvr_common-20.10.0" = "sha256-2d5+9rxCpqgLMab7i1pLKaY1qSKRxzPI7pgh54rQBdg="; + "alvr_common-20.11.1" = "sha256-d4KldPii8W1HcfnMSD8Fn+IGO/a3r8747APPjRCnbe8="; "openxr-0.19.0" = "sha256-kbEYoN4UvUEaZA9LJWEKx1X1r+l91GjTWs1hNXhr7cw="; "settings-schema-0.2.0" = "sha256-luEdAKDTq76dMeo5kA+QDTHpRMFUg3n0qvyQ7DkId0k="; }; From 3fb71380330bcb254b16ac394c111a0f15b5a73d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 11 Oct 2024 21:06:33 +0200 Subject: [PATCH 151/229] ocamlPackages.cohttp_async_websocket: add missing dependency --- pkgs/development/ocaml-modules/janestreet/0.15.nix | 2 +- pkgs/development/ocaml-modules/janestreet/0.16.nix | 2 +- pkgs/development/ocaml-modules/janestreet/0.17.nix | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 10675364396f..6a0e4fb58fd3 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -246,7 +246,7 @@ with self; pname = "cohttp_async_websocket"; hash = "0d0smavnxpnwrmhlcf3b5a3cm3n9kz1y8fh6l28xv6zrn4sc7ik8"; meta.description = "Websocket library for use with cohttp and async"; - propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ]; + propagatedBuildInputs = [ async_ssl async_websocket cohttp-async ppx_jane uri-sexp ]; }; cohttp_static_handler = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix index 59cd7539d1f1..325e182b48b1 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.16.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -264,7 +264,7 @@ with self; pname = "cohttp_async_websocket"; hash = "sha256-OBtyKMyvfz0KNG4SWmvoTMVPnVTpO12N38q+kEbegJE="; meta.description = "Websocket library for use with cohttp and async"; - propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ]; + propagatedBuildInputs = [ async_ssl async_websocket cohttp-async ppx_jane uri-sexp ]; }; cohttp_static_handler = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index 35f49bf6d02f..d000b57b0e22 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -402,6 +402,7 @@ with self; hash = "sha256-0InGCF34LWQes9S4OgbR6w+6cylThYuj1Dj0aQyTnuY="; meta.description = "Websocket library for use with cohttp and async"; propagatedBuildInputs = [ + async_ssl async_websocket cohttp-async ppx_jane From 6d59693e05691383a82cabc1ac34863bbb98a978 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 11 Oct 2024 21:06:40 +0200 Subject: [PATCH 152/229] comby: do not depend on opium --- pkgs/development/tools/comby/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index 4299c122109a..49532070b2b4 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -79,7 +79,6 @@ mkCombyPackage { ocamlPackages.patience_diff ocamlPackages.toml ocamlPackages.cohttp-lwt-unix - ocamlPackages.opium ocamlPackages.textutils ocamlPackages.jst-config ocamlPackages.parany From 33546d99d4db50d1656f2e98f9dad40a25f0a302 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 11 Oct 2024 21:06:45 +0200 Subject: [PATCH 153/229] ocamlPackages.ohex: init at 0.2.0 --- .../ocaml-modules/ohex/default.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ohex/default.nix diff --git a/pkgs/development/ocaml-modules/ohex/default.nix b/pkgs/development/ocaml-modules/ohex/default.nix new file mode 100644 index 000000000000..49bf6005c686 --- /dev/null +++ b/pkgs/development/ocaml-modules/ohex/default.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchurl, + buildDunePackage, + alcotest, +}: + +buildDunePackage rec { + pname = "ohex"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/ocaml/opam-source-archives/raw/main/ohex-${version}.tar.gz"; + hash = "sha256-prV7rbo0sAx3S2t4YtjniJEVq43uLXK8ZMsqoMzn2Ow="; + }; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "Hexadecimal encoding and decoding"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e9ce03cc678a..ef556b0f52e3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1407,6 +1407,8 @@ let ogg = callPackage ../development/ocaml-modules/ogg { }; + ohex = callPackage ../development/ocaml-modules/ohex { }; + ojs = callPackage ../development/ocaml-modules/gen_js_api/ojs.nix { }; omd = callPackage ../development/ocaml-modules/omd { }; From 5ea573ca476915e0ccefb99be5687e4150fa049b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 11 Oct 2024 21:48:19 +0200 Subject: [PATCH 154/229] =?UTF-8?q?ocamlPackages.mirage-crypto:=200.11.3?= =?UTF-8?q?=20=E2=86=92=201.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.asn1-combinators: 0.2.6 → 0.3.1 ocamlPackages.awa: 0.3.1 → 0.4.0 ocamlPackages.ca-certs: 0.2.3 → 1.0.0 ocamlPackages.ca-certs-nss: 3.101 → 3.103 ocamlPackages.conduit: 6.2.3 → 7.0.0 ocamlPackages.dns: 8.0.0 → 9.0.0 ocamlPackages.erm_xmpp: 0.3+20220404 → 0.3+20241009 ocamlPackages.git: 3.16.1 → 3.17.0 ocamlPackages.hkdf: 1.0.4 → 2.0.0 ocamlPackages.http-mirage-client: 0.0.6 → 0.0.7 ocamlPackages.letsencrypt: 0.5.1 → 1.0.0 ocamlPackages.paf: 0.6.0 → 0.7.0 ocamlPackages.pbkdf: 1.2.0 → 2.0.0 ocamlPackages.randomconv: 0.1.3 → 0.2.0 ocamlPackages.tcpip: 8.1.0 → 8.2.0 ocamlPackages.tls: 0.17.5 → 1.0.1 ocamlPackages.x509: 0.16.5 → 1.0.2 ocamlPackages.mrmime: disable tests ocamlPackages.chacha: mark as broken ocamlPackages.opium: mark as broken ocamlPackages.otr: mark as broken ocamlPackages.riot: mark as broken --- .../ocaml-modules/asn1-combinators/default.nix | 12 ++++++------ pkgs/development/ocaml-modules/awa/default.nix | 15 +++++---------- pkgs/development/ocaml-modules/awa/mirage.nix | 2 -- .../ocaml-modules/ca-certs-nss/default.nix | 6 ++---- .../ocaml-modules/ca-certs/default.nix | 6 ++---- .../development/ocaml-modules/chacha/default.nix | 4 +--- pkgs/development/ocaml-modules/conduit/async.nix | 7 +++---- .../ocaml-modules/conduit/default.nix | 10 +++++----- .../ocaml-modules/conduit/lwt-unix.nix | 3 +-- pkgs/development/ocaml-modules/conduit/lwt.nix | 4 ++-- .../development/ocaml-modules/conduit/mirage.nix | 8 ++++---- pkgs/development/ocaml-modules/dns/certify.nix | 8 +++----- pkgs/development/ocaml-modules/dns/cli.nix | 5 ++--- .../development/ocaml-modules/dns/client-lwt.nix | 4 ++-- .../ocaml-modules/dns/client-mirage.nix | 4 ++-- pkgs/development/ocaml-modules/dns/default.nix | 10 +++++----- pkgs/development/ocaml-modules/dns/dnssec.nix | 3 --- pkgs/development/ocaml-modules/dns/mirage.nix | 1 - pkgs/development/ocaml-modules/dns/resolver.nix | 1 - pkgs/development/ocaml-modules/dns/server.nix | 1 - pkgs/development/ocaml-modules/dns/stub.nix | 5 ++--- pkgs/development/ocaml-modules/dns/tsig.nix | 5 ++--- .../ocaml-modules/erm_xmpp/default.nix | 10 +++++----- pkgs/development/ocaml-modules/git/default.nix | 8 ++++---- pkgs/development/ocaml-modules/git/paf.nix | 2 -- pkgs/development/ocaml-modules/git/unix.nix | 16 +++++++--------- pkgs/development/ocaml-modules/hkdf/default.nix | 13 ++++++------- .../ocaml-modules/http-mirage-client/default.nix | 4 ++-- .../ocaml-modules/letsencrypt/app.nix | 3 --- .../ocaml-modules/letsencrypt/default.nix | 15 ++++++--------- .../ocaml-modules/letsencrypt/dns.nix | 1 - .../ocaml-modules/letsencrypt/mirage.nix | 2 -- .../ocaml-modules/mirage-crypto/default.nix | 16 +++++----------- .../ocaml-modules/mirage-crypto/ec.nix | 10 ++++------ .../ocaml-modules/mirage-crypto/pk.nix | 14 +++++--------- .../ocaml-modules/mirage-crypto/rng-mirage.nix | 8 ++++---- .../ocaml-modules/mirage-crypto/rng.nix | 10 ++++------ .../development/ocaml-modules/mrmime/default.nix | 3 ++- pkgs/development/ocaml-modules/opium/default.nix | 2 +- pkgs/development/ocaml-modules/otr/default.nix | 3 +-- pkgs/development/ocaml-modules/paf/default.nix | 4 ++-- pkgs/development/ocaml-modules/pbkdf/default.nix | 13 ++++++------- .../ocaml-modules/randomconv/default.nix | 12 +++++------- pkgs/development/ocaml-modules/riot/default.nix | 1 + pkgs/development/ocaml-modules/tcpip/default.nix | 8 ++++---- pkgs/development/ocaml-modules/tls/async.nix | 3 +-- pkgs/development/ocaml-modules/tls/default.nix | 10 ++++------ pkgs/development/ocaml-modules/tls/lwt.nix | 3 +-- pkgs/development/ocaml-modules/tls/mirage.nix | 3 +-- pkgs/development/ocaml-modules/x509/default.nix | 14 ++++++-------- 50 files changed, 136 insertions(+), 199 deletions(-) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index a8e8a9cc847f..822c4056e259 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,20 +1,20 @@ { lib, buildDunePackage, fetchurl -, cstruct, zarith, bigarray-compat, stdlib-shims, ptime, alcotest +, ptime +, alcotest }: buildDunePackage rec { minimalOCamlVersion = "4.08"; - duneVersion = "3"; pname = "asn1-combinators"; - version = "0.2.6"; + version = "0.3.1"; src = fetchurl { - url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; - sha256 = "sha256-ASreDYhp72IQY3UsHPjqAm9rxwL+0Q35r1ZojikbGpE="; + url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-${version}.tbz"; + hash = "sha256-+imExupuHhxP4gM/AWWvYRljwkAM4roFEAS3ffxVfE4="; }; - propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; + propagatedBuildInputs = [ ptime ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 9cdc9e4cad2a..02e789de5672 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -1,31 +1,26 @@ { lib, buildDunePackage, fetchurl -, ppx_sexp_conv , mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk -, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf-cstruct +, x509, cstruct, cstruct-unix, eqaf , mtime, logs, fmt, cmdliner, base64 , zarith }: buildDunePackage rec { pname = "awa"; - version = "0.3.1"; + version = "0.4.0"; minimalOCamlVersion = "4.10"; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; - hash = "sha256-VejHFn07B/zoEG4LjLaen24ig9kAXtERl/pRo6UZCQk="; + hash = "sha256-uATKGr+J18jBx5vErB93Q9+BCR7ezi1Q+ueQGolpybQ="; }; - postPatch = '' - substituteInPlace lib/dune --replace-warn eqaf.cstruct eqaf-cstruct - ''; - propagatedBuildInputs = [ mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509 - cstruct cstruct-sexp sexplib mtime + cstruct mtime logs base64 zarith - ppx_sexp_conv eqaf-cstruct + eqaf ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/awa/mirage.nix b/pkgs/development/ocaml-modules/awa/mirage.nix index ebf3ad23fc5b..8513e5741048 100644 --- a/pkgs/development/ocaml-modules/awa/mirage.nix +++ b/pkgs/development/ocaml-modules/awa/mirage.nix @@ -8,8 +8,6 @@ buildDunePackage { inherit (awa) version src; - duneVersion = "3"; - propagatedBuildInputs = [ awa cstruct mtime lwt mirage-flow mirage-clock logs duration mirage-time diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 308fcf3ac4c9..9956dacf8885 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -7,20 +7,19 @@ , logs , fmt , bos -, astring , cmdliner , alcotest }: buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.101"; + version = "3.103"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz"; - hash = "sha256-XE3201P5JXWMRLhCwAa6zwMHEwZjg3ORIKii7tmx/hI="; + hash = "sha256-ZBwPBUwYuBBuzukgocEHBoqorotLmzHkjUYCmWRqYAw="; }; propagatedBuildInputs = [ @@ -33,7 +32,6 @@ buildDunePackage rec { logs fmt bos - astring cmdliner ]; diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index 185944f412e6..85539cdc3dd6 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -5,17 +5,15 @@ buildDunePackage rec { pname = "ca-certs"; - version = "0.2.3"; + version = "1.0.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-${version}.tbz"; - hash = "sha256-0tjWRX2RXvbXg974Lzvl7C9W+S4gIU9Y7dY8nC/GDpw="; + hash = "sha256-hpDyMSNGckeZ8tihtoTsFrYnsCfUFkgDoOK34kYsCnI="; }; - duneVersion = "3"; - propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/chacha/default.nix b/pkgs/development/ocaml-modules/chacha/default.nix index 28aaad1c46d8..c72ab59e3f7b 100644 --- a/pkgs/development/ocaml-modules/chacha/default.nix +++ b/pkgs/development/ocaml-modules/chacha/default.nix @@ -26,9 +26,6 @@ buildDunePackage rec { sha256 = "sha256-y7X9toFDrgdv3qmFmUs7K7QS+Gy45rRLulKy48m7uqc="; })]; - minimalOCamlVersion = "4.02"; - duneVersion = "3"; - propagatedBuildInputs = [ cstruct mirage-crypto ]; # alcotest isn't available for OCaml < 4.05 due to fmt @@ -45,5 +42,6 @@ buildDunePackage rec { ''; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fufexan ]; + broken = true; # Not compatible with mirage-crypto ≥ 1.0 }; } diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index 76e5cfb09cfa..5d9475dbe0c5 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,5 +1,5 @@ -{ buildDunePackage, async, async_ssl ? null, ppx_sexp_conv, ppx_here, uri, conduit -, core, ipaddr, ipaddr-sexp, sexplib +{ buildDunePackage, async, ppx_sexp_conv, ppx_here, uri, conduit +, core, ipaddr, ipaddr-sexp, sexplib0 }: buildDunePackage { @@ -13,13 +13,12 @@ buildDunePackage { propagatedBuildInputs = [ async - async_ssl conduit uri ipaddr ipaddr-sexp core - sexplib + sexplib0 ]; meta = conduit.meta // { diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index f904fda36a14..602e3919cb1f 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,20 +1,20 @@ { lib, fetchurl, buildDunePackage -, ppx_sexp_conv, sexplib, astring, uri +, ppx_sexp_conv, sexplib0, astring, uri , ipaddr, ipaddr-sexp }: buildDunePackage rec { pname = "conduit"; - version = "6.2.3"; + version = "7.0.0"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; - hash = "sha256-OkaEuxSFsfJH1ghN0KNW4QJ+ksLNRns1yr1Zp2RCPnk="; + hash = "sha256-Pg7ChIlqldF42NE1eS56Rssk+csK8OqWTQXO4avLEhg="; }; - propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ]; + propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib0 uri ppx_sexp_conv ]; meta = { description = "Network connection establishment library"; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index 144325e6c2b9..4e614bfd40cb 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -1,6 +1,6 @@ { buildDunePackage , conduit-lwt, ppx_sexp_conv, lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs -, lwt_ssl, tls, lwt_log, ssl +, lwt_ssl, lwt_log, ssl }: buildDunePackage { @@ -15,7 +15,6 @@ buildDunePackage { uri ipaddr ipaddr-sexp - tls ca-certs logs lwt_ssl diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index bc64a7869e57..a81114ec4f77 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, ppx_sexp_conv, conduit, lwt, sexplib }: +{ buildDunePackage, ppx_sexp_conv, conduit, lwt, sexplib0 }: buildDunePackage { pname = "conduit-lwt"; @@ -6,7 +6,7 @@ buildDunePackage { buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ conduit lwt sexplib ]; + propagatedBuildInputs = [ conduit lwt sexplib0 ]; meta = conduit.meta // { description = "Network connection establishment library for Lwt"; diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index c4a7b304a6e8..02bb1e6649f4 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,6 +1,6 @@ { buildDunePackage, conduit-lwt -, ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow -, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock +, ppx_sexp_conv, sexplib0, uri, cstruct, mirage-flow +, mirage-flow-combinators, mirage-crypto-rng-mirage, mirage-time, mirage-clock , dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp , tcpip, ca-certs-nss }: @@ -13,8 +13,8 @@ buildDunePackage { nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ - sexplib uri cstruct mirage-clock mirage-flow - mirage-flow-combinators mirage-random mirage-time + sexplib0 uri cstruct mirage-clock mirage-flow + mirage-flow-combinators mirage-crypto-rng-mirage mirage-time dns-client-mirage conduit-lwt vchan xenstore tls tls-mirage ipaddr ipaddr-sexp tcpip ca-certs-nss ]; diff --git a/pkgs/development/ocaml-modules/dns/certify.nix b/pkgs/development/ocaml-modules/dns/certify.nix index 3260e139fbbb..fff97dafed32 100644 --- a/pkgs/development/ocaml-modules/dns/certify.nix +++ b/pkgs/development/ocaml-modules/dns/certify.nix @@ -1,6 +1,6 @@ { buildDunePackage, dns, dns-tsig, dns-mirage, randomconv, x509 -, mirage-random, mirage-time, mirage-clock -, logs, mirage-crypto-pk, mirage-crypto-rng, mirage-crypto-ec, lwt +, mirage-time, mirage-clock +, logs, mirage-crypto-pk, mirage-crypto-rng-mirage, mirage-crypto-ec, lwt , tcpip }: @@ -8,7 +8,6 @@ buildDunePackage { pname = "dns-certify"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ dns @@ -16,12 +15,11 @@ buildDunePackage { dns-mirage randomconv x509 - mirage-random mirage-time mirage-clock logs mirage-crypto-pk - mirage-crypto-rng + mirage-crypto-rng-mirage mirage-crypto-ec lwt tcpip diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix index 8c1ff57bc9b3..e08a29756a2f 100644 --- a/pkgs/development/ocaml-modules/dns/cli.nix +++ b/pkgs/development/ocaml-modules/dns/cli.nix @@ -1,6 +1,6 @@ { buildDunePackage, dns, dns-tsig, dns-client-lwt, dns-server, dns-certify, dnssec , bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk -, mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt +, mirage-crypto-rng, ohex, ptime, mtime, logs, fmt, ipaddr, lwt , randomconv, alcotest }: @@ -10,7 +10,6 @@ buildDunePackage { minimalOCamlVersion = "4.08"; inherit (dns) version src; - duneVersion = "3"; # no need to propagate as this is primarily # an executable package @@ -28,7 +27,7 @@ buildDunePackage { mirage-crypto mirage-crypto-pk mirage-crypto-rng - hex + ohex ptime mtime logs diff --git a/pkgs/development/ocaml-modules/dns/client-lwt.nix b/pkgs/development/ocaml-modules/dns/client-lwt.nix index 107e574f5925..3c9c126e1d1b 100644 --- a/pkgs/development/ocaml-modules/dns/client-lwt.nix +++ b/pkgs/development/ocaml-modules/dns/client-lwt.nix @@ -1,5 +1,5 @@ { buildDunePackage, dns, dns-client, lwt -, mirage-crypto-rng, mtime +, mirage-crypto-rng-lwt, mtime , ipaddr, alcotest , ca-certs , happy-eyeballs @@ -21,7 +21,7 @@ buildDunePackage { happy-eyeballs-lwt tls-lwt mtime - mirage-crypto-rng + mirage-crypto-rng-lwt ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/dns/client-mirage.nix b/pkgs/development/ocaml-modules/dns/client-mirage.nix index c400a7145cdb..f9159df2f940 100644 --- a/pkgs/development/ocaml-modules/dns/client-mirage.nix +++ b/pkgs/development/ocaml-modules/dns/client-mirage.nix @@ -1,5 +1,5 @@ { buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time -, mirage-random +, mirage-crypto-rng-mirage , domain-name, ipaddr , ca-certs-nss , happy-eyeballs @@ -17,7 +17,7 @@ buildDunePackage { domain-name ipaddr lwt - mirage-random + mirage-crypto-rng-mirage mirage-time mirage-clock ca-certs-nss diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index dd5a5d786dc3..00ee104ad209 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -2,7 +2,6 @@ , buildDunePackage , fetchurl , alcotest -, cstruct , domain-name , duration , gmap @@ -13,20 +12,21 @@ , ptime , fmt , base64 +, ohex }: buildDunePackage rec { pname = "dns"; - version = "8.0.0"; + version = "9.0.0"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz"; - hash = "sha256-CIIGG8W/p1FasmyEyoBiMjrFkxs/iuKVJ5SwySfYhU4="; + hash = "sha256-HvXwTLVKw0wHV+xftL/z+yNA6UjxUTSdo/cC+s3qy/Y="; }; - propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ]; + propagatedBuildInputs = [ fmt logs ptime domain-name gmap ipaddr lru duration metrics base64 ohex ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/dns/dnssec.nix b/pkgs/development/ocaml-modules/dns/dnssec.nix index de2a76052384..16a5f3449041 100644 --- a/pkgs/development/ocaml-modules/dns/dnssec.nix +++ b/pkgs/development/ocaml-modules/dns/dnssec.nix @@ -1,5 +1,4 @@ { buildDunePackage -, cstruct , dns , mirage-crypto , mirage-crypto-pk @@ -14,10 +13,8 @@ buildDunePackage { pname = "dnssec"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ - cstruct dns mirage-crypto mirage-crypto-pk diff --git a/pkgs/development/ocaml-modules/dns/mirage.nix b/pkgs/development/ocaml-modules/dns/mirage.nix index aba32efe5245..2040a56a6766 100644 --- a/pkgs/development/ocaml-modules/dns/mirage.nix +++ b/pkgs/development/ocaml-modules/dns/mirage.nix @@ -4,7 +4,6 @@ buildDunePackage { pname = "dns-mirage"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix index dd46a1534ed3..04611a738d74 100644 --- a/pkgs/development/ocaml-modules/dns/resolver.nix +++ b/pkgs/development/ocaml-modules/dns/resolver.nix @@ -20,7 +20,6 @@ buildDunePackage { pname = "dns-resolver"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/server.nix b/pkgs/development/ocaml-modules/dns/server.nix index 049cf507e3ac..09019bf655aa 100644 --- a/pkgs/development/ocaml-modules/dns/server.nix +++ b/pkgs/development/ocaml-modules/dns/server.nix @@ -17,7 +17,6 @@ buildDunePackage { pname = "dns-server"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/stub.nix b/pkgs/development/ocaml-modules/dns/stub.nix index 343f4925b18f..23ad5539c586 100644 --- a/pkgs/development/ocaml-modules/dns/stub.nix +++ b/pkgs/development/ocaml-modules/dns/stub.nix @@ -1,13 +1,12 @@ { buildDunePackage, dns, dns-client-mirage, dns-mirage, dns-resolver, dns-tsig , dns-server, duration, randomconv, lwt, mirage-time, mirage-clock -, mirage-random, tcpip, metrics +, mirage-crypto-rng-mirage, tcpip, metrics }: buildDunePackage { pname = "dns-stub"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ dns @@ -21,7 +20,7 @@ buildDunePackage { lwt mirage-time mirage-clock - mirage-random + mirage-crypto-rng-mirage tcpip metrics ]; diff --git a/pkgs/development/ocaml-modules/dns/tsig.nix b/pkgs/development/ocaml-modules/dns/tsig.nix index 3ecc90d39853..2d967301d25a 100644 --- a/pkgs/development/ocaml-modules/dns/tsig.nix +++ b/pkgs/development/ocaml-modules/dns/tsig.nix @@ -1,13 +1,12 @@ -{ buildDunePackage, dns, mirage-crypto, base64, alcotest }: +{ buildDunePackage, dns, digestif, base64, alcotest }: buildDunePackage { pname = "dns-tsig"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ - mirage-crypto + digestif dns base64 ]; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 452499aa401f..d60c4684b3d9 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -1,21 +1,21 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild -, erm_xml, mirage-crypto, mirage-crypto-rng, base64 +, erm_xml, mirage-crypto, mirage-crypto-rng, base64, digestif }: stdenv.mkDerivation rec { - version = "0.3+20220404"; + version = "0.3+20241009"; pname = "ocaml${ocaml.version}-erm_xmpp"; src = fetchFromGitHub { owner = "hannesm"; repo = "xmpp"; - rev = "e54d54e142ac9770c37e144693473692bf473530"; - sha256 = "sha256-Ize8Em4LI54Cy1Xuzr9BjQGV7JMr3W6KI1YzI8G1q/U="; + rev = "54418f77abf47b175e9c1b68a4f745a12b640d6a"; + sha256 = "sha256-AbzZjNkW1VH/FOnzNruvelZeo3IYg/Usr3enQEknTQs="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; buildInputs = [ camlp4 ]; - propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ]; + propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 digestif ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 29d7b492c837..40be36100b65 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -2,19 +2,19 @@ , alcotest, mirage-crypto-rng, git-binary , angstrom, astring, cstruct, decompress, digestif, encore, fmt, checkseum , ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd -, result, bigstringaf, optint, mirage-flow, domain-name, emile +, bigstringaf, optint, mirage-flow, domain-name, emile , mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt, cmdliner }: buildDunePackage rec { pname = "git"; - version = "3.16.1"; + version = "3.17.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - hash = "sha256-wDW9zM2eTS9IxtnNxl5h/BCDjs8dim8qN2riCoqSSAM="; + hash = "sha256-7yANBBLtGlOFJdBQEpiJDguJPgIFKAlNajrhI1n9AmU="; }; buildInputs = [ @@ -22,7 +22,7 @@ buildDunePackage rec { ]; propagatedBuildInputs = [ angstrom astring checkseum cstruct decompress digestif encore fmt - ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow + ke logs lwt ocamlgraph uri rresult bigstringaf optint mirage-flow domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd ]; nativeCheckInputs = [ diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix index 09e64bb064a3..b4b3c499bd26 100644 --- a/pkgs/development/ocaml-modules/git/paf.nix +++ b/pkgs/development/ocaml-modules/git/paf.nix @@ -9,7 +9,6 @@ , lwt , mirage-clock , mirage-time -, result , rresult , tls , uri @@ -34,7 +33,6 @@ buildDunePackage { ca-certs-nss fmt lwt - result rresult ipaddr logs diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index adad5dc0792e..9423f23b5101 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -1,12 +1,12 @@ { buildDunePackage, git -, rresult, result, bigstringaf +, rresult, bigstringaf , fmt, bos, fpath, uri, digestif, logs, lwt -, mirage-clock, mirage-clock-unix, astring, awa, cmdliner +, mirage-clock, mirage-clock-unix, astring, cmdliner , decompress, domain-name, ipaddr, mtime -, tcpip, awa-mirage, mirage-flow, mirage-unix +, tcpip, mirage-flow, mirage-unix , alcotest, alcotest-lwt, base64, cstruct , ke, mirage-crypto-rng, git-binary -, ptime, mimic, ca-certs-nss, tls, tls-mirage +, mimic, tls , cacert, happy-eyeballs-lwt, git-mirage }: @@ -17,19 +17,17 @@ buildDunePackage { minimalOCamlVersion = "4.08"; buildInputs = [ - awa - awa-mirage cmdliner mirage-clock tcpip ]; propagatedBuildInputs = [ - rresult result bigstringaf + rresult bigstringaf fmt bos fpath digestif logs lwt astring decompress domain-name ipaddr mirage-flow mirage-unix - cstruct ptime mimic ca-certs-nss - tls tls-mirage git happy-eyeballs-lwt + cstruct mimic + tls git happy-eyeballs-lwt git-mirage mirage-clock-unix ]; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/hkdf/default.nix b/pkgs/development/ocaml-modules/hkdf/default.nix index 3df9ad5307c0..9faa6d02b897 100644 --- a/pkgs/development/ocaml-modules/hkdf/default.nix +++ b/pkgs/development/ocaml-modules/hkdf/default.nix @@ -1,19 +1,18 @@ -{ lib, buildDunePackage, fetchurl, cstruct, mirage-crypto, alcotest }: +{ lib, buildDunePackage, fetchurl, digestif, alcotest, ohex }: buildDunePackage rec { pname = "hkdf"; - version = "1.0.4"; + version = "2.0.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { - url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - hash = "sha256-uSbW2krEWquZlzXdK7/R91ETFnENeRr6NhAGtv42/Vs="; + url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-VLBxJ5viTTn1nK0QNIAGq/8961x0/RGHZN/C/7ITWNM="; }; - propagatedBuildInputs = [ cstruct mirage-crypto ]; - checkInputs = [ alcotest ]; + propagatedBuildInputs = [ digestif ]; + checkInputs = [ alcotest ohex ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/pkgs/development/ocaml-modules/http-mirage-client/default.nix index 84b27dc69ff1..fa089d11767a 100644 --- a/pkgs/development/ocaml-modules/http-mirage-client/default.nix +++ b/pkgs/development/ocaml-modules/http-mirage-client/default.nix @@ -16,13 +16,13 @@ buildDunePackage rec { pname = "http-mirage-client"; - version = "0.0.6"; + version = "0.0.7"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz"; - hash = "sha256-rtl76NJRYwSRNgN57v0KwUlcDsGQ2MR+y5ZDVf4Otjs="; + hash = "sha256-GKPJKVtHEbt8L922y/G1oewqGVBO4f313XadzImMtFM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix index c3807a04061a..2f43c8c5b788 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/app.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -11,12 +11,10 @@ , bos , fpath , randomconv -, cstruct }: buildDunePackage { pname = "letsencrypt-app"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; inherit (letsencrypt) @@ -37,7 +35,6 @@ buildDunePackage { bos fpath randomconv - cstruct ]; meta = letsencrypt.meta // { diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index a5e0c8a6ffd2..fc4ccaaf00bd 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -1,9 +1,9 @@ { buildDunePackage , lib , fetchurl -, asn1-combinators , uri , base64 +, digestif , logs , fmt , lwt @@ -12,23 +12,21 @@ , mirage-crypto-pk , x509 , yojson -, ounit +, ounit2 , ptime , domain-name -, cstruct }: buildDunePackage rec { pname = "letsencrypt"; - version = "0.5.1"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz"; - hash = "sha256-uQOHpdyPg5kms+negxpQMxfhow6auZ0ipt5ksoXYo1w="; + hash = "sha256-koNG19aoLY28Hb7GyuPuJUyrCAE59n2vjbH4z0ykGvA="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; buildInputs = [ fmt @@ -41,17 +39,16 @@ buildDunePackage rec { yojson lwt base64 + digestif mirage-crypto mirage-crypto-ec mirage-crypto-pk - asn1-combinators x509 uri - cstruct ]; doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; meta = { description = "ACME implementation in OCaml"; diff --git a/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/pkgs/development/ocaml-modules/letsencrypt/dns.nix index 26802cf0cb34..c263b6c12806 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/dns.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/dns.nix @@ -10,7 +10,6 @@ buildDunePackage { pname = "letsencrypt-dns"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; inherit (letsencrypt) diff --git a/pkgs/development/ocaml-modules/letsencrypt/mirage.nix b/pkgs/development/ocaml-modules/letsencrypt/mirage.nix index f43ab9812c7e..038e75932da0 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/mirage.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/mirage.nix @@ -10,8 +10,6 @@ buildDunePackage { inherit (letsencrypt) version src; - duneVersion = "3"; - propagatedBuildInputs = [ emile http-mirage-client letsencrypt paf ]; meta = letsencrypt.meta // { diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 7057d8980652..154c740bf001 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,23 +1,22 @@ -{ lib, fetchurl, buildDunePackage, ounit2, dune-configurator, eqaf-cstruct, pkg-config +{ lib, fetchurl, buildDunePackage, ohex, ounit2, dune-configurator, eqaf-cstruct , withFreestanding ? false , ocaml-freestanding }: buildDunePackage rec { - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.13"; pname = "mirage-crypto"; - version = "0.11.3"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; - sha256 = "sha256-v7Uw+hac2QXrx+JEnzQHz71nAjrAspG4tvShQ3pdlbE="; + hash = "sha256-xxiXZ6fq1UkjyrAg85zQw0r31LBId2k52U8Cir9TY1M="; }; doCheck = true; - checkInputs = [ ounit2 ]; + checkInputs = [ ohex ounit2 ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ eqaf-cstruct @@ -25,11 +24,6 @@ buildDunePackage rec { ocaml-freestanding ]; - # Compatibility with eqaf 0.10 - postPatch = '' - substituteInPlace src/dune --replace-warn eqaf.cstruct eqaf-cstruct - ''; - meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index f1312f58146d..4fa3d2389f7b 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -3,12 +3,12 @@ , mirage-crypto , dune-configurator , pkg-config -, cstruct , mirage-crypto-rng , mirage-crypto-pk -, hex , alcotest , asn1-combinators +, ohex +, ounit2 , ppx_deriving_yojson , ppx_deriving , yojson @@ -23,14 +23,11 @@ buildDunePackage rec { src version; - duneVersion = "3"; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ - cstruct mirage-crypto mirage-crypto-rng ] ++ lib.optionals withFreestanding [ @@ -41,9 +38,10 @@ buildDunePackage rec { doCheck = true; checkInputs = [ - hex alcotest asn1-combinators + ohex + ounit2 ppx_deriving_yojson ppx_deriving yojson diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 11f09dfd5161..3b647e90b37b 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,21 +1,17 @@ -{ buildDunePackage, ounit2, randomconv, mirage-crypto, mirage-crypto-rng -, cstruct, sexplib0, zarith, eqaf-cstruct, gmp }: +{ buildDunePackage, ohex, ounit2, randomconv, mirage-crypto, mirage-crypto-rng +, sexplib0, zarith, gmp }: buildDunePackage rec { pname = "mirage-crypto-pk"; inherit (mirage-crypto) version src; - postPatch = '' - substituteInPlace pk/dune --replace-warn eqaf.cstruct eqaf-cstruct - ''; - buildInputs = [ gmp ]; - propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng - zarith eqaf-cstruct sexplib0 ]; + propagatedBuildInputs = [ mirage-crypto mirage-crypto-rng + zarith sexplib0 ]; doCheck = true; - checkInputs = [ ounit2 randomconv ]; + checkInputs = [ ohex ounit2 randomconv ]; meta = mirage-crypto.meta // { description = "Simple public-key cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 3e0cde29c52d..78c64d981297 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -1,18 +1,18 @@ -{ buildDunePackage, mirage-crypto-rng, duration, cstruct, mirage-runtime +{ buildDunePackage, mirage-crypto-rng, duration, mirage-runtime , mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix , logs, lwt +, ohex }: buildDunePackage rec { pname = "mirage-crypto-rng-mirage"; inherit (mirage-crypto-rng) version src; - duneVersion = "3"; doCheck = true; - checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; + checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ohex ]; - propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime + propagatedBuildInputs = [ duration mirage-crypto-rng mirage-runtime mirage-time mirage-clock logs lwt ]; meta = mirage-crypto-rng.meta // { diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index 79ff29a05de4..b1c4be4a6234 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,5 +1,5 @@ -{ buildDunePackage, mirage-crypto, ounit2, randomconv, dune-configurator -, cstruct, duration, logs }: +{ buildDunePackage, mirage-crypto, ohex, ounit2, randomconv, dune-configurator +, digestif, duration, logs }: buildDunePackage rec { pname = "mirage-crypto-rng"; @@ -7,12 +7,10 @@ buildDunePackage rec { inherit (mirage-crypto) version src; doCheck = true; - checkInputs = [ ounit2 randomconv ]; + checkInputs = [ ohex ounit2 randomconv ]; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ cstruct mirage-crypto duration logs ]; - - strictDeps = true; + propagatedBuildInputs = [ digestif mirage-crypto duration logs ]; meta = mirage-crypto.meta // { description = "Cryptographically secure PRNG"; diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix index 8e9a3e1049e1..758d27e45f1c 100644 --- a/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/pkgs/development/ocaml-modules/mrmime/default.nix @@ -57,7 +57,8 @@ buildDunePackage rec { jsonm mirage-crypto-rng ]; - doCheck = true; + # Checks are not compatible with mirage-crypto-rng ≥ 1.0 + doCheck = false; meta = { description = "Parser and generator of mail in OCaml"; diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix index b11ab3a8ec95..ceae3c4867cf 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -23,7 +23,6 @@ buildDunePackage rec { pname = "opium"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; inherit (rock) src version; @@ -57,5 +56,6 @@ buildDunePackage rec { homepage = "https://github.com/rgrinberg/opium"; license = lib.licenses.mit; maintainers = [ lib.maintainers.pmahoney ]; + broken = true; # Not compatible with mirage-crypto ≥ 1.0 }; } diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index 108f4b79d782..033e4a2127e5 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -13,8 +13,6 @@ buildDunePackage rec { hash = "sha256:0dssc7p6s7z53n0mddyipjghzr8ld8bb7alaxqrx9gdpspwab1gq"; }; - duneVersion = "3"; - propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk astring base64 ]; @@ -25,5 +23,6 @@ buildDunePackage rec { description = "Off-the-record messaging protocol, purely in OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; + broken = true; # Not compatible with mirage-crypto ≥ 1.0 }; } diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index 0c25da1453ab..7ac80079933a 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -24,11 +24,11 @@ buildDunePackage rec { pname = "paf"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - hash = "sha256-uvNezux0V4mwbxU07zCfCYXOgCYKPxshOKiiAjLef9k="; + hash = "sha256-w2lGs+DYY08BUKumWFxPFTLQKvdRPu7H1FdQOIjDQyE="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix index d6b9bdb7e758..27b269b369e8 100644 --- a/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -1,25 +1,24 @@ { lib , buildDunePackage , fetchzip -, cstruct +, digestif , mirage-crypto , alcotest +, ohex }: buildDunePackage rec { pname = "pbkdf"; - version = "1.2.0"; - - duneVersion = "3"; + version = "2.0.0"; src = fetchzip { url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${version}.tar.gz"; - sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI="; + hash = "sha256-D2dXpf1D/wsJrcajU3If37tuLYjahoA/+QoXZKr1vQs="; }; minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ cstruct mirage-crypto ]; - checkInputs = [ alcotest ]; + propagatedBuildInputs = [ digestif mirage-crypto ]; + checkInputs = [ alcotest ohex ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/randomconv/default.nix b/pkgs/development/ocaml-modules/randomconv/default.nix index 45f52ba5bded..e3e7f8ceb99d 100644 --- a/pkgs/development/ocaml-modules/randomconv/default.nix +++ b/pkgs/development/ocaml-modules/randomconv/default.nix @@ -1,18 +1,16 @@ -{ lib, buildDunePackage, fetchurl, cstruct }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { pname = "randomconv"; - version = "0.1.3"; + version = "0.2.0"; - duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz"; - sha256 = "1iv3r0s5kqxs893b0d55f0r62k777haiahfkkvvfbqwgqsm6la4v"; + url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-${version}.tbz"; + hash = "sha256-sxce3wfjQaRGj5L/wh4qiGO4LtXDb3R3zJja8F1bY+o="; }; - propagatedBuildInputs = [ cstruct ]; - meta = { homepage = "https://github.com/hannesm/randomconv"; description = "Convert from random bytes to random native numbers"; diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix index a5c37a292930..7b5008d9b1b0 100644 --- a/pkgs/development/ocaml-modules/riot/default.nix +++ b/pkgs/development/ocaml-modules/riot/default.nix @@ -47,5 +47,6 @@ buildDunePackage rec { changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md"; license = lib.licenses.mit; maintainers = [ ]; + broken = true; # Not compatible with mirage-crypto ≥ 1.0 }; } diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index 45702c493fea..9920f8f8576b 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, fetchurl , pkg-config , cstruct, cstruct-lwt, mirage-net, mirage-clock -, mirage-random, mirage-time +, mirage-crypto-rng-mirage, mirage-time , macaddr, macaddr-cstruct, fmt , lwt, lwt-dllist, logs, duration, randomconv, ethernet , alcotest, mirage-flow, mirage-vnetif, pcap-format @@ -13,11 +13,11 @@ buildDunePackage rec { pname = "tcpip"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-hrpdkvkHi93GUxL2O19M40/SVw12VDOyOiJquE11qcA="; + hash = "sha256-kW5oirqJdnbERNuBKfSWOtc5+NG+Yx2eAJxiKLS31u0="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildDunePackage rec { cstruct-lwt mirage-net mirage-clock - mirage-random + mirage-crypto-rng-mirage mirage-time ipaddr-cstruct macaddr diff --git a/pkgs/development/ocaml-modules/tls/async.nix b/pkgs/development/ocaml-modules/tls/async.nix index 338658cabbdb..ef4f72ec15a9 100644 --- a/pkgs/development/ocaml-modules/tls/async.nix +++ b/pkgs/development/ocaml-modules/tls/async.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }: +{ buildDunePackage, tls, async, cstruct-async, core, mirage-crypto-rng-async }: buildDunePackage rec { pname = "tls-async"; @@ -12,7 +12,6 @@ buildDunePackage rec { propagatedBuildInputs = [ async core - cstruct cstruct-async mirage-crypto-rng-async tls diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 745712cbab52..9fc0656be162 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,22 +1,21 @@ { lib, fetchurl, buildDunePackage -, cstruct, domain-name, fmt, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ptime, x509 +, domain-name, fmt, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ptime, x509 , ipaddr -, alcotest, cstruct-unix, ounit2 +, alcotest, ounit2 }: buildDunePackage rec { pname = "tls"; - version = "0.17.5"; + version = "1.0.1"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz"; - hash = "sha256-iRCIV786b4VyKSWo1KP1nCkdY4wPLi/EXw/a+JKuSBk="; + hash = "sha256-2uS1/8gD6ILphIBCWP+KrKe4N9hVbeaEABldpccKjYM="; }; minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ - cstruct domain-name fmt logs @@ -33,7 +32,6 @@ buildDunePackage rec { doCheck = true; checkInputs = [ alcotest - cstruct-unix ounit2 ]; diff --git a/pkgs/development/ocaml-modules/tls/lwt.nix b/pkgs/development/ocaml-modules/tls/lwt.nix index b86f41aeaa07..113a705381ca 100644 --- a/pkgs/development/ocaml-modules/tls/lwt.nix +++ b/pkgs/development/ocaml-modules/tls/lwt.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, tls, lwt, mirage-crypto-rng-lwt, x509 }: +{ buildDunePackage, tls, lwt, mirage-crypto-rng-lwt }: buildDunePackage rec { pname = "tls-lwt"; @@ -13,6 +13,5 @@ buildDunePackage rec { lwt mirage-crypto-rng-lwt tls - x509 ]; } diff --git a/pkgs/development/ocaml-modules/tls/mirage.nix b/pkgs/development/ocaml-modules/tls/mirage.nix index 49d2967b27ee..b302a90aecfd 100644 --- a/pkgs/development/ocaml-modules/tls/mirage.nix +++ b/pkgs/development/ocaml-modules/tls/mirage.nix @@ -1,5 +1,5 @@ { buildDunePackage, tls -, fmt, lwt, mirage-clock, mirage-crypto, mirage-crypto-pk, mirage-flow, mirage-kv, ptime, x509 +, fmt, lwt, mirage-clock, mirage-crypto, mirage-crypto-pk, mirage-flow, mirage-kv, ptime }: buildDunePackage { @@ -16,7 +16,6 @@ buildDunePackage { mirage-kv ptime tls - x509 ]; meta = tls.meta // { diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index aca71e2dfc17..9c71df2e8f65 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,24 +1,22 @@ { lib, fetchurl, buildDunePackage -, alcotest, cstruct-unix +, alcotest , asn1-combinators, domain-name, fmt, gmap, pbkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, ipaddr -, logs, base64 +, logs, base64, ohex }: buildDunePackage rec { minimalOCamlVersion = "4.08"; pname = "x509"; - version = "0.16.5"; - - duneVersion = "3"; + version = "1.0.2"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz"; - hash = "sha256-FJ4lpf6jf2GfsmkL7lwA8BydzzHTNfj/yqs5p1OMzZk="; + hash = "sha256-LrUYbLLJTNCWvEZtRXUv5LHdEya2oNTtAbrfm7EE2Bg="; }; - checkInputs = [ alcotest cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ]; + checkInputs = [ alcotest ]; + propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ohex ]; doCheck = true; From 53cb15aadcad2b805c04e897675d7a95de91ee21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 05:49:55 +0000 Subject: [PATCH 155/229] mark: 10.0.1 -> 11.2.0 --- pkgs/tools/text/mark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index e640d32c55ed..6dbe584d8e00 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "10.0.1"; + version = "11.2.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-i1luJsAADk7VqrZAqnI52XGrbWeNLBMnzW0wxEO5LXQ="; + sha256 = "sha256-Pwt8HhbO+1wmEGYRny1W5HzKRWmvTneqN4fuAaKcYaA="; }; - vendorHash = "sha256-g8KN8M1jB4lTjXNfTw6gnjTCN4HDBTqtNS6c+5tJQv4="; + vendorHash = "sha256-uokBuQquSkdbHsI3hZ7/FxE93/QOZ6jD2zB8vDPeESI="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From b58c8efae874164a5aba08b238d014acd474db44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 06:28:14 +0000 Subject: [PATCH 156/229] mozcdic-ut-sudachidict: 0-unstable-2024-07-28 -> 0-unstable-2024-10-12 --- pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix index 2ddb8fe5d2b5..aa3dbaf25fb8 100644 --- a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-sudachidict"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-sudachidict"; - rev = "a754f1fff5fded62cc066aa6be0ab0169059a144"; - hash = "sha256-WzhWNpqtiG9TtFHEOSbHG1mbb4ak0zCkO13g9ZWqyBE="; + rev = "a807010ef3fdc9573a83f41594e9d79b969c3f80"; + hash = "sha256-AGs/MleR/UMtVUDfxpE9clyD1uaI3SvTGFZInOo8ms0="; }; installPhase = '' From 19742067f4694a18c827aceaebdb0221bb7ab818 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 06:28:38 +0000 Subject: [PATCH 157/229] mozcdic-ut-personal-names: 0-unstable-2024-09-21 -> 0-unstable-2024-10-14 --- pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix b/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix index fb3c430c4597..fe3c0c1ec08f 100644 --- a/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-personal-names"; - version = "0-unstable-2024-09-21"; + version = "0-unstable-2024-10-14"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-personal-names"; - rev = "b61a5af7992d6fcdc82fa08b67b1c9771bbc4449"; - hash = "sha256-xcfhfO5GIiOVxLfqX3izLHYuSFZCgOlbQE3N3U+HTW4="; + rev = "24d783e5b1fe57af571e000861cfc70da173aedb"; + hash = "sha256-ezx4Am1xuP9SNNBsNC3KwpWghypRU97MCw10/P2LlnY="; }; installPhase = '' From 1e1a6c16476e3610331149aace6150c0a4f3d6ed Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 21 Oct 2024 08:29:26 +0200 Subject: [PATCH 158/229] cargo-public-api: 0.38.0 -> 0.40.0 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-public-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 8bc991d0bd4c..2ba9fe941dab 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.38.0"; + version = "0.40.0"; src = fetchCrate { inherit pname version; - hash = "sha256-NgaW/QsBaMMBbfUGyHwuu0fb3q3GmD8Qv5wG6qYPjvA="; + hash = "sha256-FXScN4xOaJOiEm9NV66wsfGOj7up1DPzLK7lMofXL2g="; }; - cargoHash = "sha256-KX3+tIdAyaWdaq2nabVTvoZRTXLSXEALFJYCa5nda4w="; + cargoHash = "sha256-v7K62jMGNwIo1XbkWpIXuoNkaRGRAqvZ/c9wdKfY+Xs="; nativeBuildInputs = [ pkg-config ]; From 1276b88d5c577097e8972f69816fc39ed090737c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 07:08:54 +0000 Subject: [PATCH 159/229] mozcdic-ut-alt-cannadic: 0-unstable-2024-07-28 -> 0-unstable-2024-10-13 --- pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix b/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix index 40295db08ce5..1eccf58c8330 100644 --- a/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-alt-cannadic"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-alt-cannadic"; - rev = "50fee0397b87fe508f9edd45bac56f5290d8ce66"; - hash = "sha256-KKUj3d9yR2kTTTFbroZQs+OZR4KUyAUYE/X3z9/vQvM="; + rev = "7f70e48a63735c781b6453977628e594bdd50d89"; + hash = "sha256-R7qU2YNdeojuu4VTxH+M5Bvf8XAEvK6N8jPNz9MQqvU="; }; installPhase = '' From 66463e22244e41ae4b4112af04dcafca189927a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 07:09:11 +0000 Subject: [PATCH 160/229] kara: 0.7.1 -> 0.7.3 --- pkgs/by-name/ka/kara/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kara/package.nix b/pkgs/by-name/ka/kara/package.nix index 89789a0d891d..8aef49b4d294 100644 --- a/pkgs/by-name/ka/kara/package.nix +++ b/pkgs/by-name/ka/kara/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "kara"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "dhruv8sh"; repo = "kara"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-G+sLHcHnNuzIRE+6bvEeXaWYVdoqqxcp5kGF8ZhD/34="; + hash = "sha256-an0tA1YQU/wpaY4y6lQfOFiUYm6aLmVTC1M5sukARVA="; }; installPhase = '' From fc4c4be8046c94999bdd17be1b11168292e23203 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 07:09:20 +0000 Subject: [PATCH 161/229] mozcdic-ut-place-names: 0-unstable-2024-09-03 -> 0-unstable-2024-10-12 --- pkgs/by-name/mo/mozcdic-ut-place-names/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix b/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix index 8cfb509f5b43..9253bb94f0e9 100644 --- a/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-place-names"; - version = "0-unstable-2024-09-03"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-place-names"; - rev = "4525819546a26fc994d7ca4a2e883fde14bf908c"; - hash = "sha256-oiSBR2QhOYyurftdEn2w6hNK1ucddlvLqGTiZk9G/4k="; + rev = "888a977a3f30451e8f286ef8eaf2f9be169234cb"; + hash = "sha256-UL3ik/CxmRM7m0AXS+UNQEipCDS8pH+AheIMx6xqAaU="; }; installPhase = '' From 0fb7151745f150b036d28364d5356cd5dee79bb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 07:14:51 +0000 Subject: [PATCH 162/229] xcrawl3r: 0.1.0 -> 0.2.0 --- pkgs/tools/security/xcrawl3r/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/xcrawl3r/default.nix b/pkgs/tools/security/xcrawl3r/default.nix index c12439f49d67..fd3a33eaac2b 100644 --- a/pkgs/tools/security/xcrawl3r/default.nix +++ b/pkgs/tools/security/xcrawl3r/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "xcrawl3r"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hueristiq"; repo = "xcrawl3r"; rev = "refs/tags/${version}"; - hash = "sha256-K7UuWsteI8mEAGOF/g/EbT/Ch6sbmKhiiYB3npdDmFk="; + hash = "sha256-W1cvSvRnDGFp4br8s/nL+owIGWTJ1bVX6kvmeTLUuuI="; }; - vendorHash = "sha256-/yBSrZdlVMZgcKcONBSq7C5IFC30TJL0z6FZRXm+HUs="; + vendorHash = "sha256-fHdtqjFmT+8cmy2SxjjBvw5Rct7lA2ksGVmm/9ncbRI="; ldflags = [ "-s" From d977b90826b58a8f9b4ca37659e3c36c11cfcae8 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Thu, 17 Oct 2024 11:05:50 +0530 Subject: [PATCH 163/229] fnlfmt: 0.3.1 -> 0.3.2 --- pkgs/development/tools/fnlfmt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/development/tools/fnlfmt/default.nix index 14c783ce845b..a5f325ebdab8 100644 --- a/pkgs/development/tools/fnlfmt/default.nix +++ b/pkgs/development/tools/fnlfmt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fnlfmt"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromSourcehut { owner = "~technomancy"; - repo = pname; - rev = version; - sha256 = "sha256-rhbYG0TpqAZnbLaZOG739/pDA61Dwb4Y1HhBxWLtOus="; + repo = "fnlfmt"; + rev = "refs/tags/${version}"; + hash = "sha256-LYHhKC8iA4N8DdCH8GfSOkN/e+W3YjkFhVSDQraKoFk="; }; nativeBuildInputs = [ luaPackages.fennel ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { runHook preBuild echo "#!${lua}/bin/lua" > fnlfmt - ${luaPackages.fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt + ${luaPackages.fennel}/bin/fennel --require-as-include --compile tags/${version}/cli.fnl >> fnlfmt chmod +x fnlfmt runHook postBuild From 439625a0f6c69c84c74dd1e32512e6e11cfb0872 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 09:19:54 +0200 Subject: [PATCH 164/229] python312Packages.praw: 7.7.1 -> 7.8.0 Diff: https://github.com/praw-dev/praw/compare/refs/tags/v7.8.0...v7.8.0 Changelog: https://github.com/praw-dev/praw/blob/v7.8.0/CHANGES.rst --- .../development/python-modules/praw/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 08fb2795bd17..c2e34a316578 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -1,10 +1,11 @@ { lib, - betamax, betamax-matchers, betamax-serializers, + betamax, buildPythonPackage, fetchFromGitHub, + flit-core, mock, prawcore, pytestCheckHook, @@ -16,19 +17,21 @@ buildPythonPackage rec { pname = "praw"; - version = "7.7.1"; - format = "setuptools"; + version = "7.8.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "praw-dev"; - repo = pname; + repo = "praw"; rev = "refs/tags/v${version}"; - hash = "sha256-L7wTHD/ypXVc8GMfl9u16VNb9caLJoXpaMEIzaVVUgo="; + hash = "sha256-oJkpFGJswG//5dnfdwkUdAkn8FOuqT/tDoTT5UncOGA="; }; - propagatedBuildInputs = [ + build-system = [ flit-core ]; + + dependencies = [ mock prawcore update-checker From ee6e844811304df2ce073cf5f690c0c891afbf74 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 21 Oct 2024 15:22:37 +0800 Subject: [PATCH 165/229] gweled: move to pkgs/by-name --- .../{games/gweled/default.nix => by-name/gw/gweled/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/gweled/default.nix => by-name/gw/gweled/package.nix} (100%) diff --git a/pkgs/games/gweled/default.nix b/pkgs/by-name/gw/gweled/package.nix similarity index 100% rename from pkgs/games/gweled/default.nix rename to pkgs/by-name/gw/gweled/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85dc76a96bfc..00809354c93d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34685,8 +34685,6 @@ with pkgs; gtypist = callPackage ../games/gtypist { }; - gweled = callPackage ../games/gweled { }; - harmonist = callPackage ../games/harmonist { }; hase = callPackage ../games/hase { }; From 17f0d2ac4035fdd8be36711a8bd85fa5bd7ac639 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 21 Oct 2024 15:23:04 +0800 Subject: [PATCH 166/229] gweled: format with nixfmt-rfc-style --- pkgs/by-name/gw/gweled/package.nix | 32 +++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gw/gweled/package.nix b/pkgs/by-name/gw/gweled/package.nix index f76085b77ddf..e2fe7f3a20ae 100644 --- a/pkgs/by-name/gw/gweled/package.nix +++ b/pkgs/by-name/gw/gweled/package.nix @@ -1,6 +1,17 @@ -{ lib, stdenv, fetchbzr, gettext -, gtk2, wrapGAppsHook3, autoreconfHook, pkg-config -, libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: +{ + lib, + stdenv, + fetchbzr, + gettext, + gtk2, + wrapGAppsHook3, + autoreconfHook, + pkg-config, + libmikmod, + librsvg, + libcanberra-gtk2, + hicolor-icon-theme, +}: stdenv.mkDerivation rec { pname = "gweled"; @@ -18,9 +29,20 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace "AM_GNU_GETTEXT_VERSION([0.19.8])" "AM_GNU_GETTEXT_VERSION([${gettext.version}])" ''; - nativeBuildInputs = [ wrapGAppsHook3 gettext autoreconfHook pkg-config ]; + nativeBuildInputs = [ + wrapGAppsHook3 + gettext + autoreconfHook + pkg-config + ]; - buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; + buildInputs = [ + gtk2 + libmikmod + librsvg + hicolor-icon-theme + libcanberra-gtk2 + ]; configureFlags = [ "--disable-setgid" ]; From 01bc8773ea6ec77c4466c0785ec70f32954c6cf5 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 21 Oct 2024 15:46:26 +0800 Subject: [PATCH 167/229] gweled: unstable-2021-02-11 -> 1.0-beta1 --- pkgs/by-name/gw/gweled/package.nix | 64 ++++++++++++++---------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/gw/gweled/package.nix b/pkgs/by-name/gw/gweled/package.nix index e2fe7f3a20ae..5263d9adab99 100644 --- a/pkgs/by-name/gw/gweled/package.nix +++ b/pkgs/by-name/gw/gweled/package.nix @@ -1,57 +1,51 @@ { lib, stdenv, - fetchbzr, - gettext, - gtk2, - wrapGAppsHook3, - autoreconfHook, + fetchgit, + meson, + ninja, pkg-config, - libmikmod, - librsvg, - libcanberra-gtk2, - hicolor-icon-theme, + wrapGAppsHook3, + desktop-file-utils, + clutter, + clutter-gtk, + gsound, + libgnome-games-support, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gweled"; - version = "unstable-2021-02-11"; + version = "1.0-beta1"; - src = fetchbzr { - url = "lp:gweled"; - rev = "108"; - hash = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo="; + src = fetchgit { + url = "https://git.launchpad.net/gweled"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-cm1z6l2tfYBFVFcvsnQ6cI3pQDnJMzn6SUC20gnBF5w="; }; - doCheck = false; - - postPatch = '' - substituteInPlace configure.ac --replace "AM_GNU_GETTEXT_VERSION([0.19.8])" "AM_GNU_GETTEXT_VERSION([${gettext.version}])" - ''; - nativeBuildInputs = [ - wrapGAppsHook3 - gettext - autoreconfHook + meson + ninja pkg-config + wrapGAppsHook3 + desktop-file-utils ]; buildInputs = [ - gtk2 - libmikmod - librsvg - hicolor-icon-theme - libcanberra-gtk2 + clutter + clutter-gtk + gsound + libgnome-games-support ]; configureFlags = [ "--disable-setgid" ]; - meta = with lib; { - description = "Bejeweled clone game"; + meta = { + description = "Puzzle game similar to Bejeweled or Diamond Mine"; mainProgram = "gweled"; homepage = "https://gweled.org"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; }; -} +}) From f6bdbd1605b17cfbd8af51ba68db779e130d54b3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 21 Oct 2024 08:53:29 +1000 Subject: [PATCH 168/229] shfmt: 3.9.0 -> 3.10.0 Diff: https://github.com/mvdan/sh/compare/v3.9.0...v3.10.0 --- pkgs/tools/text/shfmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index cceda4e15525..4cf05bd98a76 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shfmt"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - hash = "sha256-sYfMMKBqaYf3dfFcxE9awUMW+Hk7ps0/zpVFHul7GWM="; + hash = "sha256-UI/f5EC5OOvwrxP1wfnNgEpY1DCwmekQohTILRvM2Gc="; }; - vendorHash = "sha256-xm5qKSg7OU++mVtTeRwefL3J1Uf+a0nFdtlD7eulI8s="; + vendorHash = "sha256-p52IIzkAkcnqbxXBqQ92crYBrD84wQb/uVsTWX8EsPE="; subPackages = [ "cmd/shfmt" ]; From ab3e98d6b72ccf09802804ee85387fdbb3db14a6 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 21 Oct 2024 10:06:24 +0200 Subject: [PATCH 169/229] icu: temporary change to test rc version --- pkgs/development/libraries/icu/make-icu.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index d7fe46041607..7e137003b030 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -8,9 +8,9 @@ let pname = "icu4c"; - release = lib.replaceStrings [ "." ] [ "-" ] version; + #release = lib.replaceStrings [ "." ] [ "-" ] version; # To test rc versions of ICU replace the line above with the line below. - #release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version); + release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version); baseAttrs = { src = fetchurl { From ad22c7506d4444ceee1a3c741027dda5af839ee4 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 21 Oct 2024 16:02:13 +0800 Subject: [PATCH 170/229] gmrun: move to pkgs/by-name --- .../gm}/gmrun/find-config-file-in-system-etc-dir.patch | 0 pkgs/{applications/misc => by-name/gm}/gmrun/gcc43.patch | 0 .../misc => by-name/gm}/gmrun/gmrun-0.9.2-xdg.patch | 0 .../misc/gmrun/default.nix => by-name/gm/gmrun/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/misc => by-name/gm}/gmrun/find-config-file-in-system-etc-dir.patch (100%) rename pkgs/{applications/misc => by-name/gm}/gmrun/gcc43.patch (100%) rename pkgs/{applications/misc => by-name/gm}/gmrun/gmrun-0.9.2-xdg.patch (100%) rename pkgs/{applications/misc/gmrun/default.nix => by-name/gm/gmrun/package.nix} (100%) diff --git a/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch b/pkgs/by-name/gm/gmrun/find-config-file-in-system-etc-dir.patch similarity index 100% rename from pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch rename to pkgs/by-name/gm/gmrun/find-config-file-in-system-etc-dir.patch diff --git a/pkgs/applications/misc/gmrun/gcc43.patch b/pkgs/by-name/gm/gmrun/gcc43.patch similarity index 100% rename from pkgs/applications/misc/gmrun/gcc43.patch rename to pkgs/by-name/gm/gmrun/gcc43.patch diff --git a/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch b/pkgs/by-name/gm/gmrun/gmrun-0.9.2-xdg.patch similarity index 100% rename from pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch rename to pkgs/by-name/gm/gmrun/gmrun-0.9.2-xdg.patch diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/by-name/gm/gmrun/package.nix similarity index 100% rename from pkgs/applications/misc/gmrun/default.nix rename to pkgs/by-name/gm/gmrun/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85dc76a96bfc..a560dfb27043 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29502,8 +29502,6 @@ with pkgs; gitolite = callPackage ../applications/version-management/gitolite { }; - gmrun = callPackage ../applications/misc/gmrun { }; - goffice = callPackage ../development/libraries/goffice { }; gtkterm = callPackage ../tools/misc/gtkterm { }; From e7d4c70bebd6ed25075bf9c8d8d4f77802765a19 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 21 Oct 2024 16:02:22 +0800 Subject: [PATCH 171/229] gmrun: format with nixfmt-rfc-style --- pkgs/by-name/gm/gmrun/package.nix | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gm/gmrun/package.nix b/pkgs/by-name/gm/gmrun/package.nix index aa1a3cd46b69..fed1b3e15678 100644 --- a/pkgs/by-name/gm/gmrun/package.nix +++ b/pkgs/by-name/gm/gmrun/package.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, popt }: +{ + lib, + stdenv, + fetchurl, + glib, + gtk2, + pkg-config, + popt, +}: let version = "0.9.2"; @@ -14,17 +22,21 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib gtk2 popt ]; + buildInputs = [ + glib + gtk2 + popt + ]; doCheck = true; enableParallelBuilding = true; patches = [ - ./gcc43.patch - ./find-config-file-in-system-etc-dir.patch - ./gmrun-0.9.2-xdg.patch - ]; + ./gcc43.patch + ./find-config-file-in-system-etc-dir.patch + ./gmrun-0.9.2-xdg.patch + ]; meta = with lib; { description = "Gnome Completion-Run Utility"; From 860eea03372b8fe77f4a450953974b9f290be263 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 21 Oct 2024 16:14:18 +0800 Subject: [PATCH 172/229] gmrun: 0.9.2 -> 1.4w gmrun has been rewritten while maintaining compatibility with previous version. The original author acknowledged this fork and grant permission to modify the license, see https://github.com/wdlkmpx/gmrun/issues/2 --- .../find-config-file-in-system-etc-dir.patch | 18 ------ pkgs/by-name/gm/gmrun/gcc43.patch | 51 ---------------- pkgs/by-name/gm/gmrun/gmrun-0.9.2-xdg.patch | 58 ------------------- pkgs/by-name/gm/gmrun/package.nix | 51 +++++++--------- 4 files changed, 22 insertions(+), 156 deletions(-) delete mode 100644 pkgs/by-name/gm/gmrun/find-config-file-in-system-etc-dir.patch delete mode 100644 pkgs/by-name/gm/gmrun/gcc43.patch delete mode 100644 pkgs/by-name/gm/gmrun/gmrun-0.9.2-xdg.patch diff --git a/pkgs/by-name/gm/gmrun/find-config-file-in-system-etc-dir.patch b/pkgs/by-name/gm/gmrun/find-config-file-in-system-etc-dir.patch deleted file mode 100644 index 12d5370961c0..000000000000 --- a/pkgs/by-name/gm/gmrun/find-config-file-in-system-etc-dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur gmrun-0.9.2-orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc ---- gmrun-0.9.2-orig/src/prefs.cc 2019-05-02 12:56:39.025088361 +0200 -+++ gmrun-0.9.2/src/prefs.cc 2019-05-02 13:21:51.179778620 +0200 -@@ -31,9 +31,11 @@ - - Prefs::Prefs() - { -- string file_name = PACKAGE_DATA_DIR"/"; -- file_name += GMRUNRC; -- init(file_name); -+ string file_name = "/etc/" GMRUNRC; -+ if (!init(file_name)) { -+ file_name = PACKAGE_DATA_DIR "/" GMRUNRC;; -+ init(file_name); -+ } - - file_name = getenv("HOME"); - if (!file_name.empty()) { diff --git a/pkgs/by-name/gm/gmrun/gcc43.patch b/pkgs/by-name/gm/gmrun/gcc43.patch deleted file mode 100644 index 60e4338e893d..000000000000 --- a/pkgs/by-name/gm/gmrun/gcc43.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/src/gtkcompletionline.cc.orig 2003-11-16 11:55:07.000000000 +0100 -+++ a/src/gtkcompletionline.cc 2008-05-08 08:51:22.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - using namespace std; - ---- a/src/ci_string.h.orig 2001-05-16 16:39:31.000000000 +0200 -+++ a/src/ci_string.h 2008-05-08 08:51:33.000000000 +0200 -@@ -7,6 +7,7 @@ - #define __CI_STRING_H__ - - #include -+#include - #include - - struct ci_char_traits : public std::char_traits ---- a/src/prefs.cc.orig 2002-08-16 12:48:22.000000000 +0200 -+++ a/src/prefs.cc 2008-05-08 08:51:54.000000000 +0200 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - ---- a/src/main.cc.orig 2003-11-16 11:55:07.000000000 +0100 -+++ a/src/main.cc 2008-05-08 09:03:11.000000000 +0200 -@@ -14,6 +14,7 @@ - #include - - #include -+#include - #include - #include - #include - ---- a/src/gtkcompletionline.cc.orig 2009-06-19 22:38:14.000000000 +0400 -+++ a/src/gtkcompletionline.cc 2009-06-19 22:37:14.000000000 +0400 -@@ -376,7 +377,7 @@ - return 0; - } - --int my_alphasort(const void* va, const void* vb) { -+int my_alphasort(const dirent** va, const dirent** vb) { - const struct dirent** a = (const struct dirent**)va; - const struct dirent** b = (const struct dirent**)vb; diff --git a/pkgs/by-name/gm/gmrun/gmrun-0.9.2-xdg.patch b/pkgs/by-name/gm/gmrun/gmrun-0.9.2-xdg.patch deleted file mode 100644 index b5cd41a3c5b4..000000000000 --- a/pkgs/by-name/gm/gmrun/gmrun-0.9.2-xdg.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -ur a/src/history.cc src/history.cc ---- a/src/history.cc 2002-08-17 15:19:31.000000000 +0200 -+++ a/src/history.cc 2012-06-04 23:42:35.314653414 +0200 -@@ -24,8 +24,15 @@ - HistoryFile::HistoryFile() - { - m_file_entries = 0; -- m_filename = g_get_home_dir(); -- m_filename += "/.gmrun_history"; -+ const char* filename = getenv("XDG_CACHE_HOME"); -+ if (filename != 0 && *filename != '\0') { -+ m_filename = filename; -+ m_filename += "/gmrun_history"; -+ } -+ else { -+ m_filename = g_get_home_dir(); -+ m_filename += "/.gmrun_history"; -+ } - m_current = 0; - m_default_set = false; - read_the_file(); -diff -ur a/src/prefs.cc src/prefs.cc ---- a/src/prefs.cc 2012-06-04 22:35:00.671949439 +0200 -+++ a/src/prefs.cc 2012-06-04 23:24:24.184445962 +0200 -@@ -35,12 +35,29 @@ - file_name += GMRUNRC; - init(file_name); - -- file_name = getenv("HOME"); -- if (!file_name.empty()) { -+ file_name.clear(); -+ const char* filename = getenv("XDG_CONFIG_HOME"); -+ if (filename != 0 && *filename != '\0') { -+ file_name = filename; - string::iterator i = file_name.end() - 1; -- if (*i == '/') file_name.erase(i); -- file_name += "/."; -+ if (*i != '/') { -+ file_name += '/'; -+ } - file_name += GMRUNRC; -+ } -+ else { -+ filename = getenv("HOME"); -+ if (filename != 0 && *filename != '\0') { -+ file_name = filename; -+ string::iterator i = file_name.end() - 1; -+ if (*i != '/') { -+ file_name += '/'; -+ } -+ file_name += '.'; -+ file_name += GMRUNRC; -+ } -+ } -+ if (!file_name.empty()) { - init(file_name); - } - } diff --git a/pkgs/by-name/gm/gmrun/package.nix b/pkgs/by-name/gm/gmrun/package.nix index fed1b3e15678..1a87c20d12e6 100644 --- a/pkgs/by-name/gm/gmrun/package.nix +++ b/pkgs/by-name/gm/gmrun/package.nix @@ -1,44 +1,37 @@ { lib, stdenv, - fetchurl, - glib, - gtk2, + fetchFromGitHub, pkg-config, - popt, + wrapGAppsHook3, }: -let - version = "0.9.2"; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmrun"; - inherit version; + version = "1.4w"; - src = fetchurl { - url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz"; - sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; + src = fetchFromGitHub { + owner = "wdlkmpx"; + repo = "gmrun"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-sp+Atod9ZKVF8sxNWIMrlewqZAGnoLo2mZUNkCtSkec="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - glib - gtk2 - popt + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 ]; doCheck = true; enableParallelBuilding = true; - patches = [ - ./gcc43.patch - ./find-config-file-in-system-etc-dir.patch - ./gmrun-0.9.2-xdg.patch - ]; + # Problem with component size on wayland + preFixup = '' + gappsWrapperArgs+=(--set-default GDK_BACKEND x11) + ''; - meta = with lib; { + meta = { description = "Gnome Completion-Run Utility"; longDescription = '' A simple program which provides a "run program" window, featuring a bash-like TAB completion. @@ -46,10 +39,10 @@ stdenv.mkDerivation rec { Also, supports CTRL-R / CTRL-S / "!" for searching through history. Running commands in a terminal with CTRL-Enter. URL handlers. ''; - homepage = "https://sourceforge.net/projects/gmrun/"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.all; + homepage = "https://github.com/wdlkmpx/gmrun"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; mainProgram = "gmrun"; }; -} +}) From 9455dd1c9d043b2f111716d94a18905d0f74e14d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= Date: Mon, 21 Oct 2024 01:19:46 +0200 Subject: [PATCH 173/229] nushell: 0.99.0 -> 0.99.1 --- pkgs/shells/nushell/default.nix | 8 ++++---- pkgs/shells/nushell/plugins/formats.nix | 2 +- pkgs/shells/nushell/plugins/gstat.nix | 2 +- pkgs/shells/nushell/plugins/highlight.nix | 8 ++++---- pkgs/shells/nushell/plugins/polars.nix | 2 +- pkgs/shells/nushell/plugins/query.nix | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 52c211b46bba..0bb21e3cc859 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -21,7 +21,7 @@ }: let - version = "0.99.0"; + version = "0.99.1"; in rustPlatform.buildRustPackage { @@ -31,11 +31,11 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "nushell"; repo = "nushell"; - rev = version; - hash = "sha256-X/+i4CSGAkNQ7oW1kbDUj/g6Hbrf17IXwpNPVmkE4tU="; + rev = "refs/tags/${version}"; + hash = "sha256-amPQJW8ofSMh2cQQrqPNOp/p33KwPNX7fpZ4SiJGQHU="; }; - cargoHash = "sha256-6cGzEZdk0zgrRRTHlnlEqZg8AcoUi2GR3wZ3iq4WGKA="; + cargoHash = "sha256-AblXOeSJGqrZY5aRzdst9F+ZB++/3Adu7Kri5lDsDH8="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ python3 ] diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 057bded72d65..1dd473260cf3 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-dfJ1EgbTygLky2sE6nW5fYiZDAfsrTb4Qw18u1nFNYY="; + cargoHash = "sha256-9wKJkZnbM8Zt90LlSTd9hb40Xuy2cOBThwUWyS2NuaI="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 4f363d8b6cb0..b0c1cd66ed15 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-1Ct3VjqFuYFVOwb9tNrbEmz0PbIXdQhZqG9hUnYIk2s="; + cargoHash = "sha256-Z2A6DaARkffU7FABuLSTNeDLClRr4V21bD76ns8ueAM="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix index 19f70ca8d81e..fbd37e432b49 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/shells/nushell/plugins/highlight.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_highlight"; - version = "1.3.1+0.98.0"; + version = "1.3.2+0.99.0"; src = fetchFromGitHub { repo = "nu-plugin-highlight"; owner = "cptpiepmatz"; - rev = "v${version}"; - hash = "sha256-G669d13JBLdy/1RUXtgZkiQhjgn3SqV34VlLbQoVOzc="; + rev = "refs/tags/v${version}"; + hash = "sha256-rYS5Nqk+No1BhmEPzl+MX+aCH8fzHqdp8U8PKYSWVcc="; }; - cargoHash = "sha256-ZZyxRiAaazLIwWtl9f30yp94HiKao3ZlYJ6B/vK14jc="; + cargoHash = "sha256-VHx+DLS+v4p++KI+ZLzJpFk4A5Omwy6E0vJ/lgP3pC0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ ]; diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index 924587633972..7a290bce3f7e 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-Lwmz3OXezzUzNG4PLCI1W/yvg4hfJAdNgA/2RI3nRUs="; + cargoHash = "sha256-bpZphNYHx9LkEu9JlGrIkks2M99JRjc+skY8MqPHMJA="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index f6ad70169702..4746c01afc50 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-M55nMYsTlmJZWXaNPZJ3M7w34cxpZx49Ap+u1Pr/Htw="; + cargoHash = "sha256-4oSmt92nMIaSV7hLEBv5GIDYVmtT96O4qktO8ovdcBQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = From fa25edac5b9a0621890ee927d532a2cc99bad878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= Date: Mon, 21 Oct 2024 09:58:23 +0200 Subject: [PATCH 174/229] nushell: fix build on darwin --- pkgs/shells/nushell/plugins/default.nix | 4 ++-- pkgs/shells/nushell/plugins/highlight.nix | 7 ++++++- pkgs/shells/nushell/plugins/units.nix | 7 ++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix index 7aa271e82e3b..f0f998be7443 100644 --- a/pkgs/shells/nushell/plugins/default.nix +++ b/pkgs/shells/nushell/plugins/default.nix @@ -7,7 +7,7 @@ lib.makeScope newScope (self: with self; { query = callPackage ./query.nix { inherit IOKit CoreFoundation; }; regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release."; net = callPackage ./net.nix { inherit IOKit CoreFoundation; }; - units = callPackage ./units.nix { }; - highlight = callPackage ./highlight.nix { }; + units = callPackage ./units.nix { inherit IOKit Foundation; }; + highlight = callPackage ./highlight.nix { inherit IOKit Foundation; }; dbus = callPackage ./dbus.nix { inherit dbus; nushell_plugin_dbus = self.dbus; }; }) diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix index fbd37e432b49..a63ba5e7f82f 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/shells/nushell/plugins/highlight.nix @@ -5,6 +5,8 @@ pkg-config, nix-update-script, fetchFromGitHub, + IOKit, + Foundation, }: rustPlatform.buildRustPackage rec { @@ -20,7 +22,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VHx+DLS+v4p++KI+ZLzJpFk4A5Omwy6E0vJ/lgP3pC0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = [ ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + Foundation + ]; cargoBuildFlags = [ "--package nu_plugin_highlight" ]; checkPhase = '' diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix index ffb231c2bec0..0bc8304a49bd 100644 --- a/pkgs/shells/nushell/plugins/units.nix +++ b/pkgs/shells/nushell/plugins/units.nix @@ -5,6 +5,8 @@ pkg-config, nix-update-script, fetchFromGitHub, + IOKit, + Foundation, }: rustPlatform.buildRustPackage rec { @@ -20,7 +22,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pxA+6E5luFHq/N0K/8Xk2LapwDnPqDUEpTYqP/jcc3s="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = [ ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + Foundation + ]; cargoBuildFlags = [ "--package nu_plugin_units" ]; passthru.updateScript = nix-update-script { }; From a33965600a4d58ba10e4060fdcd86792e2047e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= Date: Mon, 21 Oct 2024 10:15:17 +0200 Subject: [PATCH 175/229] nushellPlugins.net: consistent naming --- pkgs/shells/nushell/plugins/net.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index f0af1af66081..755285e5509b 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -9,7 +9,7 @@ }: rustPlatform.buildRustPackage rec { - pname = "nu-plugin-net"; + pname = "nushell_plugin_net"; version = "1.8.0"; src = fetchFromGitHub { From 7214c817dd7692aefc29dcafff57b84615f738fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 08:32:45 +0000 Subject: [PATCH 176/229] merge-ut-dictionaries: 0-unstable-2024-09-09 -> 0-unstable-2024-10-13 --- pkgs/by-name/me/merge-ut-dictionaries/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/merge-ut-dictionaries/package.nix b/pkgs/by-name/me/merge-ut-dictionaries/package.nix index ebe05f2fd1fd..130a89016a48 100644 --- a/pkgs/by-name/me/merge-ut-dictionaries/package.nix +++ b/pkgs/by-name/me/merge-ut-dictionaries/package.nix @@ -24,13 +24,13 @@ assert lib.assertMsg (dictionaries != [ ]) "merge-ut-dictionaries needs at least stdenvNoCC.mkDerivation { pname = "merge-ut-dictionaries"; - version = "0-unstable-2024-09-09"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "merge-ut-dictionaries"; - rev = "35dfcca5c8657f2bf78bc000baa349c322ecb771"; - hash = "sha256-s6m430nXrG5v6iA+Fp2CKDPfFoAZirw/c3WahLrsaL4="; + rev = "4e08ad0bc0e493a35e9408edf963a3e77257b4cf"; + hash = "sha256-o+4a2FdMfKnCrZ7b+gbVwCBxs72M0QY4C8EnNyBZqXU="; }; nativeBuildInputs = [ python3 ]; From 4112fd7ab9bc4b4f8015df87a7c1bbab7af2d0ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 08:35:19 +0000 Subject: [PATCH 177/229] mozcdic-ut-neologd: 0-unstable-2024-07-28 -> 0-unstable-2024-10-12 --- pkgs/by-name/mo/mozcdic-ut-neologd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix index 686fe1e9fefb..a0c5b3761b59 100644 --- a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-neologd"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-neologd"; - rev = "b7035b88db25ad1a933f05a33f193711c6c3b2db"; - hash = "sha256-JPTrWaDtdNs/Z0uLRwaS8Qc/l4/Y7NtwLanivyefXnk="; + rev = "d37f0514dd8c4057f2f94a92617ac7994ece3519"; + hash = "sha256-Vj/5SNe5kC07qQRAOuqRZScoOpUXjLdX0JsakNm9tfk="; }; installPhase = '' From 2534d1c5295d3f6fd2c95092f369974e540f5b0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 08:36:47 +0000 Subject: [PATCH 178/229] mozcdic-ut-edict2: 0-unstable-2024-07-28 -> 0-unstable-2024-10-12 --- pkgs/by-name/mo/mozcdic-ut-edict2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix b/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix index 37551d7e0d04..356d4822b3c6 100644 --- a/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-edict2"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-edict2"; - rev = "b2112277d0d479b9218f42772356da3601b3e8cf"; - hash = "sha256-DIIp8FooWxyHMrQmq+2KUGEmYHKy+H6NtHrvRldxXqc="; + rev = "f68299b7113080d5e1981c97db490b3075874445"; + hash = "sha256-PdHGVudApWgQaxvAsdVui1XQR+4JHjGkhGHfcwL3wjc="; }; installPhase = '' From 7eb09a2082c07f2f3e388f3abe785ba157a9d286 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 08:37:27 +0000 Subject: [PATCH 179/229] mozcdic-ut-skk-jisyo: 0-unstable-2024-07-27 -> 0-unstable-2024-10-12 --- pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix b/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix index 264490ad6126..41852d7a2150 100644 --- a/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-skk-jisyo"; - version = "0-unstable-2024-07-27"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-skk-jisyo"; - rev = "7300f19e6a3f27334ed7af64589de8782549a13f"; - hash = "sha256-LJ1rP+uyh8K3IWCgKMDYt0EwEDiQqQL+wBdQCFbZM/k="; + rev = "f34f5801b1f29cff34633e4a03b887702f98ed54"; + hash = "sha256-W5ZZDSKvN5fLsFyrEKGMQl/S4q9WGLmewPqofztOPe0="; }; installPhase = '' From df56fd90bfd678cb596245317c71043de5e16887 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 21 Oct 2024 16:57:32 +0800 Subject: [PATCH 180/229] lazpaint: move to pkgs/by-name --- .../lazpaint/default.nix => by-name/la/lazpaint/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/graphics/lazpaint/default.nix => by-name/la/lazpaint/package.nix} (100%) diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/by-name/la/lazpaint/package.nix similarity index 100% rename from pkgs/applications/graphics/lazpaint/default.nix rename to pkgs/by-name/la/lazpaint/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85dc76a96bfc..aaef6e913f9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30550,8 +30550,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL; }; - lazpaint = callPackage ../applications/graphics/lazpaint { }; - caps = callPackage ../applications/audio/caps { }; lbdb = callPackage ../tools/misc/lbdb { }; From 028da5a73bab6f2a7d3097d187581e9c12ebb671 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 21 Oct 2024 17:05:42 +0800 Subject: [PATCH 181/229] lazpaint: format with nixfmt-rfc-style --- pkgs/by-name/la/lazpaint/package.nix | 37 +++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/la/lazpaint/package.nix b/pkgs/by-name/la/lazpaint/package.nix index 18f4e8de7fed..ad65c005905b 100644 --- a/pkgs/by-name/la/lazpaint/package.nix +++ b/pkgs/by-name/la/lazpaint/package.nix @@ -1,6 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib -, atk, gtk2, libX11, gdk-pixbuf, python3 -, makeWrapper +{ + lib, + stdenv, + fetchFromGitHub, + lazarus, + fpc, + pango, + cairo, + glib, + atk, + gtk2, + libX11, + gdk-pixbuf, + python3, + makeWrapper, }: let @@ -16,7 +28,8 @@ let rev = "v8.0"; hash = "sha256-5L05eGVN+xncd0/0XLFN6EL2ux4aAOsiU0BMoy0dKgg="; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "lazpaint"; version = "7.2.2-unstable-2024-01-20"; @@ -27,9 +40,21 @@ in stdenv.mkDerivation rec { hash = "sha256-LaOTJiS+COJUlyJiN9H2kEKwv5lbJqOHsUXOnb+IQFA="; }; - nativeBuildInputs = [ lazarus fpc makeWrapper ]; + nativeBuildInputs = [ + lazarus + fpc + makeWrapper + ]; - buildInputs = [ pango cairo glib atk gtk2 libX11 gdk-pixbuf ]; + buildInputs = [ + pango + cairo + glib + atk + gtk2 + libX11 + gdk-pixbuf + ]; NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; From 863fb6de5ea88c079ee196951ac660da7eeffd95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 09:30:18 +0000 Subject: [PATCH 182/229] mozcdic-ut-jawiki: 0-unstable-2024-09-27 -> 0-unstable-2024-10-12 --- pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix b/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix index e7ab1d99a11c..b17b50058416 100644 --- a/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-jawiki"; - version = "0-unstable-2024-09-27"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-jawiki"; - rev = "773cc08e71c4daa3c06fc577853f715a2bb4d9aa"; - hash = "sha256-TDZvB8/ZrUtkAbCr3vMfyFfhQ4v5SYWEqPNjuGB1Ve4="; + rev = "a91b76a05c4187420e46ead1cc70c2267148004b"; + hash = "sha256-EuMxFSiwSFkcpetsQpuQU6yjX4BhSmS1LbVuLacw4w0="; }; installPhase = '' From b2d525e17244a61c674ae17a858901f69a8b5276 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Oct 2024 11:34:40 +0200 Subject: [PATCH 183/229] python312Packages.optimistix: 0.0.8 -> 0.0.9 Diff: https://github.com/patrick-kidger/optimistix/compare/refs/tags/v0.0.8...v0.0.9 Changelog: https://github.com/patrick-kidger/optimistix/releases/tag/v0.0.9 --- pkgs/development/python-modules/optimistix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix index a7cb8b7c5e7e..5e2809133764 100644 --- a/pkgs/development/python-modules/optimistix/default.nix +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "optimistix"; - version = "0.0.8"; + version = "0.0.9"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "optimistix"; rev = "refs/tags/v${version}"; - hash = "sha256-0ehNApiBoiAb8LFBW81ZCRPsjTVQG8zRTVSAp7oHF8w="; + hash = "sha256-s8MRPyPObTpgLRm4bxU8F4Su7FKH+MHqtQsxIHb/DN4="; }; build-system = [ hatchling ]; From e3acda6ad2a499a0b678140fd1956bc0401925d4 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 21 Oct 2024 12:06:01 +0200 Subject: [PATCH 184/229] iosevka-comfy: 2.0.0 -> 2.1.0 --- pkgs/data/fonts/iosevka/comfy.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index 65d44c25e9d0..c920a5c677d6 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -20,12 +20,12 @@ let "comfy-wide-motion-fixed" # Slab | Wide | Monospaced | No | "comfy-wide-motion-duo" # | Slab | Wide | Duospaced | Yes | ]; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "protesilaos"; repo = "iosevka-comfy"; rev = version; - sha256 = "sha256-wDcBaNXIzOQ3/LBuW3YUnx/fjtJMeI+jsxLRBlsd1M0="; + sha256 = "sha256-z9OlxeD88HuPJF88CsAy3vd1SFpJF1qh5c/0AIeMA7o="; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; makeIosevkaFont = set: @@ -40,11 +40,11 @@ let src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; - rev = "v31.3.0"; - hash = "sha256-WrRxVrBJeyUwv0/DYTIHLi52+k2PilC7ay0tc5yq3Pw="; + rev = "v31.9.1"; + hash = "sha256-eAC4afBfHfiteYCzBNGFG2U/oCA7C5CdUlQVSO9Dg6E="; }; - npmDepsHash = "sha256-xw0GA1aIA/J5hfLQBSE+GJzXfbfWQI2k2pYdenlM9NY="; + npmDepsHash = "sha256-xwGR21+CpZRFdZYz8SQrSf1tkp3fjGudoMmP5TGgEe8="; meta = with lib; { inherit (src.meta) homepage; From 3d8ab12ae1e6035c61ec86185fa205ae5399a607 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 21 Oct 2024 18:20:33 +0800 Subject: [PATCH 185/229] lazpaint: 7.2.2-unstable-2024-01-20 -> 7.2.2-unstable-2024-01-23; switch to qt5 --- pkgs/by-name/la/lazpaint/package.nix | 64 ++++++++++++++-------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/la/lazpaint/package.nix b/pkgs/by-name/la/lazpaint/package.nix index ad65c005905b..6c9d1149a159 100644 --- a/pkgs/by-name/la/lazpaint/package.nix +++ b/pkgs/by-name/la/lazpaint/package.nix @@ -2,17 +2,13 @@ lib, stdenv, fetchFromGitHub, - lazarus, + lazarus-qt, fpc, - pango, - cairo, - glib, - atk, - gtk2, - libX11, - gdk-pixbuf, + autoPatchelfHook, + libsForQt5, + libqt5pas, + xorg, python3, - makeWrapper, }: let @@ -31,62 +27,64 @@ let in stdenv.mkDerivation rec { pname = "lazpaint"; - version = "7.2.2-unstable-2024-01-20"; + version = "7.2.2-unstable-2024-01-23"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; - rev = "fe54c2e2561c51218a5a2755842ce3fc2e0ebb35"; - hash = "sha256-LaOTJiS+COJUlyJiN9H2kEKwv5lbJqOHsUXOnb+IQFA="; + rev = "45a7a471d531d6adb5ee557ff917a99af76e92f1"; + hash = "sha256-KgCxSK72Ow29T58mlcYCJiS4D0Ov2/p37c1FSNgKZew="; }; nativeBuildInputs = [ - lazarus + lazarus-qt fpc - makeWrapper + libsForQt5.wrapQtAppsHook + autoPatchelfHook ]; buildInputs = [ - pango - cairo - glib - atk - gtk2 - libX11 - gdk-pixbuf + libsForQt5.qtbase + libqt5pas ]; - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + runtimeDependencies = [ + xorg.libX11 + ]; preConfigure = '' - patchShebangs configure + patchShebangs --build configure ''; buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap cp -r --no-preserve=mode ${bgracontrols} bgracontrols - lazbuild --lazarusdir=${lazarus}/share/lazarus \ - --build-mode=Release \ + lazbuild --lazarusdir=${lazarus-qt}/share/lazarus \ + --build-mode=ReleaseQt5 \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ bgracontrols/bgracontrols.lpk \ lazpaintcontrols/lazpaintcontrols.lpk \ lazpaint/lazpaint.lpi + + runHook postBuild ''; - postBuild = '' - # Python is needed for scripts - wrapProgram $out/bin/lazpaint \ - --prefix PATH : ${lib.makeBinPath [ python3 ]} + # Python is needed for scripts + preFixup = '' + qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ python3 ]}) ''; - meta = with lib; { + meta = { description = "Image editor like PaintBrush or Paint.Net"; homepage = "https://lazpaint.github.io"; downloadPage = "https://github.com/bgrabitmap/lazpaint/"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ aleksana ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; mainProgram = "lazpaint"; }; } From 4a6b6e7e0559b888ed6ba6348619141bf324eb7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 10:51:07 +0000 Subject: [PATCH 186/229] lunatask: 2.0.9 -> 2.0.11 --- pkgs/applications/misc/lunatask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 7471d7ce5e97..82b30866f842 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "2.0.9"; + version = "2.0.11"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-tV3giMBF3DN8Aop1B1D7pGp3HYPMQlcZ52JrOhxFrEE="; + sha256 = "sha256-aGU8WsC3jLg8xOF7HzW6oGxizBa3afiT+qS1oyi1r7o="; }; appimageContents = appimageTools.extractType2 { From d1e6b4455683ffc2dfdf5a0cf56a337004e4db36 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Oct 2024 10:22:36 +0200 Subject: [PATCH 187/229] exo: 0-unstable-2024-10-09 -> 0-unstable-2024-10-21 --- pkgs/by-name/ex/exo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index fb2bfbe7b18a..a346ef87102f 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication { pname = "exo"; - version = "0-unstable-2024-10-09"; + version = "0-unstable-2024-10-21"; pyproject = true; src = fetchFromGitHub { owner = "exo-explore"; repo = "exo"; - rev = "c1a26cd7fa447b2802a4bececfd7cb9d316c0600"; - hash = "sha256-jtcfGmk03Yf5IaswIvi6N9oMXzNPYlJBf4WMLkogUVo="; + rev = "82a708f974b9a720e127c38a383f22e129be6373"; + hash = "sha256-BhhcYOipdLAviTzWRdNLMMPiND4mYv9Mkn8/yxo0vXY="; }; build-system = with python3Packages; [ setuptools ]; From 1051d82fa8fd02c440ddb9b91749e82c3b5b3ab2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Oct 2024 12:57:15 +0200 Subject: [PATCH 188/229] python312Packages.lineax: 0.0.6 -> 0.0.7 Diff: https://github.com/patrick-kidger/lineax/compare/refs/tags/v0.0.6...v0.0.7 Changelog: https://github.com/patrick-kidger/lineax/releases/tag/v0.0.7 --- pkgs/development/python-modules/lineax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lineax/default.nix b/pkgs/development/python-modules/lineax/default.nix index 8f547bc1d9d7..2680211c58fa 100644 --- a/pkgs/development/python-modules/lineax/default.nix +++ b/pkgs/development/python-modules/lineax/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "lineax"; - version = "0.0.6"; + version = "0.0.7"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "lineax"; rev = "refs/tags/v${version}"; - hash = "sha256-rM3H+q75F98eEIJkEszWgxD5C5vGK5RlYtVv8GD/VC0="; + hash = "sha256-HcFI55Ww/y7ZaUkawj7xWSb7VDTBec3u0ulWL8kTm2c="; }; build-system = [ hatchling ]; From 56444f5f6a71400d7e34ca983ff7af0ef2765e4a Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 21 Oct 2024 12:08:21 +0100 Subject: [PATCH 189/229] factorio: 1.1.110 -> 2.0.7 --- pkgs/games/factorio/versions.json | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 60e88c026f9d..5d7f07777274 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,20 +2,20 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.110.tar.xz", + "name": "factorio_alpha_x64-2.0.7.tar.xz", "needsAuth": true, - "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", + "sha256": "14gsl01j06d0cfii2zsp0njak3hf8kgb9ig9i3prbch507bmfw6q", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.7/alpha/linux64", + "version": "2.0.7" }, "stable": { - "name": "factorio_alpha_x64-1.1.110.tar.xz", + "name": "factorio_alpha_x64-2.0.7.tar.xz", "needsAuth": true, - "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", + "sha256": "14gsl01j06d0cfii2zsp0njak3hf8kgb9ig9i3prbch507bmfw6q", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.7/alpha/linux64", + "version": "2.0.7" } }, "demo": { @@ -38,20 +38,20 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.110.tar.xz", + "name": "factorio_headless_x64-2.0.7.tar.xz", "needsAuth": false, - "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", + "sha256": "0qi7vypm4iy3cp9qyl3cvvm606g9g37sa2pls4y7glxiwng4m9p6", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/headless/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.7/headless/linux64", + "version": "2.0.7" }, "stable": { - "name": "factorio_headless_x64-1.1.110.tar.xz", + "name": "factorio_headless_x64-2.0.7.tar.xz", "needsAuth": false, - "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", + "sha256": "0qi7vypm4iy3cp9qyl3cvvm606g9g37sa2pls4y7glxiwng4m9p6", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/headless/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.7/headless/linux64", + "version": "2.0.7" } } } From 5579fe359c6969b6587d68a66f2c42dab46d5f20 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 21 Oct 2024 12:13:58 +0100 Subject: [PATCH 190/229] factorio-space-age: init at 2.0.7 --- pkgs/games/factorio/default.nix | 4 +++- pkgs/games/factorio/update.py | 1 + pkgs/games/factorio/versions.json | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index aff5d11b3021..4775ba5b1635 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -29,7 +29,8 @@ assert releaseType == "alpha" || releaseType == "headless" - || releaseType == "demo"; + || releaseType == "demo" + || releaseType == "expansion"; let @@ -272,6 +273,7 @@ let cp -a doc-html $out/share/factorio ''; }; + expansion = alpha; }; in diff --git a/pkgs/games/factorio/update.py b/pkgs/games/factorio/update.py index c234b36264e8..6da1d9dfee7d 100755 --- a/pkgs/games/factorio/update.py +++ b/pkgs/games/factorio/update.py @@ -55,6 +55,7 @@ SYSTEMS = [ RELEASE_TYPES = [ ReleaseType("alpha", needs_auth=True), + ReleaseType("expansion", needs_auth=True), ReleaseType("demo"), ReleaseType("headless"), ] diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 5d7f07777274..3c4139657b68 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -36,6 +36,24 @@ "version": "1.1.110" } }, + "expansion": { + "experimental": { + "name": "factorio_expansion_x64-2.0.7.tar.xz", + "needsAuth": true, + "sha256": "1zvk1skkm37kyikq4l1q285l8zhxc6lqvs1x2y2ccxwd4cdm6r96", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.7/expansion/linux64", + "version": "2.0.7" + }, + "stable": { + "name": "factorio_expansion_x64-2.0.7.tar.xz", + "needsAuth": true, + "sha256": "1zvk1skkm37kyikq4l1q285l8zhxc6lqvs1x2y2ccxwd4cdm6r96", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.7/expansion/linux64", + "version": "2.0.7" + } + }, "headless": { "experimental": { "name": "factorio_headless_x64-2.0.7.tar.xz", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 400f04bdbb59..d8e7bce73d22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34543,6 +34543,10 @@ with pkgs; factorio-demo = factorio.override { releaseType = "demo"; }; + factorio-space-age = factorio.override { releaseType = "expansion"; }; + + factorio-space-age-experimental = factorio.override { releaseType = "expansion"; experimental = true; }; + factorio-mods = callPackage ../games/factorio/mods.nix { }; factorio-utils = callPackage ../games/factorio/utils.nix { }; From 19865ae53ac2266dcfe5dc3a079c87329b858fb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 11:44:41 +0000 Subject: [PATCH 191/229] tflint-plugins.tflint-ruleset-aws: 0.32.0 -> 0.34.0 --- .../tools/analysis/tflint-plugins/tflint-ruleset-aws.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index d9a851d09824..f29d54a9eefe 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.32.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-sgAr4kUBjKIH+DgI5XqH/Zs3uL0yiYwlBa6vO0m++xM="; + hash = "sha256-osQhLnOuJQqyKm24mgaEuYKy69cPvnR3XHU0JgVKA84="; }; - vendorHash = "sha256-B2QFjJKwfQYZP8ypiv7bNkFNr3ejP42WA/bmv4Jz46c="; + vendorHash = "sha256-mhc8HJG+sI8pZG/D+91+pyi0RGK0WfZV6ZNuH1bUfhk="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' From b93bbf6406ab5cb00b5e0bf0ceb321462c8266bd Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 21 Oct 2024 14:49:53 +0300 Subject: [PATCH 192/229] nixos/nginx: remove rejectSSL assertion --- nixos/modules/services/web-servers/nginx/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 1a58662adafa..af7885c30afd 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -1150,14 +1150,6 @@ in ''; } - { - assertion = any (host: host.rejectSSL) (attrValues virtualHosts) -> versionAtLeast cfg.package.version "1.19.4"; - message = '' - services.nginx.virtualHosts..rejectSSL requires nginx version - 1.19.4 or above; see the documentation for services.nginx.package. - ''; - } - { assertion = all (host: !(host.enableACME && host.useACMEHost != null)) (attrValues virtualHosts); message = '' From 77514565aef4cc2bd8fab96949c34317f2c687a6 Mon Sep 17 00:00:00 2001 From: L-Trump Date: Mon, 21 Oct 2024 19:55:25 +0800 Subject: [PATCH 193/229] snipaste: 2.9.2-Beta -> 2.10.2 --- pkgs/by-name/sn/snipaste/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix index 45b35d04d68e..ebdcd47936b5 100644 --- a/pkgs/by-name/sn/snipaste/package.nix +++ b/pkgs/by-name/sn/snipaste/package.nix @@ -5,18 +5,21 @@ }: appimageTools.wrapType2 rec { pname = "snipaste"; - version = "2.9.2-Beta"; + version = "2.10.2"; src = fetchurl { url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage"; - hash = "sha256-oV69uABjzkbQdwb+1wRRxszhrwI4uyzhQZ4aXBnyeo8="; + hash = "sha256-u9e2d9ZpHDbDIsFkseOdJX2Kspn9TkhFfZxbeielDA8="; }; meta = { description = "Screenshot tools"; homepage = "https://www.snipaste.com/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + ltrump + ]; mainProgram = "snipaste"; platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; From 117bafd4d2e40cbfe0ce863bf5dec4e18c3fa379 Mon Sep 17 00:00:00 2001 From: L-Trump Date: Mon, 21 Oct 2024 19:56:07 +0800 Subject: [PATCH 194/229] snipaste: add updateScript --- pkgs/by-name/sn/snipaste/package.nix | 2 ++ pkgs/by-name/sn/snipaste/update.sh | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100755 pkgs/by-name/sn/snipaste/update.sh diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix index ebdcd47936b5..12cf92be8f51 100644 --- a/pkgs/by-name/sn/snipaste/package.nix +++ b/pkgs/by-name/sn/snipaste/package.nix @@ -12,6 +12,8 @@ appimageTools.wrapType2 rec { hash = "sha256-u9e2d9ZpHDbDIsFkseOdJX2Kspn9TkhFfZxbeielDA8="; }; + passthru.updateScript = ./update.sh; + meta = { description = "Screenshot tools"; homepage = "https://www.snipaste.com/"; diff --git a/pkgs/by-name/sn/snipaste/update.sh b/pkgs/by-name/sn/snipaste/update.sh new file mode 100755 index 000000000000..1c6843fe6839 --- /dev/null +++ b/pkgs/by-name/sn/snipaste/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts + +latestTag=$(curl -sSfL https://www.snipaste.com/linux_version | jq -r ".subject") +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; snipaste.version" | tr -d '"') + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +prefetch=$(nix-prefetch-url "https://download.snipaste.com/archives/Snipaste-$latestVersion-x86_64.AppImage") +hash=$(nix-hash --type sha256 --to-sri "$prefetch") +update-source-version snipaste "$latestVersion" "$hash" --ignore-same-version From b32fbba3f6260aaa9f6b05eb17e792ef3819e8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20Bjarki=20Bogason?= Date: Mon, 14 Oct 2024 14:50:13 +0000 Subject: [PATCH 195/229] fireplace: nix-darwin bugfix fmt --- pkgs/by-name/fi/fireplace/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/fi/fireplace/package.nix b/pkgs/by-name/fi/fireplace/package.nix index f7791438ec55..1a41a09d851a 100644 --- a/pkgs/by-name/fi/fireplace/package.nix +++ b/pkgs/by-name/fi/fireplace/package.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { hash = "sha256-2NUE/zaFoGwkZxgvVCYXxToiL23aVUFwFNlQzEq9GEc="; }; + makeFlags = lib.optional stdenv.hostPlatform.isDarwin [ "CC=cc" ]; + meta = { description = "Cozy fireplace in your terminal"; homepage = "https://github.com/Wyatt915/fireplace"; From b01da391b7e51feeca65d428ff16570f1249fc29 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Sat, 19 Oct 2024 02:46:09 +0330 Subject: [PATCH 196/229] inspector: init at 0.2.0 --- pkgs/by-name/in/inspector/package.nix | 67 +++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 pkgs/by-name/in/inspector/package.nix diff --git a/pkgs/by-name/in/inspector/package.nix b/pkgs/by-name/in/inspector/package.nix new file mode 100644 index 000000000000..c9d0957f7225 --- /dev/null +++ b/pkgs/by-name/in/inspector/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + gettext, + wrapGAppsHook4, + desktop-file-utils, + gobject-introspection, + libadwaita, + python3Packages, + iproute2, + util-linux, + coreutils, + usbutils, + pciutils, +}: + +python3Packages.buildPythonApplication rec { + pname = "inspector"; + version = "0.2.0"; + format = "other"; + + src = fetchFromGitHub { + owner = "Nokse22"; + repo = "inspector"; + rev = "v${version}"; + hash = "sha256-tjQCF2Tyv7/NWgrwHu+JPpnLECfDmQS77EVLBt+cRTs="; + }; + + nativeBuildInputs = [ + meson + ninja + gettext + wrapGAppsHook4 + desktop-file-utils + gobject-introspection + ]; + + buildInputs = [ + libadwaita + ]; + + dependencies = [ + python3Packages.pygobject3 + iproute2 + util-linux + coreutils + usbutils + pciutils + ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/Nokse22/inspector"; + description = "Gtk4 Libadwaita wrapper for various system info cli commands"; + license = with lib.licenses; [ + gpl3Plus + cc0 + ]; + platforms = lib.platforms.linux; + mainProgram = "inspector"; + maintainers = with lib.maintainers; [ mksafavi ]; + }; +} From ceef7db08594f060070bbe58ac2a89262acc6d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 21 Oct 2024 11:37:11 +0200 Subject: [PATCH 197/229] mastodon: 4.3.0 -> 4.3.1 --- pkgs/servers/mastodon/gemset.nix | 52 ++++++++++++++++---------------- pkgs/servers/mastodon/source.nix | 6 ++-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 429393553e26..10ca3b991bbd 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g4g7r68h30iw7spypc7hvvd7w1vx05mysmijdy6vkr947hxyhw4"; + sha256 = "1mfb5x6kwxwprprhzj2a1hff7vw37v1wd9hl70nqq23xr82w20wx"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vzkwsc7k43v5irpydrzrh4v9dmwikj9xcdafz21kvwh8903pgih"; + sha256 = "1z95jcq4cmk7zzy4jjgxjbigk0zaxm2gpf8p0s0jn3b5px0k3ljk"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09abzaywpzwnbkpdn8g340pi584k8lpcqzi63m7wahyyyairdqza"; + sha256 = "1h39ffp0zs0r46bfm8bbgvc8icwamq4icsf1qn32xskdssnb8xyr"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "nokogiri" "racc" "rack" "rack-session" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c72nzrs3jjag7xbawy8hzzxggmpfp4r23y6viril2xzxffqgy7m"; + sha256 = "1mrdaql56iqnqcg7n3frc0r48bca8b4g9f2ifc69f15dpps2wfsx"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lvvaq994hihwb63jvdxbq03i5wgfk6llkibzsq1v0csphby1sx"; + sha256 = "06az0qalnvz0hv1wq8nn5q70gak9r50b6b95avmkz860lhbpx70d"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrrb4r6p2wrdbjphkkd482h10hri77d1aj1ddhz3ynvbrkg0ay0"; + sha256 = "02zrp7x6k6sgd4rrpsh2b9k2h0qhx538fsb1grsw25ss8d9k2b2j"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xhb7hy7dxx5qy8hahdf2gpr65n0xisxrfapzd2g8czb59ammxk5"; + sha256 = "1r0i34jrsibwkbg61kjm1xjbc8ppy8r91bnach8rv7jgjrid4dyl"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dhhsiv2hk1jfqdxx9qqlmzhvshqjs9kqh13gl1jyzfhzmd0b38q"; + sha256 = "1dpdfa132zsfw5l754p2iwialbscvhp9dblq9fg65ww306s3g0pl"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "timeout"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p9cch94h3wj71mldyk85657r4cpr9p3z55bwxqvpiby2fn6svc3"; + sha256 = "1cwx0a7pbl2shm0jc0m7aylacb84j2p4f3h0v7f6aas2b8s6lkf1"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ihbywjdp57mcnbx2150rpsx79f3pfv313d1zwsz0qwmzdcvpsr3"; + sha256 = "07zw4r8n3ag3d8jfynngpk0cxjwwlh7pxg3hrz1fdww2fnl6nan8"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activesupport = { dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cm2v3zkr58ljr1fswf67lkm8zwxr100qfdaxzzv46jlwmy1m3is"; + sha256 = "0p3167vw7csidyfl731hbp27xaz90w0v31l3fqzrsipci69p7qw0"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -2550,10 +2550,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07n5ijqxlp4jkd29s9v9b7p9rnspi7pffn4rp4h07dvds9w9xkyz"; + sha256 = "0fa7maxd1ydbnws0fym43pv8j2c6k5dkg0z0fkq31j8jr1aqk7ja"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2605,10 +2605,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njacgg01934sd942byyjkcyy3iwidysdbhp8kjrjrinackmyfal"; + sha256 = "0ypihpilhxdz5p3sb5g37jn2sbfjhf2ydkxj097kkn7ri7a7702x"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; rainbow = { groups = ["default" "development"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 9c27b1ee3297..9d7ac7df238c 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.3.0"; + version = "4.3.1"; in ( applyPatches { @@ -9,10 +9,10 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-nZtxildQmT/7JMCTx89ZSWxb9I7xMLGHTJv7v4gfdd4="; + hash = "sha256-JlpQGyVPTLcB3RcWMBrmYc1AAUT1JLfS4IDas9ZoWh4="; }; patches = patches ++ []; }) // { inherit version; - yarnHash = "sha256-V/kBkxv6akTyzlFzdR1F53b7RD0NYtap58Xt5yOAbYA="; + yarnHash = "sha256-e5c04M6XplAgaVyldU5HmYMYtY3MAWs+a8Z/BGSyGBg="; } From 045c2d219ddbfde49420900ade5cf7cfffaad3db Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Oct 2024 15:23:17 +0200 Subject: [PATCH 198/229] binutils-unwrapped: remove broken iOS patch This hasn't applied since e1ef521cffc2 ("binutils: 2.39 -> 2.40"), almost two years ago. It's therefore safe to say that nobody depends on this continuing to work in recent Nixpkgs, and all these targetPlatform conditionals are making new development (like adding cross binutils packages), so let's just remove it. It can be brought back if somebody wants to make it work in future, but since it seems to just be trying to make iOS behave identically to macOS, a better solution would probably be to just pass the darwin triple when building for iOS. --- .../tools/misc/binutils/default.nix | 1 - .../tools/misc/binutils/support-ios.patch | 168 ------------------ 2 files changed, 169 deletions(-) delete mode 100644 pkgs/development/tools/misc/binutils/support-ios.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 984afa184a22..9e52960f8737 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -90,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: { # version detection in `libtool.m4` fails to detect the Darwin version correctly. ./0001-libtool.m4-update-macos-version-detection-block.patch ] - ++ lib.optional targetPlatform.isiOS ./support-ios.patch # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution # Patch from arch-community # https://github.com/archlinux/svntogit-community/blob/c8d53dd1734df7ab15931f7fad0c9acb8386904c/trunk/avr-size.patch diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/pkgs/development/tools/misc/binutils/support-ios.patch deleted file mode 100644 index 74e56d130ed5..000000000000 --- a/pkgs/development/tools/misc/binutils/support-ios.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff --git a/bfd/config.bfd b/bfd/config.bfd -index f04a993f06..1e24a9d030 100644 ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -238,7 +238,7 @@ case "${targ}" in - - # START OF targmatch.h - #ifdef BFD64 -- aarch64-*-darwin*) -+ aarch64-*-darwin* | aarch64-*-ios*) - targ_defvec=aarch64_mach_o_vec - targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec" - targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" -@@ -358,7 +358,7 @@ case "${targ}" in - targ_selvecs=arc_elf32_be_vec - ;; - -- arm-*-darwin*) -+ arm-*-darwin* | arm-*-ios*) - targ_defvec=arm_mach_o_vec - targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec" - targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" -@@ -678,7 +678,7 @@ case "${targ}" in - i[3-7]86-*-aix*) - targ_defvec=i386_coff_vec - ;; -- i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*) -+ i[3-7]86-*-darwin* | i[3-7]86-*-ios* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*) - targ_defvec=i386_mach_o_vec - targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ64_selvecs=x86_64_mach_o_vec -@@ -762,7 +762,7 @@ case "${targ}" in - targ_defvec=x86_64_elf64_cloudabi_vec - want64=true - ;; -- x86_64-*-darwin*) -+ x86_64-*-darwin* | x86_64-*-ios*) - targ_defvec=x86_64_mach_o_vec - targ_selvecs="i386_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch" -@@ -1402,7 +1402,7 @@ case "${targ}" in - targ_selvecs="powerpc_elf32_le_vec powerpc_boot_vec" - targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec" - ;; -- powerpc-*-darwin* | powerpc-*-macos10* | powerpc-*-rhapsody*) -+ powerpc-*-darwin* | powerpc-*-ios* | powerpc-*-macos10* | powerpc-*-rhapsody*) - targ_defvec=mach_o_be_vec - targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ_archs="$targ_archs bfd_i386_arch" -diff --git a/configure.ac b/configure.ac -index aae94501e4..2cceb4dad4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then - ;; - *-*-solaris2* | *-*-hpux11*) - ;; -- *-*-darwin* | *-*-aix*) -+ *-*-darwin* | *-*-ios* | *-*-aix*) - ;; - nvptx*-*-*) - ;; -@@ -700,13 +700,13 @@ esac - - # Disable libffi for some systems. - case "${target}" in -- powerpc-*-darwin*) -+ powerpc-*-darwin* | powerpc-*-ios*) - ;; -- i[[3456789]]86-*-darwin*) -+ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*) - ;; -- x86_64-*-darwin[[912]]*) -+ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*) - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - noconfigdirs="$noconfigdirs target-libffi" - ;; - *-*-netware*) -@@ -788,7 +788,7 @@ esac - # Disable the go frontend on systems where it is known to not work. Please keep - # this in sync with contrib/config-list.mk. - case "${target}" in --*-*-darwin* | *-*-cygwin* | *-*-mingw*) -+*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*) - unsupported_languages="$unsupported_languages go" - ;; - esac -@@ -797,7 +797,7 @@ esac - # For testing, you can easily override this with --enable-libgo. - if test x$enable_libgo = x; then - case "${target}" in -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - # PR 46986 - noconfigdirs="$noconfigdirs target-libgo" - ;; -@@ -916,27 +916,27 @@ esac - case "${target}" in - *-*-chorusos) - ;; -- aarch64-*-darwin*) -+ aarch64-*-darwin* | aarch64-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- arm-*-darwin*) -+ arm-*-darwin* | arm-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- powerpc-*-darwin*) -+ powerpc-*-darwin* | powerpc-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- i[[3456789]]86-*-darwin*) -+ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*) - noconfigdirs="$noconfigdirs ld gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- x86_64-*-darwin[[912]]*) -+ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*) - noconfigdirs="$noconfigdirs ld gas gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -@@ -1226,7 +1226,7 @@ case "${host}" in - hppa*-*) - host_makefile_frag="config/mh-pa" - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - host_makefile_frag="config/mh-darwin" - ;; - powerpc-*-aix*) -@@ -1697,7 +1697,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. - build_lto_plugin=yes - ],[if test x"$default_enable_lto" = x"yes" ; then - case $target in -- *-apple-darwin[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; -+ *-apple-darwin[[912]]* | *-apple-ios[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; - # On other non-ELF platforms, LTO has yet to be validated. - *) enable_lto=no ;; - esac -@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. - # warn during gcc/ subconfigure; unless you're bootstrapping with - # -flto it won't be needed until after installation anyway. - case $target in -- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; -+ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;; - *) if test x"$enable_lto" = x"yes"; then - AC_MSG_ERROR([LTO support is not enabled for this target.]) - fi -@@ -2590,7 +2590,7 @@ rm -f conftest* - # Decide which environment variable is used to find dynamic libraries. - case "${host}" in - *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; -- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; -+ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; - *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; - *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; - esac From 76cc1fd92379a39b24612ef7ba4e88c3bdc88f83 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Mon, 21 Oct 2024 18:42:22 +1100 Subject: [PATCH 199/229] spiped: format with nixfmt --- pkgs/tools/networking/spiped/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 233da21ec93e..a9be3ffbeb6c 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -1,11 +1,17 @@ -{ lib, stdenv, fetchurl, openssl, coreutils }: +{ + lib, + stdenv, + fetchurl, + openssl, + coreutils, +}: stdenv.mkDerivation rec { pname = "spiped"; version = "1.6.2"; src = fetchurl { - url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz"; + url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz"; sha256 = "sha256-BdRofRLRHX+YiNQ/PYDFQbdyHJhwONCF9xyRuwYgRWc="; }; @@ -19,7 +25,7 @@ stdenv.mkDerivation rec { substituteInPlace libcperciva/POSIX/posix-l.sh \ --replace "rm" "${coreutils}/bin/rm" \ --replace "2>/dev/null" "2>stderr.log" - ''; + ''; installPhase = '' runHook preInstall @@ -30,9 +36,9 @@ stdenv.mkDerivation rec { meta = { description = "Utility for secure encrypted channels between sockets"; - homepage = "https://www.tarsnap.com/spiped.html"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; + homepage = "https://www.tarsnap.com/spiped.html"; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; } From 6b8c4f116cd0d4e2990d8d02829de9d62037f38e Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Mon, 21 Oct 2024 22:56:32 +1100 Subject: [PATCH 200/229] spiped: small fixes, e.g. sha256 -> hash --- pkgs/tools/networking/spiped/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index a9be3ffbeb6c..09bb4eb6d6e3 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { version = "1.6.2"; src = fetchurl { - url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz"; - sha256 = "sha256-BdRofRLRHX+YiNQ/PYDFQbdyHJhwONCF9xyRuwYgRWc="; + url = "https://www.tarsnap.com/spiped/spiped-${version}.tgz"; + hash = "sha256-BdRofRLRHX+YiNQ/PYDFQbdyHJhwONCF9xyRuwYgRWc="; }; buildInputs = [ openssl ]; From 692b12ceeacab7f81b3e1d698d9f2181acf44a46 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Mon, 21 Oct 2024 18:34:20 +1100 Subject: [PATCH 201/229] nixos/tests/spiped: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/spiped.nix | 73 ++++++++++++++++++++++++ pkgs/tools/networking/spiped/default.nix | 3 + 3 files changed, 77 insertions(+) create mode 100644 nixos/tests/spiped.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8b26b710dfad..0934c25ff9d6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -929,6 +929,7 @@ in { sourcehut = handleTest ./sourcehut {}; spacecookie = handleTest ./spacecookie.nix {}; spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; + spiped = runTest ./spiped.nix; sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {}; sslh = handleTest ./sslh.nix {}; ssh-agent-auth = handleTest ./ssh-agent-auth.nix {}; diff --git a/nixos/tests/spiped.nix b/nixos/tests/spiped.nix new file mode 100644 index 000000000000..a39fc2fd722b --- /dev/null +++ b/nixos/tests/spiped.nix @@ -0,0 +1,73 @@ +{ pkgs, ... }: +let + key = pkgs.runCommand "key" { } "${pkgs.openssl}/bin/openssl rand 32 > $out"; +in +{ + name = "spiped"; + meta = with pkgs.lib.maintainers; { + maintainers = [ tomfitzhenry ]; + }; + + nodes = { + server = + { pkgs, lib, ... }: + { + services.caddy = { + enable = true; + settings = { + apps.http.servers.default = { + listen = [ ":80" ]; + routes = [ + { + handle = [ + { + body = "hello world"; + handler = "static_response"; + status_code = 200; + } + ]; + } + ]; + }; + }; + }; + + systemd.services."spiped@server" = { + wantedBy = [ "multi-user.target" ]; + overrideStrategy = "asDropin"; + }; + systemd.services."spiped@client" = { + wantedBy = [ "multi-user.target" ]; + overrideStrategy = "asDropin"; + }; + services.spiped = { + enable = true; + config = { + server = { + source = "localhost:8080"; + target = "localhost:80"; + keyfile = key; + decrypt = true; + }; + client = { + source = "localhost:8081"; + target = "localhost:8080"; + keyfile = key; + encrypt = true; + }; + }; + }; + }; + }; + + testScript = + { nodes, ... }: + '' + server.wait_for_unit("caddy") + server.wait_for_open_port(80) + server.wait_for_open_port(8080) + server.wait_for_open_port(8081) + + server.succeed("curl http://localhost:8081 | grep hello") + ''; +} diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 09bb4eb6d6e3..021549e4f10e 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -4,6 +4,7 @@ fetchurl, openssl, coreutils, + nixosTests, }: stdenv.mkDerivation rec { @@ -34,6 +35,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests.spiped = nixosTests.spiped; + meta = { description = "Utility for secure encrypted channels between sockets"; homepage = "https://www.tarsnap.com/spiped.html"; From 76842a453c96360eeeac94a469e5bd0560491fdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 13:27:04 +0000 Subject: [PATCH 202/229] gitlab-release-cli: 0.18.0 -> 0.19.0 --- pkgs/by-name/gi/gitlab-release-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix index 28119445dc2b..61e2d5d84161 100644 --- a/pkgs/by-name/gi/gitlab-release-cli/package.nix +++ b/pkgs/by-name/gi/gitlab-release-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gitlab-release-cli"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "release-cli"; rev = "v${version}"; - hash = "sha256-CCSice/uMf2OfFNEpwwhX6A0wrSsC1v9XWEhAAwQRso="; + hash = "sha256-AEDao1tehg15SmluHlivG/I+Y9Gcxjj7KUEGAmOZ1aY="; }; vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU="; From 4955cb9a09db723b52cda7f641244be62366c335 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Oct 2024 16:09:32 +0200 Subject: [PATCH 203/229] binutils-unwrapped: remove broken vc4 sources This hasn't made it past patchPhase since dde943e5356b ("Revert "Revert "Merge pull request #86954 from lovesegfault/binutils-2.34"""), more than four ago. It's therefore safe to say that nobody depends on this continuing to work in recent Nixpkgs, and all these targetPlatform conditionals are making new development (like adding cross binutils packages), so let's just remove it. It can be brought back if somebody wants to make it work in future, but given that upstream binutils will continue to diverge from the stagnant vc4 fork, a better way of doing this would be to upstream vc4 support to binutils, or at the very least use a different expression for vc4 binutils. --- .../tools/misc/binutils/default.nix | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 9e52960f8737..d91b6f33bd39 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -9,7 +9,6 @@ in , buildPackages , fetchFromGitHub , fetchurl -, flex , gettext , lib , noSysDirs @@ -35,19 +34,6 @@ let version = "2.43.1"; - srcs = { - normal = fetchurl { - url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - hash = "sha256-vsqsXSleA3WHtjpC+tV/49nXuD9HjrJLZ/nuxdDxhy8="; - }; - vc4-none = fetchFromGitHub { - owner = "itszor"; - repo = "binutils-vc4"; - rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36"; - sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63"; - }; - }; - #INFO: The targetPrefix prepended to binary names to allow multiple binuntils # on the PATH to both be usable. targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -57,7 +43,10 @@ stdenv.mkDerivation (finalAttrs: { pname = targetPrefix + "binutils"; inherit version; - src = srcs.${targetPlatform.system} or srcs.normal; + src = fetchurl { + url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; + hash = "sha256-vsqsXSleA3WHtjpC+tV/49nXuD9HjrJLZ/nuxdDxhy8="; + }; # WARN: this package is used for bootstrapping fetchurl, and thus cannot use # fetchpatch! All mutable patches (generated by GitHub or cgit) that are @@ -118,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ] ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ] - ++ lib.optionals targetPlatform.isVc4 [ flex ] ; buildInputs = [ zlib gettext ] ++ lib.optionals hostPlatform.isDarwin [ CoreServices ]; From 99d0e4996d3a7a247df0546775a48506c84220b7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Oct 2024 16:20:53 +0200 Subject: [PATCH 204/229] binutils: remove autoreconfHook on iOS This was added in ebc224377853 ("binutils: Add iOS as a supported platform"), at the same time as a patch. That patch was removed in 045c2d219ddb ("binutils-unwrapped: remove broken iOS patch"), and I'm not sure what other reason there would be for autoreconfHook to be required specifically for iOS, so I think we can remove it. It's not possible to test since iOS cross has been broken for months, and keeping this around is making other refactors (like adding cross binutils packages) harder. --- pkgs/development/tools/misc/binutils/default.nix | 2 -- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 9e52960f8737..6ad81d11fc54 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -3,7 +3,6 @@ let in { stdenv -, autoreconfHook , autoconf269, automake, libtool , bison , buildPackages @@ -116,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: { bison perl ] - ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ] ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ] ++ lib.optionals targetPlatform.isVc4 [ flex ] ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb0c7edb8f34..60e843c0abd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17022,13 +17022,11 @@ with pkgs; bingrep = callPackage ../development/tools/analysis/bingrep { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { - autoreconfHook = autoreconfHook269; inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils { - autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; From 2e1dd3a8c016215e74aeb60e1bd4435f0dab29f4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 9 Oct 2024 21:03:27 +0200 Subject: [PATCH 205/229] godot_4: use separateDebugInfo This way, people who need debug symbols don't have to rebuild to get them, without them having to be included in the main outputs. --- pkgs/by-name/go/godot_4/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index 25c36e07a1b3..829ece63d51e 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -28,7 +28,6 @@ wayland, wayland-scanner, withDbus ? true, - withDebug ? false, withFontconfig ? true, withPlatform ? "linuxbsd", withPrecision ? "single", @@ -67,6 +66,7 @@ stdenv.mkDerivation rec { "out" "man" ]; + separateDebugInfo = true; # Set the build name which is part of the version. In official downloads, this # is set to 'official'. When not specified explicitly, it is set to @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { production = true; # Set defaults to build Godot for use in production platform = withPlatform; target = withTarget; - debug_symbols = withDebug; + debug_symbols = true; # Options from 'platform/linuxbsd/detect.py' dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings @@ -159,8 +159,6 @@ stdenv.mkDerivation rec { ++ lib.optionals withSpeechd [ speechd-minimal ] ++ lib.optionals withUdev [ udev ]; - dontStrip = withDebug; - installPhase = '' runHook preInstall From 661a05d10ea42cc9a3f5e8f4e4d0b334d6c591ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 21 Oct 2024 15:16:07 +0200 Subject: [PATCH 206/229] Revert "bmake: 20240808 -> 20240921" This reverts commit bf213776214687cf87f26212c1102ccccffbdb5b. This wasn't a big rebuild on nixpkgs master, but now on staging-next it would rebuild *-darwin stdenv, which would be too expensive at this point. (cherry picked from commit 65f28f123e4656ddff8fa6e1864ade99860c6b92) Applying to master as well to minimize the potential for confusion about bmake being unexpectedly downgraded. --- pkgs/by-name/bm/bmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 05729f8aa848..f18b65c62552 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20240921"; + version = "20240808"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-s0ZXnoLSltGk2ineqFlOPuWWEwsgeG3sDziZo+ESdcI="; + hash = "sha256-tZGJJRtIPezUSS8fdDh7KlhMA9WqRjfNSLOOxiucCEg="; }; patches = [ From bdf437304655f4886b9d24a007eafc742e810b99 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Oct 2024 13:16:50 +0200 Subject: [PATCH 207/229] webrtc-audio-processing_1: use upstream's OS list This will allow disabling optional webrtc-audio-processing functionality on e.g. FreeBSD. --- .../libraries/webrtc-audio-processing/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 1a34ade3cee0..4f5c7bbdcb10 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -53,8 +53,11 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; - # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h - platforms = intersectLists platforms.unix (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); + platforms = intersectLists + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/meson.build + (platforms.darwin ++ platforms.linux ++ platforms.windows) + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h + (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); # BE platforms are unsupported # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/31 badPlatforms = platforms.bigEndian; From f295624943867145a153e2793abc010deb3b805b Mon Sep 17 00:00:00 2001 From: "Aaron Hall, MBA" Date: Thu, 14 Jul 2022 01:26:00 -0400 Subject: [PATCH 208/229] nixos/doc/configuration/wayland: add link to Sway wiki page Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com> --- nixos/doc/manual/configuration/wayland.chapter.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/doc/manual/configuration/wayland.chapter.md b/nixos/doc/manual/configuration/wayland.chapter.md index 27c027d38514..8c085670ba13 100644 --- a/nixos/doc/manual/configuration/wayland.chapter.md +++ b/nixos/doc/manual/configuration/wayland.chapter.md @@ -29,3 +29,6 @@ able to share your screen, you might want to activate this option: and configure Pipewire using [](#opt-services.pipewire.enable) and related options. + +For more helpful tips and tricks, see the +[wiki page about Sway](https://wiki.nixos.org/wiki/Sway). From ff40e745b8f9f6166a4eb280158a7d420fb3bada Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:00:47 +0200 Subject: [PATCH 209/229] nixos/doc/configuration/wayland: remove redundant snippet We already configure the wlr portal by default in wayland-session.nix. --- nixos/doc/manual/configuration/wayland.chapter.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/nixos/doc/manual/configuration/wayland.chapter.md b/nixos/doc/manual/configuration/wayland.chapter.md index 8c085670ba13..2d32f06987df 100644 --- a/nixos/doc/manual/configuration/wayland.chapter.md +++ b/nixos/doc/manual/configuration/wayland.chapter.md @@ -18,15 +18,7 @@ This installs the sway compositor along with some essential utilities. Now you can start sway from the TTY console. If you are using a wlroots-based compositor, like sway, and want to be -able to share your screen, you might want to activate this option: - -```nix -{ - xdg.portal.wlr.enable = true; -} -``` - -and configure Pipewire using +able to share your screen, make sure to configure Pipewire using [](#opt-services.pipewire.enable) and related options. From 1e301371090ad01bc41ad51393fd87a1db09becd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 21 Oct 2024 12:06:05 -0400 Subject: [PATCH 210/229] doc: Improve CMake setup hook docs, following Meson's See also #342868 --- doc/hooks/cmake.section.md | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/doc/hooks/cmake.section.md b/doc/hooks/cmake.section.md index b5dc5a914434..5bcc3c980fc5 100644 --- a/doc/hooks/cmake.section.md +++ b/doc/hooks/cmake.section.md @@ -1,3 +1,35 @@ # cmake {#cmake} -Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. `cmakeFlags` controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. +Overrides the default configure phase to run the CMake command. + +By default, we use the Make generator of CMake. +But when Ninja is also available as a `nativeBuildInput`, this setup hook will detect that and use the ninja generator. + +Dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. +Some additional flags are passed in to give similar behavior to configure-based packages. + +By default, parallel building is enabled as CMake supports parallel building almost everywhere. + +You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. + +## Variables controlling CMake {#cmake-variables-controlling} + +### CMake Exclusive Variables {#cmake-exclusive-variables} + +#### `cmakeFlags` {#cmake-flags} + +Controls the flags passed to `cmake setup` during configure phase. + +#### `cmakeBuildDir` {#cmake-build-dir} + +Directory where CMake will put intermediate files. + +Setting this can be useful for debugging multiple CMake builds while in the same source directory, for example, when building for different platforms. +Different values for each build will prevent build artefacts from interefering with each other. +This setting has no tangible effect when running the build in a sandboxed derivation. + +The default value is `build`. + +#### `dontUseCmakeConfigure` {#dont-use-cmake-configure} + +When set to true, don't use the predefined `cmakeConfigurePhase`. From 47f610fbeef96c999d3ca3a3fdd0729104c62b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 21 Oct 2024 11:16:55 -0600 Subject: [PATCH 211/229] aliases: cleanup old throw aliases maintainers/scripts/remove-old-aliases.py --year 2024 --month 4 --file pkgs/top-level/aliases.nix --only-throws --- pkgs/top-level/aliases.nix | 508 ------------------------------------- 1 file changed, 508 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7b07e7b1ce1b..5c6c10b9c23b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -88,55 +88,30 @@ mapAliases { adoptopenjdk-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09 adoptopenjdk-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09 adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09 - advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29 # Post 24.11 branch-off, this should throw an error addOpenGLRunpath = addDriverRunpath; # Added 2024-05-25 - aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" - airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 - alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28 - alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12 alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17 alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17 alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2024-10-17 alsaPlugins = throw "'alsaPlugins' has been renamed to/replaced by 'alsa-plugins'"; # Converted to throw 2024-10-17 alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2024-10-17 alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17 - amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31 angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17 - ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 - ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10 ao = libfive; # Added 2024-10-11 - apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 - apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_1 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_2 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_3 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_4 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 - arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 - archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 - ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aria = aria2; # Added 2024-03-26 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 - asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 - asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19 - asterisk_19 = throw "asterisk_19: Asterisk 19 is end of life and has been removed"; # Added 2023-04-19 - atom = throw "'atom' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 - atom-beta = throw "'atom-beta' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 - atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 - atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 @@ -151,55 +126,31 @@ mapAliases { badtouch = authoscope; # Project was renamed, added 20210626 baget = throw "'baget' has been removed due to being unmaintained"; - ballAndPaddle = throw "'ballAndPaddle' has been removed because it was broken and abandoned upstream"; # Added 2023-10-16 bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17 bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17 - bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 - bazel_4 = throw "'bazel_4' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-23 BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 - bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 - bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 - bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 - beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08 bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15 bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 - binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09 bird2 = bird; # Added 2022-02-21 bitwarden = bitwarden-desktop; # Added 2024-02-25 - bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 - bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 blender-with-packages = args: lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" (blender.withPackages (_: args.packages)).overrideAttrs (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15 blockbench-electron = blockbench; # Added 2024-03-16 - bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 bmap-tools = bmaptool; # Added 2024-08-05 - bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01 - boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost16x = throw "boost16x has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost170 = throw "boost170 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost172 = throw "boost172 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost173 = throw "boost173 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost174 = throw "boost174 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost17x = throw "boost17x has been deprecated in favor of the latest version"; # Added 2023-07-13 - boost18x = throw "boost18x has been deprecated in favor of the latest version"; # Added 2023-07-13 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 - bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 brasero-original = lib.warn "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29 - bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29 budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 - bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24 butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18 # Shorter names; keep the longer name for back-compat. Added 2023-04-11 buildFHSUserEnv = buildFHSEnv; @@ -219,17 +170,11 @@ mapAliases { calligra = kdePackages.calligra; # Added 2024-09-27 callPackage_i686 = pkgsi686Linux.callPackage; - cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 - cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-espflash = espflash; - cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 - cargo-graph = throw "cargo-graph has been removed as it is broken and archived upstream"; # Added 2024-03-16 - catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2023-09-10 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; - ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09 certmgr-selfsigned = certmgr; # Added 2023-11-30 challenger = taler-challenger; # Added 2024-09-04 check_smartmon = throw "'check_smartmon' has been renamed to 'nagiosPlugins.check_smartmon'"; # Added 2024-05-03 @@ -243,69 +188,43 @@ mapAliases { check-uptime = throw "'check-uptime' has been renamed to 'nagiosPlugins.check_uptime'"; # Added 2024-05-03 check-wmiplus = throw "'check-wmiplus' has been renamed to 'nagiosPlugins.check_wmi_plus'"; # Added 2024-05-03 checkSSLCert = throw "'checkSSLCert' has been renamed to 'nagiosPlugins.check_ssl_cert'"; # Added 2024-05-03 - chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 - chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 - chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 - chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chiaki4deck = chiaki-ng; # Added 2024-08-04 - chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 ChowCentaur = chow-centaur; # Added 2024-06-12 ChowPhaser = chow-phaser; # Added 2024-06-12 ChowKick = chow-kick; # Added 2024-06-12 CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 - chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 - chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 - citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 - citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 - citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 - clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05 clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 - clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 - composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01 cosmic-tasks = tasks; # Added 2024-07-04 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 - cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 - clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17 - clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09 - cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 cockroachdb-bin = cockroachdb; # 2024-03-15 codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 - compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17 - connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08 containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 - convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27 crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11 - crda = throw "'crda' has been removed from nixpkgs, as it is needed only for kernels before 4.16"; # Added 2024-02-06 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 # these are for convenience, not for backward compat and shouldn't expire - clang6Stdenv = throw "clang6Stdenv has been removed from nixpkgs"; # Added 2024-01-08 - clang7Stdenv = throw "clang7Stdenv has been removed from nixpkgs"; # Added 2023-11-19 - clang8Stdenv = throw "clang8Stdenv has been removed from nixpkgs"; # Added 2024-01-24 clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08 - clang10Stdenv = throw "clang10Stdenv has been removed from nixpkgs"; # Added 2024-01-26 - clang11Stdenv = throw "clang11Stdenv has been removed from nixpkgs"; # Added 2023-01-24 clang12Stdenv = lowPrio llvmPackages_12.stdenv; clang13Stdenv = lowPrio llvmPackages_13.stdenv; clang14Stdenv = lowPrio llvmPackages_14.stdenv; @@ -315,18 +234,8 @@ mapAliases { clang18Stdenv = lowPrio llvmPackages_18.stdenv; clang19Stdenv = lowPrio llvmPackages_19.stdenv; - clang-tools_6 = throw "clang-tools_6 has been removed from nixpkgs"; # Added 2024-01-08 - clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 - clang-tools_8 = throw "clang-tools_8 has been removed from nixpkgs"; # Added 2024-01-24 clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08 - clang-tools_10 = throw "clang-tools_10 has been removed from nixpkgs"; # Added 2023-01-26 - clang-tools_11 = throw "clang-tools_11 has been removed from nixpkgs"; # Added 2023-01-24 - clang_6 = throw "clang_6 has been removed from nixpkgs"; # Added 2024-01-08 - clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19 - clang_8 = throw "clang_8 has been removed from nixpkgs"; # Added 2024-01-24 clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08 - 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 @@ -341,45 +250,31 @@ mapAliases { ### D ### - dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17 dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself."; dat = nodePackages.dat; dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 - deadcode = throw "'deadcode' has been removed, as upstream is abandoned since 2019-04-27. Use the official deadcode from 'gotools' package."; # Added 2023-12-28 deadpixi-sam = deadpixi-sam-unstable; debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17 deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 - dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26 - devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 - dfeet = throw "'dfeet' has been removed because it is archived upstream. Please use 'd-spy' instead"; # Added 2024-03-07 dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09 - dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29 docker-distribution = distribution; # Added 2023-12-26 - docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 - docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 - docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 - docker-proxy = throw "`docker-proxy` has been merged to the main repo of Moby since Docker 22.06"; # Added 2024-03-14 - dogecoin = throw "'dogecoin' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 - dogecoind = throw "'dogecoind' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 dolphinEmu = throw "'dolphinEmu' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2024-10-17 dolphinEmuMaster = throw "'dolphinEmuMaster' has been renamed to/replaced by 'dolphin-emu-beta'"; # Converted to throw 2024-10-17 - dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16 dotty = scala_3; # Added 2023-08-20 dotnet-netcore = throw "'dotnet-netcore' has been renamed to/replaced by 'dotnet-runtime'"; # Converted to throw 2024-10-17 dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17 dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17 dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17 - drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15 drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 @@ -398,39 +293,7 @@ mapAliases { elasticsearch7Plugins = elasticsearchPlugins; # Electron - electron_9 = throw "electron_9 has been removed in favor of newer versions"; # added 2023-09-11 - electron_10 = throw "electron_10 has been removed in favor of newer versions"; # added 2024-03-20 - electron_10-bin = throw "electron_10-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_11 = throw "electron_11 has been removed in favor of newer versions"; # added 2024-03-20 - electron_11-bin = throw "electron_11-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_12 = throw "electron_12 has been removed in favor of newer versions"; # added 2024-03-20 - electron_12-bin = throw "electron_12-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_13 = throw "electron_13 has been removed in favor of newer versions"; # added 2024-03-20 - electron_13-bin = throw "electron_13-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_14 = throw "electron_14 has been removed in favor of newer versions"; # added 2024-03-20 - electron_14-bin = throw "electron_14-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_15 = throw "electron_15 has been removed in favor of newer versions"; # added 2024-03-20 - electron_15-bin = throw "electron_15-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_16 = throw "electron_16 has been removed in favor of newer versions"; # added 2024-03-20 - electron_16-bin = throw "electron_16-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_17 = throw "electron_17 has been removed in favor of newer versions"; # added 2024-03-20 - electron_17-bin = throw "electron_17-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_18 = throw "electron_18 has been removed in favor of newer versions"; # added 2024-03-20 - electron_18-bin = throw "electron_18-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_19 = throw "electron_19 has been removed in favor of newer versions"; # added 2024-03-20 - electron_19-bin = throw "electron_19-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_20 = throw "electron_20 has been removed in favor of newer versions"; # added 2024-03-20 - electron_20-bin = throw "electron_20-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_21 = throw "electron_21 has been removed in favor of newer versions"; # added 2024-03-20 - electron_21-bin = throw "electron_21-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_22 = throw "electron_22 has been removed in favor of newer versions"; # added 2024-03-20 - electron_22-bin = throw "electron_22-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_23 = throw "electron_23 has been removed in favor of newer versions"; # added 2024-03-20 - electron_23-bin = throw "electron_23-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_26 = throw "electron_26 has been removed in favor of newer versions"; # added 2024-03-20 - electron_26-bin = throw "electron_26-bin has been removed in favor of newer versions"; # added 2024-03-20 - elementary-planner = throw "elementary-planner has been renamed to planify"; # Added 2023-06-24 elixir_ls = elixir-ls; # Added 2023-03-20 @@ -441,13 +304,9 @@ mapAliases { emacs28WithPackages = throw "'emacs28WithPackages' has been renamed to/replaced by 'emacs28.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 - emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10 - emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10 emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 - empathy = throw "empathy was removed as it is unmaintained and no longer launches due to libsoup3 migration"; # Added 2023-01-20 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 - enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18 enyo-doom = enyo-launcher; # Added 2022-09-09 epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17 @@ -465,12 +324,7 @@ mapAliases { erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24 erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24 - etcd_3_3 = throw "etcd_3_3 has been removed because upstream no longer maintains it"; # Added 2023-09-29 - etcher = throw "'etcher' has been removed because it depended on an insecure version of Electron"; # Added 2024-03-14 - eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16 - exa = throw "'exa' has been removed because it is unmaintained upstream. Consider using 'eza', a maintained fork"; # Added 2023-09-07 - exhibitor = throw "'exhibitor' has been removed because it is unmaintained upstream"; # Added 2023-06-20 eww-wayland = lib.warn "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; ### F ### @@ -478,7 +332,6 @@ mapAliases { fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24 fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24 fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19 - fancypp = throw "'fancypp' was removed because it and its dependants are unmaintained"; # Added 2024-02-14 faustStk = faustPhysicalModeling; # Added 2023-05-16 fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 @@ -491,7 +344,6 @@ mapAliases { ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12 FIL-plugins = fil-plugins; # Added 2024-06-12 fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19 - findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead."; @@ -499,13 +351,9 @@ mapAliases { firefox-wayland = firefox; # Added 2022-11-15 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 - fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 fit-trackee = fittrackee; # added 2024-09-03 flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 - flintqs = throw "FlintQS has been removed due to lack of maintenance and security issues; use SageMath or FLINT instead"; # Added 2024-03-21 - flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 - flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 flutter313 = throw "flutter313 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 @@ -513,23 +361,14 @@ mapAliases { foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 - foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20 fractal-next = fractal; # added 2023-11-25 framework-system-tools = framework-tool; # added 2023-12-09 francis = kdePackages.francis; # added 2024-07-13 - fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17 fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. futuresql = libsForQt5.futuresql; # added 2023-11-11 fx_cast_bridge = fx-cast-bridge; # added 2023-07-26 - fcitx = throw "fcitx is deprecated, please use fcitx5 instead."; # Added 2023-03-13 - fcitx-engines = throw "fcitx-engines is deprecated, please use fcitx5 instead."; # Added 2023-03-13 - fcitx-configtool = throw "fcitx-configtool is deprecated, please use fcitx5 instead."; # Added 2023-03-13 fcitx5-chinese-addons = libsForQt5.fcitx5-chinese-addons; # Added 2024-03-01 fcitx5-configtool = libsForQt5.fcitx5-configtool; # Added 2024-03-01 @@ -542,10 +381,6 @@ mapAliases { g4music = gapless; # Added 2024-07-26 g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17 gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 - garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 - garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 - garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12 - garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 @@ -554,10 +389,7 @@ mapAliases { gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21 gcj = gcj6; # Added 2024-09-13 gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 - gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11 gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15 - geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 - geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 @@ -572,11 +404,8 @@ mapAliases { Consider migrating to forgejo or gitea. ''; # Added 2024-10-12 - go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 - gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20 - git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { darcsToGit = darcs-to-git; @@ -588,15 +417,12 @@ mapAliases { topGit = top-git; }; # Added 2021-01-14 - gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18 glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11 - glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26 glfw-wayland = glfw; # Added 2024-04-19 glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08 globalprotect-openconnect = throw "'globalprotect-openconnect' has been renamed to/replaced by 'gpauth' and 'gpclient'"; # Added 2024-09-21 glxinfo = mesa-demos; # Added 2024-07-04 gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17 - gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 gnatboot11 = gnat-bootstrap11; gnatboot12 = gnat-bootstrap12; gnatboot = gnat-bootstrap; @@ -620,9 +446,7 @@ mapAliases { gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14 - gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-resources = resources; # added 2023-12-10 - gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2023-09-10 gnuradio-with-packages = gnuradio3_7.override { extraPackages = lib.attrVals [ @@ -639,123 +463,57 @@ mapAliases { gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17 gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17 - gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 - gnuradio-ais = throw "'gnuradio-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 - gnuradio-gsm = throw "'gnuradio-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 - gnuradio-limesdr = throw "'gnuradio-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 - gnuradio-nacl = throw "'gnuradio-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 - gnuradio-osmosdr = throw "'gnuradio-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 - gnuradio-rds = throw "'gnuradio-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 - go2nix = throw "'go2nix' has been removed as it was archived upstream"; # Added 2023-12-27 gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17 #godot - godot = throw "godot has been renamed to godot3 to distinguish from version 4"; # Added 2023-07-16 - godot-export-templates = throw "godot-export-templates has been renamed to godot3-export-templates to distinguish from version 4"; # Added 2023-07-16 - godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 - godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 - gdtoolkit = throw "gdtoolkit has been renamed to gdtoolkit_3 to distinguish from version 4"; # Added 2024-02-17 - google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 - google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 - google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 go-thumbnailer = thud; # Added 2023-09-21 go-upower-notify = upower-notify; # Added 2024-07-21 - gocode = throw "'gocode' has been removed as the upstream project was archived. 'gopls' is suggested as replacement"; # Added 2023-12-26 - govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26 - gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15 gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25; - gpt4all-chat = throw "gpt4all-chat has been renamed to gpt4all"; # Added 2024-02-27 gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; - graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 - graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 - graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 - grab-site = throw "grab-site has been removed because it's unmaintained and broken"; # Added 2023-11-12 - gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 - gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana_reporter = grafana-reporter; # Added 2024-06-09 - gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 grapefruit = throw "'grapefruit' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 - graylog = throw "graylog is now available in versions 3.3 up to 5.0. Please mind the upgrade path and choose the appropriate version. Direct upgrading from 3.3 to 4.3 or above is not supported"; # Added 2023-04-24 graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09 graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15 - gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 gringo = clingo; # added 2022-11-27 - gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 - gr-nacl = throw "'gr-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 - gr-osmosdr = throw "'gr-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 - gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 - grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtkcord4 = dissent; # Added 2024-03-10 gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 - gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 guile-disarchive = disarchive; # Added 2023-10-27 - guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16 ### H ### - haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 - haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 HentaiAtHome = hentai-at-home; # Added 2024-06-12 - hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 - hikari = throw "hikari has been removed from nixpkgs, it was unmaintained and required wlroots_0_15 at the time of removal"; # Added 2024-03-28 - hip = throw "'hip' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 - hipcc = throw "'hipcc' has been replaced with 'rocmPackages.hipcc'"; # Added 2023-10-08 - hipchat = throw "'hipchat' has been discontinued since 2019; upstream recommends Slack."; # Added 2023-12-02 - hipify = throw "'hipify' has been replaced with 'rocmPackages.hipify'"; # Added 2023-10-08 - hipcub = throw "'hipcub' has been replaced with 'rocmPackages.hipcub'"; # Added 2023-10-08 - hipsparse = throw "'hipsparse' has been replaced with 'rocmPackages.hipsparse'"; # Added 2023-10-08 - hipfort = throw "'hipfort' has been replaced with 'rocmPackages.hipfort'"; # Added 2023-10-08 - hipfft = throw "'hipfft' has been replaced with 'rocmPackages.hipfft'"; # Added 2023-10-08 - hipsolver = throw "'hipsolver' has been replaced with 'rocmPackages.hipsolver'"; # Added 2023-10-08 - hipblas = throw "'hipblas' has been replaced with 'rocmPackages.hipblas'"; # Added 2023-10-08 - hip-amd = throw "'hip-amd' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 - hip-common = throw "'hip-common' has been replaced with 'rocmPackages.hip-common'"; # Added 2023-10-08 - hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13 ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17 hydra_unstable = hydra; # Added 2024-08-22 hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; - hyper-haskell = throw "'hyper-haskell' has been removed. reason: has been broken for a long time and depends on an insecure electron version"; # Added 2024-03-14 - hyper-haskell-server-with-packages = throw "'hyper-haskell-server-with-packages' has been removed. reason: has been broken for a long time"; # Added 2024-03-14 ### I ### i3-gaps = i3; # Added 2023-01-03 ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15 ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15 - icedtea8_web = throw "'icedtea8_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 - icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 - ignite = throw "'ignite' has been removed as the upstream project was archived, please use 'flintlock' instead"; # Added 2024-01-07 - imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17 imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17 imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17 - imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04 immersed-vr = lib.warn "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11 - indiepass-desktop = throw "indiepass-desktop has been dropped because it does not work with recent Electron versions"; # Added 2024-03-14 - indigenous-desktop = throw "'indigenous-desktop' has been renamed to/replaced by 'indiepass-desktop'"; # Added 2023-11-08 input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21 - instead-launcher = throw "instead-launcher has been removed, because it depended on qt4"; # Added 2023-07-26 - insync-v3 = throw "insync-v3 has been merged into the insync package; use insync instead"; #Added 2023-05-13 index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 - infiniband-diags = throw "'infiniband-diags' has been renamed to/replaced by 'rdma-core'"; # Converted to throw 2023-09-10 inotifyTools = inotify-tools; inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17 - iouyap = throw "'iouyap' is deprecated and archived by upstream, use 'ubridge' instead"; # Added 2023-09-21 ipfs = kubo; # Added 2022-09-27 ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 @@ -773,23 +531,15 @@ mapAliases { jami-client-qt = jami-client; # Added 2022-11-06 jami-client = jami; # Added 2023-02-10 jami-daemon = jami.daemon; # Added 2023-02-10 - jfbpdf = throw "'jfbpdf' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 - jfbview = throw "'jfbview' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 - jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 - join-desktop = throw "'join-desktop' has been removed because it is unmaintained upstream"; # Added 2023-10-04 jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 # Julia julia_16-bin = throw "'julia_16-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-10-08 - julia_18 = throw "'julia_18' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 - julia_18-bin = throw "'julia_18-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 jush = throw "jush has been removed from nixpkgs because it is unmaintained"; # Added 2024-05-28 ### K ### - k3s_1_24 = throw "'k3s_1_24' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 - k3s_1_25 = throw "'k3s_1_25' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20 k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01 # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 @@ -800,18 +550,14 @@ mapAliases { kargo = throw "kargo was removed as it is deprecated upstream and depends on the removed boto package"; # Added 2024-09-22 kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17 - keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 - keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepkey_agent = keepkey-agent; # added 2024-01-06 kerberos = throw "'kerberos' has been renamed to/replaced by 'krb5'"; # Converted to throw 2024-10-17 kexectools = throw "'kexectools' has been renamed to/replaced by 'kexec-tools'"; # Converted to throw 2024-10-17 keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25 keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17 - kfctl = throw "kfctl is broken and has been archived by upstream"; # Added 2023-08-21 kgx = gnome-console; # Added 2022-02-19 kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-30-10 kibana = kibana7; - kicad-with-packages3d = throw "'kicad-with-packages3d' has been renamed to/replaced by 'kicad'"; # Converted to throw 2023-09-10 kio-admin = libsForQt5.kdeGear.kio-admin; # Added 2023-03-18 kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10 kodiGBM = kodi-gbm; @@ -822,7 +568,6 @@ mapAliases { krb5Full = krb5; krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17 kubei = kubeclarity; # Added 2023-05-20 - kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02 ### L ### @@ -831,10 +576,8 @@ mapAliases { LASzip = laszip; # Added 2024-06-12 LASzip2 = laszip_2; # Added 2024-06-12 latinmodern-math = lmmath; - ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 ledger_agent = ledger-agent; # Added 2024-01-07 lfs = dysk; # Added 2023-07-03 - llvmPackages_rocm = throw "'llvmPackages_rocm' has been replaced with 'rocmPackages.llvm'"; # Added 2023-10-08 libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01 libav = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25 libav_0_8 = libav; # Added 2024-08-25 @@ -846,33 +589,25 @@ mapAliases { libbencodetools = bencodetools; # Added 2022-07-30 libbpf_1 = libbpf; # Added 2022-12-06 libbson = mongoc; # Added 2024-03-11 - libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10 - libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08 - libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 libheimdal = heimdal; # Added 2022-11-18 - libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 libixp_hg = libixp; libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 - libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libquotient = libsForQt5.libquotient; # Added 2023-11-11 librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 - libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17 LibreArp = librearp; # Added 2024-06-12 LibreArp-lv2 = librearp-lv2; # Added 2024-06-12 libreddit = throw "'libreddit' has been removed because it is unmaintained upstream. Consider using 'redlib', a maintained fork"; # Added 2024-07-17 - libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07 librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17 - libsigcxx12 = throw "'libsigcxx12' has been removed, please use newer versions"; # Added 2023-10-20 libsForQt515 = libsForQt5; # Added 2022-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17 @@ -884,7 +619,6 @@ mapAliases { libwnck3 = libwnck; libyamlcpp = yaml-cpp; # Added 2023-01-29 libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 - libxkbcommon_7 = throw "libxkbcommon_7 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libxkbcommon'"; # Added 2023-01-03 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; linux_wallpaperengine = throw "linux_wallpaperengine was removed due to freeimage dependency"; # Added 2024-07-19 @@ -970,34 +704,13 @@ mapAliases { llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; - lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 - lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 - lld_8 = throw "lld_8 has been removed from nixpkgs"; # Added 2024-01-24 lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08 - lld_10 = throw "lld_10 has been removed from nixpkgs"; # Added 2024-01-26 - lld_11 = throw "lld_11 has been removed from nixpkgs"; # Added 2024-01-24 - lldb_6 = throw "lldb_6 has been removed from nixpkgs"; # Added 2024-01-08 - lldb_7 = throw "lldb_7 has been removed from nixpkgs"; # Added 2023-11-19 - lldb_8 = throw "lldb_8 has been removed from nixpkgs"; # Added 2024-01-24 lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08 - lldb_10 = throw "lldb_10 has been removed from nixpkgs"; # Added 2024-01-26 - lldb_11 = throw "lldb_11 has been removed from nixpkgs"; # Added 2024-01-24 - llvmPackages_6 = throw "llvmPackages_6 has been removed from nixpkgs"; # Added 2024-01-09 - llvmPackages_7 = throw "llvmPackages_7 has been removed from nixpkgs"; # Added 2023-11-19 - llvmPackages_8 = throw "llvmPackages_8 has been removed from nixpkgs"; # Added 2024-01-24 llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08 - llvmPackages_10 = throw "llvmPackages_10 has been removed from nixpkgs"; # Added 2024-01-26 - llvmPackages_11 = throw "llvmPackages_11 has been removed from nixpkgs"; # Added 2024-01-24 - llvm_6 = throw "llvm_6 has been removed from nixpkgs"; # Added 2024-01-08 - llvm_7 = throw "llvm_7 has been removed from nixpkgs"; # Added 2023-11-19 - llvm_8 = throw "llvm_8 has been removed from nixpkgs"; # Added 2024-01-24 llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08 - llvm_10 = throw "llvm_10 has been removed from nixpkgs"; # Added 2024-01-26 - llvm_11 = throw "llvm_11 has been removed from nixpkgs"; # Added 2024-01-24 lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17 lsh = throw "lsh has been removed as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decade"; # Added 2024-08-14 - luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 @@ -1009,12 +722,8 @@ mapAliases { MACS2 = macs2; # Added 2023-06-12 mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19 mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 - mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 - mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 - markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 - markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24 marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08 marwaita-peppermint = lib.warn "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01 @@ -1024,35 +733,23 @@ mapAliases { mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17 - matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09 - matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15 - mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17 - mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; microcodeAmd = microcode-amd; # Added 2024-09-08 microcodeIntel = microcode-intel; # Added 2024-09-08 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 MIDIVisualizer = midivisualizer; # Added 2024-06-12 - migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01 - minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 - miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 - miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages_5.miopengemm'"; # Added 2023-10-08 - miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08 - miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08 mime-types = mailcap; # Added 2022-01-21 minetest-touch = minetestclient; # Added 2024-08-12 minetestclient_5 = minetestclient; # Added 2023-12-11 minetestserver_5 = minetestserver; # Added 2023-12-11 minizip2 = pkgs.minizip-ng; # Added 2022-12-28 - mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26 - mlton20210107 = throw "'mlton20210107' has been renamed to 'mlton20210117', correcting the version number"; # Added 2024-03-31 mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17 mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17 mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17 @@ -1066,24 +763,16 @@ mapAliases { mod_pkcs12 = throw "'mod_pkcs12' has been renamed to/replaced by 'apacheHttpdPackages.mod_pkcs12'"; # Converted to throw 2024-10-17 mod_timestamp = throw "'mod_timestamp' has been renamed to/replaced by 'apacheHttpdPackages.mod_timestamp'"; # Converted to throw 2024-10-17 monero = throw "'monero' has been renamed to/replaced by 'monero-cli'"; # Converted to throw 2024-10-17 - moneyplex = throw "'moneyplex' has been removed, as it was broken and unmaintained"; # Added 2024-02-28 - mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05 - mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06 mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11 mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01 - moonlander = throw "'moonlander' has been removed due to it being broken and unmaintained"; # Added 2023-11-26 moz-phab = mozphab; # Added 2022-08-09 - mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 - mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17 mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 msp430NewlibCross = msp430Newlib; # Added 2024-09-06 - mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22 - murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 mutt-with-sidebar = mutt; # Added 2022-09-17 mysql-client = hiPrio mariadb.client; mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17 @@ -1093,11 +782,6 @@ mapAliases { ncdu_2 = ncdu; # Added 2022-07-22 neocities-cli = neocities; # Added 2024-07-31 - nestopia = throw "nestopia was forked; use nestopia-ue instead"; # Added 2024-01-24 - net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10 - netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 - netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 - netease-music-tui = throw "netease-music-tui has been removed due to unmaintained by upstream and broken functionality"; # Added 2024-03-03 nextcloud27 = throw '' Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring @@ -1112,7 +796,6 @@ mapAliases { nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 - neoload = throw "'neoload' has been removed as it is broken and unmaintained"; # Added 2024-03-02 newlibCross = newlib; # Added 2024-09-06 newlib-nanoCross = newlib-nano; # Added 2024-09-06 nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 @@ -1123,36 +806,25 @@ mapAliases { "nix-repl has been removed because it's not maintained anymore, " + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" ); - nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 nix-simple-deploy = throw "'nix-simple-deploy' has been removed as it is broken and unmaintained"; # Added 2024-08-17 - nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21 nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2024-10-17 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22 nix_2_3 = nixVersions.nix_2_3; nixfmt = lib.warn "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31 - nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable. - nixops_unstable = throw "nixops_unstable has been replaced. Please use for example 'nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ps.nixops-encrypted-links ])' instead"; # Added 2024-02-28 nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 - nodejs_14 = throw "nodejs_14 has been removed as it is EOL."; # Added 2023-10-30 - nodejs-slim_14 = throw "nodejs-slim_14 has been removed as it is EOL."; # Added 2023-10-30 nodejs-14_x = nodejs_14; # Added 2022-11-06 nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 - nodejs_16 = throw "nodejs_16 has been removed as it is EOL."; # Added 2023-10-30 nodejs-16_x = nodejs_16; # Added 2022-11-06 - nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 - nodejs-slim_16 = throw "nodejs-slim_16 has been removed as it is EOL."; # Added 2022-11-06 nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 - nomad_1_2 = throw "nomad_1_2 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 - nomad_1_3 = throw "nomad_1_3 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 @@ -1171,33 +843,19 @@ mapAliases { o = orbiton; # Added 2023-04-09 oathToolkit = oath-toolkit; # Added 2022-04-04 oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17 - obinskit = throw "'obinskit' has been removed from nixpkgs, because the package was unmaintained and depended on an insecure version of electron"; # Added 2024-03-20 - octant = throw "octant has been dropped due to being archived and vulnerable"; # Added 2023-09-29 - octant-desktop = throw "octant-desktop has been dropped due to being archived and vulnerable"; # Added 2023-09-29 - octorpki = throw "octorpki has been removed, upstream says to use rpki-client instead"; # Added 2024-03-19 - ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22 - ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20 onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 - opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21 - opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08 opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 openafs_1_8 = openafs; # Added 2022-08-22 - openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02 - openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 - opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 - openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 opendylan = throw "opendylan has been removed from nixpkgs as it was broken"; # Added 2024-07-15 opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15 openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17 openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13 - openimagedenoise_1_2_x = throw "'openimagedenoise_1_2_x' has been renamed to/replaced by 'openimagedenoise'"; # Added 2023-06-07 openimageio2 = openimageio; # Added 2023-01-05 - openimageio_1 = throw "'openimageio_1' has been removed, please update to 'openimageio' 2"; # Added 2023-06-14 openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17 openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjdk19_headless = openjdk19; # Added 2024-08-01 @@ -1215,20 +873,15 @@ mapAliases { openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29 openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17 openssl_3_0 = openssl_3; # Added 2022-06-27 - openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 - optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12 orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17 - oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24 - oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 OSCAR = oscar; # Added 2024-06-12 osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 - oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23 ### P ### @@ -1237,18 +890,12 @@ mapAliases { p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 - packet = throw "packet has been removed as it is no longer working and unmaintained"; # Added 2024-03-29 - palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18 - pam_usb = throw "'pam_usb' has been removed: abandoned by upstream since 2015."; # Added 2023-10-30 - paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17 paperless-ng = paperless-ngx; # Added 2022-04-11 partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 - pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 patchelfStable = patchelf; # Added 2024-01-25 pcsctools = pcsc-tools; # Added 2023-12-07 pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 - pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 percona-server_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13 percona-server_lts = percona-server; # Added 2024-10-13 @@ -1260,26 +907,18 @@ mapAliases { petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 pgadmin = pgadmin4; pharo-spur64 = pharo; # Added 2022-08-03 - phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 - photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 - picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 - picom-jonaburg = throw "picom-jonaburg was removed because it is unmaintained by upstream"; # Added 2024-02-13 picom-next = picom; # Added 2024-02-13 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 # Obsolete PHP version aliases - php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 php80Packages = php80; # Added 2023-06-21 php80Extensions = php80; # Added 2023-06-21 pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; - pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2023-09-10 playwright = lib.warn "'playwright' will reference playwright-driver in 25.05. Reference 'python3Packages.playwright' for the python test launcher" python3Packages.toPythonApplication python3Packages.playwright; # Added 2024-10-04 pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 pltScheme = racket; # just to be sure - pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 - pomotroid = throw "pomotroid has been removed from nixpkgs, because it depended on an insecure version of electron"; # Added 2023-09-12 poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 powerdns = pdns; # Added 2022-03-28 @@ -1311,50 +950,31 @@ mapAliases { tty = pinentry-tty; flavors = [ "curses" "emacs" "gnome3" "gtk2" "qt" "tty" ]; }; # added 2024-01-15 - pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2023-09-10 - pinentry_emacs = throw "'pinentry_emacs' has been renamed to/replaced by 'pinentry-emacs'"; # Converted to throw 2023-09-10 - pinentry_gnome = throw "'pinentry_gnome' has been renamed to/replaced by 'pinentry-gnome'"; # Converted to throw 2023-09-10 - pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 - pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2024-10-17 pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15 pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15 PlistCpp = plistcpp; # Added 2024-01-05 pocket-updater-utility = pupdate; # Added 2024-01-25 - poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 - prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 - privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 probe-rs = probe-rs-tools; # Added 2024-05-23 - probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 probe-run = throw "probe-run is deprecated upstream. Use probe-rs instead."; # Added 2024-05-23 - processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01 - prometheus-openvpn-exporter = throw "'prometheus-openvpn-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-12-23 prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10 - prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 - protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 - protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01 protobuf3_24 = protobuf_24; protobuf3_23 = protobuf_23; protobuf3_21 = protobuf_21; protonup = protonup-ng; # Added 2022-11-06 protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 proxmark3-rrg = proxmark3; # Added 2023-07-25 - proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 - pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 - pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 - pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2023-09-10 pyo3-pack = maturin; pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; pypolicyd-spf = spf-engine; # Added 2022-10-09 python = python2; # Added 2022-01-11 - python-language-server = throw "python-language-server has been removed as it is no longer maintained. Use e.g. python-lsp-server instead"; # Added 2023-01-07 python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17 pythonFull = python2Full; # Added 2022-01-11 pythonPackages = python.pkgs; # Added 2022-01-11 @@ -1363,9 +983,7 @@ mapAliases { qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30 qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2024-10-17 - qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25 qflipper = qFlipper; # Added 2022-02-11 - qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17 qscintilla = libsForQt5.qscintilla; # Added 2023-09-20 qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20 qt515 = qt5; # Added 2022-11-24 @@ -1382,8 +1000,6 @@ mapAliases { quicklispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 - qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19 - quvi = throw "'quvi' has been removed, as it was broken and unmaintained"; # Added 2023-11-25 ### R ### @@ -1394,58 +1010,18 @@ mapAliases { railway-travel = diebahn; # Added 2024-04-01 rambox-pro = rambox; # Added 2022-12-12 rapidjson-unstable = lib.warn "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28 - rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 - rccl = throw "'rccl' has been replaced with 'rocmPackages.rccl'"; # Added 2023-10-08 - rdc = throw "'rdc' has been replaced with 'rocmPackages.rdc'"; # Added 2023-10-08 - readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10 relibc = throw "relibc has been removed due to lack of maintenance"; # Added 2024-09-02 replay-sorcery = throw "replay-sorcery has been removed as it is unmaintained upstream. Consider using gpu-screen-recorder or obs-studio instead."; # Added 2024-07-13 restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04 - restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 - retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 retroshare06 = retroshare; - ricochet = throw "ricochet has been deprecated in favor of ricochet-refresh"; # Added 2024-02-26 rigsofrods = rigsofrods-bin; # Added 2023-03-22 ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17 - rnix-lsp = throw "'rnix-lsp' has been removed as it is unmaintained"; # Added 2024-03-09 rockbox_utility = rockbox-utility; # Added 2022-03-17 - rocalution = throw "'rocalution' has been replaced with 'rocmPackages.rocalution'"; # Added 2023-10-08 - rocblas = throw "'rocblas' has been replaced with 'rocmPackages.rocblas'"; # Added 2023-10-08 - rocfft = throw "'rocfft' has been replaced with 'rocmPackages.rocfft'"; # Added 2023-10-08 - rocprim = throw "'rocprim' has been replaced with 'rocmPackages.rocprim'"; # Added 2023-10-08 - rocrand = throw "'rocrand' has been replaced with 'rocmPackages.rocrand'"; # Added 2023-10-08 - rocsparse = throw "'rocsparse' has been replaced with 'rocmPackages.rocsparse'"; # Added 2023-10-08 - rocthrust = throw "'rocthrust' has been replaced with 'rocmPackages.rocthrust'"; # Added 2023-10-08 - roctracer = throw "'roctracer' has been replaced with 'rocmPackages.roctracer'"; # Added 2023-10-08 - rocwmma = throw "'rocwmma' has been replaced with 'rocmPackages.rocwmma'"; # Added 2023-10-08 - rocclr = throw "'rocclr' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 - rocdbgapi = throw "'rocdbgapi' has been replaced with 'rocmPackages.rocdbgapi'"; # Added 2023-10-08 - rocgdb = throw "'rocgdb' has been replaced with 'rocmPackages.rocgdb'"; # Added 2023-10-08 - rocprofiler = throw "'rocprofiler' has been replaced with 'rocmPackages.rocprofiler'"; # Added 2023-10-08 - rocsolver = throw "'rocsolver' has been replaced with 'rocmPackages.rocsolver'"; # Added 2023-10-08 - rocmClangStdenv = throw "'rocmClangStdenv' has been moved to 'rocmPackages' and is no longer public"; # Added 2023-10-08 - rocmUpdateScript = throw "'rocmUpdateScript' has been moved to 'rocmPackages' and is no longer public"; # Added 2023-10-08 - rocminfo = throw "'rocminfo' has been replaced with 'rocmPackages.rocminfo'"; # Added 2023-10-08 - rocmlir = throw "'rocmlir' has been replaced with 'rocmPackages.rocmlir'"; # Added 2023-10-08 - rocmlir-rock = throw "'rocmlir-rock' has been replaced with 'rocmPackages.rocmlir-rock'"; # Added 2023-10-08 - rocm-cmake = throw "'rocm-cmake' has been replaced with 'rocmPackages.rocm-cmake'"; # Added 2023-10-08 - rocm-comgr = throw "'rocm-comgr' has been replaced with 'rocmPackages.rocm-comgr'"; # Added 2023-10-08 - rocm-core = throw "'rocm-core' has been replaced with 'rocmPackages.rocm-core'"; # Added 2023-10-08 - rocm-device-libs = throw "'rccl' has been replaced with 'rocmPackages.rocm-device-libs'"; # Added 2023-10-08 - rocm-opencl-icd = rocmPackages.clr.icd; # Added 2023-10-08 Convert to throw after 23.11 is released - rocm-opencl-runtime = rocmPackages.clr; # Added 2023-10-08 Convert to throw after 23.11 is released - rocm-runtime = throw "'rocm-runtime' has been replaced with 'rocmPackages.rocm-runtime'"; # Added 2023-10-08 - rocm-smi = throw "'rocm-smi' has been replaced with 'rocmPackages.rocm-smi'"; # Added 2023-10-08 - rocm-thunk = throw "'rocm-thunk' has been replaced with 'rocmPackages.rocm-thunk'"; # Added 2023-10-08 - rocr-debug-agent = throw "'rocr-debug-agent' has been replaced with 'rocmPackages.rocr-debug-agent'"; # Added 2023-10-08 - rome = throw "rome is no longer maintained, consider using biome instead"; # Added 2023-09-12 rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17 rr-unstable = rr; # Added 2022-09-17 - rtl8723bs-firmware = throw "rtl8723bs-firmware was added in mainline kernel version 4.12"; # Added 2023-07-03 - rtsp-simple-server = throw "rtsp-simple-server is rebranded as mediamtx, including default config path update"; # Added 2023-04-11 rtx = mise; # Added 2024-01-05 runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; @@ -1458,7 +1034,6 @@ mapAliases { # due to it being inside the linuxPackagesFor function. rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2024-10-17 rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28 - rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19 ### S ### @@ -1475,44 +1050,23 @@ mapAliases { schildichat-desktop = schildichat-web; schildichat-desktop-wayland = schildichat-web; scitoken-cpp = scitokens-cpp; # Added 2024-02-12 - scylladb = throw "'scylladb' has been removed due to being unmaintained"; # Added 2024-03-17 - sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 - searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03 semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 - semver-cpp = throw "'semver-cpp' was removed because no packages in nixpkgs use it anymore"; # Added 2024-02-14 session-desktop-appimage = session-desktop; - setupcfg2nix = throw "'setupcfg2nix' has been removed. Please switch to buildPythonPackage"; # Added 2023-12-12 sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 - sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26 - sgtpuzzles = throw "'sgtpuzzles' has been renamed to 'sgt-puzzles'"; # Added 2023-10-06 - sgtpuzzles-mobile = throw "'sgtpuzzles-mobile' has been renamed to 'sgt-puzzles-mobile'"; # Added 2023-10-06 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 - shhgit = throw "shhgit is broken and is no longer maintained. See https://github.com/eth0izzle/shhgit#-shhgit-is-no-longer-maintained-"; # Added 2023-08-08 shipyard = jumppad; # Added 2023-06-06 shout = nodePackages.shout; # Added unknown; moved 2024-10-19 - signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 - simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 - skk-dicts = throw "'skk-dicts' has been split into multiple packages under 'skkDictionaries'"; # Added 2023-11-08 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 SkypeExport = skypeexport; # Added 2024-06-12 slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17 - slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 slurm-llnl = slurm; # renamed July 2017 - smesh = throw "'smesh' has been removed as it's unmaintained and depends on opencascade-oce, which is also unmaintained"; # Added 2023-09-18 snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04; soldat-unstable = opensoldat; # Added 2022-07-02 - solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 - 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 - spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 - spark_3_3 = throw "'spark_3_3' is no longer supported nixpkgs, please use 'spark'"; # Added 2024-03-23 spark2014 = gnatprove; # Added 2024-02-25 # Added 2020-02-10 @@ -1538,21 +1092,14 @@ mapAliases { source-han-serif-traditional-chinese = source-han-serif; - spacegun = throw "'spacegun' has been removed as unmaintained"; # Added 2023-05-20 spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17 - speedtest-exporter = throw "'speedtest-exporter' has been removed as unmaintained"; # Added 2023-07-31 - spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2024-10-17 spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 - spotify-tui = throw "'spotify-tui' has been removed, as it was broken and unmaintained"; # Added 2024-03-12 spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 - squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 - ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 - starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 steamPackages = { steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; @@ -1565,10 +1112,8 @@ mapAliases { steam-run-native = steam-run; # added 2022-02-21 StormLib = stormlib; # Added 2024-01-21 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 - supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 swiProlog = lib.warn "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07 swiPrologWithGui = lib.warn "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07 - swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23 swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23 swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12 @@ -1591,12 +1136,8 @@ mapAliases { taro = taproot-assets; # Added 2023-07-04 tdesktop = telegram-desktop; # Added 2023-04-07 teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 - telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 - teleport_11 = throw "teleport 11 has been removed as it is EOL. Please upgrade to Teleport 12 or later"; # Added 2023-11-27 - teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04 teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26 teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18 - teleprompter = throw "teleprompter has been removed. reason: upstream dead and does not work with recent electron versions"; # Added 2024-03-14 temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01 @@ -1604,22 +1145,17 @@ mapAliases { temurin-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-jre-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-bin-16 = throw "Temurin 16 has been removed as it has reached its end of life"; # Added 2024-08-01 - tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 tepl = libgedit-tepl; # Added 2024-04-29 testVersion = testers.testVersion; # Added 2022-04-20 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 - thrift-0_10 = throw "'thrift-0_10' has been removed because it is impacted by security issues and not used in nixpkgs, move to 'thrift'"; # Added 2024-03-17 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17 - tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 - tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 - 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 @@ -1632,8 +1168,6 @@ mapAliases { trezor_agent = trezor-agent; # Added 2024-01-07 openai-triton-llvm = triton-llvm; # added 2024-07-18 trust-dns = hickory-dns; # Added 2024-08-07 - trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 - trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15 turbogit = throw "turbogit has been removed as it is unmaintained upstream and depends on an insecure version of libgit2"; # Added 2024-08-25 tvbrowser-bin = tvbrowser; # Added 2023-03-02 @@ -1649,10 +1183,7 @@ mapAliases { ubuntu_font_family = ubuntu-classic; # Added 2024-02-19 uclibc = uclibc-ng; # Added 2022-06-16 uclibcCross = uclibc-ng; # Added 2022-06-16 - ue4 = throw "ue4 has been removed, because the package was broken for years"; # Added 2023-11-22 uefi-firmware-parser = throw "The uefi-firmware-parser package was dropped since it was unmaintained."; # Added 2024-06-21 - uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07 - uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21 unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17 uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; unifi-poller = unpoller; # Added 2022-11-24 @@ -1663,7 +1194,6 @@ mapAliases { unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11 unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11 untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17 - urlview = throw "'urlview' has been dropped because it's unmaintained. Consider switching to an alternative such as `pkgs.extract_url` or `pkgs.urlscan`."; # Added 2023-12-14 urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2024-10-17 urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2024-10-17 urxvt_font_size = throw "'urxvt_font_size' has been renamed to/replaced by 'rxvt-unicode-plugins.font-size'"; # Converted to throw 2024-10-17 @@ -1672,14 +1202,11 @@ mapAliases { urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2024-10-17 urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2024-10-17 urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2024-10-17 - usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10 - utahfs = throw "utahfs has been removed, as it is broken and lack of maintenance from upstream"; # Added 2023-09-29 util-linuxCurses = util-linux; # Added 2022-04-12 utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475 ### V ### - v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 @@ -1690,31 +1217,18 @@ mapAliases { ventoy-bin-full = ventoy-full; # Added 2023-04-12 verilog = iverilog; # Added 2024-07-12 ViennaRNA = viennarna; # Added 2023-08-23 - vikunja-api = throw "'vikunja-api' has been replaced by 'vikunja'"; # Added 2024-02-19 - vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14 vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 - virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 - virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17 - vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 vkBasalt = vkbasalt; # Added 2022-11-22 vkdt-wayland = vkdt; # Added 2024-04-19 - vsmtp = throw "'vsmtp' has been removed, upstream gone"; # Added 2023-12-18 - vte_290 = throw "'vte_290' has been renamed to/replaced by 'vte'"; # Added 2023-01-05 - varnish72 = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 - varnish73 = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 - varnish72Packages = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 - varnish73Packages = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 - volatility = throw "'volatility' has been removed, as it was broken and unmaintained"; # Added 2023-12-10 ### W ### wakatime = wakatime-cli; # 2024-05-30 wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22 - waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 wayfireApplications-unwrapped = throw '' 'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire' 'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins' @@ -1722,20 +1236,12 @@ mapAliases { 'wayfireApplications-unwrapped.wlroots' has been removed ''; # Add 2023-07-29 waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24 - wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29 - webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 webkitgtk = lib.warn "Explicitly set the ABI version of 'webkitgtk'" webkitgtk_4_0; wineWayland = wine-wayland; - win-qemu = throw "'win-qemu' has been replaced by 'virtio-win'"; # Added 2023-08-16 win-virtio = virtio-win; # Added 2023-10-17 - win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17 wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17 - wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 - wlroots_0_15 = throw "'wlroots_0_15' has been removed in favor of newer versions"; # Added 2024-03-28 wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14 wlroots = wlroots_0_18; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release - wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10 - wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10 wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03 wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03 wordpress6_5 = wordpress_6_5; # Added 2024-08-03 @@ -1745,7 +1251,6 @@ mapAliases { wmii_hg = wmii; wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26 write_stylus = styluslabs-write-bin; # Added 2024-10-09 - wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22 wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03 wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03 wxmac = wxGTK30; # Added 2023-03-22 @@ -1753,8 +1258,6 @@ mapAliases { ### X ### xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17 - xcbuild6Hook = throw "'xcbuild6Hook has been renamed to/replaced by 'xcbuildHook'"; # Added 2023-12-10 - xcodebuild6 = throw "'xcodebuild6' has been renamed to/replaced by 'xcodebuild'"; # Added 2023-12-10 xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17 xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30 xen-slim = throw "'xen-slim' has been renamed to 'xen'. The old Xen package with built-in components no longer exists"; # Added 2024-10-05 @@ -1770,7 +1273,6 @@ mapAliases { xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 - xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17 xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27 @@ -1779,19 +1281,11 @@ mapAliases { yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17 yafaray-core = libyafaray; # Added 2022-09-23 - yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 - yubikey-manager4 = throw "yubikey-manager4 has been removed, since it is no longer required by yubikey-manager-qt. Please update to yubikey-manager."; # Added 2024-01-14 - yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzu-mainline = throw "yuzu-mainline has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzuPackages = throw "yuzuPackages has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 ### Z ### - zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07 zfsStable = zfs; # Added 2024-02-26 zfsUnstable = zfs_unstable; # Added 2024-02-26 zinc = zincsearch; # Added 2023-05-28 @@ -1802,11 +1296,9 @@ mapAliases { ### UNSORTED ### - zeroc_ice = throw "'zeroc_ice' has been renamed to/replaced by 'zeroc-ice'"; # Converted to throw 2023-09-10 dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2024-10-17 dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02 - gnatsd = throw "'gnatsd' has been renamed to/replaced by 'nats-server'"; # Converted to throw 2023-09-10 posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17 ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17 From ffa3d12fc360535c74c8284d99c5779f5ec1ae17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 21 Oct 2024 11:24:48 -0600 Subject: [PATCH 212/229] aliases: manual cleanup of nodejs-{14,16} variants that were left by previous script --- pkgs/top-level/aliases.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5c6c10b9c23b..c57dd6b6a557 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -819,10 +819,6 @@ mapAliases { nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 - nodejs-14_x = nodejs_14; # Added 2022-11-06 - nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 - nodejs-16_x = nodejs_16; # Added 2022-11-06 - nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 From 390b4514b66260bf6ee8f71c4b432c1208569b30 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 21 Oct 2024 18:41:14 +0100 Subject: [PATCH 213/229] Revert "aliases: manual cleanup of nodejs-{14,16} variants that were left by previous script" The removals broke evaluation. This reverts commit ffa3d12fc360535c74c8284d99c5779f5ec1ae17. --- pkgs/top-level/aliases.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c57dd6b6a557..5c6c10b9c23b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -819,6 +819,10 @@ mapAliases { nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 + nodejs-14_x = nodejs_14; # Added 2022-11-06 + nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 + nodejs-16_x = nodejs_16; # Added 2022-11-06 + nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 From 8a70e31a6e52b4ab19ba7d531ccf94dd2022a112 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 21 Oct 2024 18:41:14 +0100 Subject: [PATCH 214/229] Revert "aliases: cleanup old throw aliases" The removals broke evaluation. This reverts commit 47f610fbeef96c999d3ca3a3fdd0729104c62b68. --- pkgs/top-level/aliases.nix | 508 +++++++++++++++++++++++++++++++++++++ 1 file changed, 508 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5c6c10b9c23b..7b07e7b1ce1b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -88,30 +88,55 @@ mapAliases { adoptopenjdk-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09 adoptopenjdk-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09 adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09 + advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29 # Post 24.11 branch-off, this should throw an error addOpenGLRunpath = addDriverRunpath; # Added 2024-05-25 + aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" + airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 + alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28 + alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12 alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17 alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17 alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2024-10-17 alsaPlugins = throw "'alsaPlugins' has been renamed to/replaced by 'alsa-plugins'"; # Converted to throw 2024-10-17 alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2024-10-17 alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17 + amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31 angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17 + ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 + ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10 ao = libfive; # Added 2024-10-11 + apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 + apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_1 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_2 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_3 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_4 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 + arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 + archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 + ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aria = aria2; # Added 2024-03-26 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 + asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 + asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19 + asterisk_19 = throw "asterisk_19: Asterisk 19 is end of life and has been removed"; # Added 2023-04-19 + atom = throw "'atom' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 + atom-beta = throw "'atom-beta' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 + atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 + atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 @@ -126,31 +151,55 @@ mapAliases { badtouch = authoscope; # Project was renamed, added 20210626 baget = throw "'baget' has been removed due to being unmaintained"; + ballAndPaddle = throw "'ballAndPaddle' has been removed because it was broken and abandoned upstream"; # Added 2023-10-16 bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17 bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17 + bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 + bazel_4 = throw "'bazel_4' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-23 BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 + bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 + bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 + bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 + beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08 bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15 bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 + binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09 bird2 = bird; # Added 2022-02-21 bitwarden = bitwarden-desktop; # Added 2024-02-25 + bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 + bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 blender-with-packages = args: lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" (blender.withPackages (_: args.packages)).overrideAttrs (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15 blockbench-electron = blockbench; # Added 2024-03-16 + bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 bmap-tools = bmaptool; # Added 2024-08-05 + bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01 + boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 + boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 + boost16x = throw "boost16x has been deprecated in favor of the latest version"; # Added 2023-06-08 + boost170 = throw "boost170 has been deprecated in favor of the latest version"; # Added 2023-06-08 + boost172 = throw "boost172 has been deprecated in favor of the latest version"; # Added 2023-06-08 + boost173 = throw "boost173 has been deprecated in favor of the latest version"; # Added 2023-06-08 + boost174 = throw "boost174 has been deprecated in favor of the latest version"; # Added 2023-06-08 + boost17x = throw "boost17x has been deprecated in favor of the latest version"; # Added 2023-07-13 + boost18x = throw "boost18x has been deprecated in favor of the latest version"; # Added 2023-07-13 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 + bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 brasero-original = lib.warn "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29 + bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29 budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 + bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24 butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18 # Shorter names; keep the longer name for back-compat. Added 2023-04-11 buildFHSUserEnv = buildFHSEnv; @@ -170,11 +219,17 @@ mapAliases { calligra = kdePackages.calligra; # Added 2024-09-27 callPackage_i686 = pkgsi686Linux.callPackage; + cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 + cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-espflash = espflash; + cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 + cargo-graph = throw "cargo-graph has been removed as it is broken and archived upstream"; # Added 2024-03-16 + catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2023-09-10 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; + ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09 certmgr-selfsigned = certmgr; # Added 2023-11-30 challenger = taler-challenger; # Added 2024-09-04 check_smartmon = throw "'check_smartmon' has been renamed to 'nagiosPlugins.check_smartmon'"; # Added 2024-05-03 @@ -188,43 +243,69 @@ mapAliases { check-uptime = throw "'check-uptime' has been renamed to 'nagiosPlugins.check_uptime'"; # Added 2024-05-03 check-wmiplus = throw "'check-wmiplus' has been renamed to 'nagiosPlugins.check_wmi_plus'"; # Added 2024-05-03 checkSSLCert = throw "'checkSSLCert' has been renamed to 'nagiosPlugins.check_ssl_cert'"; # Added 2024-05-03 + chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 + chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 + chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 + chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chiaki4deck = chiaki-ng; # Added 2024-08-04 + chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 ChowCentaur = chow-centaur; # Added 2024-06-12 ChowPhaser = chow-phaser; # Added 2024-06-12 ChowKick = chow-kick; # Added 2024-06-12 CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 + chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 + chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 + citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 + citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 + citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05 clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 + clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 + composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01 cosmic-tasks = tasks; # Added 2024-07-04 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 + cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 + clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17 + clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09 + cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 cockroachdb-bin = cockroachdb; # 2024-03-15 codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 + compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17 + connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08 containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 + convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27 crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11 + crda = throw "'crda' has been removed from nixpkgs, as it is needed only for kernels before 4.16"; # Added 2024-02-06 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 # these are for convenience, not for backward compat and shouldn't expire + clang6Stdenv = throw "clang6Stdenv has been removed from nixpkgs"; # Added 2024-01-08 + clang7Stdenv = throw "clang7Stdenv has been removed from nixpkgs"; # Added 2023-11-19 + clang8Stdenv = throw "clang8Stdenv has been removed from nixpkgs"; # Added 2024-01-24 clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08 + clang10Stdenv = throw "clang10Stdenv has been removed from nixpkgs"; # Added 2024-01-26 + clang11Stdenv = throw "clang11Stdenv has been removed from nixpkgs"; # Added 2023-01-24 clang12Stdenv = lowPrio llvmPackages_12.stdenv; clang13Stdenv = lowPrio llvmPackages_13.stdenv; clang14Stdenv = lowPrio llvmPackages_14.stdenv; @@ -234,8 +315,18 @@ mapAliases { clang18Stdenv = lowPrio llvmPackages_18.stdenv; clang19Stdenv = lowPrio llvmPackages_19.stdenv; + clang-tools_6 = throw "clang-tools_6 has been removed from nixpkgs"; # Added 2024-01-08 + clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 + clang-tools_8 = throw "clang-tools_8 has been removed from nixpkgs"; # Added 2024-01-24 clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08 + clang-tools_10 = throw "clang-tools_10 has been removed from nixpkgs"; # Added 2023-01-26 + clang-tools_11 = throw "clang-tools_11 has been removed from nixpkgs"; # Added 2023-01-24 + clang_6 = throw "clang_6 has been removed from nixpkgs"; # Added 2024-01-08 + clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19 + clang_8 = throw "clang_8 has been removed from nixpkgs"; # Added 2024-01-24 clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08 + 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 @@ -250,31 +341,45 @@ mapAliases { ### D ### + dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17 dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself."; dat = nodePackages.dat; dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 + deadcode = throw "'deadcode' has been removed, as upstream is abandoned since 2019-04-27. Use the official deadcode from 'gotools' package."; # Added 2023-12-28 deadpixi-sam = deadpixi-sam-unstable; debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17 deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 + dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26 + devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 + dfeet = throw "'dfeet' has been removed because it is archived upstream. Please use 'd-spy' instead"; # Added 2024-03-07 dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09 + dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29 docker-distribution = distribution; # Added 2023-12-26 + docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 + docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 + docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 + docker-proxy = throw "`docker-proxy` has been merged to the main repo of Moby since Docker 22.06"; # Added 2024-03-14 + dogecoin = throw "'dogecoin' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 + dogecoind = throw "'dogecoind' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 dolphinEmu = throw "'dolphinEmu' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2024-10-17 dolphinEmuMaster = throw "'dolphinEmuMaster' has been renamed to/replaced by 'dolphin-emu-beta'"; # Converted to throw 2024-10-17 + dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16 dotty = scala_3; # Added 2023-08-20 dotnet-netcore = throw "'dotnet-netcore' has been renamed to/replaced by 'dotnet-runtime'"; # Converted to throw 2024-10-17 dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17 dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17 dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17 + drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15 drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 @@ -293,7 +398,39 @@ mapAliases { elasticsearch7Plugins = elasticsearchPlugins; # Electron + electron_9 = throw "electron_9 has been removed in favor of newer versions"; # added 2023-09-11 + electron_10 = throw "electron_10 has been removed in favor of newer versions"; # added 2024-03-20 + electron_10-bin = throw "electron_10-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_11 = throw "electron_11 has been removed in favor of newer versions"; # added 2024-03-20 + electron_11-bin = throw "electron_11-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_12 = throw "electron_12 has been removed in favor of newer versions"; # added 2024-03-20 + electron_12-bin = throw "electron_12-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_13 = throw "electron_13 has been removed in favor of newer versions"; # added 2024-03-20 + electron_13-bin = throw "electron_13-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_14 = throw "electron_14 has been removed in favor of newer versions"; # added 2024-03-20 + electron_14-bin = throw "electron_14-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_15 = throw "electron_15 has been removed in favor of newer versions"; # added 2024-03-20 + electron_15-bin = throw "electron_15-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_16 = throw "electron_16 has been removed in favor of newer versions"; # added 2024-03-20 + electron_16-bin = throw "electron_16-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_17 = throw "electron_17 has been removed in favor of newer versions"; # added 2024-03-20 + electron_17-bin = throw "electron_17-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_18 = throw "electron_18 has been removed in favor of newer versions"; # added 2024-03-20 + electron_18-bin = throw "electron_18-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_19 = throw "electron_19 has been removed in favor of newer versions"; # added 2024-03-20 + electron_19-bin = throw "electron_19-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_20 = throw "electron_20 has been removed in favor of newer versions"; # added 2024-03-20 + electron_20-bin = throw "electron_20-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_21 = throw "electron_21 has been removed in favor of newer versions"; # added 2024-03-20 + electron_21-bin = throw "electron_21-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_22 = throw "electron_22 has been removed in favor of newer versions"; # added 2024-03-20 + electron_22-bin = throw "electron_22-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_23 = throw "electron_23 has been removed in favor of newer versions"; # added 2024-03-20 + electron_23-bin = throw "electron_23-bin has been removed in favor of newer versions"; # added 2024-03-20 + electron_26 = throw "electron_26 has been removed in favor of newer versions"; # added 2024-03-20 + electron_26-bin = throw "electron_26-bin has been removed in favor of newer versions"; # added 2024-03-20 + elementary-planner = throw "elementary-planner has been renamed to planify"; # Added 2023-06-24 elixir_ls = elixir-ls; # Added 2023-03-20 @@ -304,9 +441,13 @@ mapAliases { emacs28WithPackages = throw "'emacs28WithPackages' has been renamed to/replaced by 'emacs28.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 + emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10 + emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10 emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 + empathy = throw "empathy was removed as it is unmaintained and no longer launches due to libsoup3 migration"; # Added 2023-01-20 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 + enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18 enyo-doom = enyo-launcher; # Added 2022-09-09 epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17 @@ -324,7 +465,12 @@ mapAliases { erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24 erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24 + etcd_3_3 = throw "etcd_3_3 has been removed because upstream no longer maintains it"; # Added 2023-09-29 + etcher = throw "'etcher' has been removed because it depended on an insecure version of Electron"; # Added 2024-03-14 + eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16 + exa = throw "'exa' has been removed because it is unmaintained upstream. Consider using 'eza', a maintained fork"; # Added 2023-09-07 + exhibitor = throw "'exhibitor' has been removed because it is unmaintained upstream"; # Added 2023-06-20 eww-wayland = lib.warn "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; ### F ### @@ -332,6 +478,7 @@ mapAliases { fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24 fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24 fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19 + fancypp = throw "'fancypp' was removed because it and its dependants are unmaintained"; # Added 2024-02-14 faustStk = faustPhysicalModeling; # Added 2023-05-16 fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 @@ -344,6 +491,7 @@ mapAliases { ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12 FIL-plugins = fil-plugins; # Added 2024-06-12 fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19 + findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead."; @@ -351,9 +499,13 @@ mapAliases { firefox-wayland = firefox; # Added 2022-11-15 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 + fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 fit-trackee = fittrackee; # added 2024-09-03 flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 + flintqs = throw "FlintQS has been removed due to lack of maintenance and security issues; use SageMath or FLINT instead"; # Added 2024-03-21 + flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 + flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 flutter313 = throw "flutter313 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 @@ -361,14 +513,23 @@ mapAliases { foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 + foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 + foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 + foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 + foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 + foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20 fractal-next = fractal; # added 2023-11-25 framework-system-tools = framework-tool; # added 2023-12-09 francis = kdePackages.francis; # added 2024-07-13 + fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17 fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. futuresql = libsForQt5.futuresql; # added 2023-11-11 fx_cast_bridge = fx-cast-bridge; # added 2023-07-26 + fcitx = throw "fcitx is deprecated, please use fcitx5 instead."; # Added 2023-03-13 + fcitx-engines = throw "fcitx-engines is deprecated, please use fcitx5 instead."; # Added 2023-03-13 + fcitx-configtool = throw "fcitx-configtool is deprecated, please use fcitx5 instead."; # Added 2023-03-13 fcitx5-chinese-addons = libsForQt5.fcitx5-chinese-addons; # Added 2024-03-01 fcitx5-configtool = libsForQt5.fcitx5-configtool; # Added 2024-03-01 @@ -381,6 +542,10 @@ mapAliases { g4music = gapless; # Added 2024-07-26 g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17 gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 + garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 + garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 + garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12 + garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 @@ -389,7 +554,10 @@ mapAliases { gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21 gcj = gcj6; # Added 2024-09-13 gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11 gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15 + geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 + geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 @@ -404,8 +572,11 @@ mapAliases { Consider migrating to forgejo or gitea. ''; # Added 2024-10-12 + go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 + gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20 + git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { darcsToGit = darcs-to-git; @@ -417,12 +588,15 @@ mapAliases { topGit = top-git; }; # Added 2021-01-14 + gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18 glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11 + glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26 glfw-wayland = glfw; # Added 2024-04-19 glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08 globalprotect-openconnect = throw "'globalprotect-openconnect' has been renamed to/replaced by 'gpauth' and 'gpclient'"; # Added 2024-09-21 glxinfo = mesa-demos; # Added 2024-07-04 gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17 + gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 gnatboot11 = gnat-bootstrap11; gnatboot12 = gnat-bootstrap12; gnatboot = gnat-bootstrap; @@ -446,7 +620,9 @@ mapAliases { gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14 + gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-resources = resources; # added 2023-12-10 + gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2023-09-10 gnuradio-with-packages = gnuradio3_7.override { extraPackages = lib.attrVals [ @@ -463,57 +639,123 @@ mapAliases { gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17 gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17 + gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 + gnuradio-ais = throw "'gnuradio-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 + gnuradio-gsm = throw "'gnuradio-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 + gnuradio-limesdr = throw "'gnuradio-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 + gnuradio-nacl = throw "'gnuradio-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 + gnuradio-osmosdr = throw "'gnuradio-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 + gnuradio-rds = throw "'gnuradio-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 + go2nix = throw "'go2nix' has been removed as it was archived upstream"; # Added 2023-12-27 gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17 #godot + godot = throw "godot has been renamed to godot3 to distinguish from version 4"; # Added 2023-07-16 + godot-export-templates = throw "godot-export-templates has been renamed to godot3-export-templates to distinguish from version 4"; # Added 2023-07-16 + godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 + godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 + gdtoolkit = throw "gdtoolkit has been renamed to gdtoolkit_3 to distinguish from version 4"; # Added 2024-02-17 + google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 + google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 + google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 go-thumbnailer = thud; # Added 2023-09-21 go-upower-notify = upower-notify; # Added 2024-07-21 + gocode = throw "'gocode' has been removed as the upstream project was archived. 'gopls' is suggested as replacement"; # Added 2023-12-26 + govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26 + gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15 gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25; + gpt4all-chat = throw "gpt4all-chat has been renamed to gpt4all"; # Added 2024-02-27 gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; + graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 + graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 + graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 + grab-site = throw "grab-site has been removed because it's unmaintained and broken"; # Added 2023-11-12 + gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 + gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana_reporter = grafana-reporter; # Added 2024-06-09 + gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 grapefruit = throw "'grapefruit' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 + graylog = throw "graylog is now available in versions 3.3 up to 5.0. Please mind the upgrade path and choose the appropriate version. Direct upgrading from 3.3 to 4.3 or above is not supported"; # Added 2023-04-24 graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09 graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15 + gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 gringo = clingo; # added 2022-11-27 + gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 + gr-nacl = throw "'gr-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 + gr-osmosdr = throw "'gr-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 + gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 + grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtkcord4 = dissent; # Added 2024-03-10 gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 + gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 guile-disarchive = disarchive; # Added 2023-10-27 + guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16 ### H ### + haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 + haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 HentaiAtHome = hentai-at-home; # Added 2024-06-12 + hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 + hikari = throw "hikari has been removed from nixpkgs, it was unmaintained and required wlroots_0_15 at the time of removal"; # Added 2024-03-28 + hip = throw "'hip' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 + hipcc = throw "'hipcc' has been replaced with 'rocmPackages.hipcc'"; # Added 2023-10-08 + hipchat = throw "'hipchat' has been discontinued since 2019; upstream recommends Slack."; # Added 2023-12-02 + hipify = throw "'hipify' has been replaced with 'rocmPackages.hipify'"; # Added 2023-10-08 + hipcub = throw "'hipcub' has been replaced with 'rocmPackages.hipcub'"; # Added 2023-10-08 + hipsparse = throw "'hipsparse' has been replaced with 'rocmPackages.hipsparse'"; # Added 2023-10-08 + hipfort = throw "'hipfort' has been replaced with 'rocmPackages.hipfort'"; # Added 2023-10-08 + hipfft = throw "'hipfft' has been replaced with 'rocmPackages.hipfft'"; # Added 2023-10-08 + hipsolver = throw "'hipsolver' has been replaced with 'rocmPackages.hipsolver'"; # Added 2023-10-08 + hipblas = throw "'hipblas' has been replaced with 'rocmPackages.hipblas'"; # Added 2023-10-08 + hip-amd = throw "'hip-amd' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 + hip-common = throw "'hip-common' has been replaced with 'rocmPackages.hip-common'"; # Added 2023-10-08 + hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13 ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17 hydra_unstable = hydra; # Added 2024-08-22 hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; + hyper-haskell = throw "'hyper-haskell' has been removed. reason: has been broken for a long time and depends on an insecure electron version"; # Added 2024-03-14 + hyper-haskell-server-with-packages = throw "'hyper-haskell-server-with-packages' has been removed. reason: has been broken for a long time"; # Added 2024-03-14 ### I ### i3-gaps = i3; # Added 2023-01-03 ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15 ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15 + icedtea8_web = throw "'icedtea8_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 + icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 + ignite = throw "'ignite' has been removed as the upstream project was archived, please use 'flintlock' instead"; # Added 2024-01-07 + imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17 imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17 imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17 + imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04 immersed-vr = lib.warn "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11 + indiepass-desktop = throw "indiepass-desktop has been dropped because it does not work with recent Electron versions"; # Added 2024-03-14 + indigenous-desktop = throw "'indigenous-desktop' has been renamed to/replaced by 'indiepass-desktop'"; # Added 2023-11-08 input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21 + instead-launcher = throw "instead-launcher has been removed, because it depended on qt4"; # Added 2023-07-26 + insync-v3 = throw "insync-v3 has been merged into the insync package; use insync instead"; #Added 2023-05-13 index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 + infiniband-diags = throw "'infiniband-diags' has been renamed to/replaced by 'rdma-core'"; # Converted to throw 2023-09-10 inotifyTools = inotify-tools; inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17 + iouyap = throw "'iouyap' is deprecated and archived by upstream, use 'ubridge' instead"; # Added 2023-09-21 ipfs = kubo; # Added 2022-09-27 ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 @@ -531,15 +773,23 @@ mapAliases { jami-client-qt = jami-client; # Added 2022-11-06 jami-client = jami; # Added 2023-02-10 jami-daemon = jami.daemon; # Added 2023-02-10 + jfbpdf = throw "'jfbpdf' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 + jfbview = throw "'jfbview' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 + jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 + join-desktop = throw "'join-desktop' has been removed because it is unmaintained upstream"; # Added 2023-10-04 jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 # Julia julia_16-bin = throw "'julia_16-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-10-08 + julia_18 = throw "'julia_18' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 + julia_18-bin = throw "'julia_18-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 jush = throw "jush has been removed from nixpkgs because it is unmaintained"; # Added 2024-05-28 ### K ### + k3s_1_24 = throw "'k3s_1_24' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 + k3s_1_25 = throw "'k3s_1_25' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20 k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01 # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 @@ -550,14 +800,18 @@ mapAliases { kargo = throw "kargo was removed as it is deprecated upstream and depends on the removed boto package"; # Added 2024-09-22 kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17 + keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 + keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepkey_agent = keepkey-agent; # added 2024-01-06 kerberos = throw "'kerberos' has been renamed to/replaced by 'krb5'"; # Converted to throw 2024-10-17 kexectools = throw "'kexectools' has been renamed to/replaced by 'kexec-tools'"; # Converted to throw 2024-10-17 keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25 keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17 + kfctl = throw "kfctl is broken and has been archived by upstream"; # Added 2023-08-21 kgx = gnome-console; # Added 2022-02-19 kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-30-10 kibana = kibana7; + kicad-with-packages3d = throw "'kicad-with-packages3d' has been renamed to/replaced by 'kicad'"; # Converted to throw 2023-09-10 kio-admin = libsForQt5.kdeGear.kio-admin; # Added 2023-03-18 kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10 kodiGBM = kodi-gbm; @@ -568,6 +822,7 @@ mapAliases { krb5Full = krb5; krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17 kubei = kubeclarity; # Added 2023-05-20 + kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02 ### L ### @@ -576,8 +831,10 @@ mapAliases { LASzip = laszip; # Added 2024-06-12 LASzip2 = laszip_2; # Added 2024-06-12 latinmodern-math = lmmath; + ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 ledger_agent = ledger-agent; # Added 2024-01-07 lfs = dysk; # Added 2023-07-03 + llvmPackages_rocm = throw "'llvmPackages_rocm' has been replaced with 'rocmPackages.llvm'"; # Added 2023-10-08 libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01 libav = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25 libav_0_8 = libav; # Added 2024-08-25 @@ -589,25 +846,33 @@ mapAliases { libbencodetools = bencodetools; # Added 2022-07-30 libbpf_1 = libbpf; # Added 2022-12-06 libbson = mongoc; # Added 2024-03-11 + libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10 + libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08 + libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 libheimdal = heimdal; # Added 2022-11-18 + libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 libixp_hg = libixp; libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 + libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libquotient = libsForQt5.libquotient; # Added 2023-11-11 librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 + libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17 LibreArp = librearp; # Added 2024-06-12 LibreArp-lv2 = librearp-lv2; # Added 2024-06-12 libreddit = throw "'libreddit' has been removed because it is unmaintained upstream. Consider using 'redlib', a maintained fork"; # Added 2024-07-17 + libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07 librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17 + libsigcxx12 = throw "'libsigcxx12' has been removed, please use newer versions"; # Added 2023-10-20 libsForQt515 = libsForQt5; # Added 2022-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17 @@ -619,6 +884,7 @@ mapAliases { libwnck3 = libwnck; libyamlcpp = yaml-cpp; # Added 2023-01-29 libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 + libxkbcommon_7 = throw "libxkbcommon_7 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libxkbcommon'"; # Added 2023-01-03 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; linux_wallpaperengine = throw "linux_wallpaperengine was removed due to freeimage dependency"; # Added 2024-07-19 @@ -704,13 +970,34 @@ mapAliases { llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; + lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 + lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 + lld_8 = throw "lld_8 has been removed from nixpkgs"; # Added 2024-01-24 lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08 + lld_10 = throw "lld_10 has been removed from nixpkgs"; # Added 2024-01-26 + lld_11 = throw "lld_11 has been removed from nixpkgs"; # Added 2024-01-24 + lldb_6 = throw "lldb_6 has been removed from nixpkgs"; # Added 2024-01-08 + lldb_7 = throw "lldb_7 has been removed from nixpkgs"; # Added 2023-11-19 + lldb_8 = throw "lldb_8 has been removed from nixpkgs"; # Added 2024-01-24 lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08 + lldb_10 = throw "lldb_10 has been removed from nixpkgs"; # Added 2024-01-26 + lldb_11 = throw "lldb_11 has been removed from nixpkgs"; # Added 2024-01-24 + llvmPackages_6 = throw "llvmPackages_6 has been removed from nixpkgs"; # Added 2024-01-09 + llvmPackages_7 = throw "llvmPackages_7 has been removed from nixpkgs"; # Added 2023-11-19 + llvmPackages_8 = throw "llvmPackages_8 has been removed from nixpkgs"; # Added 2024-01-24 llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08 + llvmPackages_10 = throw "llvmPackages_10 has been removed from nixpkgs"; # Added 2024-01-26 + llvmPackages_11 = throw "llvmPackages_11 has been removed from nixpkgs"; # Added 2024-01-24 + llvm_6 = throw "llvm_6 has been removed from nixpkgs"; # Added 2024-01-08 + llvm_7 = throw "llvm_7 has been removed from nixpkgs"; # Added 2023-11-19 + llvm_8 = throw "llvm_8 has been removed from nixpkgs"; # Added 2024-01-24 llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08 + llvm_10 = throw "llvm_10 has been removed from nixpkgs"; # Added 2024-01-26 + llvm_11 = throw "llvm_11 has been removed from nixpkgs"; # Added 2024-01-24 lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17 lsh = throw "lsh has been removed as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decade"; # Added 2024-08-14 + luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 @@ -722,8 +1009,12 @@ mapAliases { MACS2 = macs2; # Added 2023-06-12 mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19 mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 + mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 + mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 + markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24 marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08 marwaita-peppermint = lib.warn "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01 @@ -733,23 +1024,35 @@ mapAliases { mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17 + matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09 + matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15 + mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17 + mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; microcodeAmd = microcode-amd; # Added 2024-09-08 microcodeIntel = microcode-intel; # Added 2024-09-08 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 MIDIVisualizer = midivisualizer; # Added 2024-06-12 + migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01 + minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 + miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 + miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages_5.miopengemm'"; # Added 2023-10-08 + miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08 + miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08 mime-types = mailcap; # Added 2022-01-21 minetest-touch = minetestclient; # Added 2024-08-12 minetestclient_5 = minetestclient; # Added 2023-12-11 minetestserver_5 = minetestserver; # Added 2023-12-11 minizip2 = pkgs.minizip-ng; # Added 2022-12-28 + mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26 + mlton20210107 = throw "'mlton20210107' has been renamed to 'mlton20210117', correcting the version number"; # Added 2024-03-31 mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17 mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17 mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17 @@ -763,16 +1066,24 @@ mapAliases { mod_pkcs12 = throw "'mod_pkcs12' has been renamed to/replaced by 'apacheHttpdPackages.mod_pkcs12'"; # Converted to throw 2024-10-17 mod_timestamp = throw "'mod_timestamp' has been renamed to/replaced by 'apacheHttpdPackages.mod_timestamp'"; # Converted to throw 2024-10-17 monero = throw "'monero' has been renamed to/replaced by 'monero-cli'"; # Converted to throw 2024-10-17 + moneyplex = throw "'moneyplex' has been removed, as it was broken and unmaintained"; # Added 2024-02-28 + mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05 + mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06 mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11 mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01 + moonlander = throw "'moonlander' has been removed due to it being broken and unmaintained"; # Added 2023-11-26 moz-phab = mozphab; # Added 2022-08-09 + mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 + mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17 mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 msp430NewlibCross = msp430Newlib; # Added 2024-09-06 + mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22 + murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 mutt-with-sidebar = mutt; # Added 2022-09-17 mysql-client = hiPrio mariadb.client; mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17 @@ -782,6 +1093,11 @@ mapAliases { ncdu_2 = ncdu; # Added 2022-07-22 neocities-cli = neocities; # Added 2024-07-31 + nestopia = throw "nestopia was forked; use nestopia-ue instead"; # Added 2024-01-24 + net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10 + netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 + netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 + netease-music-tui = throw "netease-music-tui has been removed due to unmaintained by upstream and broken functionality"; # Added 2024-03-03 nextcloud27 = throw '' Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring @@ -796,6 +1112,7 @@ mapAliases { nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 + neoload = throw "'neoload' has been removed as it is broken and unmaintained"; # Added 2024-03-02 newlibCross = newlib; # Added 2024-09-06 newlib-nanoCross = newlib-nano; # Added 2024-09-06 nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 @@ -806,25 +1123,36 @@ mapAliases { "nix-repl has been removed because it's not maintained anymore, " + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" ); + nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 nix-simple-deploy = throw "'nix-simple-deploy' has been removed as it is broken and unmaintained"; # Added 2024-08-17 + nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21 nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2024-10-17 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22 nix_2_3 = nixVersions.nix_2_3; nixfmt = lib.warn "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31 + nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable. + nixops_unstable = throw "nixops_unstable has been replaced. Please use for example 'nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ps.nixops-encrypted-links ])' instead"; # Added 2024-02-28 nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 + nodejs_14 = throw "nodejs_14 has been removed as it is EOL."; # Added 2023-10-30 + nodejs-slim_14 = throw "nodejs-slim_14 has been removed as it is EOL."; # Added 2023-10-30 nodejs-14_x = nodejs_14; # Added 2022-11-06 nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 + nodejs_16 = throw "nodejs_16 has been removed as it is EOL."; # Added 2023-10-30 nodejs-16_x = nodejs_16; # Added 2022-11-06 + nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 + nodejs-slim_16 = throw "nodejs-slim_16 has been removed as it is EOL."; # Added 2022-11-06 nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 + nomad_1_2 = throw "nomad_1_2 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 + nomad_1_3 = throw "nomad_1_3 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 @@ -843,19 +1171,33 @@ mapAliases { o = orbiton; # Added 2023-04-09 oathToolkit = oath-toolkit; # Added 2022-04-04 oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17 + obinskit = throw "'obinskit' has been removed from nixpkgs, because the package was unmaintained and depended on an insecure version of electron"; # Added 2024-03-20 + octant = throw "octant has been dropped due to being archived and vulnerable"; # Added 2023-09-29 + octant-desktop = throw "octant-desktop has been dropped due to being archived and vulnerable"; # Added 2023-09-29 + octorpki = throw "octorpki has been removed, upstream says to use rpki-client instead"; # Added 2024-03-19 + ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22 + ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20 onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 + opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21 + opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08 opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 openafs_1_8 = openafs; # Added 2022-08-22 + openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02 + openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 + opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 + openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 opendylan = throw "opendylan has been removed from nixpkgs as it was broken"; # Added 2024-07-15 opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15 openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17 openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13 + openimagedenoise_1_2_x = throw "'openimagedenoise_1_2_x' has been renamed to/replaced by 'openimagedenoise'"; # Added 2023-06-07 openimageio2 = openimageio; # Added 2023-01-05 + openimageio_1 = throw "'openimageio_1' has been removed, please update to 'openimageio' 2"; # Added 2023-06-14 openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17 openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjdk19_headless = openjdk19; # Added 2024-08-01 @@ -873,15 +1215,20 @@ mapAliases { openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29 openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17 openssl_3_0 = openssl_3; # Added 2022-06-27 + openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 + optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12 orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17 + oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24 + oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 OSCAR = oscar; # Added 2024-06-12 osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 + oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23 ### P ### @@ -890,12 +1237,18 @@ mapAliases { p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 + packet = throw "packet has been removed as it is no longer working and unmaintained"; # Added 2024-03-29 + palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18 + pam_usb = throw "'pam_usb' has been removed: abandoned by upstream since 2015."; # Added 2023-10-30 + paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17 paperless-ng = paperless-ngx; # Added 2022-04-11 partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 + pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 patchelfStable = patchelf; # Added 2024-01-25 pcsctools = pcsc-tools; # Added 2023-12-07 pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 + pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 percona-server_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13 percona-server_lts = percona-server; # Added 2024-10-13 @@ -907,18 +1260,26 @@ mapAliases { petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 pgadmin = pgadmin4; pharo-spur64 = pharo; # Added 2022-08-03 + phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 + photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 + picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 + picom-jonaburg = throw "picom-jonaburg was removed because it is unmaintained by upstream"; # Added 2024-02-13 picom-next = picom; # Added 2024-02-13 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 # Obsolete PHP version aliases + php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 php80Packages = php80; # Added 2023-06-21 php80Extensions = php80; # Added 2023-06-21 pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; + pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2023-09-10 playwright = lib.warn "'playwright' will reference playwright-driver in 25.05. Reference 'python3Packages.playwright' for the python test launcher" python3Packages.toPythonApplication python3Packages.playwright; # Added 2024-10-04 pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 pltScheme = racket; # just to be sure + pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 + pomotroid = throw "pomotroid has been removed from nixpkgs, because it depended on an insecure version of electron"; # Added 2023-09-12 poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 powerdns = pdns; # Added 2022-03-28 @@ -950,31 +1311,50 @@ mapAliases { tty = pinentry-tty; flavors = [ "curses" "emacs" "gnome3" "gtk2" "qt" "tty" ]; }; # added 2024-01-15 + pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2023-09-10 + pinentry_emacs = throw "'pinentry_emacs' has been renamed to/replaced by 'pinentry-emacs'"; # Converted to throw 2023-09-10 + pinentry_gnome = throw "'pinentry_gnome' has been renamed to/replaced by 'pinentry-gnome'"; # Converted to throw 2023-09-10 + pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 + pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2024-10-17 pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15 pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15 PlistCpp = plistcpp; # Added 2024-01-05 pocket-updater-utility = pupdate; # Added 2024-01-25 + poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 + prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 + privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 probe-rs = probe-rs-tools; # Added 2024-05-23 + probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 probe-run = throw "probe-run is deprecated upstream. Use probe-rs instead."; # Added 2024-05-23 + processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01 + prometheus-openvpn-exporter = throw "'prometheus-openvpn-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-12-23 prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10 + prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 + protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 + protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01 protobuf3_24 = protobuf_24; protobuf3_23 = protobuf_23; protobuf3_21 = protobuf_21; protonup = protonup-ng; # Added 2022-11-06 protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 proxmark3-rrg = proxmark3; # Added 2023-07-25 + proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 + pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 + pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 + pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2023-09-10 pyo3-pack = maturin; pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; pypolicyd-spf = spf-engine; # Added 2022-10-09 python = python2; # Added 2022-01-11 + python-language-server = throw "python-language-server has been removed as it is no longer maintained. Use e.g. python-lsp-server instead"; # Added 2023-01-07 python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17 pythonFull = python2Full; # Added 2022-01-11 pythonPackages = python.pkgs; # Added 2022-01-11 @@ -983,7 +1363,9 @@ mapAliases { qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30 qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2024-10-17 + qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25 qflipper = qFlipper; # Added 2022-02-11 + qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17 qscintilla = libsForQt5.qscintilla; # Added 2023-09-20 qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20 qt515 = qt5; # Added 2022-11-24 @@ -1000,6 +1382,8 @@ mapAliases { quicklispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19 + quvi = throw "'quvi' has been removed, as it was broken and unmaintained"; # Added 2023-11-25 ### R ### @@ -1010,18 +1394,58 @@ mapAliases { railway-travel = diebahn; # Added 2024-04-01 rambox-pro = rambox; # Added 2022-12-12 rapidjson-unstable = lib.warn "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28 + rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 + rccl = throw "'rccl' has been replaced with 'rocmPackages.rccl'"; # Added 2023-10-08 + rdc = throw "'rdc' has been replaced with 'rocmPackages.rdc'"; # Added 2023-10-08 + readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10 relibc = throw "relibc has been removed due to lack of maintenance"; # Added 2024-09-02 replay-sorcery = throw "replay-sorcery has been removed as it is unmaintained upstream. Consider using gpu-screen-recorder or obs-studio instead."; # Added 2024-07-13 restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04 + restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 + retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 retroshare06 = retroshare; + ricochet = throw "ricochet has been deprecated in favor of ricochet-refresh"; # Added 2024-02-26 rigsofrods = rigsofrods-bin; # Added 2023-03-22 ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17 + rnix-lsp = throw "'rnix-lsp' has been removed as it is unmaintained"; # Added 2024-03-09 rockbox_utility = rockbox-utility; # Added 2022-03-17 + rocalution = throw "'rocalution' has been replaced with 'rocmPackages.rocalution'"; # Added 2023-10-08 + rocblas = throw "'rocblas' has been replaced with 'rocmPackages.rocblas'"; # Added 2023-10-08 + rocfft = throw "'rocfft' has been replaced with 'rocmPackages.rocfft'"; # Added 2023-10-08 + rocprim = throw "'rocprim' has been replaced with 'rocmPackages.rocprim'"; # Added 2023-10-08 + rocrand = throw "'rocrand' has been replaced with 'rocmPackages.rocrand'"; # Added 2023-10-08 + rocsparse = throw "'rocsparse' has been replaced with 'rocmPackages.rocsparse'"; # Added 2023-10-08 + rocthrust = throw "'rocthrust' has been replaced with 'rocmPackages.rocthrust'"; # Added 2023-10-08 + roctracer = throw "'roctracer' has been replaced with 'rocmPackages.roctracer'"; # Added 2023-10-08 + rocwmma = throw "'rocwmma' has been replaced with 'rocmPackages.rocwmma'"; # Added 2023-10-08 + rocclr = throw "'rocclr' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 + rocdbgapi = throw "'rocdbgapi' has been replaced with 'rocmPackages.rocdbgapi'"; # Added 2023-10-08 + rocgdb = throw "'rocgdb' has been replaced with 'rocmPackages.rocgdb'"; # Added 2023-10-08 + rocprofiler = throw "'rocprofiler' has been replaced with 'rocmPackages.rocprofiler'"; # Added 2023-10-08 + rocsolver = throw "'rocsolver' has been replaced with 'rocmPackages.rocsolver'"; # Added 2023-10-08 + rocmClangStdenv = throw "'rocmClangStdenv' has been moved to 'rocmPackages' and is no longer public"; # Added 2023-10-08 + rocmUpdateScript = throw "'rocmUpdateScript' has been moved to 'rocmPackages' and is no longer public"; # Added 2023-10-08 + rocminfo = throw "'rocminfo' has been replaced with 'rocmPackages.rocminfo'"; # Added 2023-10-08 + rocmlir = throw "'rocmlir' has been replaced with 'rocmPackages.rocmlir'"; # Added 2023-10-08 + rocmlir-rock = throw "'rocmlir-rock' has been replaced with 'rocmPackages.rocmlir-rock'"; # Added 2023-10-08 + rocm-cmake = throw "'rocm-cmake' has been replaced with 'rocmPackages.rocm-cmake'"; # Added 2023-10-08 + rocm-comgr = throw "'rocm-comgr' has been replaced with 'rocmPackages.rocm-comgr'"; # Added 2023-10-08 + rocm-core = throw "'rocm-core' has been replaced with 'rocmPackages.rocm-core'"; # Added 2023-10-08 + rocm-device-libs = throw "'rccl' has been replaced with 'rocmPackages.rocm-device-libs'"; # Added 2023-10-08 + rocm-opencl-icd = rocmPackages.clr.icd; # Added 2023-10-08 Convert to throw after 23.11 is released + rocm-opencl-runtime = rocmPackages.clr; # Added 2023-10-08 Convert to throw after 23.11 is released + rocm-runtime = throw "'rocm-runtime' has been replaced with 'rocmPackages.rocm-runtime'"; # Added 2023-10-08 + rocm-smi = throw "'rocm-smi' has been replaced with 'rocmPackages.rocm-smi'"; # Added 2023-10-08 + rocm-thunk = throw "'rocm-thunk' has been replaced with 'rocmPackages.rocm-thunk'"; # Added 2023-10-08 + rocr-debug-agent = throw "'rocr-debug-agent' has been replaced with 'rocmPackages.rocr-debug-agent'"; # Added 2023-10-08 + rome = throw "rome is no longer maintained, consider using biome instead"; # Added 2023-09-12 rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17 rr-unstable = rr; # Added 2022-09-17 + rtl8723bs-firmware = throw "rtl8723bs-firmware was added in mainline kernel version 4.12"; # Added 2023-07-03 + rtsp-simple-server = throw "rtsp-simple-server is rebranded as mediamtx, including default config path update"; # Added 2023-04-11 rtx = mise; # Added 2024-01-05 runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; @@ -1034,6 +1458,7 @@ mapAliases { # due to it being inside the linuxPackagesFor function. rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2024-10-17 rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28 + rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19 ### S ### @@ -1050,23 +1475,44 @@ mapAliases { schildichat-desktop = schildichat-web; schildichat-desktop-wayland = schildichat-web; scitoken-cpp = scitokens-cpp; # Added 2024-02-12 + scylladb = throw "'scylladb' has been removed due to being unmaintained"; # Added 2024-03-17 + sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 + searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03 semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 + semver-cpp = throw "'semver-cpp' was removed because no packages in nixpkgs use it anymore"; # Added 2024-02-14 session-desktop-appimage = session-desktop; + setupcfg2nix = throw "'setupcfg2nix' has been removed. Please switch to buildPythonPackage"; # Added 2023-12-12 sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 + sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26 + sgtpuzzles = throw "'sgtpuzzles' has been renamed to 'sgt-puzzles'"; # Added 2023-10-06 + sgtpuzzles-mobile = throw "'sgtpuzzles-mobile' has been renamed to 'sgt-puzzles-mobile'"; # Added 2023-10-06 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 + shhgit = throw "shhgit is broken and is no longer maintained. See https://github.com/eth0izzle/shhgit#-shhgit-is-no-longer-maintained-"; # Added 2023-08-08 shipyard = jumppad; # Added 2023-06-06 shout = nodePackages.shout; # Added unknown; moved 2024-10-19 + signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 + simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 + skk-dicts = throw "'skk-dicts' has been split into multiple packages under 'skkDictionaries'"; # Added 2023-11-08 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 SkypeExport = skypeexport; # Added 2024-06-12 slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17 + slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 slurm-llnl = slurm; # renamed July 2017 + smesh = throw "'smesh' has been removed as it's unmaintained and depends on opencascade-oce, which is also unmaintained"; # Added 2023-09-18 snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04; soldat-unstable = opensoldat; # Added 2022-07-02 + solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 + 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 + spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 + spark_3_3 = throw "'spark_3_3' is no longer supported nixpkgs, please use 'spark'"; # Added 2024-03-23 spark2014 = gnatprove; # Added 2024-02-25 # Added 2020-02-10 @@ -1092,14 +1538,21 @@ mapAliases { source-han-serif-traditional-chinese = source-han-serif; + spacegun = throw "'spacegun' has been removed as unmaintained"; # Added 2023-05-20 spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17 + speedtest-exporter = throw "'speedtest-exporter' has been removed as unmaintained"; # Added 2023-07-31 + spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2024-10-17 spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 + spotify-tui = throw "'spotify-tui' has been removed, as it was broken and unmaintained"; # Added 2024-03-12 spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 + squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 + ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 + starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 steamPackages = { steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; @@ -1112,8 +1565,10 @@ mapAliases { steam-run-native = steam-run; # added 2022-02-21 StormLib = stormlib; # Added 2024-01-21 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 + supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 swiProlog = lib.warn "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07 swiPrologWithGui = lib.warn "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07 + swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23 swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23 swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12 @@ -1136,8 +1591,12 @@ mapAliases { taro = taproot-assets; # Added 2023-07-04 tdesktop = telegram-desktop; # Added 2023-04-07 teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 + telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 + teleport_11 = throw "teleport 11 has been removed as it is EOL. Please upgrade to Teleport 12 or later"; # Added 2023-11-27 + teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04 teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26 teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18 + teleprompter = throw "teleprompter has been removed. reason: upstream dead and does not work with recent electron versions"; # Added 2024-03-14 temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01 @@ -1145,17 +1604,22 @@ mapAliases { temurin-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-jre-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-bin-16 = throw "Temurin 16 has been removed as it has reached its end of life"; # Added 2024-08-01 + tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 tepl = libgedit-tepl; # Added 2024-04-29 testVersion = testers.testVersion; # Added 2022-04-20 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 + thrift-0_10 = throw "'thrift-0_10' has been removed because it is impacted by security issues and not used in nixpkgs, move to 'thrift'"; # Added 2024-03-17 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17 + tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 + tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 + 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 @@ -1168,6 +1632,8 @@ mapAliases { trezor_agent = trezor-agent; # Added 2024-01-07 openai-triton-llvm = triton-llvm; # added 2024-07-18 trust-dns = hickory-dns; # Added 2024-08-07 + trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 + trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15 turbogit = throw "turbogit has been removed as it is unmaintained upstream and depends on an insecure version of libgit2"; # Added 2024-08-25 tvbrowser-bin = tvbrowser; # Added 2023-03-02 @@ -1183,7 +1649,10 @@ mapAliases { ubuntu_font_family = ubuntu-classic; # Added 2024-02-19 uclibc = uclibc-ng; # Added 2022-06-16 uclibcCross = uclibc-ng; # Added 2022-06-16 + ue4 = throw "ue4 has been removed, because the package was broken for years"; # Added 2023-11-22 uefi-firmware-parser = throw "The uefi-firmware-parser package was dropped since it was unmaintained."; # Added 2024-06-21 + uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07 + uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21 unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17 uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; unifi-poller = unpoller; # Added 2022-11-24 @@ -1194,6 +1663,7 @@ mapAliases { unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11 unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11 untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17 + urlview = throw "'urlview' has been dropped because it's unmaintained. Consider switching to an alternative such as `pkgs.extract_url` or `pkgs.urlscan`."; # Added 2023-12-14 urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2024-10-17 urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2024-10-17 urxvt_font_size = throw "'urxvt_font_size' has been renamed to/replaced by 'rxvt-unicode-plugins.font-size'"; # Converted to throw 2024-10-17 @@ -1202,11 +1672,14 @@ mapAliases { urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2024-10-17 urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2024-10-17 urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2024-10-17 + usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10 + utahfs = throw "utahfs has been removed, as it is broken and lack of maintenance from upstream"; # Added 2023-09-29 util-linuxCurses = util-linux; # Added 2022-04-12 utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475 ### V ### + v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 @@ -1217,18 +1690,31 @@ mapAliases { ventoy-bin-full = ventoy-full; # Added 2023-04-12 verilog = iverilog; # Added 2024-07-12 ViennaRNA = viennarna; # Added 2023-08-23 + vikunja-api = throw "'vikunja-api' has been replaced by 'vikunja'"; # Added 2024-02-19 + vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14 vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 + virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 + virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17 + vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 vkBasalt = vkbasalt; # Added 2022-11-22 vkdt-wayland = vkdt; # Added 2024-04-19 + vsmtp = throw "'vsmtp' has been removed, upstream gone"; # Added 2023-12-18 + vte_290 = throw "'vte_290' has been renamed to/replaced by 'vte'"; # Added 2023-01-05 + varnish72 = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 + varnish73 = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 + varnish72Packages = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 + varnish73Packages = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 + volatility = throw "'volatility' has been removed, as it was broken and unmaintained"; # Added 2023-12-10 ### W ### wakatime = wakatime-cli; # 2024-05-30 wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22 + waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 wayfireApplications-unwrapped = throw '' 'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire' 'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins' @@ -1236,12 +1722,20 @@ mapAliases { 'wayfireApplications-unwrapped.wlroots' has been removed ''; # Add 2023-07-29 waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24 + wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29 + webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 webkitgtk = lib.warn "Explicitly set the ABI version of 'webkitgtk'" webkitgtk_4_0; wineWayland = wine-wayland; + win-qemu = throw "'win-qemu' has been replaced by 'virtio-win'"; # Added 2023-08-16 win-virtio = virtio-win; # Added 2023-10-17 + win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17 wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17 + wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 + wlroots_0_15 = throw "'wlroots_0_15' has been removed in favor of newer versions"; # Added 2024-03-28 wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14 wlroots = wlroots_0_18; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release + wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10 + wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10 wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03 wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03 wordpress6_5 = wordpress_6_5; # Added 2024-08-03 @@ -1251,6 +1745,7 @@ mapAliases { wmii_hg = wmii; wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26 write_stylus = styluslabs-write-bin; # Added 2024-10-09 + wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22 wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03 wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03 wxmac = wxGTK30; # Added 2023-03-22 @@ -1258,6 +1753,8 @@ mapAliases { ### X ### xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17 + xcbuild6Hook = throw "'xcbuild6Hook has been renamed to/replaced by 'xcbuildHook'"; # Added 2023-12-10 + xcodebuild6 = throw "'xcodebuild6' has been renamed to/replaced by 'xcodebuild'"; # Added 2023-12-10 xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17 xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30 xen-slim = throw "'xen-slim' has been renamed to 'xen'. The old Xen package with built-in components no longer exists"; # Added 2024-10-05 @@ -1273,6 +1770,7 @@ mapAliases { xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 + xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17 xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27 @@ -1281,11 +1779,19 @@ mapAliases { yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17 yafaray-core = libyafaray; # Added 2022-09-23 + yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 + yubikey-manager4 = throw "yubikey-manager4 has been removed, since it is no longer required by yubikey-manager-qt. Please update to yubikey-manager."; # Added 2024-01-14 + yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzu-mainline = throw "yuzu-mainline has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzuPackages = throw "yuzuPackages has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 ### Z ### + zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07 zfsStable = zfs; # Added 2024-02-26 zfsUnstable = zfs_unstable; # Added 2024-02-26 zinc = zincsearch; # Added 2023-05-28 @@ -1296,9 +1802,11 @@ mapAliases { ### UNSORTED ### + zeroc_ice = throw "'zeroc_ice' has been renamed to/replaced by 'zeroc-ice'"; # Converted to throw 2023-09-10 dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2024-10-17 dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02 + gnatsd = throw "'gnatsd' has been renamed to/replaced by 'nats-server'"; # Converted to throw 2023-09-10 posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17 ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17 From 1cacb713a4b9bb379a68d2a08d8283df266670d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 21 Oct 2024 11:52:00 -0600 Subject: [PATCH 215/229] Reapply "aliases: cleanup old throw aliases" This reverts commit 8a70e31a6e52b4ab19ba7d531ccf94dd2022a112. --- pkgs/top-level/aliases.nix | 508 ------------------------------------- 1 file changed, 508 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7b07e7b1ce1b..5c6c10b9c23b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -88,55 +88,30 @@ mapAliases { adoptopenjdk-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09 adoptopenjdk-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09 adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09 - advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29 # Post 24.11 branch-off, this should throw an error addOpenGLRunpath = addDriverRunpath; # Added 2024-05-25 - aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" - airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 - alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28 - alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12 alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17 alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17 alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2024-10-17 alsaPlugins = throw "'alsaPlugins' has been renamed to/replaced by 'alsa-plugins'"; # Converted to throw 2024-10-17 alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2024-10-17 alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17 - amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31 angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17 - ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 - ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10 ao = libfive; # Added 2024-10-11 - apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 - apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_1 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_2 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_3 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_4 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 - arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 - archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 - ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aria = aria2; # Added 2024-03-26 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 - asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 - asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19 - asterisk_19 = throw "asterisk_19: Asterisk 19 is end of life and has been removed"; # Added 2023-04-19 - atom = throw "'atom' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 - atom-beta = throw "'atom-beta' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 - atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 - atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 @@ -151,55 +126,31 @@ mapAliases { badtouch = authoscope; # Project was renamed, added 20210626 baget = throw "'baget' has been removed due to being unmaintained"; - ballAndPaddle = throw "'ballAndPaddle' has been removed because it was broken and abandoned upstream"; # Added 2023-10-16 bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17 bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17 - bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 - bazel_4 = throw "'bazel_4' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-23 BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 - bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 - bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 - bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 - beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08 bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15 bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 - binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09 bird2 = bird; # Added 2022-02-21 bitwarden = bitwarden-desktop; # Added 2024-02-25 - bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 - bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 blender-with-packages = args: lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" (blender.withPackages (_: args.packages)).overrideAttrs (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15 blockbench-electron = blockbench; # Added 2024-03-16 - bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 bmap-tools = bmaptool; # Added 2024-08-05 - bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01 - boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost16x = throw "boost16x has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost170 = throw "boost170 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost172 = throw "boost172 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost173 = throw "boost173 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost174 = throw "boost174 has been deprecated in favor of the latest version"; # Added 2023-06-08 - boost17x = throw "boost17x has been deprecated in favor of the latest version"; # Added 2023-07-13 - boost18x = throw "boost18x has been deprecated in favor of the latest version"; # Added 2023-07-13 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 - bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 brasero-original = lib.warn "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29 - bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29 budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 - bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24 butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18 # Shorter names; keep the longer name for back-compat. Added 2023-04-11 buildFHSUserEnv = buildFHSEnv; @@ -219,17 +170,11 @@ mapAliases { calligra = kdePackages.calligra; # Added 2024-09-27 callPackage_i686 = pkgsi686Linux.callPackage; - cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 - cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-espflash = espflash; - cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 - cargo-graph = throw "cargo-graph has been removed as it is broken and archived upstream"; # Added 2024-03-16 - catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2023-09-10 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; - ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09 certmgr-selfsigned = certmgr; # Added 2023-11-30 challenger = taler-challenger; # Added 2024-09-04 check_smartmon = throw "'check_smartmon' has been renamed to 'nagiosPlugins.check_smartmon'"; # Added 2024-05-03 @@ -243,69 +188,43 @@ mapAliases { check-uptime = throw "'check-uptime' has been renamed to 'nagiosPlugins.check_uptime'"; # Added 2024-05-03 check-wmiplus = throw "'check-wmiplus' has been renamed to 'nagiosPlugins.check_wmi_plus'"; # Added 2024-05-03 checkSSLCert = throw "'checkSSLCert' has been renamed to 'nagiosPlugins.check_ssl_cert'"; # Added 2024-05-03 - chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 - chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 - chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 - chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chiaki4deck = chiaki-ng; # Added 2024-08-04 - chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 ChowCentaur = chow-centaur; # Added 2024-06-12 ChowPhaser = chow-phaser; # Added 2024-06-12 ChowKick = chow-kick; # Added 2024-06-12 CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 - chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 - chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 - citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 - citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 - citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 - clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05 clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 - clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 - composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01 cosmic-tasks = tasks; # Added 2024-07-04 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 - cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 - clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17 - clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09 - cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 cockroachdb-bin = cockroachdb; # 2024-03-15 codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 - compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17 - connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08 containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 - convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27 crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11 - crda = throw "'crda' has been removed from nixpkgs, as it is needed only for kernels before 4.16"; # Added 2024-02-06 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 # these are for convenience, not for backward compat and shouldn't expire - clang6Stdenv = throw "clang6Stdenv has been removed from nixpkgs"; # Added 2024-01-08 - clang7Stdenv = throw "clang7Stdenv has been removed from nixpkgs"; # Added 2023-11-19 - clang8Stdenv = throw "clang8Stdenv has been removed from nixpkgs"; # Added 2024-01-24 clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08 - clang10Stdenv = throw "clang10Stdenv has been removed from nixpkgs"; # Added 2024-01-26 - clang11Stdenv = throw "clang11Stdenv has been removed from nixpkgs"; # Added 2023-01-24 clang12Stdenv = lowPrio llvmPackages_12.stdenv; clang13Stdenv = lowPrio llvmPackages_13.stdenv; clang14Stdenv = lowPrio llvmPackages_14.stdenv; @@ -315,18 +234,8 @@ mapAliases { clang18Stdenv = lowPrio llvmPackages_18.stdenv; clang19Stdenv = lowPrio llvmPackages_19.stdenv; - clang-tools_6 = throw "clang-tools_6 has been removed from nixpkgs"; # Added 2024-01-08 - clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 - clang-tools_8 = throw "clang-tools_8 has been removed from nixpkgs"; # Added 2024-01-24 clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08 - clang-tools_10 = throw "clang-tools_10 has been removed from nixpkgs"; # Added 2023-01-26 - clang-tools_11 = throw "clang-tools_11 has been removed from nixpkgs"; # Added 2023-01-24 - clang_6 = throw "clang_6 has been removed from nixpkgs"; # Added 2024-01-08 - clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19 - clang_8 = throw "clang_8 has been removed from nixpkgs"; # Added 2024-01-24 clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08 - 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 @@ -341,45 +250,31 @@ mapAliases { ### D ### - dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17 dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself."; dat = nodePackages.dat; dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 - deadcode = throw "'deadcode' has been removed, as upstream is abandoned since 2019-04-27. Use the official deadcode from 'gotools' package."; # Added 2023-12-28 deadpixi-sam = deadpixi-sam-unstable; debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17 deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 - dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26 - devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 - dfeet = throw "'dfeet' has been removed because it is archived upstream. Please use 'd-spy' instead"; # Added 2024-03-07 dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09 - dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29 docker-distribution = distribution; # Added 2023-12-26 - docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 - docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 - docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 - docker-proxy = throw "`docker-proxy` has been merged to the main repo of Moby since Docker 22.06"; # Added 2024-03-14 - dogecoin = throw "'dogecoin' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 - dogecoind = throw "'dogecoind' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 dolphinEmu = throw "'dolphinEmu' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2024-10-17 dolphinEmuMaster = throw "'dolphinEmuMaster' has been renamed to/replaced by 'dolphin-emu-beta'"; # Converted to throw 2024-10-17 - dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16 dotty = scala_3; # Added 2023-08-20 dotnet-netcore = throw "'dotnet-netcore' has been renamed to/replaced by 'dotnet-runtime'"; # Converted to throw 2024-10-17 dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17 dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17 dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17 - drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15 drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 @@ -398,39 +293,7 @@ mapAliases { elasticsearch7Plugins = elasticsearchPlugins; # Electron - electron_9 = throw "electron_9 has been removed in favor of newer versions"; # added 2023-09-11 - electron_10 = throw "electron_10 has been removed in favor of newer versions"; # added 2024-03-20 - electron_10-bin = throw "electron_10-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_11 = throw "electron_11 has been removed in favor of newer versions"; # added 2024-03-20 - electron_11-bin = throw "electron_11-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_12 = throw "electron_12 has been removed in favor of newer versions"; # added 2024-03-20 - electron_12-bin = throw "electron_12-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_13 = throw "electron_13 has been removed in favor of newer versions"; # added 2024-03-20 - electron_13-bin = throw "electron_13-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_14 = throw "electron_14 has been removed in favor of newer versions"; # added 2024-03-20 - electron_14-bin = throw "electron_14-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_15 = throw "electron_15 has been removed in favor of newer versions"; # added 2024-03-20 - electron_15-bin = throw "electron_15-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_16 = throw "electron_16 has been removed in favor of newer versions"; # added 2024-03-20 - electron_16-bin = throw "electron_16-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_17 = throw "electron_17 has been removed in favor of newer versions"; # added 2024-03-20 - electron_17-bin = throw "electron_17-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_18 = throw "electron_18 has been removed in favor of newer versions"; # added 2024-03-20 - electron_18-bin = throw "electron_18-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_19 = throw "electron_19 has been removed in favor of newer versions"; # added 2024-03-20 - electron_19-bin = throw "electron_19-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_20 = throw "electron_20 has been removed in favor of newer versions"; # added 2024-03-20 - electron_20-bin = throw "electron_20-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_21 = throw "electron_21 has been removed in favor of newer versions"; # added 2024-03-20 - electron_21-bin = throw "electron_21-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_22 = throw "electron_22 has been removed in favor of newer versions"; # added 2024-03-20 - electron_22-bin = throw "electron_22-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_23 = throw "electron_23 has been removed in favor of newer versions"; # added 2024-03-20 - electron_23-bin = throw "electron_23-bin has been removed in favor of newer versions"; # added 2024-03-20 - electron_26 = throw "electron_26 has been removed in favor of newer versions"; # added 2024-03-20 - electron_26-bin = throw "electron_26-bin has been removed in favor of newer versions"; # added 2024-03-20 - elementary-planner = throw "elementary-planner has been renamed to planify"; # Added 2023-06-24 elixir_ls = elixir-ls; # Added 2023-03-20 @@ -441,13 +304,9 @@ mapAliases { emacs28WithPackages = throw "'emacs28WithPackages' has been renamed to/replaced by 'emacs28.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 - emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10 - emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10 emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 - empathy = throw "empathy was removed as it is unmaintained and no longer launches due to libsoup3 migration"; # Added 2023-01-20 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 - enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18 enyo-doom = enyo-launcher; # Added 2022-09-09 epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17 @@ -465,12 +324,7 @@ mapAliases { erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24 erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24 - etcd_3_3 = throw "etcd_3_3 has been removed because upstream no longer maintains it"; # Added 2023-09-29 - etcher = throw "'etcher' has been removed because it depended on an insecure version of Electron"; # Added 2024-03-14 - eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16 - exa = throw "'exa' has been removed because it is unmaintained upstream. Consider using 'eza', a maintained fork"; # Added 2023-09-07 - exhibitor = throw "'exhibitor' has been removed because it is unmaintained upstream"; # Added 2023-06-20 eww-wayland = lib.warn "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; ### F ### @@ -478,7 +332,6 @@ mapAliases { fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24 fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24 fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19 - fancypp = throw "'fancypp' was removed because it and its dependants are unmaintained"; # Added 2024-02-14 faustStk = faustPhysicalModeling; # Added 2023-05-16 fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 @@ -491,7 +344,6 @@ mapAliases { ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12 FIL-plugins = fil-plugins; # Added 2024-06-12 fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19 - findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead."; @@ -499,13 +351,9 @@ mapAliases { firefox-wayland = firefox; # Added 2022-11-15 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 - fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 fit-trackee = fittrackee; # added 2024-09-03 flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 - flintqs = throw "FlintQS has been removed due to lack of maintenance and security issues; use SageMath or FLINT instead"; # Added 2024-03-21 - flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 - flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 flutter313 = throw "flutter313 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 @@ -513,23 +361,14 @@ mapAliases { foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 - foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 - foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20 fractal-next = fractal; # added 2023-11-25 framework-system-tools = framework-tool; # added 2023-12-09 francis = kdePackages.francis; # added 2024-07-13 - fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17 fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. futuresql = libsForQt5.futuresql; # added 2023-11-11 fx_cast_bridge = fx-cast-bridge; # added 2023-07-26 - fcitx = throw "fcitx is deprecated, please use fcitx5 instead."; # Added 2023-03-13 - fcitx-engines = throw "fcitx-engines is deprecated, please use fcitx5 instead."; # Added 2023-03-13 - fcitx-configtool = throw "fcitx-configtool is deprecated, please use fcitx5 instead."; # Added 2023-03-13 fcitx5-chinese-addons = libsForQt5.fcitx5-chinese-addons; # Added 2024-03-01 fcitx5-configtool = libsForQt5.fcitx5-configtool; # Added 2024-03-01 @@ -542,10 +381,6 @@ mapAliases { g4music = gapless; # Added 2024-07-26 g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17 gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 - garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 - garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 - garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12 - garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 @@ -554,10 +389,7 @@ mapAliases { gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21 gcj = gcj6; # Added 2024-09-13 gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 - gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11 gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15 - geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 - geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 @@ -572,11 +404,8 @@ mapAliases { Consider migrating to forgejo or gitea. ''; # Added 2024-10-12 - go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 - gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20 - git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { darcsToGit = darcs-to-git; @@ -588,15 +417,12 @@ mapAliases { topGit = top-git; }; # Added 2021-01-14 - gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18 glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11 - glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26 glfw-wayland = glfw; # Added 2024-04-19 glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08 globalprotect-openconnect = throw "'globalprotect-openconnect' has been renamed to/replaced by 'gpauth' and 'gpclient'"; # Added 2024-09-21 glxinfo = mesa-demos; # Added 2024-07-04 gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17 - gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 gnatboot11 = gnat-bootstrap11; gnatboot12 = gnat-bootstrap12; gnatboot = gnat-bootstrap; @@ -620,9 +446,7 @@ mapAliases { gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14 - gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-resources = resources; # added 2023-12-10 - gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2023-09-10 gnuradio-with-packages = gnuradio3_7.override { extraPackages = lib.attrVals [ @@ -639,123 +463,57 @@ mapAliases { gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17 gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17 - gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 - gnuradio-ais = throw "'gnuradio-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 - gnuradio-gsm = throw "'gnuradio-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 - gnuradio-limesdr = throw "'gnuradio-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 - gnuradio-nacl = throw "'gnuradio-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 - gnuradio-osmosdr = throw "'gnuradio-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 - gnuradio-rds = throw "'gnuradio-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 - go2nix = throw "'go2nix' has been removed as it was archived upstream"; # Added 2023-12-27 gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17 #godot - godot = throw "godot has been renamed to godot3 to distinguish from version 4"; # Added 2023-07-16 - godot-export-templates = throw "godot-export-templates has been renamed to godot3-export-templates to distinguish from version 4"; # Added 2023-07-16 - godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 - godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 - gdtoolkit = throw "gdtoolkit has been renamed to gdtoolkit_3 to distinguish from version 4"; # Added 2024-02-17 - google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 - google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 - google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 go-thumbnailer = thud; # Added 2023-09-21 go-upower-notify = upower-notify; # Added 2024-07-21 - gocode = throw "'gocode' has been removed as the upstream project was archived. 'gopls' is suggested as replacement"; # Added 2023-12-26 - govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26 - gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15 gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25; - gpt4all-chat = throw "gpt4all-chat has been renamed to gpt4all"; # Added 2024-02-27 gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; - graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 - graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 - graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 - grab-site = throw "grab-site has been removed because it's unmaintained and broken"; # Added 2023-11-12 - gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 - gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana_reporter = grafana-reporter; # Added 2024-06-09 - gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 grapefruit = throw "'grapefruit' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 - graylog = throw "graylog is now available in versions 3.3 up to 5.0. Please mind the upgrade path and choose the appropriate version. Direct upgrading from 3.3 to 4.3 or above is not supported"; # Added 2023-04-24 graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09 graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15 - gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 gringo = clingo; # added 2022-11-27 - gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 - gr-nacl = throw "'gr-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 - gr-osmosdr = throw "'gr-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 - gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 - grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtkcord4 = dissent; # Added 2024-03-10 gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 - gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 guile-disarchive = disarchive; # Added 2023-10-27 - guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16 ### H ### - haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 - haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 HentaiAtHome = hentai-at-home; # Added 2024-06-12 - hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 - hikari = throw "hikari has been removed from nixpkgs, it was unmaintained and required wlroots_0_15 at the time of removal"; # Added 2024-03-28 - hip = throw "'hip' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 - hipcc = throw "'hipcc' has been replaced with 'rocmPackages.hipcc'"; # Added 2023-10-08 - hipchat = throw "'hipchat' has been discontinued since 2019; upstream recommends Slack."; # Added 2023-12-02 - hipify = throw "'hipify' has been replaced with 'rocmPackages.hipify'"; # Added 2023-10-08 - hipcub = throw "'hipcub' has been replaced with 'rocmPackages.hipcub'"; # Added 2023-10-08 - hipsparse = throw "'hipsparse' has been replaced with 'rocmPackages.hipsparse'"; # Added 2023-10-08 - hipfort = throw "'hipfort' has been replaced with 'rocmPackages.hipfort'"; # Added 2023-10-08 - hipfft = throw "'hipfft' has been replaced with 'rocmPackages.hipfft'"; # Added 2023-10-08 - hipsolver = throw "'hipsolver' has been replaced with 'rocmPackages.hipsolver'"; # Added 2023-10-08 - hipblas = throw "'hipblas' has been replaced with 'rocmPackages.hipblas'"; # Added 2023-10-08 - hip-amd = throw "'hip-amd' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 - hip-common = throw "'hip-common' has been replaced with 'rocmPackages.hip-common'"; # Added 2023-10-08 - hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13 ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17 hydra_unstable = hydra; # Added 2024-08-22 hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; - hyper-haskell = throw "'hyper-haskell' has been removed. reason: has been broken for a long time and depends on an insecure electron version"; # Added 2024-03-14 - hyper-haskell-server-with-packages = throw "'hyper-haskell-server-with-packages' has been removed. reason: has been broken for a long time"; # Added 2024-03-14 ### I ### i3-gaps = i3; # Added 2023-01-03 ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15 ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15 - icedtea8_web = throw "'icedtea8_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 - icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 - ignite = throw "'ignite' has been removed as the upstream project was archived, please use 'flintlock' instead"; # Added 2024-01-07 - imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17 imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17 imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17 - imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04 immersed-vr = lib.warn "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11 - indiepass-desktop = throw "indiepass-desktop has been dropped because it does not work with recent Electron versions"; # Added 2024-03-14 - indigenous-desktop = throw "'indigenous-desktop' has been renamed to/replaced by 'indiepass-desktop'"; # Added 2023-11-08 input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21 - instead-launcher = throw "instead-launcher has been removed, because it depended on qt4"; # Added 2023-07-26 - insync-v3 = throw "insync-v3 has been merged into the insync package; use insync instead"; #Added 2023-05-13 index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 - infiniband-diags = throw "'infiniband-diags' has been renamed to/replaced by 'rdma-core'"; # Converted to throw 2023-09-10 inotifyTools = inotify-tools; inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17 - iouyap = throw "'iouyap' is deprecated and archived by upstream, use 'ubridge' instead"; # Added 2023-09-21 ipfs = kubo; # Added 2022-09-27 ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 @@ -773,23 +531,15 @@ mapAliases { jami-client-qt = jami-client; # Added 2022-11-06 jami-client = jami; # Added 2023-02-10 jami-daemon = jami.daemon; # Added 2023-02-10 - jfbpdf = throw "'jfbpdf' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 - jfbview = throw "'jfbview' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 - jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 - join-desktop = throw "'join-desktop' has been removed because it is unmaintained upstream"; # Added 2023-10-04 jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 # Julia julia_16-bin = throw "'julia_16-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-10-08 - julia_18 = throw "'julia_18' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 - julia_18-bin = throw "'julia_18-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 jush = throw "jush has been removed from nixpkgs because it is unmaintained"; # Added 2024-05-28 ### K ### - k3s_1_24 = throw "'k3s_1_24' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 - k3s_1_25 = throw "'k3s_1_25' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20 k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01 # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 @@ -800,18 +550,14 @@ mapAliases { kargo = throw "kargo was removed as it is deprecated upstream and depends on the removed boto package"; # Added 2024-09-22 kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17 - keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 - keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepkey_agent = keepkey-agent; # added 2024-01-06 kerberos = throw "'kerberos' has been renamed to/replaced by 'krb5'"; # Converted to throw 2024-10-17 kexectools = throw "'kexectools' has been renamed to/replaced by 'kexec-tools'"; # Converted to throw 2024-10-17 keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25 keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17 - kfctl = throw "kfctl is broken and has been archived by upstream"; # Added 2023-08-21 kgx = gnome-console; # Added 2022-02-19 kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-30-10 kibana = kibana7; - kicad-with-packages3d = throw "'kicad-with-packages3d' has been renamed to/replaced by 'kicad'"; # Converted to throw 2023-09-10 kio-admin = libsForQt5.kdeGear.kio-admin; # Added 2023-03-18 kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10 kodiGBM = kodi-gbm; @@ -822,7 +568,6 @@ mapAliases { krb5Full = krb5; krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17 kubei = kubeclarity; # Added 2023-05-20 - kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02 ### L ### @@ -831,10 +576,8 @@ mapAliases { LASzip = laszip; # Added 2024-06-12 LASzip2 = laszip_2; # Added 2024-06-12 latinmodern-math = lmmath; - ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 ledger_agent = ledger-agent; # Added 2024-01-07 lfs = dysk; # Added 2023-07-03 - llvmPackages_rocm = throw "'llvmPackages_rocm' has been replaced with 'rocmPackages.llvm'"; # Added 2023-10-08 libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01 libav = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25 libav_0_8 = libav; # Added 2024-08-25 @@ -846,33 +589,25 @@ mapAliases { libbencodetools = bencodetools; # Added 2022-07-30 libbpf_1 = libbpf; # Added 2022-12-06 libbson = mongoc; # Added 2024-03-11 - libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10 - libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08 - libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 libheimdal = heimdal; # Added 2022-11-18 - libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 libixp_hg = libixp; libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 - libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libquotient = libsForQt5.libquotient; # Added 2023-11-11 librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 - libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17 LibreArp = librearp; # Added 2024-06-12 LibreArp-lv2 = librearp-lv2; # Added 2024-06-12 libreddit = throw "'libreddit' has been removed because it is unmaintained upstream. Consider using 'redlib', a maintained fork"; # Added 2024-07-17 - libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07 librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17 - libsigcxx12 = throw "'libsigcxx12' has been removed, please use newer versions"; # Added 2023-10-20 libsForQt515 = libsForQt5; # Added 2022-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17 @@ -884,7 +619,6 @@ mapAliases { libwnck3 = libwnck; libyamlcpp = yaml-cpp; # Added 2023-01-29 libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 - libxkbcommon_7 = throw "libxkbcommon_7 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libxkbcommon'"; # Added 2023-01-03 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; linux_wallpaperengine = throw "linux_wallpaperengine was removed due to freeimage dependency"; # Added 2024-07-19 @@ -970,34 +704,13 @@ mapAliases { llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; - lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 - lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 - lld_8 = throw "lld_8 has been removed from nixpkgs"; # Added 2024-01-24 lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08 - lld_10 = throw "lld_10 has been removed from nixpkgs"; # Added 2024-01-26 - lld_11 = throw "lld_11 has been removed from nixpkgs"; # Added 2024-01-24 - lldb_6 = throw "lldb_6 has been removed from nixpkgs"; # Added 2024-01-08 - lldb_7 = throw "lldb_7 has been removed from nixpkgs"; # Added 2023-11-19 - lldb_8 = throw "lldb_8 has been removed from nixpkgs"; # Added 2024-01-24 lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08 - lldb_10 = throw "lldb_10 has been removed from nixpkgs"; # Added 2024-01-26 - lldb_11 = throw "lldb_11 has been removed from nixpkgs"; # Added 2024-01-24 - llvmPackages_6 = throw "llvmPackages_6 has been removed from nixpkgs"; # Added 2024-01-09 - llvmPackages_7 = throw "llvmPackages_7 has been removed from nixpkgs"; # Added 2023-11-19 - llvmPackages_8 = throw "llvmPackages_8 has been removed from nixpkgs"; # Added 2024-01-24 llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08 - llvmPackages_10 = throw "llvmPackages_10 has been removed from nixpkgs"; # Added 2024-01-26 - llvmPackages_11 = throw "llvmPackages_11 has been removed from nixpkgs"; # Added 2024-01-24 - llvm_6 = throw "llvm_6 has been removed from nixpkgs"; # Added 2024-01-08 - llvm_7 = throw "llvm_7 has been removed from nixpkgs"; # Added 2023-11-19 - llvm_8 = throw "llvm_8 has been removed from nixpkgs"; # Added 2024-01-24 llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08 - llvm_10 = throw "llvm_10 has been removed from nixpkgs"; # Added 2024-01-26 - llvm_11 = throw "llvm_11 has been removed from nixpkgs"; # Added 2024-01-24 lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17 lsh = throw "lsh has been removed as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decade"; # Added 2024-08-14 - luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 @@ -1009,12 +722,8 @@ mapAliases { MACS2 = macs2; # Added 2023-06-12 mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19 mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 - mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 - mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 - markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 - markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24 marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08 marwaita-peppermint = lib.warn "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01 @@ -1024,35 +733,23 @@ mapAliases { mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17 - matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09 - matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15 - mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17 - mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; microcodeAmd = microcode-amd; # Added 2024-09-08 microcodeIntel = microcode-intel; # Added 2024-09-08 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 MIDIVisualizer = midivisualizer; # Added 2024-06-12 - migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01 - minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 - miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 - miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages_5.miopengemm'"; # Added 2023-10-08 - miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08 - miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08 mime-types = mailcap; # Added 2022-01-21 minetest-touch = minetestclient; # Added 2024-08-12 minetestclient_5 = minetestclient; # Added 2023-12-11 minetestserver_5 = minetestserver; # Added 2023-12-11 minizip2 = pkgs.minizip-ng; # Added 2022-12-28 - mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26 - mlton20210107 = throw "'mlton20210107' has been renamed to 'mlton20210117', correcting the version number"; # Added 2024-03-31 mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17 mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17 mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17 @@ -1066,24 +763,16 @@ mapAliases { mod_pkcs12 = throw "'mod_pkcs12' has been renamed to/replaced by 'apacheHttpdPackages.mod_pkcs12'"; # Converted to throw 2024-10-17 mod_timestamp = throw "'mod_timestamp' has been renamed to/replaced by 'apacheHttpdPackages.mod_timestamp'"; # Converted to throw 2024-10-17 monero = throw "'monero' has been renamed to/replaced by 'monero-cli'"; # Converted to throw 2024-10-17 - moneyplex = throw "'moneyplex' has been removed, as it was broken and unmaintained"; # Added 2024-02-28 - mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05 - mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06 mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11 mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01 - moonlander = throw "'moonlander' has been removed due to it being broken and unmaintained"; # Added 2023-11-26 moz-phab = mozphab; # Added 2022-08-09 - mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 - mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17 mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 msp430NewlibCross = msp430Newlib; # Added 2024-09-06 - mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22 - murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 mutt-with-sidebar = mutt; # Added 2022-09-17 mysql-client = hiPrio mariadb.client; mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17 @@ -1093,11 +782,6 @@ mapAliases { ncdu_2 = ncdu; # Added 2022-07-22 neocities-cli = neocities; # Added 2024-07-31 - nestopia = throw "nestopia was forked; use nestopia-ue instead"; # Added 2024-01-24 - net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10 - netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 - netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 - netease-music-tui = throw "netease-music-tui has been removed due to unmaintained by upstream and broken functionality"; # Added 2024-03-03 nextcloud27 = throw '' Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring @@ -1112,7 +796,6 @@ mapAliases { nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 - neoload = throw "'neoload' has been removed as it is broken and unmaintained"; # Added 2024-03-02 newlibCross = newlib; # Added 2024-09-06 newlib-nanoCross = newlib-nano; # Added 2024-09-06 nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 @@ -1123,36 +806,25 @@ mapAliases { "nix-repl has been removed because it's not maintained anymore, " + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" ); - nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 nix-simple-deploy = throw "'nix-simple-deploy' has been removed as it is broken and unmaintained"; # Added 2024-08-17 - nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21 nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2024-10-17 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22 nix_2_3 = nixVersions.nix_2_3; nixfmt = lib.warn "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31 - nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable. - nixops_unstable = throw "nixops_unstable has been replaced. Please use for example 'nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ps.nixops-encrypted-links ])' instead"; # Added 2024-02-28 nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 - nodejs_14 = throw "nodejs_14 has been removed as it is EOL."; # Added 2023-10-30 - nodejs-slim_14 = throw "nodejs-slim_14 has been removed as it is EOL."; # Added 2023-10-30 nodejs-14_x = nodejs_14; # Added 2022-11-06 nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 - nodejs_16 = throw "nodejs_16 has been removed as it is EOL."; # Added 2023-10-30 nodejs-16_x = nodejs_16; # Added 2022-11-06 - nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 - nodejs-slim_16 = throw "nodejs-slim_16 has been removed as it is EOL."; # Added 2022-11-06 nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 - nomad_1_2 = throw "nomad_1_2 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 - nomad_1_3 = throw "nomad_1_3 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 @@ -1171,33 +843,19 @@ mapAliases { o = orbiton; # Added 2023-04-09 oathToolkit = oath-toolkit; # Added 2022-04-04 oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17 - obinskit = throw "'obinskit' has been removed from nixpkgs, because the package was unmaintained and depended on an insecure version of electron"; # Added 2024-03-20 - octant = throw "octant has been dropped due to being archived and vulnerable"; # Added 2023-09-29 - octant-desktop = throw "octant-desktop has been dropped due to being archived and vulnerable"; # Added 2023-09-29 - octorpki = throw "octorpki has been removed, upstream says to use rpki-client instead"; # Added 2024-03-19 - ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22 - ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20 onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 - opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21 - opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08 opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 openafs_1_8 = openafs; # Added 2022-08-22 - openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02 - openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 - opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 - openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 opendylan = throw "opendylan has been removed from nixpkgs as it was broken"; # Added 2024-07-15 opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15 openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17 openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13 - openimagedenoise_1_2_x = throw "'openimagedenoise_1_2_x' has been renamed to/replaced by 'openimagedenoise'"; # Added 2023-06-07 openimageio2 = openimageio; # Added 2023-01-05 - openimageio_1 = throw "'openimageio_1' has been removed, please update to 'openimageio' 2"; # Added 2023-06-14 openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17 openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjdk19_headless = openjdk19; # Added 2024-08-01 @@ -1215,20 +873,15 @@ mapAliases { openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29 openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17 openssl_3_0 = openssl_3; # Added 2022-06-27 - openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 - optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12 orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17 - oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24 - oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 OSCAR = oscar; # Added 2024-06-12 osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 - oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23 ### P ### @@ -1237,18 +890,12 @@ mapAliases { p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 - packet = throw "packet has been removed as it is no longer working and unmaintained"; # Added 2024-03-29 - palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18 - pam_usb = throw "'pam_usb' has been removed: abandoned by upstream since 2015."; # Added 2023-10-30 - paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17 paperless-ng = paperless-ngx; # Added 2022-04-11 partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 - pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 patchelfStable = patchelf; # Added 2024-01-25 pcsctools = pcsc-tools; # Added 2023-12-07 pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 - pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 percona-server_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13 percona-server_lts = percona-server; # Added 2024-10-13 @@ -1260,26 +907,18 @@ mapAliases { petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 pgadmin = pgadmin4; pharo-spur64 = pharo; # Added 2022-08-03 - phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 - photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 - picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 - picom-jonaburg = throw "picom-jonaburg was removed because it is unmaintained by upstream"; # Added 2024-02-13 picom-next = picom; # Added 2024-02-13 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 # Obsolete PHP version aliases - php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 php80Packages = php80; # Added 2023-06-21 php80Extensions = php80; # Added 2023-06-21 pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; - pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2023-09-10 playwright = lib.warn "'playwright' will reference playwright-driver in 25.05. Reference 'python3Packages.playwright' for the python test launcher" python3Packages.toPythonApplication python3Packages.playwright; # Added 2024-10-04 pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 pltScheme = racket; # just to be sure - pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 - pomotroid = throw "pomotroid has been removed from nixpkgs, because it depended on an insecure version of electron"; # Added 2023-09-12 poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 powerdns = pdns; # Added 2022-03-28 @@ -1311,50 +950,31 @@ mapAliases { tty = pinentry-tty; flavors = [ "curses" "emacs" "gnome3" "gtk2" "qt" "tty" ]; }; # added 2024-01-15 - pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2023-09-10 - pinentry_emacs = throw "'pinentry_emacs' has been renamed to/replaced by 'pinentry-emacs'"; # Converted to throw 2023-09-10 - pinentry_gnome = throw "'pinentry_gnome' has been renamed to/replaced by 'pinentry-gnome'"; # Converted to throw 2023-09-10 - pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 - pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2024-10-17 pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15 pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15 PlistCpp = plistcpp; # Added 2024-01-05 pocket-updater-utility = pupdate; # Added 2024-01-25 - poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 - prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 - privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 probe-rs = probe-rs-tools; # Added 2024-05-23 - probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 probe-run = throw "probe-run is deprecated upstream. Use probe-rs instead."; # Added 2024-05-23 - processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01 - prometheus-openvpn-exporter = throw "'prometheus-openvpn-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-12-23 prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10 - prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 - protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 - protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01 protobuf3_24 = protobuf_24; protobuf3_23 = protobuf_23; protobuf3_21 = protobuf_21; protonup = protonup-ng; # Added 2022-11-06 protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 proxmark3-rrg = proxmark3; # Added 2023-07-25 - proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 - pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 - pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 - pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2023-09-10 pyo3-pack = maturin; pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; pypolicyd-spf = spf-engine; # Added 2022-10-09 python = python2; # Added 2022-01-11 - python-language-server = throw "python-language-server has been removed as it is no longer maintained. Use e.g. python-lsp-server instead"; # Added 2023-01-07 python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17 pythonFull = python2Full; # Added 2022-01-11 pythonPackages = python.pkgs; # Added 2022-01-11 @@ -1363,9 +983,7 @@ mapAliases { qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30 qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2024-10-17 - qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25 qflipper = qFlipper; # Added 2022-02-11 - qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17 qscintilla = libsForQt5.qscintilla; # Added 2023-09-20 qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20 qt515 = qt5; # Added 2022-11-24 @@ -1382,8 +1000,6 @@ mapAliases { quicklispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 - qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19 - quvi = throw "'quvi' has been removed, as it was broken and unmaintained"; # Added 2023-11-25 ### R ### @@ -1394,58 +1010,18 @@ mapAliases { railway-travel = diebahn; # Added 2024-04-01 rambox-pro = rambox; # Added 2022-12-12 rapidjson-unstable = lib.warn "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28 - rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 - rccl = throw "'rccl' has been replaced with 'rocmPackages.rccl'"; # Added 2023-10-08 - rdc = throw "'rdc' has been replaced with 'rocmPackages.rdc'"; # Added 2023-10-08 - readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10 relibc = throw "relibc has been removed due to lack of maintenance"; # Added 2024-09-02 replay-sorcery = throw "replay-sorcery has been removed as it is unmaintained upstream. Consider using gpu-screen-recorder or obs-studio instead."; # Added 2024-07-13 restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04 - restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 - retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 retroshare06 = retroshare; - ricochet = throw "ricochet has been deprecated in favor of ricochet-refresh"; # Added 2024-02-26 rigsofrods = rigsofrods-bin; # Added 2023-03-22 ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17 - rnix-lsp = throw "'rnix-lsp' has been removed as it is unmaintained"; # Added 2024-03-09 rockbox_utility = rockbox-utility; # Added 2022-03-17 - rocalution = throw "'rocalution' has been replaced with 'rocmPackages.rocalution'"; # Added 2023-10-08 - rocblas = throw "'rocblas' has been replaced with 'rocmPackages.rocblas'"; # Added 2023-10-08 - rocfft = throw "'rocfft' has been replaced with 'rocmPackages.rocfft'"; # Added 2023-10-08 - rocprim = throw "'rocprim' has been replaced with 'rocmPackages.rocprim'"; # Added 2023-10-08 - rocrand = throw "'rocrand' has been replaced with 'rocmPackages.rocrand'"; # Added 2023-10-08 - rocsparse = throw "'rocsparse' has been replaced with 'rocmPackages.rocsparse'"; # Added 2023-10-08 - rocthrust = throw "'rocthrust' has been replaced with 'rocmPackages.rocthrust'"; # Added 2023-10-08 - roctracer = throw "'roctracer' has been replaced with 'rocmPackages.roctracer'"; # Added 2023-10-08 - rocwmma = throw "'rocwmma' has been replaced with 'rocmPackages.rocwmma'"; # Added 2023-10-08 - rocclr = throw "'rocclr' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 - rocdbgapi = throw "'rocdbgapi' has been replaced with 'rocmPackages.rocdbgapi'"; # Added 2023-10-08 - rocgdb = throw "'rocgdb' has been replaced with 'rocmPackages.rocgdb'"; # Added 2023-10-08 - rocprofiler = throw "'rocprofiler' has been replaced with 'rocmPackages.rocprofiler'"; # Added 2023-10-08 - rocsolver = throw "'rocsolver' has been replaced with 'rocmPackages.rocsolver'"; # Added 2023-10-08 - rocmClangStdenv = throw "'rocmClangStdenv' has been moved to 'rocmPackages' and is no longer public"; # Added 2023-10-08 - rocmUpdateScript = throw "'rocmUpdateScript' has been moved to 'rocmPackages' and is no longer public"; # Added 2023-10-08 - rocminfo = throw "'rocminfo' has been replaced with 'rocmPackages.rocminfo'"; # Added 2023-10-08 - rocmlir = throw "'rocmlir' has been replaced with 'rocmPackages.rocmlir'"; # Added 2023-10-08 - rocmlir-rock = throw "'rocmlir-rock' has been replaced with 'rocmPackages.rocmlir-rock'"; # Added 2023-10-08 - rocm-cmake = throw "'rocm-cmake' has been replaced with 'rocmPackages.rocm-cmake'"; # Added 2023-10-08 - rocm-comgr = throw "'rocm-comgr' has been replaced with 'rocmPackages.rocm-comgr'"; # Added 2023-10-08 - rocm-core = throw "'rocm-core' has been replaced with 'rocmPackages.rocm-core'"; # Added 2023-10-08 - rocm-device-libs = throw "'rccl' has been replaced with 'rocmPackages.rocm-device-libs'"; # Added 2023-10-08 - rocm-opencl-icd = rocmPackages.clr.icd; # Added 2023-10-08 Convert to throw after 23.11 is released - rocm-opencl-runtime = rocmPackages.clr; # Added 2023-10-08 Convert to throw after 23.11 is released - rocm-runtime = throw "'rocm-runtime' has been replaced with 'rocmPackages.rocm-runtime'"; # Added 2023-10-08 - rocm-smi = throw "'rocm-smi' has been replaced with 'rocmPackages.rocm-smi'"; # Added 2023-10-08 - rocm-thunk = throw "'rocm-thunk' has been replaced with 'rocmPackages.rocm-thunk'"; # Added 2023-10-08 - rocr-debug-agent = throw "'rocr-debug-agent' has been replaced with 'rocmPackages.rocr-debug-agent'"; # Added 2023-10-08 - rome = throw "rome is no longer maintained, consider using biome instead"; # Added 2023-09-12 rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17 rr-unstable = rr; # Added 2022-09-17 - rtl8723bs-firmware = throw "rtl8723bs-firmware was added in mainline kernel version 4.12"; # Added 2023-07-03 - rtsp-simple-server = throw "rtsp-simple-server is rebranded as mediamtx, including default config path update"; # Added 2023-04-11 rtx = mise; # Added 2024-01-05 runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; @@ -1458,7 +1034,6 @@ mapAliases { # due to it being inside the linuxPackagesFor function. rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2024-10-17 rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28 - rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19 ### S ### @@ -1475,44 +1050,23 @@ mapAliases { schildichat-desktop = schildichat-web; schildichat-desktop-wayland = schildichat-web; scitoken-cpp = scitokens-cpp; # Added 2024-02-12 - scylladb = throw "'scylladb' has been removed due to being unmaintained"; # Added 2024-03-17 - sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 - searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03 semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 - semver-cpp = throw "'semver-cpp' was removed because no packages in nixpkgs use it anymore"; # Added 2024-02-14 session-desktop-appimage = session-desktop; - setupcfg2nix = throw "'setupcfg2nix' has been removed. Please switch to buildPythonPackage"; # Added 2023-12-12 sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 - sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26 - sgtpuzzles = throw "'sgtpuzzles' has been renamed to 'sgt-puzzles'"; # Added 2023-10-06 - sgtpuzzles-mobile = throw "'sgtpuzzles-mobile' has been renamed to 'sgt-puzzles-mobile'"; # Added 2023-10-06 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 - shhgit = throw "shhgit is broken and is no longer maintained. See https://github.com/eth0izzle/shhgit#-shhgit-is-no-longer-maintained-"; # Added 2023-08-08 shipyard = jumppad; # Added 2023-06-06 shout = nodePackages.shout; # Added unknown; moved 2024-10-19 - signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 - simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 - skk-dicts = throw "'skk-dicts' has been split into multiple packages under 'skkDictionaries'"; # Added 2023-11-08 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 SkypeExport = skypeexport; # Added 2024-06-12 slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17 - slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 slurm-llnl = slurm; # renamed July 2017 - smesh = throw "'smesh' has been removed as it's unmaintained and depends on opencascade-oce, which is also unmaintained"; # Added 2023-09-18 snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04; soldat-unstable = opensoldat; # Added 2022-07-02 - solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 - 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 - spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 - spark_3_3 = throw "'spark_3_3' is no longer supported nixpkgs, please use 'spark'"; # Added 2024-03-23 spark2014 = gnatprove; # Added 2024-02-25 # Added 2020-02-10 @@ -1538,21 +1092,14 @@ mapAliases { source-han-serif-traditional-chinese = source-han-serif; - spacegun = throw "'spacegun' has been removed as unmaintained"; # Added 2023-05-20 spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17 - speedtest-exporter = throw "'speedtest-exporter' has been removed as unmaintained"; # Added 2023-07-31 - spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2024-10-17 spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 - spotify-tui = throw "'spotify-tui' has been removed, as it was broken and unmaintained"; # Added 2024-03-12 spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 - squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 - ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 - starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 steamPackages = { steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; @@ -1565,10 +1112,8 @@ mapAliases { steam-run-native = steam-run; # added 2022-02-21 StormLib = stormlib; # Added 2024-01-21 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 - supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 swiProlog = lib.warn "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07 swiPrologWithGui = lib.warn "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07 - swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23 swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23 swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12 @@ -1591,12 +1136,8 @@ mapAliases { taro = taproot-assets; # Added 2023-07-04 tdesktop = telegram-desktop; # Added 2023-04-07 teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 - telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 - teleport_11 = throw "teleport 11 has been removed as it is EOL. Please upgrade to Teleport 12 or later"; # Added 2023-11-27 - teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04 teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26 teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18 - teleprompter = throw "teleprompter has been removed. reason: upstream dead and does not work with recent electron versions"; # Added 2024-03-14 temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01 @@ -1604,22 +1145,17 @@ mapAliases { temurin-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-jre-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-bin-16 = throw "Temurin 16 has been removed as it has reached its end of life"; # Added 2024-08-01 - tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 tepl = libgedit-tepl; # Added 2024-04-29 testVersion = testers.testVersion; # Added 2022-04-20 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 - thrift-0_10 = throw "'thrift-0_10' has been removed because it is impacted by security issues and not used in nixpkgs, move to 'thrift'"; # Added 2024-03-17 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17 - tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 - tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 - 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 @@ -1632,8 +1168,6 @@ mapAliases { trezor_agent = trezor-agent; # Added 2024-01-07 openai-triton-llvm = triton-llvm; # added 2024-07-18 trust-dns = hickory-dns; # Added 2024-08-07 - trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 - trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15 turbogit = throw "turbogit has been removed as it is unmaintained upstream and depends on an insecure version of libgit2"; # Added 2024-08-25 tvbrowser-bin = tvbrowser; # Added 2023-03-02 @@ -1649,10 +1183,7 @@ mapAliases { ubuntu_font_family = ubuntu-classic; # Added 2024-02-19 uclibc = uclibc-ng; # Added 2022-06-16 uclibcCross = uclibc-ng; # Added 2022-06-16 - ue4 = throw "ue4 has been removed, because the package was broken for years"; # Added 2023-11-22 uefi-firmware-parser = throw "The uefi-firmware-parser package was dropped since it was unmaintained."; # Added 2024-06-21 - uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07 - uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21 unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17 uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; unifi-poller = unpoller; # Added 2022-11-24 @@ -1663,7 +1194,6 @@ mapAliases { unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11 unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11 untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17 - urlview = throw "'urlview' has been dropped because it's unmaintained. Consider switching to an alternative such as `pkgs.extract_url` or `pkgs.urlscan`."; # Added 2023-12-14 urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2024-10-17 urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2024-10-17 urxvt_font_size = throw "'urxvt_font_size' has been renamed to/replaced by 'rxvt-unicode-plugins.font-size'"; # Converted to throw 2024-10-17 @@ -1672,14 +1202,11 @@ mapAliases { urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2024-10-17 urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2024-10-17 urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2024-10-17 - usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10 - utahfs = throw "utahfs has been removed, as it is broken and lack of maintenance from upstream"; # Added 2023-09-29 util-linuxCurses = util-linux; # Added 2022-04-12 utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475 ### V ### - v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 @@ -1690,31 +1217,18 @@ mapAliases { ventoy-bin-full = ventoy-full; # Added 2023-04-12 verilog = iverilog; # Added 2024-07-12 ViennaRNA = viennarna; # Added 2023-08-23 - vikunja-api = throw "'vikunja-api' has been replaced by 'vikunja'"; # Added 2024-02-19 - vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14 vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 - virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 - virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17 - vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 vkBasalt = vkbasalt; # Added 2022-11-22 vkdt-wayland = vkdt; # Added 2024-04-19 - vsmtp = throw "'vsmtp' has been removed, upstream gone"; # Added 2023-12-18 - vte_290 = throw "'vte_290' has been renamed to/replaced by 'vte'"; # Added 2023-01-05 - varnish72 = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 - varnish73 = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 - varnish72Packages = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 - varnish73Packages = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 - volatility = throw "'volatility' has been removed, as it was broken and unmaintained"; # Added 2023-12-10 ### W ### wakatime = wakatime-cli; # 2024-05-30 wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22 - waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 wayfireApplications-unwrapped = throw '' 'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire' 'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins' @@ -1722,20 +1236,12 @@ mapAliases { 'wayfireApplications-unwrapped.wlroots' has been removed ''; # Add 2023-07-29 waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24 - wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29 - webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 webkitgtk = lib.warn "Explicitly set the ABI version of 'webkitgtk'" webkitgtk_4_0; wineWayland = wine-wayland; - win-qemu = throw "'win-qemu' has been replaced by 'virtio-win'"; # Added 2023-08-16 win-virtio = virtio-win; # Added 2023-10-17 - win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17 wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17 - wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 - wlroots_0_15 = throw "'wlroots_0_15' has been removed in favor of newer versions"; # Added 2024-03-28 wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14 wlroots = wlroots_0_18; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release - wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10 - wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10 wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03 wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03 wordpress6_5 = wordpress_6_5; # Added 2024-08-03 @@ -1745,7 +1251,6 @@ mapAliases { wmii_hg = wmii; wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26 write_stylus = styluslabs-write-bin; # Added 2024-10-09 - wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22 wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03 wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03 wxmac = wxGTK30; # Added 2023-03-22 @@ -1753,8 +1258,6 @@ mapAliases { ### X ### xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17 - xcbuild6Hook = throw "'xcbuild6Hook has been renamed to/replaced by 'xcbuildHook'"; # Added 2023-12-10 - xcodebuild6 = throw "'xcodebuild6' has been renamed to/replaced by 'xcodebuild'"; # Added 2023-12-10 xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17 xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30 xen-slim = throw "'xen-slim' has been renamed to 'xen'. The old Xen package with built-in components no longer exists"; # Added 2024-10-05 @@ -1770,7 +1273,6 @@ mapAliases { xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 - xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17 xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27 @@ -1779,19 +1281,11 @@ mapAliases { yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17 yafaray-core = libyafaray; # Added 2022-09-23 - yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 - yubikey-manager4 = throw "yubikey-manager4 has been removed, since it is no longer required by yubikey-manager-qt. Please update to yubikey-manager."; # Added 2024-01-14 - yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzu-mainline = throw "yuzu-mainline has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 - yuzuPackages = throw "yuzuPackages has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 ### Z ### - zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07 zfsStable = zfs; # Added 2024-02-26 zfsUnstable = zfs_unstable; # Added 2024-02-26 zinc = zincsearch; # Added 2023-05-28 @@ -1802,11 +1296,9 @@ mapAliases { ### UNSORTED ### - zeroc_ice = throw "'zeroc_ice' has been renamed to/replaced by 'zeroc-ice'"; # Converted to throw 2023-09-10 dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2024-10-17 dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02 - gnatsd = throw "'gnatsd' has been renamed to/replaced by 'nats-server'"; # Converted to throw 2023-09-10 posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17 ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17 From a50fe7c812019d8e53f6b360b74e08b4b5b66a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 21 Oct 2024 11:55:41 -0600 Subject: [PATCH 216/229] Reapply "aliases: manual cleanup of nodejs-{14,16} variants that were left by previous script" This reverts commit 390b4514b66260bf6ee8f71c4b432c1208569b30. --- pkgs/top-level/aliases.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5c6c10b9c23b..c57dd6b6a557 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -819,10 +819,6 @@ mapAliases { nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 - nodejs-14_x = nodejs_14; # Added 2022-11-06 - nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 - nodejs-16_x = nodejs_16; # Added 2022-11-06 - nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 From 9d1796f1506dbb1d40de1a28c7530351cb332563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 21 Oct 2024 11:33:40 -0600 Subject: [PATCH 217/229] aliases: manual cleanup of gnuradio-with-packages that depended on gnuradio3_7 which was already a throw --- pkgs/top-level/aliases.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c57dd6b6a557..e6f70c531b1c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -448,18 +448,6 @@ mapAliases { gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14 gnome-resources = resources; # added 2023-12-10 - gnuradio-with-packages = gnuradio3_7.override { - extraPackages = lib.attrVals [ - "osmosdr" - "ais" - "gsm" - "nacl" - "rds" - "limesdr" - ] - gnuradio3_7Packages; - }; # Added 2020-10-16 - gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17 gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17 From 6d7b5fc78cf20ce4de18437502d96e561ad14522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 21 Oct 2024 11:36:25 -0600 Subject: [PATCH 218/229] aliases: manual cleanup of nixopsUnstable that depended on nixops_unstable which was already a throw --- pkgs/top-level/aliases.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e6f70c531b1c..ebe0a7ff23c4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -801,7 +801,6 @@ mapAliases { nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22 nix_2_3 = nixVersions.nix_2_3; nixfmt = lib.warn "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31 - nixopsUnstable = nixops_unstable; # Added 2022-03-03 # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable. From bf6aebdab821e5eb0aedb7d6689859bc49f8cdd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 21 Oct 2024 11:39:19 -0600 Subject: [PATCH 219/229] aliases: manual cleanup of openconnect_head that depended on openconnect_unstable which was already a throw --- pkgs/top-level/aliases.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ebe0a7ff23c4..3adb6d4e07f7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -832,7 +832,6 @@ mapAliases { openafs_1_8 = openafs; # Added 2022-08-22 opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07 - openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 opendylan = throw "opendylan has been removed from nixpkgs as it was broken"; # Added 2024-07-15 opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15 From 585642fda14c94c6c901aa7334548268a8299763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 21 Oct 2024 11:41:28 -0600 Subject: [PATCH 220/229] aliases: manual cleanup of php80{Packages,Extensions} that depended on php80 which was already a throw --- pkgs/top-level/aliases.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3adb6d4e07f7..9630bb0f78ec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -892,10 +892,6 @@ mapAliases { picom-next = picom; # Added 2024-02-13 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 - # Obsolete PHP version aliases - php80Packages = php80; # Added 2023-06-21 - php80Extensions = php80; # Added 2023-06-21 - pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; playwright = lib.warn "'playwright' will reference playwright-driver in 25.05. Reference 'python3Packages.playwright' for the python test launcher" python3Packages.toPythonApplication python3Packages.playwright; # Added 2024-10-04 From e547554122130faee45b4c9aa5def4a8c677f72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 21 Oct 2024 11:45:12 -0600 Subject: [PATCH 221/229] aliases: manual cleanup of wx{GTK30,mac} that depended on wxGTK30 which was already a throw --- pkgs/top-level/aliases.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9630bb0f78ec..2014b9ce30fc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1229,9 +1229,6 @@ mapAliases { wmii_hg = wmii; wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26 write_stylus = styluslabs-write-bin; # Added 2024-10-09 - wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03 - wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03 - wxmac = wxGTK30; # Added 2023-03-22 ### X ### From 6dad3ab2f7acc3633bf22e4ce589d571a1ada819 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Oct 2024 19:27:49 +0200 Subject: [PATCH 222/229] weston: 14.0.0 -> 14.0.1 --- pkgs/applications/window-managers/weston/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index e0a76e219535..8cd8ba35e31b 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "14.0.0"; + version = "14.0.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-R/0DJbC5SOmwA6OP306zqFgfP9x0C4kys1roeTv05KU="; + hash = "sha256-qBUFBbEmpZ33gf6MMMjm+H2nAT4XkDnrhEpbu8x8ebM="; }; depsBuildBuild = [ pkg-config ]; From 3f30412c0fd39d1ee2c03ef4ed6f377fcf121af0 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 19 Oct 2024 20:10:11 +0200 Subject: [PATCH 223/229] bluespec: 2024.01 -> 2024.07 Signed-off-by: Felix Singer --- pkgs/development/compilers/bluespec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index e761c8609e8b..720dbe84743b 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "bluespec"; - version = "2024.01"; + version = "2024.07"; src = fetchFromGitHub { owner = "B-Lang-org"; repo = "bsc"; rev = version; - sha256 = "sha256-yqmtydv94p7qhps0t4EdPaSZNh/9XCuUwOzLqz0gjxE="; + sha256 = "sha256-gA/vfAkkM2cuArN99JZVYEWTIJqg82HlC+BHNVS5Ot0="; }; yices-src = fetchurl { From 2d88282897c0e74b7ef8d042059212c5703adc4e Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 20 Oct 2024 18:53:30 +0200 Subject: [PATCH 224/229] bluespec: Move package definition into by-name structure Signed-off-by: Felix Singer --- .../bl}/bluespec/libstp_stub_makefile.patch | 0 .../bluespec/default.nix => by-name/bl/bluespec/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/compilers => by-name/bl}/bluespec/libstp_stub_makefile.patch (100%) rename pkgs/{development/compilers/bluespec/default.nix => by-name/bl/bluespec/package.nix} (100%) diff --git a/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch b/pkgs/by-name/bl/bluespec/libstp_stub_makefile.patch similarity index 100% rename from pkgs/development/compilers/bluespec/libstp_stub_makefile.patch rename to pkgs/by-name/bl/bluespec/libstp_stub_makefile.patch diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/by-name/bl/bluespec/package.nix similarity index 100% rename from pkgs/development/compilers/bluespec/default.nix rename to pkgs/by-name/bl/bluespec/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 181ac0979518..86a7f82855fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14313,7 +14313,7 @@ with pkgs; inherit (python3Packages) filecheck; }; - bluespec = callPackage ../development/compilers/bluespec { + bluespec = callPackage ../by-name/bl/bluespec/package.nix { gmp-static = gmp.override { withStatic = true; }; }; From 563d006e88eab91a5cb8994817d52444d65af6c5 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Thu, 17 Oct 2024 14:48:55 -0400 Subject: [PATCH 225/229] astro-language-server: 2.15.0 -> 2.15.3 --- pkgs/by-name/as/astro-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index d51829c07858..a979dafd8a24 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "astro-language-server"; - version = "2.15.0"; + version = "2.15.3"; src = fetchFromGitHub { owner = "withastro"; repo = "language-tools"; rev = "@astrojs/language-server@${finalAttrs.version}"; - hash = "sha256-2MaoW04mX016VIrtfnBX/jzMNCOXE10lSInSyhqot5E="; + hash = "sha256-PJTcr/FIA0haatLFNHMJV24j6eK+c2DR9zpnR8aReHo="; }; pnpmDeps = pnpm.fetchDeps { @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspace prePnpmInstall ; - hash = "sha256-WSnXMVWuE6VC75a1bhZHGyUg6r1yMBvoQZeKdIYE7QI="; + hash = "sha256-/X8ZoWK5kBPm/8clBDP+B9A5ofXnH2svmy4kMc2t5iA="; }; nativeBuildInputs = [ From 9dcad2b0b5caf4f80d80032d088f186804648130 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 20 Oct 2024 15:22:57 +0530 Subject: [PATCH 226/229] vimPlugins.nvim-treesitter-pairs: init at 2024-10-20 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b40c1ebbd49b..c671d738425a 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9401,6 +9401,18 @@ final: prev: meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; }; + nvim-treesitter-pairs = buildVimPlugin { + pname = "nvim-treesitter-pairs"; + version = "2024-10-20"; + src = fetchFromGitHub { + owner = "theHamsta"; + repo = "nvim-treesitter-pairs"; + rev = "f8c195d4d8464cba6971bf8de2d6a5c8c109b37a"; + sha256 = "sha256-VHq7ohBDThkBwqUIEVBb4RujBkftu96DQe/y6l7egzM="; + }; + meta.homepage = "https://github.com/theHamsta/nvim-treesitter-pairs/"; + }; + nvim-treesitter-pyfold = buildVimPlugin { pname = "nvim-treesitter-pyfold"; version = "2023-04-11"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2405a025b282..1eb8909aabec 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -789,6 +789,7 @@ https://github.com/nvim-tree/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, https://github.com/nvim-treesitter/nvim-treesitter-context/,, https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, +https://github.com/theHamsta/nvim-treesitter-pairs/,HEAD, https://github.com/eddiebergman/nvim-treesitter-pyfold/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,, From 83429e7cc9f3e0a5b4eb212e813044cc7af10024 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 20 Oct 2024 14:57:46 +0530 Subject: [PATCH 227/229] vimPlugins.scretch-nvim: init at 2024-10-20 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c671d738425a..d7d6593b8f67 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -18684,6 +18684,18 @@ final: prev: meta.homepage = "https://github.com/samodostal/image.nvim/"; }; + scretch-nvim = buildVimPlugin { + pname = "scretch.nvim"; + version = "2024-10-20"; + src = fetchFromGitHub { + owner = "0xJohnnyboy"; + repo = "scretch.nvim"; + rev = "0b2fbd0ed285f74baab7396a4a08c7bb7a3653c1"; + sha256 = "sha256-BqCVe7dY6WNJZS2XTNcnvB9d+HoM0wUItmmVskEaVHQ="; + }; + meta.homepage = "https://github.com/0xJohnnyboy/scretch.nvim/"; + }; + tinykeymap = buildVimPlugin { pname = "tinykeymap"; version = "2024-02-17"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3dc4109ab99a..a334c28d1ef8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1861,6 +1861,10 @@ in nvimRequireCheck = "rustaceanvim"; }; + scretch-nvim = super.scretch-nvim.overrideAttrs { + nvimRequireCheck = "scretch"; + }; + sg-nvim = super.sg-nvim.overrideAttrs ( old: let diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 1eb8909aabec..c7c7e0925399 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -905,6 +905,7 @@ https://github.com/vmware-archive/salt-vim/,, https://github.com/lewis6991/satellite.nvim/,HEAD, https://github.com/davidgranstrom/scnvim/,HEAD, https://github.com/tiagovla/scope.nvim/,HEAD, +https://github.com/0xJohnnyboy/scretch.nvim/,HEAD, https://github.com/Xuyuanp/scrollbar.nvim/,, https://github.com/cakebaker/scss-syntax.vim/,, https://github.com/VonHeikemen/searchbox.nvim/,, From b09d2fa0d9811ce31fd01391574e1cdc7bf00be2 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 21 Oct 2024 00:08:24 +0200 Subject: [PATCH 228/229] openvmm: init at 0-unstable-2024-10-19 --- pkgs/by-name/op/openvmm/Cargo.lock | 8750 +++++++++++++++++++++++++++ pkgs/by-name/op/openvmm/package.nix | 57 + 2 files changed, 8807 insertions(+) create mode 100644 pkgs/by-name/op/openvmm/Cargo.lock create mode 100644 pkgs/by-name/op/openvmm/package.nix diff --git a/pkgs/by-name/op/openvmm/Cargo.lock b/pkgs/by-name/op/openvmm/Cargo.lock new file mode 100644 index 000000000000..f2d618b44fd2 --- /dev/null +++ b/pkgs/by-name/op/openvmm/Cargo.lock @@ -0,0 +1,8750 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aarch64defs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "open_enum", + "zerocopy", +] + +[[package]] +name = "aarch64emu" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "futures", + "getrandom", + "inspect", + "pal_async", + "parking_lot", + "thiserror", + "tracing", +] + +[[package]] +name = "acpi" +version = "0.0.0" +dependencies = [ + "acpi_spec", + "memory_range", + "x86defs", + "zerocopy", +] + +[[package]] +name = "acpi_spec" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "open_enum", + "static_assertions", + "thiserror", + "zerocopy", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arc_cyclic_builder" +version = "0.0.0" +dependencies = [ + "futures-executor", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "awaitgroup" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a872ceb3db05a391fbe7cf8eba07a1239b2d946eee66f9e942be9bff06206302" + +[[package]] +name = "azure_profiler_proto" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "mesh_build", + "mesh_rpc", + "prost", + "prost-build", +] + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64-serde" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7" +dependencies = [ + "base64 0.21.7", + "serde", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitfield-struct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2ce686adbebce0ee484a502c440b4657739adbad65eadf06d64f5816ee9765" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "bitvec" +version = "1.1.0" +source = "git+https://github.com/smalis-msft/bitvec?branch=set-aliased-previous-val#d0aea0cf9e71323f41f1732634edb3aff2bf70f2" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + +[[package]] +name = "bootloader_fdt_parser" +version = "0.0.0" +dependencies = [ + "anyhow", + "fdt", + "fs-err", + "igvm_defs", + "inspect", + "loader_defs", + "memory_range", + "vm_topology", +] + +[[package]] +name = "bstr" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +dependencies = [ + "memchr", + "regex-automata 0.4.3", + "serde", +] + +[[package]] +name = "build_info" +version = "0.0.0" +dependencies = [ + "inspect", + "vergen", +] + +[[package]] +name = "build_rs_guest_arch" +version = "0.0.0" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder_slice" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b294e30387378958e8bf8f4242131b930ea615ff81e8cac2440cea0a6013190" +dependencies = [ + "byteorder", +] + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cache_topology" +version = "0.0.0" +dependencies = [ + "fs-err", + "thiserror", + "windows-sys 0.52.0", +] + +[[package]] +name = "caps" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" +dependencies = [ + "libc", + "thiserror", +] + +[[package]] +name = "cargo_toml" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chipset" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "chipset_device", + "chipset_device_resources", + "chipset_resources", + "futures", + "input_core", + "inspect", + "inspect_counters", + "local_clock", + "mesh", + "open_enum", + "pal_async", + "power_resources", + "test_with_tracing", + "thiserror", + "time", + "tracelimit", + "tracing", + "vm_resource", + "vmcore", + "x86defs", +] + +[[package]] +name = "chipset_arc_mutex_device" +version = "0.0.0" +dependencies = [ + "arc_cyclic_builder", + "chipset_device", + "closeable_mutex", + "parking_lot", + "range_map_vec", + "thiserror", + "tracing", +] + +[[package]] +name = "chipset_device" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", +] + +[[package]] +name = "chipset_device_fuzz" +version = "0.0.0" +dependencies = [ + "arbitrary", + "chipset_arc_mutex_device", + "chipset_device", + "closeable_mutex", + "futures", + "parking_lot", + "range_map_vec", + "tracing", + "zerocopy", +] + +[[package]] +name = "chipset_device_resources" +version = "0.0.0" +dependencies = [ + "async-trait", + "chipset_device", + "guestmem", + "inspect", + "vm_resource", + "vmcore", +] + +[[package]] +name = "chipset_legacy" +version = "0.0.0" +dependencies = [ + "chipset", + "chipset_device", + "floppy", + "floppy_pcat_stub", + "guestmem", + "inspect", + "local_clock", + "memory_range", + "mesh", + "open_enum", + "pal_async", + "pci_bus", + "pci_core", + "thiserror", + "tracelimit", + "tracing", + "vmcore", +] + +[[package]] +name = "chipset_resources" +version = "0.0.0" +dependencies = [ + "arbitrary", + "inspect", + "mesh", + "vm_resource", +] + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ci_logger" +version = "0.0.0" +dependencies = [ + "env_logger", + "log", +] + +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "clap_dyn_complete" +version = "0.0.0" +dependencies = [ + "async-trait", + "clap", + "futures", + "log", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "clipboard-win" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc" +dependencies = [ + "error-code", +] + +[[package]] +name = "closeable_mutex" +version = "0.0.0" +dependencies = [ + "parking_lot", +] + +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "consomme" +version = "0.0.0" +dependencies = [ + "futures", + "getrandom", + "inspect", + "libc", + "mesh", + "pal_async", + "resolv-conf", + "smoltcp", + "socket2", + "thiserror", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "futures", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.4.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctrlc" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +dependencies = [ + "nix 0.27.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "cvm_tracing" +version = "0.0.0" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "debug_ptr" +version = "0.0.0" + +[[package]] +name = "debug_worker" +version = "0.0.0" +dependencies = [ + "anyhow", + "debug_worker_defs", + "futures", + "gdbstub", + "inspect", + "mesh", + "mesh_worker", + "pal_async", + "socket2", + "tracelimit", + "tracing", + "vmm_core_defs", + "vmsocket", +] + +[[package]] +name = "debug_worker_defs" +version = "0.0.0" +dependencies = [ + "mesh", + "mesh_worker", + "vmm_core_defs", + "vmsocket", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "der_derive", + "zeroize", +] + +[[package]] +name = "der_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive-into-owned" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d94d81e3819a7b06a8638f448bc6339371ca9b6076a99d4a43eece3c4c923" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "device_emulators" +version = "0.0.0" + +[[package]] +name = "diag_client" +version = "0.0.0" +dependencies = [ + "anyhow", + "diag_proto", + "fs-err", + "futures", + "guid", + "inspect", + "inspect_proto", + "mesh", + "mesh_rpc", + "pal_async", + "socket2", + "thiserror", + "unix_socket", + "vmsocket", + "windows-sys 0.52.0", +] + +[[package]] +name = "diag_proto" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "mesh_build", + "mesh_rpc", + "prost", + "prost-build", +] + +[[package]] +name = "diag_server" +version = "0.0.0" +dependencies = [ + "anyhow", + "azure_profiler_proto", + "build_rs_guest_arch", + "diag_proto", + "fs-err", + "futures", + "futures-concurrency", + "hvdef", + "inspect", + "inspect_proto", + "libc", + "mesh", + "mesh_rpc", + "net_packet_capture", + "pal", + "pal_async", + "parking_lot", + "profiler_worker", + "safe_x86_intrinsics", + "socket2", + "tracing", + "underhill_confidentiality", + "unix_socket", + "vmsocket", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "disk_backend" +version = "0.0.0" +dependencies = [ + "async-trait", + "futures", + "guestmem", + "inspect", + "scsi_buffers", + "stackfuture", + "thiserror", + "vm_resource", +] + +[[package]] +name = "disk_backend_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "disk_blob" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "blocking", + "disk_backend", + "disk_backend_resources", + "guestmem", + "http", + "http-body-util", + "hyper", + "hyper-tls", + "hyper-util", + "inspect", + "once_cell", + "scsi_buffers", + "stackfuture", + "thiserror", + "tokio", + "vhd1_defs", + "vm_resource", + "zerocopy", +] + +[[package]] +name = "disk_blockdevice" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bitfield-struct", + "blocking", + "disk_backend", + "event-listener", + "fs-err", + "futures", + "guestmem", + "hvdef", + "inspect", + "io-uring", + "libc", + "mesh", + "nix 0.26.4", + "nvme_common", + "nvme_spec", + "once_cell", + "open_enum", + "pal", + "pal_async", + "pal_uring", + "scsi_buffers", + "stackfuture", + "tempfile", + "thiserror", + "tracing", + "uevent", + "vm_resource", + "zerocopy", +] + +[[package]] +name = "disk_file" +version = "0.0.0" +dependencies = [ + "blocking", + "disk_backend", + "disk_backend_resources", + "guestmem", + "inspect", + "scsi_buffers", + "stackfuture", + "vm_resource", +] + +[[package]] +name = "disk_nvme" +version = "0.0.0" +dependencies = [ + "async-trait", + "disk_backend", + "inspect", + "nvme_common", + "nvme_driver", + "nvme_spec", + "pal", + "scsi_buffers", + "stackfuture", +] + +[[package]] +name = "disk_prwrap" +version = "0.0.0" +dependencies = [ + "async-trait", + "disk_backend", + "disk_backend_resources", + "inspect", + "parking_lot", + "scsi_buffers", + "stackfuture", + "tracing", + "vm_resource", +] + +[[package]] +name = "disk_ramdisk" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "disk_backend", + "disk_backend_resources", + "event-listener", + "guestmem", + "inspect", + "pal_async", + "parking_lot", + "scsi_buffers", + "stackfuture", + "thiserror", + "tracing", + "vm_resource", + "zerocopy", +] + +[[package]] +name = "disk_striped" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "disk_backend", + "disk_backend_resources", + "disk_ramdisk", + "futures", + "guestmem", + "hvdef", + "inspect", + "pal_async", + "scsi_buffers", + "stackfuture", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", +] + +[[package]] +name = "disk_vhd1" +version = "0.0.0" +dependencies = [ + "disk_backend", + "disk_backend_resources", + "disk_file", + "guestmem", + "guid", + "inspect", + "pal_async", + "scsi_buffers", + "stackfuture", + "tempfile", + "thiserror", + "vhd1_defs", + "vm_resource", + "zerocopy", +] + +[[package]] +name = "disk_vhdmp" +version = "0.0.0" +dependencies = [ + "disk_backend", + "disk_file", + "disk_vhd1", + "futures", + "guid", + "inspect", + "mesh", + "scsi_buffers", + "stackfuture", + "tempfile", + "thiserror", + "vm_resource", + "winapi", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "elfcore" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051a3f44a8f1d574d13116351c3f2bc466801495d52578d1d34ac4ddbcd6ecb4" +dependencies = [ + "libc", + "nix 0.26.4", + "smallvec", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "embed-resource" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml", + "vswhom", + "winreg", +] + +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "encoding_rs_io" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "fast_select" +version = "0.0.0" +dependencies = [ + "futures", + "pal_async", + "parking_lot", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fatfs" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05669f8e7e2d7badc545c513710f0eba09c2fbef683eb859fd79c46c355048e0" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "log", +] + +[[package]] +name = "fd-lock" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" +dependencies = [ + "cfg-if", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fdt" +version = "0.0.0" +dependencies = [ + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "filepath" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7faa16fcec147281a1719947edb44af4f9124964bf7476bd5f5356a48e44dcc" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "firmware_pcat" +version = "0.0.0" +dependencies = [ + "chipset_device", + "generation_id", + "getrandom", + "guestmem", + "guid", + "inspect", + "memory_range", + "mesh", + "open_enum", + "static_assertions", + "thiserror", + "tracelimit", + "tracing", + "vm_topology", + "vmcore", + "zerocopy", +] + +[[package]] +name = "firmware_uefi" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "chipset_device", + "der", + "firmware_uefi_custom_vars", + "generation_id", + "getrandom", + "guestmem", + "guid", + "inspect", + "local_clock", + "mesh", + "open_enum", + "openssl", + "pal_async", + "test_with_tracing", + "thiserror", + "time", + "tracelimit", + "tracing", + "ucs2 0.0.0", + "uefi_nvram_specvars", + "uefi_nvram_storage", + "uefi_specs", + "vmcore", + "watchdog_core", + "wchar", + "zerocopy", +] + +[[package]] +name = "firmware_uefi_custom_vars" +version = "0.0.0" +dependencies = [ + "guid", + "mesh_protobuf", + "thiserror", + "uefi_specs", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "floppy" +version = "0.0.0" +dependencies = [ + "arrayvec", + "bitfield-struct", + "chipset_device", + "disk_backend", + "guestmem", + "inspect", + "mesh", + "open_enum", + "scsi_buffers", + "thiserror", + "tracelimit", + "tracing", + "vmcore", +] + +[[package]] +name = "floppy_pcat_stub" +version = "0.0.0" +dependencies = [ + "arrayvec", + "bitfield-struct", + "chipset_device", + "inspect", + "mesh", + "open_enum", + "tracelimit", + "tracing", + "vmcore", +] + +[[package]] +name = "floppy_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "flowey" +version = "0.0.0" +dependencies = [ + "anyhow", + "flowey_core", + "fs-err", + "log", + "serde", +] + +[[package]] +name = "flowey_cli" +version = "0.0.0" +dependencies = [ + "anyhow", + "ci_logger", + "clap", + "flowey_core", + "fs-err", + "log", + "parking_lot", + "petgraph", + "schema_ado_yaml", + "serde", + "serde_json", + "serde_yaml", + "toml_edit", + "xshell", +] + +[[package]] +name = "flowey_core" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "linkme", + "serde", + "serde_json", + "serde_yaml", +] + +[[package]] +name = "flowey_hvlite" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "flowey", + "flowey_cli", + "flowey_lib_common", + "flowey_lib_hvlite", + "log", + "serde", + "target-lexicon", +] + +[[package]] +name = "flowey_lib_common" +version = "0.0.0" +dependencies = [ + "anyhow", + "dirs", + "flowey", + "fs-err", + "home", + "log", + "rlimit", + "rustc-hash", + "serde", + "target-lexicon", + "toml_edit", + "which 6.0.0", + "xshell", +] + +[[package]] +name = "flowey_lib_hvlite" +version = "0.0.0" +dependencies = [ + "anyhow", + "flowey", + "flowey_lib_common", + "fs-err", + "igvmfilegen_config", + "log", + "serde", + "serde_json", + "target-lexicon", + "vmm_test_images", + "which 6.0.0", + "xshell", +] + +[[package]] +name = "flowey_trampoline" +version = "0.0.0" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "framebuffer" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "chipset_device", + "guestmem", + "inspect", + "memory_range", + "mesh", + "parking_lot", + "sparse_mmap", + "tracing", + "video_core", + "vm_resource", + "vmcore", +] + +[[package]] +name = "fs-err" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] + +[[package]] +name = "fscommon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "315ce685aca5ddcc5a3e7e436ef47d4a5d0064462849b6f0f628c28140103531" +dependencies = [ + "log", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "fuse" +version = "0.0.0" +dependencies = [ + "libc", + "lx", + "parking_lot", + "tempfile", + "test_with_tracing", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-concurrency" +version = "7.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef6712e11cdeed5c8cf21ea0b90fec40fbe64afc9bbf2339356197eeca829fc3" +dependencies = [ + "bitvec", + "futures-core", + "pin-project", + "slab", + "smallvec", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fuzz_chipset" +version = "0.0.0" +dependencies = [ + "arbitrary", + "chipset", + "chipset_device_fuzz", + "chipset_resources", + "libfuzzer-sys", + "local_clock", + "mesh", + "pal_async", + "vmcore", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_firmware_uefi" +version = "0.0.0" +dependencies = [ + "arbitrary", + "firmware_uefi", + "guid", + "libfuzzer-sys", + "openssl", + "ucs2 0.0.0", + "uefi_nvram_specvars", + "xtask_fuzz", + "zerocopy", +] + +[[package]] +name = "fuzz_guestmem" +version = "0.0.0" +dependencies = [ + "arbitrary", + "guestmem", + "libfuzzer-sys", + "smallvec", + "sparse_mmap", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_ide" +version = "0.0.0" +dependencies = [ + "arbitrary", + "chipset_arc_mutex_device", + "chipset_device", + "chipset_device_fuzz", + "disk_ramdisk", + "guestmem", + "ide", + "libfuzzer-sys", + "pci_core", + "scsidisk", + "vmcore", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_inspect" +version = "0.0.0" +dependencies = [ + "arbitrary", + "futures", + "inspect", + "libfuzzer-sys", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_mesh_ttrpc" +version = "0.0.0" +dependencies = [ + "futures", + "libfuzzer-sys", + "mesh", + "mesh_build", + "mesh_rpc", + "pal_async", + "prost", + "prost-build", + "tempfile", + "unix_socket", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_scsi_buffers" +version = "0.0.0" +dependencies = [ + "arbitrary", + "guestmem", + "libfuzzer-sys", + "scsi_buffers", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_sparse_mmap" +version = "0.0.0" +dependencies = [ + "arbitrary", + "libfuzzer-sys", + "sparse_mmap", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_ucs2" +version = "0.0.0" +dependencies = [ + "arbitrary", + "libfuzzer-sys", + "ucs2 0.0.0", + "xtask_fuzz", +] + +[[package]] +name = "fuzz_x86emu" +version = "0.0.0" +dependencies = [ + "arbitrary", + "futures", + "libfuzzer-sys", + "x86defs", + "x86emu", + "xtask_fuzz", +] + +[[package]] +name = "gdbstub" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4e02bf1b1a624d96925c608f1b268d82a76cbc587ce9e59f7c755e9ea11c75c" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "log", + "managed", + "num-traits", + "paste", +] + +[[package]] +name = "gdma" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "chipset_device", + "device_emulators", + "futures", + "gdma_defs", + "gdma_resources", + "guestmem", + "inspect", + "net_backend", + "net_backend_resources", + "parking_lot", + "pci_core", + "pci_resources", + "slab", + "task_control", + "thiserror", + "tracing", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "gdma_defs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "guestmem", + "inspect", + "open_enum", + "zerocopy", +] + +[[package]] +name = "gdma_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "net_backend_resources", + "vm_resource", +] + +[[package]] +name = "generation_id" +version = "0.0.0" +dependencies = [ + "getrandom", + "guestmem", + "inspect", + "mesh", + "tracelimit", + "tracing", + "vmcore", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "get_helpers" +version = "0.0.0" +dependencies = [ + "get_protocol", + "guid", + "zerocopy", +] + +[[package]] +name = "get_protocol" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "guid", + "open_enum", + "serde", + "serde_helpers", + "serde_json", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "get_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "thiserror", + "vm_resource", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "gptman" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6ee4a804a77da3ec5d3738c44fbe34c0ecc7f0fdc0ab3a96d989f78a57fe74" +dependencies = [ + "bincode", + "crc", + "nix 0.26.4", + "serde", + "thiserror", +] + +[[package]] +name = "grep-matcher" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02" +dependencies = [ + "memchr", +] + +[[package]] +name = "grep-regex" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" +dependencies = [ + "bstr", + "grep-matcher", + "log", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "grep-searcher" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" +dependencies = [ + "bstr", + "encoding_rs", + "encoding_rs_io", + "grep-matcher", + "log", + "memchr", + "memmap2", +] + +[[package]] +name = "guest_crash_device" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "get_protocol", + "get_resources", + "guid", + "inspect", + "mesh", + "task_control", + "tracing", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmcore", + "zerocopy", +] + +[[package]] +name = "guest_emulation_device" +version = "0.0.0" +dependencies = [ + "async-trait", + "futures", + "get_protocol", + "get_resources", + "guid", + "inspect", + "mesh", + "pal_async", + "parking_lot", + "power_resources", + "serde_json", + "task_control", + "thiserror", + "time", + "tracing", + "video_core", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "guest_emulation_log" +version = "0.0.0" +dependencies = [ + "async-trait", + "get_protocol", + "get_resources", + "inspect", + "serde", + "serde_json", + "task_control", + "thiserror", + "tracing", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "guest_emulation_transport" +version = "0.0.0" +dependencies = [ + "chipset_resources", + "futures", + "futures-concurrency", + "get_protocol", + "getrandom", + "guest_emulation_device", + "guestmem", + "guid", + "hvdef", + "inspect", + "inspect_counters", + "mesh", + "pal_async", + "parking_lot", + "power_resources", + "serde_json", + "shared_pool_alloc", + "test_with_tracing", + "thiserror", + "tracing", + "tracing_helpers", + "underhill_config", + "unicycle", + "vm_resource", + "vmbus_async", + "vmbus_ring", + "vmbus_user_channel", + "vpci", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "guest_test_uefi" +version = "0.0.0" +dependencies = [ + "uefi", +] + +[[package]] +name = "guest_watchdog" +version = "0.0.0" +dependencies = [ + "chipset_device", + "inspect", + "mesh", + "open_enum", + "tracelimit", + "vmcore", + "watchdog_core", +] + +[[package]] +name = "guestmem" +version = "0.0.0" +dependencies = [ + "inspect", + "pal_event", + "sparse_mmap", + "thiserror", + "zerocopy", +] + +[[package]] +name = "guid" +version = "0.0.0" +dependencies = [ + "getrandom", + "inspect", + "mesh_protobuf", + "thiserror", + "winapi", + "windows-sys 0.52.0", + "zerocopy", +] + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "hcl" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "build_rs_guest_arch", + "getrandom", + "hvdef", + "libc", + "memory_range", + "nix 0.26.4", + "open_enum", + "pal", + "parking_lot", + "safe_x86_intrinsics", + "sidecar_client", + "signal-hook", + "tdcall", + "thiserror", + "tracelimit", + "tracing", + "vtl_array", + "x86defs", + "zerocopy", +] + +[[package]] +name = "hcl_compat_uefi_nvram_storage" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "guid", + "inspect", + "open_enum", + "pal_async", + "static_assertions", + "thiserror", + "tracing", + "ucs2 0.0.0", + "uefi_nvram_storage", + "wchar", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "host_fdt_parser" +version = "0.0.0" +dependencies = [ + "arrayvec", + "fdt", + "hvdef", + "igvm_defs", + "inspect", + "memory_range", + "tracing", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hv1_emulator" +version = "0.0.0" +dependencies = [ + "build_rs_guest_arch", + "guestmem", + "hvdef", + "inspect", + "parking_lot", + "tracelimit", + "tracing", + "virt", + "vm_topology", + "vmcore", + "vtl_array", + "x86defs", + "zerocopy", +] + +[[package]] +name = "hv1_hypercall" +version = "0.0.0" +dependencies = [ + "guestmem", + "hvdef", + "open_enum", + "sparse_mmap", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "zerocopy", +] + +[[package]] +name = "hvdef" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "open_enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "hvlite_core" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "acpi", + "anyhow", + "async-trait", + "build_rs_guest_arch", + "cache_topology", + "cfg-if", + "chipset_device_resources", + "chipset_legacy", + "debug_ptr", + "disk_backend", + "fdt", + "firmware_pcat", + "firmware_uefi", + "firmware_uefi_custom_vars", + "floppy", + "floppy_resources", + "framebuffer", + "futures", + "futures-concurrency", + "get_resources", + "getrandom", + "guestmem", + "guid", + "hcl_compat_uefi_nvram_storage", + "hvdef", + "hvlite_defs", + "hvlite_pcat_locator", + "ide", + "ide_resources", + "igvm", + "igvm_defs", + "input_core", + "inspect", + "loader", + "local_clock", + "membacking", + "memory_range", + "mesh", + "mesh_worker", + "missing_dev", + "page_table", + "pal", + "pal_async", + "pci_bus", + "pci_core", + "range_map_vec", + "scsi_core", + "scsidisk", + "serial_16550_resources", + "sparse_mmap", + "state_unit", + "storvsp", + "thiserror", + "tracing", + "tracing_helpers", + "uefi_nvram_storage", + "virt", + "virt_hvf", + "virt_kvm", + "virt_mshv", + "virt_whp", + "virtio", + "virtio_serial", + "vm_loader", + "vm_resource", + "vm_topology", + "vmbus_channel", + "vmbus_server", + "vmcore", + "vmgs", + "vmgs_broker", + "vmm_core", + "vmm_core_defs", + "vmotherboard", + "vmswitch", + "vpci", + "watchdog_core", + "watchdog_vmgs_format", + "zerocopy", +] + +[[package]] +name = "hvlite_defs" +version = "0.0.0" +dependencies = [ + "anyhow", + "build_rs_guest_arch", + "firmware_uefi_custom_vars", + "floppy_resources", + "framebuffer", + "get_resources", + "guid", + "hvlite_pcat_locator", + "ide_resources", + "input_core", + "memory_range", + "mesh", + "mesh_worker", + "net_backend_resources", + "thiserror", + "unix_socket", + "virt", + "virt_whp", + "vm_resource", + "vmbus_proxy", + "vmm_core_defs", + "vmotherboard", +] + +[[package]] +name = "hvlite_entry" +version = "0.0.0" +dependencies = [ + "anyhow", + "awaitgroup", + "build_rs_guest_arch", + "chipset_resources", + "clap", + "clap_dyn_complete", + "debug_worker_defs", + "diag_client", + "dirs", + "disk_backend_resources", + "firmware_uefi_custom_vars", + "floppy_resources", + "framebuffer", + "fs-err", + "futures", + "futures-concurrency", + "gdma_resources", + "get_resources", + "getrandom", + "guid", + "hvlite_defs", + "hvlite_helpers", + "hvlite_pcat_locator", + "hvlite_ttrpc_vmservice", + "hyperv_ic_resources", + "hyperv_secure_boot_templates", + "hyperv_uefi_custom_vars_json", + "ide_resources", + "input_core", + "inspect", + "inspect_proto", + "macaddr", + "mcr_resources", + "mesh", + "mesh_process", + "mesh_rpc", + "mesh_worker", + "net_backend_resources", + "netvsp_resources", + "nvme_resources", + "openssl", + "pal", + "pal_async", + "parking_lot", + "prost", + "rustyline", + "scsidisk_resources", + "serial_16550_resources", + "serial_socket", + "shell-words", + "sparse_mmap", + "storvsp_resources", + "term", + "thiserror", + "tpm_resources", + "tracelimit", + "tracing", + "tracing-subscriber", + "tracing_helpers", + "uidevices_resources", + "unix_socket", + "video_core", + "virt_whp", + "virtio_resources", + "vm_manifest_builder", + "vm_resource", + "vmbfs_resources", + "vmbus_core", + "vmbus_proxy", + "vmbus_serial_resources", + "vmcore", + "vmgs_format", + "vmgs_resources", + "vmm_core_defs", + "vmotherboard", + "vmswitch", + "vnc_worker_defs", + "vtl2_settings_proto", + "whp", + "win_etw_tracing", + "winapi", +] + +[[package]] +name = "hvlite_helpers" +version = "0.0.0" +dependencies = [ + "anyhow", + "disk_backend_resources", + "disk_vhd1", + "disk_vhdmp", + "futures", + "futures-concurrency", + "get_resources", + "hvlite_defs", + "mesh", + "pal_async", + "tempfile", + "tracing", + "unicycle", + "vm_resource", +] + +[[package]] +name = "hvlite_pcat_locator" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "mesh", + "object", + "tracing", +] + +[[package]] +name = "hvlite_ttrpc_vmservice" +version = "0.0.0" +dependencies = [ + "mesh", + "mesh_build", + "mesh_rpc", + "prost", + "prost-build", +] + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "hyperv_ic" +version = "0.0.0" +dependencies = [ + "async-trait", + "futures", + "futures-concurrency", + "hyperv_ic_protocol", + "hyperv_ic_resources", + "inspect", + "mesh", + "task_control", + "thiserror", + "tracing", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "hyperv_ic_guest" +version = "0.0.0" +dependencies = [ + "guid", + "hyperv_ic_protocol", + "hyperv_ic_resources", + "inspect", + "mesh", + "task_control", + "thiserror", + "tracelimit", + "tracing", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "vmbus_relay_intercept_device", + "vmbus_ring", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "hyperv_ic_protocol" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "guid", + "open_enum", + "zerocopy", +] + +[[package]] +name = "hyperv_ic_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "hyperv_secure_boot_templates" +version = "0.0.0" +dependencies = [ + "firmware_uefi_custom_vars", + "hyperv_uefi_custom_vars_json", + "serde_json", +] + +[[package]] +name = "hyperv_uefi_custom_vars_json" +version = "0.0.0" +dependencies = [ + "base64 0.21.7", + "firmware_uefi_custom_vars", + "guid", + "serde", + "serde_helpers", + "serde_json", + "thiserror", + "zerocopy", +] + +[[package]] +name = "iced-x86" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd366a53278429c028367e0ba22a46cab6d565a57afb959f06e92c7a69e7828" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "ide" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "bitflags 1.3.2", + "chipset_device", + "disk_backend", + "disk_file", + "guestmem", + "ide_resources", + "inspect", + "mesh", + "open_enum", + "pal_async", + "pci_core", + "safeatomic", + "scsi_buffers", + "scsi_core", + "scsi_defs", + "scsidisk", + "static_assertions", + "tempfile", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "tracing_helpers", + "vmcore", + "zerocopy", +] + +[[package]] +name = "ide_resources" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "scsidisk_resources", + "vm_resource", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.3", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "igvm" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7984b10433b50e06a06bd50c69bca4888a5d7de8975f64ea4c2a7687eb99b09d" +dependencies = [ + "bitfield-struct", + "crc32fast", + "hex", + "igvm_defs", + "open-enum", + "range_map_vec", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "igvm_defs" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64ec5588c475372ae830475d3ee9a7bd255407dcb9f03faf6d493556eb6105a" +dependencies = [ + "bitfield-struct", + "open-enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "igvmfilegen" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "fs-err", + "hex", + "hvdef", + "igvm", + "igvm_defs", + "igvmfilegen_config", + "loader", + "loader_defs", + "memory_range", + "range_map_vec", + "serde", + "serde_json", + "sha2", + "thiserror", + "tracing", + "tracing-subscriber", + "underhill_confidentiality", + "vbs_defs", + "x86defs", + "zerocopy", +] + +[[package]] +name = "igvmfilegen_config" +version = "0.0.0" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "image" +version = "0.24.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "input_core" +version = "0.0.0" +dependencies = [ + "futures", + "mesh", + "vm_resource", +] + +[[package]] +name = "inspect" +version = "0.0.0" +dependencies = [ + "arbitrary", + "base64 0.21.7", + "bitfield-struct", + "filepath", + "futures", + "inspect_derive", + "mesh", + "pal_async", + "parking_lot", + "thiserror", +] + +[[package]] +name = "inspect_counters" +version = "0.0.0" +dependencies = [ + "inspect", +] + +[[package]] +name = "inspect_derive" +version = "0.0.0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "inspect_proto" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "mesh_build", + "mesh_protobuf", + "mesh_rpc", + "prost", + "prost-build", +] + +[[package]] +name = "inspect_rlimit" +version = "0.0.0" +dependencies = [ + "cfg-if", + "inspect", + "libc", + "thiserror", +] + +[[package]] +name = "inspect_task" +version = "0.0.0" +dependencies = [ + "inspect", + "pal_async", +] + +[[package]] +name = "io-uring" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460648e47a07a43110fbfa2e0b14afb2be920093c31e5dccc50e49568e099762" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "is-terminal" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] +name = "kmsg" +version = "0.0.0" +dependencies = [ + "thiserror", +] + +[[package]] +name = "kmsg_defs" +version = "0.0.0" + +[[package]] +name = "kvm" +version = "0.0.0" +dependencies = [ + "kvm-bindings", + "libc", + "nix 0.26.4", + "pal", + "parking_lot", + "signal-hook", + "thiserror", +] + +[[package]] +name = "kvm-bindings" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081fbd8164229a990fbf24a1f35d287740db110c2b5d42addf460165f1b0e032" + +[[package]] +name = "landlock" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9baa9eeb6e315942429397e617a190f4fdc696ef1ee0342939d641029cbb4ea7" +dependencies = [ + "enumflags2", + "libc", + "thiserror", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "libmimalloc-sys" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] + +[[package]] +name = "linkme" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b53ad6a33de58864705954edb5ad5d571a010f9e296865ed43dc72a5621b430" +dependencies = [ + "linkme-impl", +] + +[[package]] +name = "linkme-impl" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e542a18c94a9b6fcc7adb090fa3ba6b79ee220a16404f325672729f32a66ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "linux_net_bindings" +version = "0.0.0" +dependencies = [ + "nix 0.26.4", +] + +[[package]] +name = "loader" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "anyhow", + "bitfield-struct", + "build_rs_guest_arch", + "crc32fast", + "guid", + "hvdef", + "igvm", + "loader_defs", + "memory_range", + "object", + "open_enum", + "page_table", + "thiserror", + "tracing", + "vm_topology", + "x86defs", + "zerocopy", +] + +[[package]] +name = "loader_defs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "hvdef", + "inspect", + "open_enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "local_clock" +version = "0.0.0" +dependencies = [ + "inspect", + "parking_lot", + "time", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lx" +version = "0.0.0" +dependencies = [ + "thiserror", +] + +[[package]] +name = "lxutil" +version = "0.0.0" +dependencies = [ + "libc", + "lx", + "ntapi", + "pal", + "parking_lot", + "tempfile", + "tracing", + "widestring", + "winapi", + "zerocopy", +] + +[[package]] +name = "macaddr" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8" + +[[package]] +name = "make_imc_hive" +version = "0.0.0" +dependencies = [ + "anyhow", + "windows-sys 0.52.0", +] + +[[package]] +name = "mana_driver" +version = "0.0.0" +dependencies = [ + "anyhow", + "chipset_device", + "futures", + "gdma", + "gdma_defs", + "getrandom", + "inspect", + "mesh", + "net_backend", + "net_backend_resources", + "pal_async", + "parking_lot", + "pci_core", + "test_with_tracing", + "tracing", + "user_driver", + "vmcore", + "zerocopy", +] + +[[package]] +name = "managed" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "mbrman" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c487024623ae38584610237dd1be8932bb2b324474b23c37a25f9fbe6bf5e9e" +dependencies = [ + "bincode", + "bitvec", + "serde", + "serde-big-array", + "thiserror", +] + +[[package]] +name = "mcr_resources" +version = "0.0.0" +dependencies = [ + "guid", + "mesh", + "vm_resource", +] + +[[package]] +name = "membacking" +version = "0.0.0" +dependencies = [ + "futures", + "getrandom", + "guestmem", + "hvdef", + "inspect", + "memory_range", + "mesh", + "pal_async", + "parking_lot", + "slab", + "sparse_mmap", + "thiserror", + "tracing", + "virt", + "vm_topology", + "vmcore", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +dependencies = [ + "libc", +] + +[[package]] +name = "memory_range" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh_protobuf", + "thiserror", +] + +[[package]] +name = "mesh" +version = "0.0.0" +dependencies = [ + "mesh_channel", + "mesh_derive", + "mesh_node", + "mesh_protobuf", +] + +[[package]] +name = "mesh_build" +version = "0.0.0" +dependencies = [ + "heck", + "proc-macro2", + "prost-build", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "mesh_channel" +version = "0.0.0" +dependencies = [ + "futures", + "futures-concurrency", + "futures-core", + "futures-io", + "mesh_node", + "mesh_protobuf", + "pal_async", + "pal_event", + "parking_lot", + "test_with_tracing", + "thiserror", + "tracing", +] + +[[package]] +name = "mesh_derive" +version = "0.0.0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "mesh_node" +version = "0.0.0" +dependencies = [ + "futures-channel", + "getrandom", + "mesh_derive", + "mesh_protobuf", + "open_enum", + "pal", + "pal_async", + "parking_lot", + "test_with_tracing", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "mesh_process" +version = "0.0.0" +dependencies = [ + "anyhow", + "base64 0.21.7", + "debug_ptr", + "futures", + "futures-concurrency", + "inspect", + "inspect_rlimit", + "inspect_task", + "mesh", + "mesh_remote", + "pal", + "pal_async", + "slab", + "tracing", + "unicycle", +] + +[[package]] +name = "mesh_protobuf" +version = "0.0.0" +dependencies = [ + "diff", + "fs-err", + "heck", + "mesh_derive", + "prost", + "prost-build", + "prost-types", + "socket2", + "thiserror", + "zerocopy", +] + +[[package]] +name = "mesh_remote" +version = "0.0.0" +dependencies = [ + "futures", + "futures-concurrency", + "libc", + "mesh_channel", + "mesh_node", + "mesh_protobuf", + "ntapi", + "open_enum", + "pal", + "pal_async", + "pal_event", + "parking_lot", + "socket2", + "test_with_tracing", + "thiserror", + "tracing", + "tracing_helpers", + "unicycle", + "unix_socket", + "zerocopy", +] + +[[package]] +name = "mesh_rpc" +version = "0.0.0" +dependencies = [ + "anyhow", + "base64 0.21.7", + "env_logger", + "futures", + "futures-concurrency", + "h2", + "http", + "mesh", + "mesh_build", + "pal_async", + "parking_lot", + "prost", + "prost-build", + "prost-types", + "test_with_tracing", + "thiserror", + "tokio", + "tracing", + "unicycle", + "unix_socket", + "urlencoding", + "zerocopy", +] + +[[package]] +name = "mesh_tracing" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "guid", + "inspect", + "mesh", + "pal_async", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mesh_worker" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "futures-concurrency", + "inspect", + "linkme", + "mesh", + "pal_async", + "test_with_tracing", + "tracing", + "unicycle", +] + +[[package]] +name = "mimalloc" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "minimal_rt" +version = "0.0.0" +dependencies = [ + "arrayvec", + "cfg-if", + "hvdef", + "minimal_rt_build", + "zerocopy", +] + +[[package]] +name = "minimal_rt_build" +version = "0.0.0" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "missing_dev" +version = "0.0.0" +dependencies = [ + "chipset_device", + "chipset_device_resources", + "inspect", + "missing_dev_resources", + "pci_core", + "vm_resource", + "vmcore", +] + +[[package]] +name = "missing_dev_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "ms-tpm-20-ref" +version = "0.1.0" +source = "git+https://github.com/microsoft/ms-tpm-20-ref-rs.git?branch=main#3e9d3874fe9273056c8e6806fc1f35493e7bdfad" +dependencies = [ + "cc", + "once_cell", + "openssl-sys", + "postcard", + "serde", + "tracing", + "walkdir", +] + +[[package]] +name = "mshv-bindings" +version = "0.1.1" +source = "git+https://github.com/rust-vmm/mshv?branch=main#7bacc75e3612fcb9c11bc7526414d70d04aa158e" +dependencies = [ + "libc", + "serde", + "serde_derive", + "vmm-sys-util", + "zerocopy", +] + +[[package]] +name = "mshv-ioctls" +version = "0.1.1" +source = "git+https://github.com/rust-vmm/mshv?branch=main#7bacc75e3612fcb9c11bc7526414d70d04aa158e" +dependencies = [ + "libc", + "mshv-bindings", + "vmm-sys-util", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "net_backend" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "futures-concurrency", + "guestmem", + "inspect", + "memory_range", + "mesh", + "net_backend_resources", + "pal_async", + "parking_lot", + "tracing", + "vm_resource", + "vm_topology", +] + +[[package]] +name = "net_backend_resources" +version = "0.0.0" +dependencies = [ + "guid", + "inspect", + "mesh", + "thiserror", + "vm_resource", +] + +[[package]] +name = "net_consomme" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "consomme", + "inspect", + "inspect_counters", + "net_backend", + "net_backend_resources", + "pal_async", + "parking_lot", + "tracing", + "vm_resource", +] + +[[package]] +name = "net_dio" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "guid", + "inspect", + "net_backend", + "net_backend_resources", + "pal_async", + "parking_lot", + "tracing", + "vm_resource", + "vmswitch", +] + +[[package]] +name = "net_mana" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "chipset_device", + "futures", + "gdma", + "gdma_defs", + "guestmem", + "inspect", + "mana_driver", + "mesh", + "net_backend", + "pal_async", + "pci_core", + "test_with_tracing", + "tracelimit", + "tracing", + "user_driver", + "vmcore", + "zerocopy", +] + +[[package]] +name = "net_packet_capture" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "futures-concurrency", + "guestmem", + "inspect", + "mesh", + "net_backend", + "parking_lot", + "pcap-file", + "tracing", +] + +[[package]] +name = "net_tap" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "inspect", + "libc", + "linux_net_bindings", + "net_backend", + "net_backend_resources", + "pal_async", + "parking_lot", + "thiserror", + "tracing", + "vm_resource", +] + +[[package]] +name = "netvsp" +version = "0.0.0" +dependencies = [ + "anyhow", + "arrayvec", + "async-trait", + "bitfield-struct", + "event-listener", + "futures", + "futures-concurrency", + "guestmem", + "guid", + "hvdef", + "inspect", + "inspect_counters", + "mesh", + "net_backend", + "net_backend_resources", + "netvsp_resources", + "open_enum", + "pal_async", + "parking_lot", + "safeatomic", + "task_control", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "vmbus_ring", + "vmcore", + "zerocopy", +] + +[[package]] +name = "netvsp_resources" +version = "0.0.0" +dependencies = [ + "guid", + "mesh", + "net_backend_resources", + "vm_resource", +] + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "libc", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "nvme" +version = "0.0.0" +dependencies = [ + "async-trait", + "chipset_device", + "device_emulators", + "disk_backend", + "event-listener", + "futures", + "futures-concurrency", + "guestmem", + "guid", + "inspect", + "mesh", + "nvme_common", + "nvme_resources", + "nvme_spec", + "pal_async", + "parking_lot", + "pci_core", + "pci_resources", + "scsi_buffers", + "task_control", + "thiserror", + "tracelimit", + "tracing", + "unicycle", + "user_driver", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "nvme_common" +version = "0.0.0" +dependencies = [ + "disk_backend", + "nvme_spec", + "thiserror", +] + +[[package]] +name = "nvme_driver" +version = "0.0.0" +dependencies = [ + "anyhow", + "chipset_device", + "disk_ramdisk", + "event-listener", + "futures", + "guestmem", + "guid", + "inspect", + "inspect_counters", + "mesh", + "nvme", + "nvme_spec", + "pal_async", + "parking_lot", + "pci_core", + "safeatomic", + "scsi_buffers", + "slab", + "task_control", + "test_with_tracing", + "thiserror", + "tracing", + "user_driver", + "vmcore", + "zerocopy", +] + +[[package]] +name = "nvme_resources" +version = "0.0.0" +dependencies = [ + "guid", + "mesh", + "vm_resource", +] + +[[package]] +name = "nvme_spec" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "inspect", + "open_enum", + "storage_string", + "zerocopy", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "ohcldiag-dev" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "clap_dyn_complete", + "ctrlc", + "diag_client", + "env_logger", + "fs-err", + "futures", + "futures-concurrency", + "inspect", + "kmsg", + "mesh", + "pal", + "pal_async", + "socket2", + "term", + "thiserror", + "unicycle", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "open-enum" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb2508143a400b3361812094d987dd5adc81f0f5294a46491be648d6c94cab5" +dependencies = [ + "open-enum-derive", +] + +[[package]] +name = "open-enum-derive" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d1296fab5231654a5aec8bf9e87ba4e3938c502fc4c3c0425a00084c78944be" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "open_enum" +version = "0.0.0" + +[[package]] +name = "openhcl_boot" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "arrayvec", + "cfg-if", + "crc32fast", + "fdt", + "host_fdt_parser", + "hvdef", + "igvm_defs", + "loader_defs", + "memory_range", + "minimal_rt", + "minimal_rt_build", + "safe_x86_intrinsics", + "sha2", + "sidecar_defs", + "tdcall", + "underhill_confidentiality", + "x86defs", + "zerocopy", +] + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.2.1+3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "openssl_crypto_only" +version = "0.0.0" + +[[package]] +name = "openssl_kdf" +version = "0.0.0" +dependencies = [ + "libc", + "openssl", + "openssl-sys", + "thiserror", +] + +[[package]] +name = "openvmm" +version = "0.0.0" +dependencies = [ + "hvlite_entry", + "openvmm_resources", + "win_prng_support", +] + +[[package]] +name = "openvmm_hcl" +version = "0.0.0" +dependencies = [ + "openvmm_hcl_resources", + "underhill_entry", +] + +[[package]] +name = "openvmm_hcl_resources" +version = "0.0.0" +dependencies = [ + "build_rs_guest_arch", + "chipset", + "debug_worker", + "disk_striped", + "hyperv_ic", + "mesh_worker", + "missing_dev", + "nvme", + "scsidisk", + "serial_16550", + "serial_core", + "serial_pl011", + "storvsp", + "tpm", + "uidevices", + "vm_resource", + "vmbus_serial_guest", + "vmcore", + "vmsocket", + "vnc_worker", +] + +[[package]] +name = "openvmm_resources" +version = "0.0.0" +dependencies = [ + "build_rs_guest_arch", + "chipset", + "debug_worker", + "disk_blob", + "disk_file", + "disk_prwrap", + "disk_ramdisk", + "disk_vhd1", + "disk_vhdmp", + "gdma", + "guest_crash_device", + "guest_emulation_device", + "guest_emulation_log", + "hvlite_core", + "hyperv_ic", + "mesh_worker", + "missing_dev", + "net_backend", + "net_consomme", + "net_dio", + "net_tap", + "netvsp", + "nvme", + "scsidisk", + "serial_16550", + "serial_core", + "serial_pl011", + "serial_socket", + "storvsp", + "tpm", + "uidevices", + "virtio_net", + "virtio_p9", + "virtio_pmem", + "virtiofs", + "vm_resource", + "vmbfs", + "vmbus_serial_host", + "vmcore", + "vnc_worker", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "oversized_box" +version = "0.0.0" + +[[package]] +name = "page_table" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "tracing", + "zerocopy", +] + +[[package]] +name = "pal" +version = "0.0.0" +dependencies = [ + "caps", + "fs-err", + "getrandom", + "landlock", + "libc", + "ntapi", + "pal_event", + "seccompiler", + "socket2", + "thiserror", + "tracing", + "widestring", + "win_import_lib", + "winapi", +] + +[[package]] +name = "pal_async" +version = "0.0.0" +dependencies = [ + "async-channel", + "async-task", + "cfg-if", + "futures", + "getrandom", + "libc", + "once_cell", + "pal", + "pal_async_test", + "pal_event", + "parking_lot", + "slab", + "smallbox", + "socket2", + "tempfile", + "tempfile_helpers", + "unicycle", + "unix_socket", + "winapi", + "windows-sys 0.52.0", + "zerocopy", +] + +[[package]] +name = "pal_async_test" +version = "0.0.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pal_event" +version = "0.0.0" +dependencies = [ + "getrandom", + "libc", + "mesh_protobuf", + "windows-sys 0.52.0", +] + +[[package]] +name = "pal_uring" +version = "0.0.0" +dependencies = [ + "futures", + "inspect", + "io-uring", + "libc", + "once_cell", + "pal", + "pal_async", + "parking_lot", + "slab", + "smallbox", + "tempfile", + "test_with_tracing", + "tracing", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pbjson" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048f9ac93c1eab514f9470c4bc8d97ca2a0a236b84f45cc19d69a59fc11467f6" +dependencies = [ + "base64 0.13.1", + "serde", +] + +[[package]] +name = "pbjson-build" +version = "0.5.1" +source = "git+https://github.com/jstarks/pbjson?branch=aliases#8896d740a44ef46a3bad8cbfccedb87ea8e7b0d3" +dependencies = [ + "heck", + "itertools", + "prost", + "prost-types", +] + +[[package]] +name = "pbjson-types" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a88c8d87f99a4ac14325e7a4c24af190fca261956e3b82dd7ed67e77e6c7043" +dependencies = [ + "bytes", + "chrono", + "pbjson", + "pbjson-build", + "prost", + "prost-build", + "serde", +] + +[[package]] +name = "pcap-file" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc1f139757b058f9f37b76c48501799d12c9aa0aa4c0d4c980b062ee925d1b2" +dependencies = [ + "byteorder_slice", + "derive-into-owned", + "thiserror", +] + +[[package]] +name = "pci_bus" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "chipset_device", + "inspect", + "mesh", + "thiserror", + "tracelimit", + "tracing", + "vmcore", + "zerocopy", +] + +[[package]] +name = "pci_core" +version = "0.0.0" +dependencies = [ + "bitflags 1.3.2", + "chipset_device", + "guestmem", + "inspect", + "mesh", + "open_enum", + "parking_lot", + "thiserror", + "tracelimit", + "tracing", + "vmcore", + "zerocopy", +] + +[[package]] +name = "pci_resources" +version = "0.0.0" +dependencies = [ + "chipset_device", + "chipset_device_resources", + "guestmem", + "pci_core", + "vm_resource", + "vmcore", +] + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "petri" +version = "0.0.0" +dependencies = [ + "anyhow", + "chipset_resources", + "diag_client", + "disk_backend_resources", + "fatfs", + "framebuffer", + "fs-err", + "fscommon", + "futures", + "futures-concurrency", + "get_resources", + "gptman", + "guid", + "hvlite_defs", + "hvlite_helpers", + "hvlite_pcat_locator", + "hyperv_ic_resources", + "hyperv_secure_boot_templates", + "ide_resources", + "image", + "inspect", + "mbrman", + "mesh", + "mesh_process", + "mesh_worker", + "nvme_resources", + "pal", + "pal_async", + "petri_artifacts_common", + "petri_artifacts_core", + "petri_artifacts_vmm_test", + "pipette_client", + "prost", + "scsidisk_resources", + "serial_16550_resources", + "serial_core", + "serial_socket", + "sparse_mmap", + "storvsp_resources", + "tempfile", + "tempfile_helpers", + "tpm_resources", + "tracing", + "tracing-subscriber", + "uidevices_resources", + "underhill_confidentiality", + "unix_socket", + "video_core", + "vm_manifest_builder", + "vm_resource", + "vmbfs_resources", + "vmbus_serial_resources", + "vmcore", + "vmm_core_defs", + "vmotherboard", + "vtl2_settings_proto", +] + +[[package]] +name = "petri_artifact_resolver_openvmm_known_paths" +version = "0.0.0" +dependencies = [ + "anyhow", + "petri_artifacts_common", + "petri_artifacts_core", + "petri_artifacts_vmm_test", + "tempfile", + "vmm_test_images", +] + +[[package]] +name = "petri_artifacts_common" +version = "0.0.0" +dependencies = [ + "petri_artifacts_core", +] + +[[package]] +name = "petri_artifacts_core" +version = "0.0.0" +dependencies = [ + "anyhow", + "paste", +] + +[[package]] +name = "petri_artifacts_vmm_test" +version = "0.0.0" +dependencies = [ + "petri_artifacts_common", + "petri_artifacts_core", +] + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pipette" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "futures-concurrency", + "mesh", + "mesh_remote", + "pal_async", + "pipette_protocol", + "tracing", + "tracing-subscriber", + "unicycle", + "vmsocket", + "windows-service", + "windows-sys 0.52.0", +] + +[[package]] +name = "pipette_client" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "futures-concurrency", + "mesh", + "mesh_remote", + "pal_async", + "pipette_protocol", + "tracing", + "typed-path", + "xshell-macros", +] + +[[package]] +name = "pipette_protocol" +version = "0.0.0" +dependencies = [ + "mesh", +] + +[[package]] +name = "pkg-config" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" + +[[package]] +name = "plan9" +version = "0.0.0" +dependencies = [ + "lx", + "lxutil", + "parking_lot", + "tracing", +] + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] + +[[package]] +name = "power_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "prettyplease" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "proc-macro2" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiler_worker" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "mesh", + "mesh_worker", + "pal_async", + "socket2", + "tracing", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which 4.4.2", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "ptr_meta" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcada80daa06c42ed5f48c9a043865edea5dc44cbf9ac009fda3b89526e28607" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca9224df2e20e7c5548aeb5f110a0f3b77ef05f8585139b7148b59056168ed2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + +[[package]] +name = "range_map_vec" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc2191ec1fd850e3ede4cf09ccfd40a33df561111f73e96e1b7c3f9eee31328" + +[[package]] +name = "rayon" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "quick-error", +] + +[[package]] +name = "rlimit" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" +dependencies = [ + "libc", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rustyline" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "clipboard-win", + "fd-lock", + "home", + "libc", + "log", + "memchr", + "nix 0.27.1", + "radix_trie", + "rustyline-derive", + "unicode-segmentation", + "unicode-width", + "utf8parse", + "winapi", +] + +[[package]] +name = "rustyline-derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5af959c8bf6af1aff6d2b463a57f71aae53d1332da58419e30ad8dc7011d951" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "safe_x86_intrinsics" +version = "0.0.0" + +[[package]] +name = "safeatomic" +version = "0.0.0" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "save_restore_derive" +version = "0.0.0" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "schema_ado_yaml" +version = "0.0.0" +dependencies = [ + "serde", + "serde_yaml", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scsi_buffers" +version = "0.0.0" +dependencies = [ + "event-listener", + "guestmem", + "safeatomic", + "smallvec", + "zerocopy", +] + +[[package]] +name = "scsi_core" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "scsi_buffers", + "scsi_defs", + "stackfuture", + "vm_resource", + "vmcore", +] + +[[package]] +name = "scsi_defs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "open_enum", + "zerocopy", +] + +[[package]] +name = "scsidisk" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "disk_backend", + "disk_prwrap", + "futures", + "getrandom", + "guestmem", + "guid", + "hvdef", + "inspect", + "mesh", + "pal_async", + "parking_lot", + "scsi_buffers", + "scsi_core", + "scsi_defs", + "scsidisk_resources", + "stackfuture", + "thiserror", + "tracelimit", + "tracing", + "tracing_helpers", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "scsidisk_resources" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "storage_string", + "vm_resource", +] + +[[package]] +name = "seccompiler" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345a3e4dddf721a478089d4697b83c6c0a8f5bf16086f6c13397e4534eb6e2e5" +dependencies = [ + "libc", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "serde" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-big-array" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3323f09a748af288c3dc2474ea6803ee81f118321775bffa3ac8f7e65c5e90e7" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_helpers" +version = "0.0.0" +dependencies = [ + "base64 0.21.7", + "guid", + "serde", + "serde_json", +] + +[[package]] +name = "serde_json" +version = "1.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "serial_16550" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "chipset_device", + "chipset_device_resources", + "futures", + "inspect", + "inspect_counters", + "mesh", + "open_enum", + "serial_16550_resources", + "serial_core", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", + "vmcore", +] + +[[package]] +name = "serial_16550_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "serial_core" +version = "0.0.0" +dependencies = [ + "futures", + "inspect", + "mesh", + "pal_async", + "parking_lot", + "vm_resource", +] + +[[package]] +name = "serial_pl011" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "chipset_device", + "chipset_device_resources", + "futures", + "inspect", + "inspect_counters", + "mesh", + "open_enum", + "pal_async", + "serial_core", + "serial_pl011_resources", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", + "vmcore", +] + +[[package]] +name = "serial_pl011_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "serial_socket" +version = "0.0.0" +dependencies = [ + "futures", + "inspect", + "mesh", + "pal", + "pal_async", + "serial_core", + "tracing", + "unix_socket", + "vm_resource", +] + +[[package]] +name = "sev_guest_device" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "nix 0.26.4", + "static_assertions", + "thiserror", + "zerocopy", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shared_pool_alloc" +version = "0.0.0" +dependencies = [ + "anyhow", + "hcl", + "hvdef", + "inspect", + "parking_lot", + "sparse_mmap", + "thiserror", + "tracing", + "user_driver", + "vm_topology", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "sidecar" +version = "0.0.0" +dependencies = [ + "arrayvec", + "hvdef", + "memory_range", + "minimal_rt", + "minimal_rt_build", + "sidecar_defs", + "x86defs", + "zerocopy", +] + +[[package]] +name = "sidecar_client" +version = "0.0.0" +dependencies = [ + "fs-err", + "hvdef", + "libc", + "nix 0.26.4", + "pal_async", + "parking_lot", + "sidecar_defs", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "sidecar_defs" +version = "0.0.0" +dependencies = [ + "hvdef", + "open_enum", + "x86defs", + "zerocopy", +] + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallbox" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92359f97e6b417da4328a970cf04a044db104fbd57f7d72cb7ff665bb8806af" + +[[package]] +name = "smallvec" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b187f0231d56fe41bfb12034819dd2bf336422a5866de41bc3fec4b2e3883e8" + +[[package]] +name = "smoltcp" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee34c1e1bfc7e9206cc0fb8030a90129b4e319ab53856249bb27642cab914fb3" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "managed", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "sparse_mmap" +version = "0.0.0" +dependencies = [ + "cc", + "criterion", + "getrandom", + "libc", + "pal", + "parking_lot", + "thiserror", + "windows-sys 0.52.0", + "zerocopy", +] + +[[package]] +name = "stackfuture" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eae92052b72ef70dafa16eddbabffc77e5ca3574be2f7bc1127b36f0a7ad7f2" + +[[package]] +name = "state_unit" +version = "0.0.0" +dependencies = [ + "anyhow", + "event-listener", + "futures", + "futures-concurrency", + "inspect", + "mesh", + "pal_async", + "parking_lot", + "test_with_tracing", + "thiserror", + "tracing", + "vmcore", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "storage_string" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh_protobuf", + "thiserror", + "zerocopy", +] + +[[package]] +name = "storvsp" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "criterion", + "disk_backend", + "disk_ramdisk", + "event-listener", + "fast_select", + "futures", + "guestmem", + "guid", + "inspect", + "inspect_counters", + "mesh", + "open_enum", + "oversized_box", + "pal_async", + "parking_lot", + "scsi_buffers", + "scsi_core", + "scsi_defs", + "scsidisk", + "slab", + "storvsp_resources", + "task_control", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "tracing_helpers", + "unicycle", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "vmbus_ring", + "vmcore", + "zerocopy", +] + +[[package]] +name = "storvsp_resources" +version = "0.0.0" +dependencies = [ + "guid", + "mesh", + "vm_resource", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-lexicon" +version = "0.12.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +dependencies = [ + "serde", +] + +[[package]] +name = "task_control" +version = "0.0.0" +dependencies = [ + "fast_select", + "futures", + "inspect", + "pal_async", + "parking_lot", +] + +[[package]] +name = "tdcall" +version = "0.0.0" +dependencies = [ + "hvdef", + "memory_range", + "tracing", + "x86defs", +] + +[[package]] +name = "tdx_guest_device" +version = "0.0.0" +dependencies = [ + "nix 0.26.4", + "static_assertions", + "thiserror", + "zerocopy", +] + +[[package]] +name = "tee_call" +version = "0.0.0" +dependencies = [ + "sev_guest_device", + "static_assertions", + "tdx_guest_device", + "thiserror", + "zerocopy", +] + +[[package]] +name = "tempfile" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "tempfile_helpers" +version = "0.0.0" +dependencies = [ + "tempfile", +] + +[[package]] +name = "term" +version = "0.0.0" +dependencies = [ + "crossterm", + "libc", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "test_with_tracing" +version = "0.0.0" +dependencies = [ + "log", + "test_with_tracing_macro", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "test_with_tracing_macro" +version = "0.0.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tokio" +version = "1.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tpm" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "chipset_device", + "chipset_device_resources", + "getrandom", + "guestmem", + "inspect", + "mesh", + "ms-tpm-20-ref", + "open_enum", + "pal_async", + "parking_lot", + "thiserror", + "tpm_resources", + "tracelimit", + "tracing", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "tpm_resources" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "vm_resource", +] + +[[package]] +name = "tracelimit" +version = "0.0.0" +dependencies = [ + "parking_lot", + "tracing", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log 0.2.0", + "tracing-serde", +] + +[[package]] +name = "tracing_helpers" +version = "0.0.0" +dependencies = [ + "anyhow", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typed-path" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a90726108dab678edab76459751e1cc7c597c3484a6384d6423191255fa641b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucs2" +version = "0.0.0" +dependencies = [ + "mesh_protobuf", + "thiserror", +] + +[[package]] +name = "ucs2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df79298e11f316400c57ec268f3c2c29ac3c4d4777687955cd3d4f3a35ce7eba" +dependencies = [ + "bit_field", +] + +[[package]] +name = "uefi" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91f17ea8502a6bd414acb2bf5194f90ca4c48e33a2d18cb57eab3294d2050d99" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "log", + "ptr_meta", + "ucs2 0.3.3", + "uefi-macros", + "uefi-raw", + "uguid", +] + +[[package]] +name = "uefi-macros" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c19ee3a01d435eda42cb9931269b349d28a1762f91ddf01c68d276f74b957cc3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "uefi-raw" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b463030b802e1265a3800fab24df95d3229c202c2e408832a206f05b4d1496ca" +dependencies = [ + "bitflags 2.4.2", + "ptr_meta", + "uguid", +] + +[[package]] +name = "uefi_nvram_specvars" +version = "0.0.0" +dependencies = [ + "guid", + "thiserror", + "ucs2 0.0.0", + "uefi_specs", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "uefi_nvram_storage" +version = "0.0.0" +dependencies = [ + "async-trait", + "guid", + "inspect", + "pal_async", + "thiserror", + "ucs2 0.0.0", + "uefi_specs", + "wchar", + "zerocopy", +] + +[[package]] +name = "uefi_specs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "guid", + "inspect", + "open_enum", + "static_assertions", + "ucs2 0.0.0", + "wchar", + "zerocopy", +] + +[[package]] +name = "uevent" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "futures-concurrency", + "libc", + "mesh", + "pal_async", + "socket2", + "thiserror", + "tracing", +] + +[[package]] +name = "uguid" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab14ea9660d240e7865ce9d54ecdbd1cd9fa5802ae6f4512f093c7907e921533" + +[[package]] +name = "uidevices" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "guestmem", + "guid", + "input_core", + "inspect", + "mesh", + "pal_async", + "static_assertions", + "task_control", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "tracing_helpers", + "uidevices_resources", + "video_core", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "uidevices_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "underhill_attestation" +version = "0.0.0" +dependencies = [ + "base64 0.21.7", + "base64-serde", + "get_protocol", + "getrandom", + "guest_emulation_transport", + "guid", + "hex", + "mesh", + "open_enum", + "openssl", + "openssl_kdf", + "pal_async", + "serde", + "serde_json", + "sev_guest_device", + "static_assertions", + "tdx_guest_device", + "tee_call", + "thiserror", + "time", + "tracing", + "vmgs", + "zerocopy", +] + +[[package]] +name = "underhill_confidentiality" +version = "0.0.0" + +[[package]] +name = "underhill_config" +version = "0.0.0" +dependencies = [ + "guid", + "inspect", + "mesh", + "prost", + "serde", + "serde_json", + "thiserror", + "vtl2_settings_proto", +] + +[[package]] +name = "underhill_core" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "acpi_spec", + "anyhow", + "async-trait", + "blocking", + "bootloader_fdt_parser", + "build_info", + "build_rs_guest_arch", + "cfg-if", + "chipset", + "chipset_device", + "chipset_device_resources", + "chipset_legacy", + "closeable_mutex", + "cvm_tracing", + "debug_ptr", + "debug_worker_defs", + "diag_proto", + "diag_server", + "disk_backend", + "disk_backend_resources", + "disk_blockdevice", + "disk_nvme", + "firmware_pcat", + "firmware_uefi", + "firmware_uefi_custom_vars", + "framebuffer", + "fs-err", + "futures", + "futures-concurrency", + "get_helpers", + "get_protocol", + "getrandom", + "guest_emulation_transport", + "guestmem", + "guid", + "hcl", + "hcl_compat_uefi_nvram_storage", + "hvdef", + "hyperv_ic_guest", + "hyperv_ic_resources", + "hyperv_secure_boot_templates", + "hyperv_uefi_custom_vars_json", + "ide", + "ide_resources", + "igvm", + "igvm_defs", + "input_core", + "inspect", + "kmsg", + "kmsg_defs", + "libc", + "loader", + "loader_defs", + "local_clock", + "mana_driver", + "mcr_resources", + "memory_range", + "mesh", + "mesh_process", + "mesh_tracing", + "mesh_worker", + "net_backend", + "net_backend_resources", + "net_mana", + "net_packet_capture", + "netvsp", + "nvme_driver", + "nvme_resources", + "pal", + "pal_async", + "pal_uring", + "parking_lot", + "profiler_worker", + "safe_x86_intrinsics", + "scsi_buffers", + "scsi_core", + "scsidisk", + "scsidisk_resources", + "serde", + "serde_helpers", + "serde_json", + "serial_16550_resources", + "shared_pool_alloc", + "sidecar_client", + "socket2", + "sparse_mmap", + "state_unit", + "storage_string", + "storvsp", + "storvsp_resources", + "tee_call", + "thiserror", + "time", + "tpm", + "tpm_resources", + "tracelimit", + "tracing", + "tracing-subscriber", + "tracing_helpers", + "uevent", + "uidevices_resources", + "underhill_attestation", + "underhill_confidentiality", + "underhill_config", + "underhill_mem", + "underhill_threadpool", + "user_driver", + "vga_proxy", + "video_core", + "virt", + "virt_mshv_vtl", + "vm_loader", + "vm_manifest_builder", + "vm_resource", + "vm_topology", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "vmbus_relay", + "vmbus_relay_intercept_device", + "vmbus_serial_guest", + "vmbus_server", + "vmbus_user_channel", + "vmcore", + "vmgs", + "vmgs_broker", + "vmgs_resources", + "vmm_core", + "vmm_core_defs", + "vmotherboard", + "vmsocket", + "vnc_worker_defs", + "vpci", + "watchdog_core", + "watchdog_vmgs_format", + "x86defs", + "zerocopy", +] + +[[package]] +name = "underhill_crash" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "get_protocol", + "guid", + "libc", + "pal_async", + "thiserror", + "tracing", + "tracing-subscriber", + "vergen", + "vmbus_async", + "vmbus_user_channel", + "zerocopy", +] + +[[package]] +name = "underhill_dump" +version = "0.0.0" +dependencies = [ + "anyhow", + "elfcore", + "libc", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "underhill_entry" +version = "0.0.0" +dependencies = [ + "anyhow", + "mimalloc", + "openssl_crypto_only", + "underhill_core", + "underhill_crash", + "underhill_dump", + "underhill_init", +] + +[[package]] +name = "underhill_init" +version = "0.0.0" +dependencies = [ + "anyhow", + "fs-err", + "kmsg_defs", + "libc", + "log", + "nix 0.26.4", + "underhill_confidentiality", + "vergen", + "walkdir", +] + +[[package]] +name = "underhill_mem" +version = "0.0.0" +dependencies = [ + "anyhow", + "build_rs_guest_arch", + "futures", + "guestmem", + "hcl", + "hvdef", + "inspect", + "memory_range", + "pal_async", + "parking_lot", + "sparse_mmap", + "thiserror", + "tracing", + "underhill_threadpool", + "virt_mshv_vtl", + "vm_topology", + "x86defs", +] + +[[package]] +name = "underhill_threadpool" +version = "0.0.0" +dependencies = [ + "fs-err", + "inspect", + "pal", + "pal_async", + "pal_uring", + "parking_lot", + "thiserror", + "tracing", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicycle" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0edfa5ca2452d3fbf68f7078c5e7f42b96f0c0c7def017994147f8acd8c4264d" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", + "pin-project", + "uniset", +] + +[[package]] +name = "uniset" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c9f21fe154ca4d5d06fc2ebb8c58cc80e338eacc372ec794943f69e535c131c" + +[[package]] +name = "unix_socket" +version = "0.0.0" +dependencies = [ + "getrandom", + "mesh_protobuf", + "socket2", + "windows-sys 0.52.0", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "user_driver" +version = "0.0.0" +dependencies = [ + "anyhow", + "chipset_device", + "fs-err", + "futures", + "futures-concurrency", + "guestmem", + "inspect", + "inspect_counters", + "libc", + "mesh", + "pal_async", + "pal_event", + "parking_lot", + "pci_core", + "safeatomic", + "sparse_mmap", + "tracing", + "uevent", + "vfio-bindings", + "vfio_sys", + "vmcore", + "zerocopy", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vbs_defs" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "igvm_defs", + "open_enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vergen" +version = "8.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +dependencies = [ + "anyhow", + "cfg-if", + "rustversion", + "time", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vfio-bindings" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43449b404c488f70507dca193debd4bea361fe8089869b947adc19720e464bce" + +[[package]] +name = "vfio_sys" +version = "0.0.0" +dependencies = [ + "anyhow", + "bitfield-struct", + "libc", + "nix 0.26.4", + "tracing", + "vfio-bindings", +] + +[[package]] +name = "vga" +version = "0.0.0" +dependencies = [ + "chipset_device", + "framebuffer", + "guestmem", + "inspect", + "memory_range", + "open_enum", + "pal_async", + "parking_lot", + "pci_core", + "task_control", + "thiserror", + "tracing", + "video_core", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vga_proxy" +version = "0.0.0" +dependencies = [ + "async-trait", + "chipset_device", + "inspect", + "tracelimit", + "tracing", + "vmcore", +] + +[[package]] +name = "vhd1_defs" +version = "0.0.0" +dependencies = [ + "guid", + "zerocopy", +] + +[[package]] +name = "video_core" +version = "0.0.0" +dependencies = [ + "async-trait", + "inspect", + "mesh", + "vm_resource", +] + +[[package]] +name = "virt" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "anyhow", + "build_rs_guest_arch", + "guestmem", + "hvdef", + "inspect", + "memory_range", + "mesh_protobuf", + "pal_event", + "parking_lot", + "pci_core", + "slab", + "thiserror", + "tracelimit", + "tracing", + "vm_topology", + "vmcore", + "x86defs", + "zerocopy", +] + +[[package]] +name = "virt_hvf" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "anyhow", + "guestmem", + "hv1_emulator", + "hv1_hypercall", + "hvdef", + "inspect", + "memory_range", + "open_enum", + "parking_lot", + "thiserror", + "tracelimit", + "tracing", + "virt", + "virt_support_gic", + "vmcore", +] + +[[package]] +name = "virt_kvm" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "bitfield-struct", + "build_rs_guest_arch", + "cfg-if", + "guestmem", + "hv1_emulator", + "hv1_hypercall", + "hvdef", + "inspect", + "kvm", + "memory_range", + "open_enum", + "pal_event", + "parking_lot", + "pci_core", + "safe_x86_intrinsics", + "thiserror", + "tracelimit", + "tracing", + "virt", + "vm_topology", + "vmcore", + "x86defs", + "zerocopy", +] + +[[package]] +name = "virt_mshv" +version = "0.0.0" +dependencies = [ + "arrayvec", + "build_rs_guest_arch", + "guestmem", + "hv1_emulator", + "hv1_hypercall", + "hvdef", + "inspect", + "libc", + "mshv-bindings", + "mshv-ioctls", + "pal", + "pal_event", + "parking_lot", + "signal-hook", + "static_assertions", + "thiserror", + "tracelimit", + "tracing", + "virt", + "virt_support_x86emu", + "vmcore", + "vmm-sys-util", + "x86defs", + "x86emu", + "zerocopy", +] + +[[package]] +name = "virt_mshv_vtl" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "aarch64emu", + "anyhow", + "bitfield-struct", + "bitvec", + "build_rs_guest_arch", + "cfg-if", + "fs-err", + "guestmem", + "hcl", + "hv1_emulator", + "hv1_hypercall", + "hvdef", + "inspect", + "inspect_counters", + "libc", + "memory_range", + "mesh", + "pal", + "pal_async", + "pal_uring", + "parking_lot", + "pci_core", + "safe_x86_intrinsics", + "shared_pool_alloc", + "sidecar_client", + "thiserror", + "tracelimit", + "tracing", + "virt", + "virt_support_aarch64emu", + "virt_support_apic", + "virt_support_x86emu", + "vm_topology", + "vmcore", + "vtl_array", + "x86defs", + "x86emu", + "zerocopy", +] + +[[package]] +name = "virt_support_aarch64emu" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "aarch64emu", + "guestmem", + "hvdef", + "thiserror", + "tracing", + "virt", + "vm_topology", + "zerocopy", +] + +[[package]] +name = "virt_support_apic" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "hvdef", + "inspect", + "inspect_counters", + "parking_lot", + "thiserror", + "tracelimit", + "tracing", + "virt", + "vm_topology", + "vmcore", + "x86defs", +] + +[[package]] +name = "virt_support_gic" +version = "0.0.0" +dependencies = [ + "inspect", + "open_enum", + "parking_lot", + "tracing", + "vm_topology", +] + +[[package]] +name = "virt_support_x86emu" +version = "0.0.0" +dependencies = [ + "guestmem", + "hvdef", + "iced-x86", + "pal_async", + "thiserror", + "tracelimit", + "tracing", + "virt", + "vm_topology", + "x86defs", + "x86emu", + "zerocopy", +] + +[[package]] +name = "virt_whp" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "anyhow", + "arrayvec", + "build_rs_guest_arch", + "chipset_device", + "guestmem", + "hv1_emulator", + "hv1_hypercall", + "hvdef", + "inspect", + "inspect_counters", + "memory_range", + "mesh", + "pal_event", + "parking_lot", + "pci_core", + "range_map_vec", + "sparse_mmap", + "thiserror", + "tracelimit", + "tracing", + "tracing_helpers", + "virt", + "virt_support_aarch64emu", + "virt_support_apic", + "virt_support_x86emu", + "vm_topology", + "vmcore", + "vtl_array", + "whp", + "winapi", + "x86defs", + "x86emu", + "zerocopy", +] + +[[package]] +name = "virtio" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bitfield-struct", + "chipset_device", + "device_emulators", + "event-listener", + "futures", + "guestmem", + "inspect", + "mesh", + "pal_async", + "pal_event", + "parking_lot", + "pci_core", + "task_control", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "virtio_net" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bitfield-struct", + "futures", + "futures-concurrency", + "guestmem", + "inspect", + "inspect_counters", + "mesh", + "net_backend", + "net_backend_resources", + "open_enum", + "pal_async", + "parking_lot", + "task_control", + "thiserror", + "tracing", + "virtio", + "virtio_resources", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "virtio_p9" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "guestmem", + "plan9", + "tracing", + "virtio", + "virtio_resources", + "vm_resource", +] + +[[package]] +name = "virtio_pmem" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "event-listener", + "fs-err", + "guestmem", + "pal_async", + "sparse_mmap", + "task_control", + "tracing", + "virtio", + "virtio_resources", + "vm_resource", + "vmcore", +] + +[[package]] +name = "virtio_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "net_backend_resources", + "vm_resource", +] + +[[package]] +name = "virtio_serial" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "guestmem", + "parking_lot", + "tracing", + "virtio", +] + +[[package]] +name = "virtiofs" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "event-listener", + "fuse", + "futures", + "guestmem", + "lx", + "lxutil", + "ntapi", + "pal", + "pal_async", + "parking_lot", + "task_control", + "tracing", + "virtio", + "virtio_resources", + "vm_resource", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vm_loader" +version = "0.0.0" +dependencies = [ + "anyhow", + "build_rs_guest_arch", + "guestmem", + "hvdef", + "loader", + "memory_range", + "range_map_vec", + "tracing", + "virt", + "vm_topology", +] + +[[package]] +name = "vm_manifest_builder" +version = "0.0.0" +dependencies = [ + "chipset_resources", + "input_core", + "mesh", + "missing_dev_resources", + "serial_16550_resources", + "serial_core", + "serial_pl011_resources", + "thiserror", + "vm_resource", + "vmotherboard", +] + +[[package]] +name = "vm_resource" +version = "0.0.0" +dependencies = [ + "async-trait", + "inspect", + "linkme", + "mesh", + "pal_async", + "thiserror", +] + +[[package]] +name = "vm_topology" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "build_rs_guest_arch", + "cfg-if", + "inspect", + "memory_range", + "mesh_protobuf", + "safe_x86_intrinsics", + "thiserror", + "x86defs", +] + +[[package]] +name = "vmbfs" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "guid", + "inspect", + "open_enum", + "task_control", + "thiserror", + "tracing", + "vm_resource", + "vmbfs_resources", + "vmbus_async", + "vmbus_channel", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "vmbfs_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "vmbus_async" +version = "0.0.0" +dependencies = [ + "futures", + "guestmem", + "inspect", + "inspect_counters", + "pal_async", + "smallvec", + "thiserror", + "vmbus_channel", + "vmbus_ring", + "zerocopy", +] + +[[package]] +name = "vmbus_channel" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "guestmem", + "guid", + "inspect", + "mesh", + "pal_async", + "pal_event", + "parking_lot", + "task_control", + "thiserror", + "tracelimit", + "tracing", + "vm_resource", + "vmbus_core", + "vmbus_ring", + "vmcore", +] + +[[package]] +name = "vmbus_client" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "guid", + "inspect", + "mesh", + "pal_async", + "parking_lot", + "thiserror", + "tracing", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "zerocopy", +] + +[[package]] +name = "vmbus_core" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "futures", + "guid", + "hvdef", + "inspect", + "mesh", + "open_enum", + "static_assertions", + "thiserror", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "vmbus_proxy" +version = "0.0.0" +dependencies = [ + "guestmem", + "mesh", + "ntapi", + "pal", + "pal_async", + "pal_event", + "vmbus_core", + "winapi", + "zerocopy", +] + +[[package]] +name = "vmbus_relay" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "guid", + "hcl", + "hvdef", + "inspect", + "mesh", + "mesh_protobuf", + "once_cell", + "pal_async", + "pal_event", + "parking_lot", + "tracelimit", + "tracing", + "vmbus_async", + "vmbus_channel", + "vmbus_client", + "vmbus_core", + "vmbus_server", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vmbus_relay_intercept_device" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "guid", + "hcl", + "hvdef", + "inspect", + "mesh", + "pal_async", + "safeatomic", + "task_control", + "tracelimit", + "tracing", + "user_driver", + "virt", + "vmbus_channel", + "vmbus_client", + "vmbus_core", + "vmbus_relay", + "vmbus_ring", + "vmbus_server", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vmbus_ring" +version = "0.0.0" +dependencies = [ + "criterion", + "guestmem", + "inspect", + "safeatomic", + "smallvec", + "thiserror", + "zerocopy", +] + +[[package]] +name = "vmbus_serial_guest" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "guid", + "inspect", + "inspect_counters", + "mesh", + "pal_async", + "serial_core", + "test_with_tracing", + "thiserror", + "tracing", + "unix_socket", + "vm_resource", + "vmbus_async", + "vmbus_serial_host", + "vmbus_serial_protocol", + "vmbus_user_channel", + "zerocopy", +] + +[[package]] +name = "vmbus_serial_host" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "inspect", + "inspect_counters", + "serial_core", + "task_control", + "thiserror", + "tracing", + "vm_resource", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "vmbus_serial_protocol", + "vmbus_serial_resources", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vmbus_serial_protocol" +version = "0.0.0" +dependencies = [ + "guid", + "open_enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "vmbus_serial_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", +] + +[[package]] +name = "vmbus_server" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "futures-concurrency", + "guestmem", + "guid", + "hvdef", + "inspect", + "mesh", + "pal_async", + "pal_event", + "parking_lot", + "safeatomic", + "slab", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "unicycle", + "unix_socket", + "vmbus_async", + "vmbus_channel", + "vmbus_core", + "vmbus_proxy", + "vmbus_ring", + "vmcore", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "vmbus_user_channel" +version = "0.0.0" +dependencies = [ + "filepath", + "fs-err", + "guid", + "libc", + "pal_async", + "parking_lot", + "safeatomic", + "sparse_mmap", + "thiserror", + "tracing", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "zerocopy", +] + +[[package]] +name = "vmcore" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "futures-concurrency", + "hvdef", + "inspect", + "linkme", + "mesh", + "pal_async", + "pal_event", + "parking_lot", + "save_restore_derive", + "slab", + "thiserror", + "time", + "tracelimit", + "tracing", + "vm_resource", + "zerocopy", +] + +[[package]] +name = "vmfirmwareigvm_dll" +version = "0.0.0" +dependencies = [ + "embed-resource", +] + +[[package]] +name = "vmgs" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "cfg-if", + "crc32fast", + "getrandom", + "guid", + "inspect", + "inspect_counters", + "mesh_protobuf", + "openssl", + "pal_async", + "tempfile_helpers", + "thiserror", + "tracing", + "vhd1_defs", + "vmgs_format", + "windows", + "zerocopy", +] + +[[package]] +name = "vmgs_broker" +version = "0.0.0" +dependencies = [ + "async-trait", + "inspect", + "mesh_channel", + "pal_async", + "thiserror", + "tracing", + "vm_resource", + "vmcore", + "vmgs", + "vmgs_format", + "vmgs_resources", +] + +[[package]] +name = "vmgs_format" +version = "0.0.0" +dependencies = [ + "bitfield-struct", + "inspect", + "open_enum", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "vmgs_lib" +version = "0.0.0" +dependencies = [ + "futures", + "vmgs", + "vmgs_format", +] + +[[package]] +name = "vmgs_resources" +version = "0.0.0" +dependencies = [ + "mesh", + "vm_resource", + "vmgs_format", +] + +[[package]] +name = "vmgstool" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "clap", + "fs-err", + "guid", + "hcl_compat_uefi_nvram_storage", + "hex", + "pal_async", + "serde", + "serde_json", + "tempfile", + "thiserror", + "ucs2 0.0.0", + "uefi_nvram_specvars", + "uefi_nvram_storage", + "uefi_specs", + "vmgs", + "vmgs_format", +] + +[[package]] +name = "vmm-sys-util" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "vmm_core" +version = "0.0.0" +dependencies = [ + "aarch64defs", + "acpi", + "acpi_spec", + "anyhow", + "async-trait", + "build_rs_guest_arch", + "cache_topology", + "chipset", + "futures", + "futures-concurrency", + "guestmem", + "hcl_compat_uefi_nvram_storage", + "hvdef", + "iced-x86", + "input_core", + "inspect", + "memory_range", + "mesh", + "pal_async", + "parking_lot", + "pci_core", + "pci_resources", + "power_resources", + "slab", + "state_unit", + "thiserror", + "tracing", + "virt", + "virt_support_x86emu", + "vm_resource", + "vm_topology", + "vmbus_channel", + "vmbus_server", + "vmcore", + "vmm_core_defs", + "vmotherboard", + "vpci", + "x86defs", + "zerocopy", +] + +[[package]] +name = "vmm_core_defs" +version = "0.0.0" +dependencies = [ + "inspect", + "mesh", + "virt", +] + +[[package]] +name = "vmm_test_images" +version = "0.0.0" +dependencies = [ + "clap", + "petri_artifacts_vmm_test", + "serde", +] + +[[package]] +name = "vmm_test_macros" +version = "0.0.0" +dependencies = [ + "petri_artifacts_common", + "petri_artifacts_vmm_test", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "vmm_test_petri_support" +version = "0.0.0" +dependencies = [ + "anyhow", + "parking_lot", + "petri", + "petri_artifacts_common", + "petri_artifacts_vmm_test", +] + +[[package]] +name = "vmm_tests" +version = "0.0.0" +dependencies = [ + "anyhow", + "build_rs_guest_arch", + "disk_backend_resources", + "gdma_resources", + "guid", + "hvlite_defs", + "hvlite_ttrpc_vmservice", + "mesh", + "mesh_rpc", + "net_backend_resources", + "nvme_resources", + "pal_async", + "petri", + "petri_artifact_resolver_openvmm_known_paths", + "petri_artifacts_common", + "petri_artifacts_vmm_test", + "scsidisk_resources", + "storvsp_resources", + "test_with_tracing", + "tracing", + "unix_socket", + "vm_resource", + "vmm_core_defs", + "vmm_test_macros", + "vmm_test_petri_support", + "vtl2_settings_proto", +] + +[[package]] +name = "vmotherboard" +version = "0.0.0" +dependencies = [ + "anyhow", + "arc_cyclic_builder", + "async-trait", + "chipset", + "chipset_device", + "chipset_device_resources", + "chipset_legacy", + "chipset_resources", + "closeable_mutex", + "firmware_pcat", + "firmware_uefi", + "floppy", + "floppy_pcat_stub", + "framebuffer", + "futures", + "generation_id", + "guest_watchdog", + "guestmem", + "ide", + "inspect", + "inspect_counters", + "local_clock", + "mesh", + "missing_dev", + "pal_async", + "parking_lot", + "paste", + "pci_bus", + "range_map_vec", + "state_unit", + "thiserror", + "tracelimit", + "tracing", + "uefi_nvram_storage", + "vga", + "vga_proxy", + "vm_resource", + "vmcore", + "watchdog_core", +] + +[[package]] +name = "vmsocket" +version = "0.0.0" +dependencies = [ + "cfg-if", + "guid", + "libc", + "mesh", + "pal_async", + "socket2", + "windows-sys 0.52.0", +] + +[[package]] +name = "vmswitch" +version = "0.0.0" +dependencies = [ + "futures", + "getrandom", + "guid", + "pal", + "pal_async", + "pal_event", + "thiserror", + "tracing", + "widestring", + "winapi", + "zerocopy", + "zerocopy_helpers", +] + +[[package]] +name = "vnc" +version = "0.0.0" +dependencies = [ + "futures", + "pal_async", + "socket2", + "thiserror", + "zerocopy", +] + +[[package]] +name = "vnc_worker" +version = "0.0.0" +dependencies = [ + "anyhow", + "framebuffer", + "futures", + "input_core", + "inspect", + "mesh", + "mesh_worker", + "pal_async", + "tracing", + "tracing_helpers", + "vmsocket", + "vnc", + "vnc_worker_defs", +] + +[[package]] +name = "vnc_worker_defs" +version = "0.0.0" +dependencies = [ + "framebuffer", + "input_core", + "mesh", + "mesh_worker", + "vmsocket", +] + +[[package]] +name = "vpci" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bitfield-struct", + "chipset_arc_mutex_device", + "chipset_device", + "closeable_mutex", + "device_emulators", + "guestmem", + "guid", + "hvdef", + "inspect", + "mesh", + "open_enum", + "pal_async", + "parking_lot", + "pci_core", + "task_control", + "test_with_tracing", + "thiserror", + "tracelimit", + "tracing", + "vmbus_async", + "vmbus_channel", + "vmbus_ring", + "vmcore", + "zerocopy", +] + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "vtl2_settings_proto" +version = "0.0.0" +dependencies = [ + "pbjson", + "pbjson-build", + "pbjson-types", + "prost", + "prost-build", + "serde", +] + +[[package]] +name = "vtl_array" +version = "0.0.0" +dependencies = [ + "bitvec", + "hvdef", + "inspect", +] + +[[package]] +name = "w32-error" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7c61a6bd91e168c12fc170985725340f6b458eb6f971d1cf6c34f74ffafb43" +dependencies = [ + "winapi", +] + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "watchdog_core" +version = "0.0.0" +dependencies = [ + "async-trait", + "bitfield-struct", + "inspect", + "mesh", + "pal_async", + "thiserror", + "tracing", + "vmcore", +] + +[[package]] +name = "watchdog_vmgs_format" +version = "0.0.0" +dependencies = [ + "thiserror", + "vmcore", +] + +[[package]] +name = "wchar" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1ca6ea80317e76471c3aa6d47efb151ef04538960ab810845a1c854f5cd7d8c" +dependencies = [ + "wchar-impl", +] + +[[package]] +name = "wchar-impl" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "075c93156fed21f9dab57af5e81604d0fdb67432c919a8c1f78bb979f06a3d25" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "which" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "whp" +version = "0.0.0" +dependencies = [ + "criterion", + "win_import_lib", + "winapi", + "zerocopy", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "win_etw_metadata" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e50d0fa665033a19ecefd281b4fb5481eba2972dedbb5ec129c9392a206d652f" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "win_etw_provider" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f61e9dfafedf5eb4348902f2a32d326f2371245d05f012cdc67b9251ad6ea3" +dependencies = [ + "w32-error", + "widestring", + "win_etw_metadata", + "winapi", + "zerocopy", +] + +[[package]] +name = "win_etw_tracing" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d81ad6b448007f4445466a7aed270c56f05e64f5f996dc9a650b3d38c73e921" +dependencies = [ + "bytes", + "tracing", + "tracing-log 0.1.4", + "tracing-subscriber", + "win_etw_metadata", + "win_etw_provider", +] + +[[package]] +name = "win_import_lib" +version = "0.0.0" +dependencies = [ + "anyhow", + "cc", +] + +[[package]] +name = "win_prng_support" +version = "0.0.0" +dependencies = [ + "widestring", + "win_import_lib", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-service" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24d6bcc7f734a4091ecf8d7a64c5f7d7066f45585c1861eba06449909609c8a" +dependencies = [ + "bitflags 2.4.2", + "widestring", + "windows-sys 0.52.0", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "x86defs" +version = "0.0.0" +dependencies = [ + "arbitrary", + "bitfield-struct", + "open_enum", + "zerocopy", +] + +[[package]] +name = "x86emu" +version = "0.0.0" +dependencies = [ + "arbitrary", + "futures", + "iced-x86", + "thiserror", + "tracing", + "x86defs", + "zerocopy", +] + +[[package]] +name = "xshell" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d47097dc5c85234b1e41851b3422dd6d19b3befdd35b4ae5ce386724aeca981" +dependencies = [ + "xshell-macros", +] + +[[package]] +name = "xshell-macros" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88301b56c26dd9bf5c43d858538f82d6f3f7764767defbc5d34e59459901c41a" + +[[package]] +name = "xtask" +version = "0.0.0" +dependencies = [ + "anyhow", + "cargo_toml", + "ci_logger", + "clap", + "clap_dyn_complete", + "fatfs", + "fs-err", + "futures", + "glob", + "gptman", + "grep-regex", + "grep-searcher", + "guid", + "ignore", + "log", + "mbrman", + "rayon", + "serde", + "serde_json", + "toml_edit", + "vmm_test_images", + "walkdir", + "which 6.0.0", + "xshell", + "zerocopy", +] + +[[package]] +name = "xtask_fuzz" +version = "0.0.0" +dependencies = [ + "libfuzzer-sys", + "tracing-subscriber", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "zerocopy_helpers" +version = "0.0.0" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/by-name/op/openvmm/package.nix b/pkgs/by-name/op/openvmm/package.nix new file mode 100644 index 000000000000..14e659cc1459 --- /dev/null +++ b/pkgs/by-name/op/openvmm/package.nix @@ -0,0 +1,57 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + protobuf, +}: + +rustPlatform.buildRustPackage rec { + pname = "openvmm"; + version = "0-unstable-2024-10-19"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "openvmm"; + rev = "2e5acb8ab89b75d6ff59d537e9f21445d830386d"; + hash = "sha256-Fi5hDFV2SfpqJjXSc7YwlNDnoL5TTgiqmFMt+ls2Uu4="; + }; + + separateDebugInfo = true; + + env = { + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + PROTOC = "protoc"; + }; + nativeBuildInputs = [ + pkg-config + protobuf + ]; + buildInputs = [ + openssl + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "bitvec-1.1.0" = "sha256-uXOTbrGCSnl/F6IJPZuViZKXg4BEMG4+lVcLxK5KIwc="; + "ms-tpm-20-ref-0.1.0" = "sha256-eB3MWRlOPtxG55sLH7HIWzSjVEY05IIBZOltTpsGpnE="; + "mshv-bindings-0.1.1" = "sha256-CZEhFb9qDR260OFA/mlTldEMFlF8bhawVAxXFWqPIcU="; + "pbjson-build-0.5.1" = "sha256-itmY3c35O7j0Otb1qyr2IDUw1MBWOCB3WwyU60ajBO4="; + }; + }; + + meta = with lib; { + homepage = "https://github.com/microsoft/openvmm"; + description = "modular, cross-platform Virtual Machine Monitor (VMM), written in Rust"; + license = licenses.mit; + mainProgram = "openvmm"; + maintainers = with maintainers; [ astro ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + }; +} From 17fcf9cfed9b2f195985f8827f60ea5f08c05821 Mon Sep 17 00:00:00 2001 From: Reinis Taukulis Date: Sat, 12 Oct 2024 23:47:53 +0300 Subject: [PATCH 229/229] vimPlugins.avante-nvim: 2024-09-30 -> 2024-10-18 --- .../editors/vim/plugins/avante-nvim/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix index 936d12af0434..d31ce3e661c8 100644 --- a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix @@ -10,13 +10,13 @@ }: let - version = "2024-09-30"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "0705234991d03170a72582085dc508600a03a779"; - hash = "sha256-tAigYqS3ZAtZJp7RaarbXrDxrjiYu2wjNHq6GP/BMfk="; + rev = "36b23cef16c2c624c34bea213f01c06782d2ca40"; + hash = "sha256-QUFcJMbfr5BAS04ig1IHLCMLACeQhFVH9ZCH/VD8i8Y="; }; meta = with lib; { @@ -71,6 +71,5 @@ vimUtils.buildVimPlugin { ''; doInstallCheck = true; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "avante"; + nvimRequireCheck = "avante"; }