diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5a1e46290878..77cf94884495 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3733,6 +3733,12 @@ githubId = 1897147; name = "Elijah Caine"; }; + Elinvention = { + email = "elia@elinvention.ovh"; + github = "Elinvention"; + githubId = 5737945; + name = "Elia Argentieri"; + }; elitak = { email = "elitak@gmail.com"; github = "elitak"; diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix index 895961707d36..4fc6ca367491 100644 --- a/nixos/modules/services/display-managers/greetd.nix +++ b/nixos/modules/services/display-managers/greetd.nix @@ -54,7 +54,7 @@ in config = mkIf cfg.enable { services.greetd.settings.terminal.vt = mkDefault cfg.vt; - services.greetd.settings.default_session = mkDefault "greeter"; + services.greetd.settings.default_session.user = mkDefault "greeter"; security.pam.services.greetd = { allowNullPassword = true; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 489dd337bb7c..c6a3315d4022 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -201,7 +201,7 @@ in { serviceConfig = { ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf"; ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID"; - ExecPostStart = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done''; + ExecStartPost = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done''; TimeoutStopSec = 60; Restart = "on-failure"; diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix index 961fa2c8c1cd..38110df29157 100644 --- a/pkgs/applications/audio/sonixd/default.nix +++ b/pkgs/applications/audio/sonixd/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "sonixd"; - version = "0.15.1"; + version = "0.15.3"; src = fetchurl { url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-23WU1nwvrzyw0J+Pplm3JbsScjJxu+RhmwVoe/PjozY="; + sha256 = "sha256-+4L3XAuR7T/z5a58SXre6yUiVi7TvSAs8vPgEC7hcIw="; }; extraInstallCommands = '' diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 25dffad43bb9..bc74edf5261d 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -196,7 +196,7 @@ in runCommand { startScript = '' #!${bash}/bin/bash - ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh + ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" ''; preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix index 506f94237ff8..e6744ac8a82e 100644 --- a/pkgs/applications/editors/mle/default.nix +++ b/pkgs/applications/editors/mle/default.nix @@ -1,26 +1,53 @@ -{ lib, stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3, makeWrapper, installShellFiles }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pcre +, uthash +, lua5_4 +, makeWrapper +, installShellFiles +}: stdenv.mkDerivation rec { pname = "mle"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "adsr"; repo = "mle"; rev = "v${version}"; - sha256 = "16dbwfdd6sqqn7jfaxd5wdy8y9ghbihnz6bgn3xhqcww8rj1sia1"; + sha256 = "1nhd00lsx9v12zdmps92magz76c2d8zzln3lxvzl4ng73gbvq3n0"; }; - # Fix location of Lua 5.3 header and library + # Bug fixes found after v1.5.0 release + patches = [ + (fetchpatch { + name = "skip_locale_dep_test.patch"; + url = "https://github.com/adsr/mle/commit/e4dc4314b02a324701d9ae9873461d34cce041e5.patch"; + sha256 = "sha256-j3Z/n+2LqB9vEkWzvRVSOrF6yE+hk6f0dvEsTQ74erw="; + }) + (fetchpatch { + name = "fix_input_trail.patch"; + url = "https://github.com/adsr/mle/commit/bc05ec0eee4143d824010c6688fce526550ed508.patch"; + sha256 = "sha256-dM63EBDQfHLAqGZk3C5NtNAv23nCTxXVW8XpLkAeEyQ="; + }) + ]; + + # Fix location of Lua 5.4 header and library postPatch = '' - substituteInPlace Makefile --replace "-llua5.3" "-llua"; - substituteInPlace mle.h --replace " 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + concurrent-ruby (1.1.9) + dalli (2.7.11) + faraday (0.17.5) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.14.0) + faraday (>= 0.7.4, < 1.0) + gemstash (2.1.0) + activesupport (>= 4.2, < 6) + dalli (~> 2.7) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + lru_redux (~> 1.1) + puma (~> 4.0) + sequel (~> 5.0) + server_health_check-rack (~> 0.1) + sinatra (>= 1.4, < 3.0) + sqlite3 (~> 1.3) + thor (~> 0.20) + i18n (1.10.0) + concurrent-ruby (~> 1.0) + lru_redux (1.1.0) + minitest (5.15.0) + multipart-post (2.1.1) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + nio4r (2.5.8) + puma (4.3.11) + nio4r (~> 2.0) + rack (2.2.3) + rack-protection (2.2.0) + rack + ruby2_keywords (0.0.5) + sequel (5.54.0) + server_health_check (1.0.2) + server_health_check-rack (0.1.0) + server_health_check (~> 1.0, >= 1.0.1) + sinatra (2.2.0) + mustermann (~> 1.0) + rack (~> 2.2) + rack-protection (= 2.2.0) + tilt (~> 2.0) + sqlite3 (1.4.2) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.10) + tzinfo (1.2.9) + thread_safe (~> 0.1) + +PLATFORMS + ruby + +DEPENDENCIES + gemstash + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/development/tools/gemstash/default.nix b/pkgs/development/tools/gemstash/default.nix new file mode 100644 index 000000000000..13ab213c15e0 --- /dev/null +++ b/pkgs/development/tools/gemstash/default.nix @@ -0,0 +1,16 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp rec { + pname = "gemstash"; + gemdir = ./.; + exes = [ pname ]; + + passthru.updateScript = bundlerUpdateScript pname; + + meta = with lib; { + description = "A cache for RubyGems.org and a private gem server"; + homepage = "https://github.com/rubygems/gemstash"; + license = licenses.mit; + maintainers = [ maintainers.viraptor ]; + }; +} diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/development/tools/gemstash/gemset.nix new file mode 100644 index 000000000000..fd5ddcd6537c --- /dev/null +++ b/pkgs/development/tools/gemstash/gemset.nix @@ -0,0 +1,313 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775"; + type = "gem"; + }; + target_platform = "ruby"; + version = "5.2.6.2"; + }; + concurrent-ruby = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.1.9"; + }; + dalli = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0br39scmr187w3ifl5gsddl2fhq6ahijgw6358plqjdzrizlg764"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.7.11"; + }; + faraday = { + dependencies = ["multipart-post"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bs2lm0wd273kwq8nk1p8pk43n1wrizv4c1bdywkpcm9g2f5sp6p"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.17.5"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.14.0"; + }; + gemstash = { + dependencies = ["activesupport" "dalli" "faraday" "faraday_middleware" "lru_redux" "puma" "sequel" "server_health_check-rack" "sinatra" "sqlite3" "thor"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fimbc5xnsxq1g2zb7kn4qf3rp4klx7fxbigg34gr9i9apq8qfrc"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.1.0"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.10.0"; + }; + lru_redux = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yxghzg7476sivz8yyr9nkak2dlbls0b89vc2kg52k0nmg6d0wgf"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.1.0"; + }; + minitest = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + type = "gem"; + }; + target_platform = "ruby"; + version = "5.15.0"; + }; + multipart-post = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.1.1"; + }; + mustermann = { + dependencies = ["ruby2_keywords"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.1.1"; + }; + nio4r = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.5.8"; + }; + puma = { + dependencies = ["nio4r"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xvkz9xrd1cqnlm0qac1iwwxzndx3cc17zrjncpa4lzjfwbxhsnm"; + type = "gem"; + }; + target_platform = "ruby"; + version = "4.3.11"; + }; + rack = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.2.3"; + }; + rack-protection = { + dependencies = ["rack"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.2.0"; + }; + ruby2_keywords = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.0.5"; + }; + sequel = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wzb16vyslr7bpy7g5k2m35yz90bpf12f3pzj5w6icf1vldnc3nf"; + type = "gem"; + }; + target_platform = "ruby"; + version = "5.54.0"; + }; + server_health_check = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06chz92parchhj1457lf5lbj3hrmvqpq6mfskxcnj5f4qa14n5wd"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.0.2"; + }; + server_health_check-rack = { + dependencies = ["server_health_check"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cgqr94x18f60n27sk9lgg471c6vk6qy132z7i1ppp32kvmjfphs"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.1.0"; + }; + sinatra = { + dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.2.0"; + }; + sqlite3 = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.4.2"; + }; + thor = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.20.3"; + }; + thread_safe = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.3.6"; + }; + tilt = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.0.10"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.2.9"; + }; +} diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index 915ed33c4669..e83846364170 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -31,14 +31,12 @@ , CoreServices , developer_cmds , DarwinTools +, makeWrapper }: let - pythonDeps = [ python3.pkgs.certifi python3.pkgs.paramiko ]; - site = '' - - import sys; sys.path.extend([${lib.concatStringsSep ", " (map (x: ''"${x}/${python3.sitePackages}"'') pythonDeps)}]) - ''; + pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; + pythonPath = lib.makeSearchPath python3.sitePackages pythonDeps; in stdenv.mkDerivation rec{ pname = "mysql-shell"; @@ -62,12 +60,9 @@ stdenv.mkDerivation rec{ substituteInPlace ../mysql-${version}/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool - - # For python dependencies - echo '${site}' >> python/packages/mysqlsh/__init__.py ''; - nativeBuildInputs = [ pkg-config cmake git bison ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; buildInputs = [ boost @@ -121,6 +116,10 @@ stdenv.mkDerivation rec{ CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ]; + postFixup = '' + wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${pythonPath}" + ''; + meta = with lib; { homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor version}/en/"; description = "A new command line scriptable shell for MySQL"; diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index 70b34dc35062..03eecf8a31ba 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-embed"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "1is58n8y5lvnvzkbnh3gfk3r3f2r1w4l2qjdp2k8373apxzjxdvr"; + sha256 = "sha256-UlQ7KJmzPWu0vVsYPIkYeqkFFhxe7mEMfUVN7iMaUw0="; }; - cargoSha256 = "0kalwigck9lf734zdpzg01sf2zzyrgdgq2rg3qj7hy94gfxlsk63"; + cargoSha256 = "sha256-RkYX5z764Kkr0xK7yYQ0lCw0/7KpmdJmKWqLzwkj4hs="; nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://probe.rs/"; changelog = "https://github.com/probe-rs/cargo-embed/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ fooker ]; + maintainers = with maintainers; [ fooker newam ]; }; } diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 49e9bbaceb5b..537392a65bbe 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bd0TY8bdpLHLCdDQgJeJvqjAcSF67+LGSNx8yafYbys="; + sha256 = "sha256-O6T1Wul0nJaTVp9MEOj9FT+FUt4oYfqR5pGFaAxuK30="; }; - cargoSha256 = "sha256-bx2N8zP7BmqU6oM/7Nf2i9S1uNWItReQMD59vtG1RKE="; + cargoSha256 = "sha256-E2gBkr50hjkzY+ZVgMm7tpdwr9yuyFh65Ht6FAPvxYg="; nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://probe.rs/"; changelog = "https://github.com/probe-rs/cargo-flash/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ fooker ]; + maintainers = with maintainers; [ fooker newam ]; }; } diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix new file mode 100644 index 000000000000..ef4f8dcb2fb2 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, openssl +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-public-api"; + version = "0.12.2"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-ZpzR6A9mV6ARz2+SedVtLjNANOEj8Ks09AWcQooltug="; + }; + + cargoSha256 = "sha256-8BZ1fPzRSJysyLCmoMxk+8xOfmfIs7viHFCeSfnxvt8="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + # Tests fail + doCheck = false; + + meta = with lib; { + description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations"; + homepage = "https://github.com/Enselic/cargo-public-api"; + license = licenses.mit; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index dbd0876eb545..7efcfb08c479 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.24.0"; + version = "0.24.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-P0s2mrfYA7DUThvje0LH3Pq0Os6UZJrrnjnzAm8UlDQ="; + sha256 = "sha256-BIATH7GsTPtvEFpCb8Kfb0k6s8K7xfhRHni+IgzAQ8k="; }; - cargoSha256 = "sha256-TDgd8RG97ROeAQJ1uDF2m+yIa8US7zFz+5qrQtFbazE="; + cargoSha256 = "sha256-kg+QW84bq+aD3/t0DmtL1W8ESC5Ug4X+I0pFJRalu7Q="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 39bae61160a1..33b8ca4f0e9d 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.2.1"; + version = "16.2.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-xDUvBsiQk7qZN9HEMCrCfxJSCZ/PruEdS5EjnHFufTA="; + sha256 = "sha256-MrCPMtWdEsWUuvKaPWZK4Mh6nhPcKpsxkFKkWugdz8A="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 41c3ccac1f9f..b9ffec66bcc1 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,29 +1,50 @@ { lib, stdenv, fetchFromGitHub -, SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU -, libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkg-config -, speexdsp, zlib + +, SDL2 +, cmake +, curl +, discord-rpc +, duktape +, flac +, fontconfig +, freetype +, gbenchmark +, icu +, jansson +, libGLU +, libiconv +, libogg +, libpng +, libpthreadstubs +, libvorbis +, libzip +, nlohmann_json +, openssl +, pkg-config +, speexdsp +, zlib }: let - openrct2-version = "0.4.0"; + openrct2-version = "0.4.1"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.2.7"; + objects-version = "1.3.2"; title-sequences-version = "0.4.0"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - sha256 = "sha256-4MDOLOPsKzk1vb1o/G90/NTyYJWBSrGRX6ZJETbBIaI="; + sha256 = "sha256-fMs0zrMzv9jXreZE4QyYIdvWUU/FUFVPuo4EzAF/2rU="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - sha256 = "sha256-R4+rEdGdvYwFrkm/S3+zXmU+UDam51dI/pWKmFXNrbE="; + sha256 = "sha256-BG0IRiNb2l6/3P7tvuUqMoYNh1zkOS0lCFDDh7m9Q7Y="; }; title-sequences-src = fetchFromGitHub { @@ -47,15 +68,20 @@ stdenv.mkDerivation { buildInputs = [ SDL2 curl + discord-rpc duktape + flac fontconfig freetype + gbenchmark icu jansson libGLU libiconv + libogg libpng libpthreadstubs + libvorbis libzip nlohmann_json openssl diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index 1ad89613a29a..78f1001a3596 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20220610"; + version = "20220708"; src = fetchzip { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; - sha256 = "sha256-vsMkuTafr//ryivdBphTGZPoTsmTuvp+BFp3lKo3YYI="; + sha256 = "sha256-jsmbBxQ4RHBySBq2lks5tJ6YTwwlkvVe2Xc0CDJY8IE="; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-qJoaJacxb60ugdk5s1oZ9CLGjWKDnT5jWZEwHPnK50Y="; + outputHash = "sha256-FNYZMJnqR2waODUXisch3ObdEjwQN94QSiBE2dDW4sk="; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix index 0375eb0eead8..72e3817f2aa2 100644 --- a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "xow_dongle-firmware"; version = "2017-07"; - dontUnpack = true; - dontInstall = true; + dontConfigure = true; + dontBuild = true; src = fetchurl { url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab"; @@ -14,10 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cabextract ]; - buildPhase = '' + sourceRoot = "./."; + + unpackCmd = '' cabextract -F FW_ACC_00U.bin ${src} - mkdir -p $out/lib/firmware - cp -a FW_ACC_00U.bin $out/lib/firmware/xow_dongle.bin + ''; + + installPhase = '' + install -Dm644 FW_ACC_00U.bin ${placeholder "out"}/lib/firmware/xow_dongle.bin ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix deleted file mode 100644 index 0b0e9e8f203d..000000000000 --- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, solaar }: - -# ltunifi and solaar both provide udev rules but solaar's rules are more -# up-to-date so we simply use that instead of having to maintain our own rules - -stdenv.mkDerivation { - pname = "logitech-udev-rules"; - inherit (solaar) version; - - buildCommand = '' - install -Dm444 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules - ''; - - meta = with lib; { - description = "udev rules for Logitech devices"; - inherit (solaar.meta) homepage license platforms; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 1f2559e06374..c91353e465e3 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { pname = "rtl8192eu"; - version = "${kernel.version}-4.4.1.20220313"; + version = "${kernel.version}-4.4.1.20220614"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "e0f967cea1d0037c730246c572f7fef000865ff7"; - sha256 = "sha256-Wgp1MZ/z8AxbZPYsmR6t7Q4nsL0TFEqTEsrkkWPI6gI="; + rev = "6ba1f320963376f15ea216238c0b62ff3e71fa82"; + sha256 = "sha256-c5swRxSjWT1tCcR7tfFKdAdVVmAEYgMZuOwUxGYYESI="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix index 5fd6bb12e1ab..ecc43bf3f3a9 100644 --- a/pkgs/os-specific/linux/vmware/default.nix +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mkubecek"; repo = "vmware-host-modules"; - rev = "w${vmware-workstation.version}-k5.17"; - sha256 = "sha256-EM6YU2nOwNlAXpQ7cGrLS1N+gAS1KxleVjJTzo22De0="; + rev = "w${vmware-workstation.version}-k5.18"; + sha256 = "sha256-sAeCjaSrBXGP5szfCY5CpMrGwzCw4aM67EN+YfA3AWA="; }; hardeningDisable = [ "pic" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mkubecek/vmware-host-modules"; license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; - broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.18"; + broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.19"; maintainers = with maintainers; [ deinferno ]; }; } diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 6e738d025ea0..f27b8188907b 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -38,14 +38,9 @@ stdenv.mkDerivation { buildInputs = [ libkrb5 ]; patches = [ - # Add autoconf-archive to src/external - (fetchBase64Patch { - url = "https://gerrit.openafs.org/changes/14942/revisions/006616bd8e88b2d386a5ddc23973cf3e625cb80d/patch"; - hash = "sha256-55sc2sKy5XkQHAv6ysVxi69+0xVsHnN2TS144UTeLHU="; - }) # Import of code from autoconf-archive - (fetchBase64Patch { - url = "https://gerrit.openafs.org/changes/14943/revisions/d3782b1d4e6fd81c5432e95112eb44305f07f272/patch"; + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=d8205bbb482554812fbe66afa3c337d991a247b6"; hash = "sha256-ohkjSux+S3+6slh6uZIw5UJXlvhy9UUDpDlP0YFRwmw="; }) # Use autoconf-archive m4 from src/external @@ -53,6 +48,11 @@ stdenv.mkDerivation { url = "https://gerrit.openafs.org/changes/14944/revisions/ea2a0e128d71802f61b8da2e44de3c6325c5f328/patch"; hash = "sha256-PAUk/MXL5p8xwhn40/UGmo3UIhvl1PB2FwgqhmqsjJ4="; }) + # cf: Use common macro to test compiler flags + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=790824ff749b6ee01c4d7101493cbe8773ef41c6"; + hash = "sha256-Zc7AjCsH7eTmZJWCrx7ci1tBjEAgcFXS9lY1YBeboLA="; + }) # Linux-5.17: kernel func complete_and_exit renamed (fetchBase64Patch { url = "https://gerrit.openafs.org/changes/14945/revisions/a714e865efe41aa1112f6f9c8479112660dacd6f/patch"; @@ -63,6 +63,36 @@ stdenv.mkDerivation { url = "https://gerrit.openafs.org/changes/14946/revisions/449d1faf87e2841e80be38cf2b4a5cf5ff4df2d8/patch"; hash = "sha256-3bRTHYeMRIleLhob56m2Xt0dWzIMDo3QrytY0K1/q7c="; }) + # afs: Introduce afs_IsDCacheFresh + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=0d8ce846ab2e6c45166a61f04eb3af271cbd27db"; + hash = "sha256-+xgRYVXz8XpT5c4Essc4VEn9Fj53vasAYhcFkK0oCBc="; + }) + # LINUX: Don't panic on some file open errors + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=af73b9a3b1fc625694807287c0897391feaad52d"; + hash = "sha256-k0d+Gav1LApU24SaMI0pmR3gGfWyicqdCpTpVJLcx7U="; + }) + # Linux-5.18 replace set_page_dirty with dirty_folio + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=6aa129e743e882cf30c35afd67eabf82274c5fca"; + hash = "sha256-8R0rdKYs7+Zl1sdizOZzpBjy6e9J+42R9HzsNUa/PQ4="; + }) + # afs: introduce afs_alloc_ncr/afs_free_ncr + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=209eb92448001e59525413610356070d8e4f10a0"; + hash = "sha256-t455gTaK5U+m0qcyKjTqnWTOb4qz6VN/JYZzRAAV8kM="; + }) + # afs: introduce get_dcache_readahead + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=44e24ae5d7dc41e54d23638d5f64ab2e81e43ad0"; + hash = "sha256-gtUNDSHAq+RY1Rm17YcxcUALy7FEBQf9k8/ELQlPORU="; + }) + # Linux-5.18: replace readpages with readahead + (fetchBase64Patch { + url = "https://gerrit.openafs.org/changes/14953/revisions/0497b0cd7bffb6335ab9bcbf5a1310b8c6a4b299/patch"; + hash = "sha256-a5pd+CHHPr1mGxsF7tSlaBqoiKw2IGr1mJ7EaDHDJSw="; + }) ]; hardeningDisable = [ "pic" ]; @@ -102,7 +132,7 @@ stdenv.mkDerivation { homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; - maintainers = with maintainers; [ maggesi spacefrogg ]; - broken = kernel.isHardened || kernel.kernelAtLeast "5.18"; + maintainers = with maintainers; [ andersk maggesi spacefrogg ]; + broken = kernel.isHardened || kernel.kernelAtLeast "5.19"; }; } diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix index 02a1ff30d8f9..0f0c03a595e8 100644 --- a/pkgs/servers/web-apps/snipe-it/default.nix +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -18,13 +18,13 @@ let in package.override rec { pname = "snipe-it"; - version = "6.0.5"; + version = "6.0.7"; src = fetchFromGitHub { owner = "snipe"; repo = pname; rev = "v${version}"; - sha256 = "15dp8y0kdjg9x4iwa5ha5w4qbwwsdg5z8337rmkkla2yjmf4lrxb"; + sha256 = "09jvkz7j2qb79mjnyrz75015xpgf8l483yha3ma14pzk4pibn620"; }; meta = with lib; { diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix new file mode 100644 index 000000000000..9687b1da1e85 --- /dev/null +++ b/pkgs/tools/bluetooth/bluetuith/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule, fetchFromGitHub, lib, stdenv }: + +buildGoModule rec { + pname = "bluetuith"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "darkhz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7JqpF9iga6RO+/r2JK0N9gjieVRUNkHhGNsfVFfKfRY="; + }; + + vendorSha256 = "sha256-MsVrhEG2DOFJAXvt5rvfctGUbb3hQsBJ7cjOSzWA+bc="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "TUI-based bluetooth connection manager"; + homepage = "https://github.com/darkhz/bluetuith"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thehedgeh0g ]; + }; +} diff --git a/pkgs/tools/misc/dt-shell-color-scripts/default.nix b/pkgs/tools/misc/dt-shell-color-scripts/default.nix index 6a0b3da4410f..4dedbd66b332 100644 --- a/pkgs/tools/misc/dt-shell-color-scripts/default.nix +++ b/pkgs/tools/misc/dt-shell-color-scripts/default.nix @@ -1,22 +1,23 @@ { stdenv , lib , fetchFromGitLab +, installShellFiles , runtimeShell , makeWrapper }: stdenv.mkDerivation { pname = "dt-shell-color-scripts"; - version = "unstable-2022-02-22"; + version = "unstable-2022-07-25"; src = fetchFromGitLab { owner = "dwt1"; repo = "shell-color-scripts"; - rev = "fcd013ea2e1ff80e01adbcea9d0eaf9c73db94c0"; - sha256 = "sha256-bd3NBf99rCiADUKQb6fzCBDaKBmYaZHcO4qokm/39do="; + rev = "da2e3c512b94f312ee54a38d5cde131b0511ad01"; + sha256 = "sha256-cdTgBbtsbJHaJuLIcZh0g0jKOrQyFx3P6QhYNx8hz0U="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' runHook preInstall @@ -25,6 +26,9 @@ stdenv.mkDerivation { mkdir -p $out/bin mkdir -p $out/opt/shell-color-scripts/ cp -r colorscripts $out/opt/shell-color-scripts/colorscripts + installManPage colorscript.1 + installShellCompletion --fish completions/colorscript.fish + installShellCompletion --zsh completions/_colorscript chmod +x colorscript.sh cp colorscript.sh $out/bin/colorscript substituteInPlace $out/bin/colorscript \ diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index a2bc615ed86f..967332f5fd4b 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -1,19 +1,19 @@ -{ lib, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: +{ lib, fetchFromGitHub, fetchurl, python3Packages, installShellFiles, gitUpdater }: python3Packages.buildPythonApplication rec { pname = "unicode"; - version = "2.7"; + version = "2.9"; src = fetchFromGitHub { owner = "garabik"; repo = "unicode"; rev = "v${version}"; - sha256 = "15d9yvarxsiy0whx1mxzsjnnkrjdm3ga4qv2yy398mk0jh763q9v"; + sha256 = "sha256-FHAlZ5HID/FE9+YR7Dmc3Uh7E16QKORoD8g9jgTeQdY="; }; ucdtxt = fetchurl { - url = "https://www.unicode.org/Public/13.0.0/ucd/UnicodeData.txt"; - sha256 = "1fz8fcd23lxyl97ay8h42zvkcgcg8l81b2dm05nklkddr2zzpgxx"; + url = "https://www.unicode.org/Public/14.0.0/ucd/UnicodeData.txt"; + sha256 = "sha256-NgGOaGV/3LNIX2NmMP/oyFMuAcl3cD0oA/W4nWxf6vs="; }; nativeBuildInputs = [ installShellFiles ]; @@ -27,6 +27,12 @@ python3Packages.buildPythonApplication rec { installManPage paracode.1 unicode.1 ''; + passthru.updateScript = gitUpdater { + inherit version; + pname = "unicode-paracode"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Display unicode character properties"; homepage = "https://github.com/garabik/unicode"; diff --git a/pkgs/tools/security/pinentry-rofi/default.nix b/pkgs/tools/security/pinentry-rofi/default.nix new file mode 100644 index 000000000000..b971f37af69c --- /dev/null +++ b/pkgs/tools/security/pinentry-rofi/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, autoreconfHook +, autoconf-archive +, guile +, texinfo +, rofi +}: + +stdenv.mkDerivation rec { + pname = "pinentry-rofi"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "plattfot"; + repo = pname; + rev = version; + sha256 = "sha256-EzbeMAhdn9SuSmE+aMHeyuje3s74isIKRDTrFO3bX04="; + }; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + pkg-config + texinfo + ]; + + buildInputs = [ guile ]; + + propagatedBuildInputs = [ rofi ]; + + meta = with lib; { + description = "Rofi frontend to pinentry"; + homepage = "https://github.com/plattfot/pinentry-rofi"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ seqizz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2588b01ec95..93b94c286da2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4701,6 +4701,8 @@ with pkgs; blueman = callPackage ../tools/bluetooth/blueman { }; + bluetuith = callPackage ../tools/bluetooth/bluetuith { }; + bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; bogofilter = callPackage ../tools/misc/bogofilter { }; @@ -6145,6 +6147,8 @@ with pkgs; frr = callPackage ../servers/frr { }; + gemstash = callPackage ../development/tools/gemstash { }; + hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { }; libbsd = callPackage ../development/libraries/libbsd { }; @@ -9620,6 +9624,8 @@ with pkgs; pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { }; + pinentry-rofi = callPackage ../tools/security/pinentry-rofi { }; + pingtcp = callPackage ../tools/networking/pingtcp { }; pinnwand = callPackage ../servers/pinnwand { }; @@ -14172,6 +14178,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { }; + crate2nix = callPackage ../development/tools/rust/crate2nix { }; convco = callPackage ../development/tools/convco { @@ -18395,6 +18403,8 @@ with pkgs; iso-flags = callPackage ../data/icons/iso-flags { }; + isort = with python3Packages; toPythonApplication isort; + ispc = callPackage ../development/compilers/ispc { inherit (llvmPackages) stdenv; }; @@ -24956,7 +24966,9 @@ with pkgs; logiops = callPackage ../misc/drivers/logiops { }; - logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules { }; + # ltunifi and solaar both provide udev rules but solaar's rules are more + # up-to-date so we simply use that instead of having to maintain our own rules + logitech-udev-rules = solaar.udev; # lohit-fonts.assamese lohit-fonts.bengali lohit-fonts.devanagari lohit-fonts.gujarati lohit-fonts.gurmukhi # lohit-fonts.kannada lohit-fonts.malayalam lohit-fonts.marathi lohit-fonts.nepali lohit-fonts.odia @@ -28122,6 +28134,8 @@ with pkgs; kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; + kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { }; + kubectl-tree = callPackage ../applications/networking/cluster/kubectl-tree { }; kubelogin = callPackage ../applications/networking/cluster/kubelogin { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34cced4ec221..6d16359d29f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2280,6 +2280,8 @@ in { dicttoxml = callPackage ../development/python-modules/dicttoxml { }; + dicttoxml2 = callPackage ../development/python-modules/dicttoxml2 { }; + diff-cover = callPackage ../development/python-modules/diff-cover { }; diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };