From ee1b9e6f7bd43f05684805ae376caf16330fa96e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 16 Jul 2022 15:30:49 +0200 Subject: [PATCH 01/66] qt6.full: add --- pkgs/development/libraries/qt-6/default.nix | 29 +++++++++++++++++++++ pkgs/development/libraries/qt-6/qt-env.nix | 20 ++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/qt-6/qt-env.nix diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 8c12cc2fb671..d6950538e741 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -19,6 +19,7 @@ , gst-plugins-base , gtk3 , dconf +, libglvnd , buildPackages # options @@ -50,6 +51,34 @@ let inherit (srcs.qtbase) src version; inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake; }; + env = callPackage ./qt-env.nix {}; + full = env "qt-full-${qtbase.version}" ([ + qt3d + qt5compat + qtcharts + qtconnectivity + qtdeclarative + qtdoc + qtimageformats + qtlottie + qtmultimedia + qtnetworkauth + qtpositioning + qtsensors + qtserialbus + qtserialport + qtshadertools + qtquick3d + qtsvg + qtscxml + qttools + qttranslations + qtvirtualkeyboard + qtwebchannel + qtwebengine + qtwebsockets + qtwebview + ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ]); qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; diff --git a/pkgs/development/libraries/qt-6/qt-env.nix b/pkgs/development/libraries/qt-6/qt-env.nix new file mode 100644 index 000000000000..0b41f0c07351 --- /dev/null +++ b/pkgs/development/libraries/qt-6/qt-env.nix @@ -0,0 +1,20 @@ +{ buildEnv, qtbase }: name: paths: + +buildEnv { + inherit name; + paths = [ qtbase ] ++ paths; + + pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" "/libexec" ]; + extraOutputsToInstall = [ "out" "dev" ]; + + postBuild = '' + rm "$out/bin/qmake" + cp "${qtbase.dev}/bin/qmake" "$out/bin" + cat >"$out/bin/qt.conf" < Date: Thu, 29 Sep 2022 04:20:00 +0000 Subject: [PATCH 02/66] martian-mono: init at 0.9.1 --- pkgs/data/fonts/martian-mono/default.nix | 35 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/data/fonts/martian-mono/default.nix diff --git a/pkgs/data/fonts/martian-mono/default.nix b/pkgs/data/fonts/martian-mono/default.nix new file mode 100644 index 000000000000..98f20082be98 --- /dev/null +++ b/pkgs/data/fonts/martian-mono/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "martian-mono"; + version = "0.9.2"; + + src = fetchzip { + url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip"; + sha256 = "sha256-whIR7BaEflm/VsF60Xck6ZJDLzTugaTOogHzcEtwCsM="; + stripRoot = false; + }; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + doCheck = false; + dontFixup = true; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/share/fonts/opentype/ *.otf + + runHook postInstall + ''; + + meta = with lib; { + description = "Free and open-source monospaced font from Evil Martians"; + homepage = "https://github.com/evilmartians/mono"; + changelog = "https://github.com/evilmartians/mono/raw/v${version}/Changelog.md"; + license = licenses.ofl; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1ccb4d98efd..a15ce3a0e921 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26604,6 +26604,8 @@ with pkgs; manrope = callPackage ../data/fonts/manrope { }; + martian-mono = callPackage ../data/fonts/martian-mono { }; + marwaita = callPackage ../data/themes/marwaita { }; marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; From e24daea3d3d46bd0ae87b29b9315bd2d0df9c389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 15 Oct 2022 16:50:22 +0200 Subject: [PATCH 03/66] tailscale: improve formatting on warning message --- nixos/modules/services/networking/tailscale.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index eb3afe118c64..26997dd96013 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -41,7 +41,11 @@ in { }; config = mkIf cfg.enable { - warnings = optional (firewallOn && rpfIsStrict) "Strict reverse path filtering breaks Tailscale exit node use and some subnet routing setups. Consider setting `networking.firewall.checkReversePath` = 'loose'"; + warnings = optional (firewallOn && rpfIsStrict) '' + Strict reverse path filtering breaks Tailscale exit node use and some subnet routing setups. Consider setting: + + networking.firewall.checkReversePath = "loose"; + ''; environment.systemPackages = [ cfg.package ]; # for the CLI systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { From d168b8cf2ff5094b7c387e0d99456fdbd79a2550 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 00:11:30 +0000 Subject: [PATCH 04/66] iosevka-bin: 16.0.0 -> 16.3.6 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index fe231ee97f8d..d7f107b78428 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "16.0.0"; + version = "16.3.6"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index a65c702487ee..e5d7447ed59a 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1akz0vnizqqamk300fknrqay5n72296s43mgf8s2pp6b9vc4m0m1"; - iosevka-aile = "1frkwcgkzs81dl4sdlv6rv8n226anp3qy8b0zng5ybcrnjsnxapy"; - iosevka-curly = "0d1h66hayn1aldczd340j75wz1xxbrqvqszx0n798q9difnvbwn6"; - iosevka-curly-slab = "0bpd7xhhba904pqnc6f4dq575dyap0wh3sm996ad253g264jk3gk"; - iosevka-etoile = "1qqvwaaw91mnabxhwrgdbsna4zn1pp2mpk51k5ffplcwcwhqkh1h"; - iosevka-slab = "1wil56m16yy9mx1yx6c5m12bxm82gwdni9cb52374d7dn5ahj6mf"; - iosevka-ss01 = "1k1xxvsddqpblmc5ymlv7cga39y8zmhpl0kj5akinv3787p73h8s"; - iosevka-ss02 = "145r4jizn4nwrnar8knrsm52g10sfv4x18hqlqn6nfjp4jw1fjia"; - iosevka-ss03 = "1mjad7nyj2wdq7g718c1ilrrvzm200prjmkf8m4f2w0rsamv80y4"; - iosevka-ss04 = "1zcl3g7h9zb9gall3q8pfdsv86xq43s5az50icp29d8n23nkqy29"; - iosevka-ss05 = "0gq1x9lvpibl0irl53aq1v5rjpprvyrlarp611jkh038fdqb9kp6"; - iosevka-ss06 = "0rqp5r4h08ypyqz93xpjmj79k1x0dh89vj9qg1sgzn2b3yql6h55"; - iosevka-ss07 = "1r4d4cp8lw3h61wfn1wdp4l8gxa1gjmhv0qafqh5f2m89sa03mdc"; - iosevka-ss08 = "16rxpmfird3gbr50p2aqhvlg3gn4m0g8khyb1jhs4bq9xa9a9sx6"; - iosevka-ss09 = "1q0ghxshs4x3srmkp1dz35bbz4pgkkqh63zjx1bakfs14mpw6k69"; - iosevka-ss10 = "0q9068raiqf4bhps9b3cyp6vy6dccy2nd4dsnabs3ls0hf5ld5pw"; - iosevka-ss11 = "05vsq8yjrvdj49sgxza8db9zn4csr9w9l9zlb6y11jw9z50ji3r6"; - iosevka-ss12 = "0y5wpaax562c4fs68x34mdp023fmj5ma0hfawyqig12g05wkqw5w"; - iosevka-ss13 = "0fz62080ni0sqhi7k51pr5yhapdjpi68hibljqz2rylrb9nhvl29"; - iosevka-ss14 = "0myhih7xg1b2pr29gl1qvfj15c3fpxr6h97hm4inxlhzqlsd35xv"; - iosevka-ss15 = "0dk7712xrrp2s0f0cdp99vc6jafpsppkjk8xbyf7vjk2pylq9kva"; - iosevka-ss16 = "1nn8qpin1rkybkq570mpl6fvl1sy8cgvrvkg7z5blbrwvn5qd5vs"; - iosevka-ss17 = "17c2ij3zldhjbxcs7c979xy82bmcy76c4m84xwkpbqnq0iggqhh6"; - iosevka-ss18 = "009sk8ic52h2vrh52xibj8grl68aav62wky05kzrhfrg1m5v6arb"; - sgr-iosevka = "1y454cn4zchhb25jx62sw7nyy07b8dsi9h9xbnbclwxfdw3hlk8j"; - sgr-iosevka-aile = "096q8dj462kp8ngsxb3rjyv7gl3ds8anh8mb03rycm59h7im9jki"; - sgr-iosevka-curly = "0vz2izq0chi2hl8zszmyag3d2vs44js18x3ff8mr4xhgpj3gamyh"; - sgr-iosevka-curly-slab = "0aangqga94b80ahsfc74b41g3nkhf73wsxfzy1lsdrmajvi4k24s"; - sgr-iosevka-etoile = "1n1p4rdbx2zfrhrh4m30dldkg5is6d0j68f8dfp8y2rb6bwrx1nx"; - sgr-iosevka-fixed = "0776j3fpklbjckm4rq8rh4v8gabdvxmki2rd99br2qcmsg5gx9ch"; - sgr-iosevka-fixed-curly = "02hpxdfd1mhm4yflx4kj2b57kw0wcqghsswlwyk9m0ll710f6a2q"; - sgr-iosevka-fixed-curly-slab = "04klqh85mm0zanpjimdfbwaf1kjih9d0bdr6vxzc9fsim47zzfyd"; - sgr-iosevka-fixed-slab = "0iir8czjf7rsxi19rbj2mgg375a1f82vzq1s6ir7i4his90ihqy0"; - sgr-iosevka-fixed-ss01 = "0s2k2js7b40j124p6mi1pad3hjfmby4yiv5l8szb3ksikgb6i9xg"; - sgr-iosevka-fixed-ss02 = "1ng32i29vkbzvadx792alrx20f35jxnpzjbh198z7k07gsxm63cx"; - sgr-iosevka-fixed-ss03 = "061z9yqfxpr0nhwsd4vhh842jpw0dbfgymbiqxf7gsmjxw7dwb9x"; - sgr-iosevka-fixed-ss04 = "0m4yd8wlpx43nf0757w249rrh1fb53k132g6wpah9xdfzndhgdf5"; - sgr-iosevka-fixed-ss05 = "1188sqah28x3nmscr462107y6xqdxs5z9s40a50bii51ii3wr4q3"; - sgr-iosevka-fixed-ss06 = "1qdz4asqmbvhs3v2izwbs69jkjsm7q1rz0y6jd95rp4ilz4zc9zl"; - sgr-iosevka-fixed-ss07 = "1q33yp9ahmry7fb3m0vxiyx7c7z69xk6gdhlp0syacwbxif0adxh"; - sgr-iosevka-fixed-ss08 = "0p43r707hiy27ndq45b85fchrz6vwcj3qymycxckfcdmds0c8dn6"; - sgr-iosevka-fixed-ss09 = "0f30kyqr8g2jgzlc87b0p242qina3zgbs7a2cy35adzdvnasg8ln"; - sgr-iosevka-fixed-ss10 = "0zdrsz918617xl1ninv4nyfc8zd5x91yjjf09gd7vrvxrq0pc7gh"; - sgr-iosevka-fixed-ss11 = "05nqp90932gq72lhcr4csba9xvi2c06jhvhai786jqmnmy2q63r1"; - sgr-iosevka-fixed-ss12 = "1vqriqa8g85f7y4qpr1ngcfyrd9p511fk2a83ny50d9ggqqmm3vg"; - sgr-iosevka-fixed-ss13 = "0m8sh1k3wqqm1618xn5p9p50mkcl1pzm7dmnbbwadmp812kj3l06"; - sgr-iosevka-fixed-ss14 = "0k2invfidpk088xa9m09gl09lgmrdz5nszbbi8cm3a4ngsrvnxzi"; - sgr-iosevka-fixed-ss15 = "0n5mqz7msjfbmdy25fbmg2va7jqaf81ymn6s340qblwv437b1v6f"; - sgr-iosevka-fixed-ss16 = "1ivd8hv52zd7ai1f0mnm7111622j4xg1sz3l9qpi6bbh6f8wiz8y"; - sgr-iosevka-fixed-ss17 = "1w460i7fxdzf1mdkc4sykdykb718xvjk5im68d0341zz9byfa9dk"; - sgr-iosevka-fixed-ss18 = "1gc5qfjswyp8farvrg4v8miyw5db668w8zyb21jkcxy4vfahh1fz"; - sgr-iosevka-slab = "059xva7waxzazcs23lil00ll7mc0pahjdpj8pks7851h3n1bxf3b"; - sgr-iosevka-ss01 = "1jfsz50krhjvhs9z0prl97b2dbsxfjny2ym8hyrcmhhqr7lwxxkv"; - sgr-iosevka-ss02 = "0y2b0mwmpvv3by6nnhz30bzdwqbmi6w7b800pnnfyh6s017613vv"; - sgr-iosevka-ss03 = "0ags2s26j4haqk3v7lf24yzymk2mqay5j9cak7dq2bmbm2mrp7sx"; - sgr-iosevka-ss04 = "1fhlfskdzxlmsv76m05s1abvg0hwkd39bbg2803f79b5a171h3y8"; - sgr-iosevka-ss05 = "1gpc5l6xk7cfaz0j0x4pan2yr87bhd7w8pwihki985rx387mwmqy"; - sgr-iosevka-ss06 = "079xxr09gxpvxp2m2zydv7dvkw5wpiqjzq5yvqx5j65j86dvihqq"; - sgr-iosevka-ss07 = "1bzpc32vsgrn45cxfdwwv1lijp387y7bbb9jc6fl8clnsklz5wdl"; - sgr-iosevka-ss08 = "1mdfxz51dr40x8mk73ifr75p7h0ac2w0gp4a67qlrwpz687nqz49"; - sgr-iosevka-ss09 = "0ghdx7gnficq39i71rwbi499paml0zb4xj4cjw0c194li1k3d1ph"; - sgr-iosevka-ss10 = "0ah10yf2w0px0y8pdra7rz57z16hv24q7mgn641shi809mcyiz9a"; - sgr-iosevka-ss11 = "08qnqiyigdbxm4wsr9gdifkyzvngncvfl8rw0is2a7clz9zpsyq2"; - sgr-iosevka-ss12 = "1yzr58il8aggqrn6l1ra0hg0xdsvrb7095qrdy1g5641df7ig91i"; - sgr-iosevka-ss13 = "1kz3gas5pxhhpwbnwrdy7qvw32vhzipzpncsdr1baakm4fngnxgz"; - sgr-iosevka-ss14 = "0860v52lnxjp0l21ak6p2n3vz5p8nfp23a7nrxrxxss3dx7cdr0x"; - sgr-iosevka-ss15 = "1w9ic5v6vjpw5fcrkv37xc4v4an2741i6q0461rf4xhv8vmbvj5k"; - sgr-iosevka-ss16 = "0qwmszs6gkpy0kdrilchpa6wm0gqvcfcii7rlhz6i931qdq3hx2j"; - sgr-iosevka-ss17 = "01d083l8ha9v2220kgzhjrvvk2822i46lvk2xvbb53mv6ml5pfyh"; - sgr-iosevka-ss18 = "0id0xs40n6hh08mqf32f6bxana3mh1h4yrdss55sln34rq5v0sin"; - sgr-iosevka-term = "0c32l3n97rlas2avyaqz9jzz7f1v52cp1jijzmal7zhdml6ahrkm"; - sgr-iosevka-term-curly = "1nr336ypclz2cs1al4xirw9w27yf3hh4myj5ky3m323mp5b5pzdn"; - sgr-iosevka-term-curly-slab = "1ylcpw9rcpmihf2zyxl7qkmq12bm7y823ks4q3ssj3z7ziddpj2d"; - sgr-iosevka-term-slab = "0ivwgfj1fhcf8a1d4bj0ym7w7q66rbgj65yfpzx4rzkgjimigpwl"; - sgr-iosevka-term-ss01 = "1rakana5w6qrzzbhschyawpfpxlhkrqbspzqrjzxbj87cxclrppc"; - sgr-iosevka-term-ss02 = "1azkwyk484gqnwi76bg11nswh17dbq3s4pn79rhxlankfmqa4bli"; - sgr-iosevka-term-ss03 = "1h426sam4d9zf8bwj28m4z33767fg0irbnrkiz4fnnbjjc1d6fwv"; - sgr-iosevka-term-ss04 = "0gr0906h6swh57j650hpq7xmfggkhv4rrbc60xhsbvwihpc8rya7"; - sgr-iosevka-term-ss05 = "009xb23xljp02gn7qb1x53grnsqw2dapkm1i0l6x8grz2bcm7bs9"; - sgr-iosevka-term-ss06 = "198k7wspvhzkgzwcykf5y1v67fhf6gd8wmnbnvslr0mxwvmq2bpn"; - sgr-iosevka-term-ss07 = "16x0yc5y0z3c7hwm95rlb4203glhmzvkmgqb1f8glzaxh40rv0sl"; - sgr-iosevka-term-ss08 = "02ngwyfadda47qmsjnxf9g052xbdj1fndxrq0bv043hvdxdcg6w2"; - sgr-iosevka-term-ss09 = "091l3078svrf3qynx8bvr6jgzwcbbj0zhm97f3lzrs39rzr94jih"; - sgr-iosevka-term-ss10 = "0vfbdly9lfgf2adk53qj662xivx0vhp08ssgqbv5laiflgchqbrc"; - sgr-iosevka-term-ss11 = "1mjhpi31ac0vjdarpp7xmpqblp6kgfdvag6didqk59s584zl7n3p"; - sgr-iosevka-term-ss12 = "11n6w0z0vwc1731x8j9cavhywmzw51ydlkwcr62c97kc6wafm7c1"; - sgr-iosevka-term-ss13 = "104najcndlcba59qn7kkyljd245l4skkhhj8aa4f53770grpp0m0"; - sgr-iosevka-term-ss14 = "0zvawavi0lkc1jws5ni0f24ddqqflp43zhajcx1gfspivnqh7qsa"; - sgr-iosevka-term-ss15 = "0ribbrcim0a75pxrwjj86rjvlzakn8l63n19mvpvp9ih431qigrz"; - sgr-iosevka-term-ss16 = "1bk3gr36dhjsm35q3q0gxbrlzqwfjm7i9yp19s350wxaadksj3n8"; - sgr-iosevka-term-ss17 = "0ly6g2ikps1nk68pkajlqmfiw6w439nxxgwr2j5f41r9zh2xhkpw"; - sgr-iosevka-term-ss18 = "12a0bpqv1nfj9znlq3v1345lr1wnb5qf0z411gqvgy66cs8r0dyn"; + iosevka = "1xjpzif2v3p78abny74wwrrcq05hahvk4rf0swhbjhsv7j1ycmnf"; + iosevka-aile = "1m1naxhf6ksasd3fq5npikgm8yv60salnhvb9b50rmyw6as2hmyb"; + iosevka-curly = "0xdb8ymcg0kmdcj7jhr3pqfyv6cw9ab1f1rgs0cvn6g97n4ag2yq"; + iosevka-curly-slab = "0396zjh043qv1j10f7m2pbibfyfkc6361rzjjgdqyvjhj0qh3wsi"; + iosevka-etoile = "0d89q4d8fvcl2130v45v873g31vvcd051wk461lid1mdmydvfs9d"; + iosevka-slab = "0jgsg1rnkx8mrcp74qbkc7dazlkh9wzyb6gn51yvwzv2gs2sj69m"; + iosevka-ss01 = "16c3kh3ynmwm0r83gv1swv2z4bhdm78a91hkdczzkngbzaa0mxhg"; + iosevka-ss02 = "1xmylqgh0972p1cz2vshlgnjpfg20k7x5alirjhpsvyj8n1v7jsx"; + iosevka-ss03 = "1qw2rwwhw4yd2s0876xp3z5kxxgf5x125vwy83wbcgca9hx7b1cw"; + iosevka-ss04 = "1nlw7na37rx9lk9g3b01v2wipglcj0lszyyk0s6j2g8cdmvcdqap"; + iosevka-ss05 = "1b3ckxpw28ail62x8g06rs6fn4gba7xfpnk2qaf8fl0lhvjyv0kf"; + iosevka-ss06 = "0ifrzd1kxhflf2kxbfsshp9chpiidx6nvvblws11276qz7qir9lq"; + iosevka-ss07 = "0bm2n688i8f40awi8k1jj8p6pz45p230pp7brlps99ljjq7ipqcb"; + iosevka-ss08 = "0qqhfcr9xmfr24rp4xq3xy8zld5l2pnqwbd801ljv6qy3zza9xhk"; + iosevka-ss09 = "0dgpzjnab2fwp2jns5fvgzh4n8w0qhxzx1fhxw4b5c99n5bnim07"; + iosevka-ss10 = "1nz8an3ar3lw3zfdyck1xh17hdkqdpg8rmwih4wxz93hpp5xhrbv"; + iosevka-ss11 = "1wmxs075ymvyzl9r687xh32iqp3xsaakdfh01m1iwpyglspyr8y0"; + iosevka-ss12 = "0c7abkq0ylzqv8ssizby5g6lnibqyiw2pfmyk8cccx9pq1ihr1jq"; + iosevka-ss13 = "0xalbmkgyj30a9y4wzqpcc8ix64jdll1sm972fc35ln8134m7fzl"; + iosevka-ss14 = "1638n30hhqv0rm2q1gqvj36knjn2n6jry6dz1xfczlaqm956395v"; + iosevka-ss15 = "05blb6va180fk4iw3ldgq17w11gqi0jflmcdgzjzxw5pxs8j1qwp"; + iosevka-ss16 = "1qgfrc5kj0x7yc77aqswy5668ymnxw9gw5rp71r4j5778wmslr5s"; + iosevka-ss17 = "03226nda56dhbia3nf5p603zz04avh5j1x24qz9z3irhqg4rn0js"; + iosevka-ss18 = "17vyf3msafgdhqhhby4qrn8p5pxdmvxwfgf44vx41iy860q89avh"; + sgr-iosevka = "0vxfkhx77b9hf63an7wzpgldlj6pbs27i65qsq45n869cyvzd9ga"; + sgr-iosevka-aile = "1iqxc42hc6398a61k84ibmjkl328sza9q3l81s04iav4kkrjd0g6"; + sgr-iosevka-curly = "0ww4h12xfpa8yxjxhgs3m819024vz6isw8gq88spj07p2w4jx4mp"; + sgr-iosevka-curly-slab = "1my79s02hhi803rakwia61c2rkpgzf6zw6xhzw6n1jkmjj1r77a7"; + sgr-iosevka-etoile = "0rp1fk156s2mxibyak8pzw871p33pjdizi2ix9ppxqdb2zyn64xd"; + sgr-iosevka-fixed = "0rldw2gq22hf2hy0brf03g12vw4rh8h5ascccsc6mljzzgwy6wir"; + sgr-iosevka-fixed-curly = "1sal7i1kybfgxfhr1c90rmjal8zhh4cbf6xqzs6zrz3zxhp1zj30"; + sgr-iosevka-fixed-curly-slab = "0spkivcqg4nzkd7r3gvym1v87d8r7cd353sw8sbllq9a93axcffs"; + sgr-iosevka-fixed-slab = "1kpzcsjdk74fbr16iqz7xm10arg8kmcnpv54xxn23h4xbxx6qy5z"; + sgr-iosevka-fixed-ss01 = "0j7kzcy7rwjqhl9hlhpbm4495b5ifl0kl9jh58nc0r17c3vfhhxq"; + sgr-iosevka-fixed-ss02 = "1lx6gx2qr82nzphxyd38xj50mrhn9y2c0lq2c1n6iq7zig7yybn6"; + sgr-iosevka-fixed-ss03 = "0clpiaa12mxksvbyrxahq56nh0dmn3y5x0dclx8clh7v39z652s6"; + sgr-iosevka-fixed-ss04 = "1lvr6vs6qbmkrgkzw5jvp3a3ib681y9784mwv25il5z7q6imlnng"; + sgr-iosevka-fixed-ss05 = "0bxqcd18657pvf6j64rhwvgpq6frqdhp65r8rb90bwfv12yqxrw7"; + sgr-iosevka-fixed-ss06 = "1fz1zvbvkyj04c8qh2xwshcnwswnzldvi6y7c1qzbfm357xsjblg"; + sgr-iosevka-fixed-ss07 = "01ndbbchf4azc4n8w26snd1l6078zxc8xzxy2vbw7vby3lify2i1"; + sgr-iosevka-fixed-ss08 = "1rv1rywpk53nf6kyc5wjsjf9j2aj1bzlr4gwk5s6m63klr7q10wx"; + sgr-iosevka-fixed-ss09 = "10rv346mjg12rihix0rr97vi5y63j4ia0q24rbs0546g4g309k6w"; + sgr-iosevka-fixed-ss10 = "0ry6abyjaq6dy39mkvzqglzrrpbgwfcq2lxy5j9kncjcwx72mpin"; + sgr-iosevka-fixed-ss11 = "0nq997c81pxjkgsr1gvkbaapv4qkqpf5w5pixhdkc22g2fp68w6s"; + sgr-iosevka-fixed-ss12 = "1v7irhjrf31mlj3h0v1bxnl1x187555zdrrv2fhycn7700im5pj2"; + sgr-iosevka-fixed-ss13 = "17m1fjlvh279wc1n2m7fhmrn3a8b2rqrnj34vps67f1m7bafh1yz"; + sgr-iosevka-fixed-ss14 = "1sm9z1zad7war4066rj5mdmc0qhl03bjq7wir01na42bw464yz2a"; + sgr-iosevka-fixed-ss15 = "0xsgjz0225vdzw5b9x8333anmshpva1w5kw7g6m0m2m21n3kvpc8"; + sgr-iosevka-fixed-ss16 = "1z5h9s9vqmmdjzkv6jzd2rxzkrdbchcbbdxilgvh0nkicpz7h1f6"; + sgr-iosevka-fixed-ss17 = "06va44pbrbp3yrpb6k58c5vkyrfjbl1sm2jhbpih0vxcpmqa209k"; + sgr-iosevka-fixed-ss18 = "03plkqbjmpbz200k062s5j9a42717fzi37c6d0jjmhqlyr62j478"; + sgr-iosevka-slab = "0xf2wzd5679j3csd5br4yfyh1m8vmijf42871szxbq85mw8k1q6f"; + sgr-iosevka-ss01 = "1v4cifbn4icgsnzvxqyg2sqza5m2378bmcqmw511cbkhrgzr15ff"; + sgr-iosevka-ss02 = "1d91qzbzlkwj0f9nfd4jvvy2lq0dy70w6dzkgggb75xm6rwn0251"; + sgr-iosevka-ss03 = "0praj6n5i1ahxnp3zji3jffvvzhpb1382inzihlgrbysjna4cqkv"; + sgr-iosevka-ss04 = "1lxifnvb61ad8v53cnj4zi4m1jnlh4gk1w6kk5w04yd0z749hyx1"; + sgr-iosevka-ss05 = "1a446rhyn69ss20ybf9mqy55i4ajq2jpwppmn6srfnrjx63706w6"; + sgr-iosevka-ss06 = "112k2gyv6r9ircw2rnrgsijw9v1fs64p5737ww6540kg8xrpz1kx"; + sgr-iosevka-ss07 = "0alc313vgf9649xgynq8h6d006phw9mbijn2m4qjzgjkw4v28xh8"; + sgr-iosevka-ss08 = "1c1xfj3jryfcgzmqyfmcz7nafhh5jzj7glcdaifviddbbdj5xi88"; + sgr-iosevka-ss09 = "1fw4qnn22fvz42mfbl1gwr4bwv53xjy0dqd7c6sy7886gxmkr04y"; + sgr-iosevka-ss10 = "1m62m1xb6xb9vwpgicag8vw817r8qf6gq6mv7kr18fs0mqv4h8sh"; + sgr-iosevka-ss11 = "0xa5wy6qnk9fgkm3yb0scwkhfxg59hchimzfzrbgvfylsdpq527y"; + sgr-iosevka-ss12 = "0c49wjypsxjgkm9s1py58lx8rybb3kzm6z3xysvmffqhyx4h03xa"; + sgr-iosevka-ss13 = "1hr0fbmhjq5ngp4hdm7zjxk3wggbk2yhx50byvbm39056v3pxbym"; + sgr-iosevka-ss14 = "0ibqdh2ddz9rv8icbfvba6jj5pcpi7l7kjkwsqx0081wqv1c3jxk"; + sgr-iosevka-ss15 = "004ibn5hrgcby93h2kz248x5qmz4xbirih1k3ic0xqda23yyqq7j"; + sgr-iosevka-ss16 = "1mad0yiwknl9f7z6c52fv12ngdgwr1yic74ssbzk529vrqmafwy1"; + sgr-iosevka-ss17 = "1igrbzw63jailzgqlv72h1iv3lz33qd3z9s0hv92w2kh2ig7q6kf"; + sgr-iosevka-ss18 = "0nsq4hg8mmnzi8dgdn0km03x72ja1vk7g7kbzr7m148kb1p4x5vv"; + sgr-iosevka-term = "1ax6i21cf4w8gwhml0rwvb3yk9hlhkjfn1pyjyglajnsbh8z4r3w"; + sgr-iosevka-term-curly = "0y7jkqddqkc2cnmgfsrq29c7id070y8gxj664q81k6alivpj62rs"; + sgr-iosevka-term-curly-slab = "021m8lmxss1qms0slsc83l78njvnjjyniarrkx95x9vpqs2dym0h"; + sgr-iosevka-term-slab = "0qkxy91hvxa36bz8q1wwf31qn18b2zvyabkpsjnv6yhpzimz4wm0"; + sgr-iosevka-term-ss01 = "0sxm07qr1l64n0p5f7dnssgi545i73gdahm18iyvijwqcvxg83rn"; + sgr-iosevka-term-ss02 = "0zlzvxbf2p27g7p5g19ixa5vf77fxd0b7bqky9pfzf72wpwd89jd"; + sgr-iosevka-term-ss03 = "09qd2np8z224h2z7yyqfz7csxdbr11kc4v9p8z4qnb8k8wg5akz9"; + sgr-iosevka-term-ss04 = "0jr5bk9x3nb9841nxlsl3wjwdy5si8g4rwh5axm5g5hwjxr29x8z"; + sgr-iosevka-term-ss05 = "1w41g52b2b5qzkhai3wk3fvsa5qi8h70wmbq0shq954gqzrlchnp"; + sgr-iosevka-term-ss06 = "0hmsq5jpnb9605scvh89wqdvyxsypm74aqwz8zsyn7siwfkhh3hc"; + sgr-iosevka-term-ss07 = "06spijbyw6dzwc73gzi9r14af9g47js0p94ddn54aq3sw2d1c9jq"; + sgr-iosevka-term-ss08 = "1yrr7lknz0h126gr6srxzfs4npl7vv8v32b2hzkixqzf1pfjv3mr"; + sgr-iosevka-term-ss09 = "1lf04m0f3l2pw1rm3klfynainxma8fs5x2zv9vgjd1vr07si0c5n"; + sgr-iosevka-term-ss10 = "1p9p3gpfd353jq1aab5dh16ppzx2qjii8x8hvaqnmhy1a1ip15jg"; + sgr-iosevka-term-ss11 = "1x1n5fjya6a01m0cwcdcf6xlynzgk2413axkr4p5glmqad7w82h8"; + sgr-iosevka-term-ss12 = "07bxpw4bsxbwsrjvbw3n6kj1bkvr9a730zp509zjzg72dy6i96ca"; + sgr-iosevka-term-ss13 = "1mw0nfknzk4qcf9nsg9904389li6sbpvgn48iydrk4bzyr41qza1"; + sgr-iosevka-term-ss14 = "13pvn4kkl4yz1hkrl04ifqbk9x7lym1i7w3d6nh8l3ch3783sjha"; + sgr-iosevka-term-ss15 = "1hqrn050qx5iljfbflzpzl4nl21jnnlih53kj9ik3scwb76pkfal"; + sgr-iosevka-term-ss16 = "1svj0wq7j0kzn4pnyn5lkd5sni3k6vv78r943zc6dlxrs7vbkljp"; + sgr-iosevka-term-ss17 = "0qmzpxgsibf8c0k6hzq7ps1gd0mb050z3dsjmjjammh0cwflax6p"; + sgr-iosevka-term-ss18 = "0qss7kz6mwzaxlff4m1lylf0a8sy65l7z6my7k6kif9iiy2595wx"; } From a893ab2509808a7f9bea2f73ab9b9c5f44003b5b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Nov 2022 23:12:54 +0100 Subject: [PATCH 05/66] tenacity: unstable-2021-10-18 -> unstable-2022-06-30 --- pkgs/applications/audio/tenacity/default.nix | 27 +++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index 748ce090c776..525a743965c2 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -1,8 +1,9 @@ { stdenv , lib -, fetchFromSourcehut +, fetchFromGitHub +, fetchpatch , cmake -, wxGTK31 +, wxGTK32 , gtk3 , pkg-config , python3 @@ -48,15 +49,23 @@ stdenv.mkDerivation rec { pname = "tenacity"; - version = "unstable-2021-10-18"; + version = "unstable-2022-06-30"; - src = fetchFromSourcehut { - owner = "~tenacity"; - repo = "tenacity"; - rev = "697c0e764ccb19c1e2f3073ae08ecdac7aa710e4"; - sha256 = "1fc9xz8lyl8si08wkzncpxq92vizan60c3640qr4kbnxg7vi2iy4"; + src = fetchFromGitHub { + owner = "tenacityteam"; + repo = pname; + rev = "91f8b4340b159af551fff94a284c6b0f704a7932"; + sha256 = "sha256-4VWckXzqo2xspw9eUloDvjxQYbsHn6ghEDw+hYqJcCE="; }; + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/wxwidgets-gtk3-3.1.6-plus.patch?h=tenacity-wxgtk3-git&id=c2503538fa7d7001181905988179952d09f69659"; + postFetch = "echo >> $out"; + sha256 = "sha256-xRY1tizBJ9CBY6e9oZVz4CWx7DWPGD9A9Ysol4prBww="; + }) + ]; + postPatch = '' touch src/RevisionIdent.h @@ -124,7 +133,7 @@ stdenv.mkDerivation rec { sratom suil twolame - wxGTK31 + wxGTK32 gtk3 ] ++ lib.optionals stdenv.isLinux [ at-spi2-core From 6a5aab566fa90e8e5e0833f78d0fb53ea14cbb74 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 8 Nov 2022 20:47:31 +0100 Subject: [PATCH 06/66] libmtp: improve cross-compilation support It still doesn't build, but it gets further now. Also added configurePlatforms explicitly, not strictly needed for cross, but might help catch issues with cross earlier in some cases. --- pkgs/development/libraries/libmtp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index e0c3e195b2da..4ca15f01a6d3 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -35,10 +35,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libusb1 ]; - preConfigure = "./autogen.sh"; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ "--with-udev=${placeholder "out"}/lib/udev" ]; + configurePlatforms = [ "build" "host" ]; + enableParallelBuilding = true; meta = with lib; { From 4fc86adaa17692482c524264726e6a5e509ca5b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 07:46:59 +0000 Subject: [PATCH 07/66] polkadot: 0.9.30 -> 0.9.32 --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 00f15c27d857..31c610f255fe 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.30"; + version = "0.9.32"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-lnClnra69vfszPjnrOldSkd3kgC34bgociicC6Kpupw="; + sha256 = "sha256-bE7PzvkHKAP/nqNkoBMTGvZZwmf8YY+cGnJ2EM/2xAs="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-mnfA0ecfmMMAy1TZeydbep6hCIu9yZQY7/c5hb1OMGc="; + cargoSha256 = "sha256-NI50KFXvQgUV+G1l5D2gnAo1EohnCpQWlFCZ0iP2CVQ="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 4d9f200932079e93c122cfd820b40f195a6d9c20 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 11 Nov 2022 10:37:02 +0800 Subject: [PATCH 08/66] efivar: fix cross compilation --- pkgs/tools/system/efivar/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index f08a70e2b07a..7ee12fb07583 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { url = "https://github.com/rhboot/efivar/commit/15622b7e5761f3dde3f0e42081380b2b41639a48.patch"; sha256 = "sha256-SjZXj0hA2eQu2MfBoNjFPtd2DMYadtL7ZqwjKSf2cmI="; }) + # src/Makefile: build util.c separately for makeguids + # util.c needs to be built twice when cross-compiling + (fetchpatch { + url = "https://github.com/rhboot/efivar/commit/ca48d3964d26f5e3b38d73655f19b1836b16bd2d.patch"; + hash = "sha256-DkNFIK4i7Eypyf2UeK7qHW36N2FSVRJ2rnOVLriWi5c="; + }) ]; nativeBuildInputs = [ pkg-config mandoc ]; From 2d67cb5fe3e0cc5880040b02486df39ce25b00a2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 18 Oct 2022 11:18:22 +0800 Subject: [PATCH 09/66] uucp: fix cross compilation by setting AR in makeFlags --- pkgs/tools/misc/uucp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 443c4b10457e..28f7a6572c18 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sed -i '/chown $(OWNER)/d' Makefile.in ''; + makeFlags = [ "AR:=$(AR)" ]; + meta = { description = "Unix-unix cp over serial line, also includes cu program"; From f6a2ef3840e0efa5969e311efe7da45fd733ba8a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 10 Jan 2022 13:44:37 +0800 Subject: [PATCH 10/66] autojump: fix cross compilation --- pkgs/tools/misc/autojump/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 47c4cbcb4e74..844e3ba99ea9 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws"; }; - buildInputs = [ python3 bash ]; + nativeBuildInputs = [ python3 ]; dontBuild = true; installPhase = '' From e0940d55db0185a15d64dbc4b38405835ef9fda0 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 18 Nov 2022 04:13:19 -0500 Subject: [PATCH 11/66] maliit-framework: 2.0.0 -> 2.3.0 --- .../misc/maliit-framework/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index ca942ca72d47..7c27b3b97146 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -24,24 +24,15 @@ mkDerivation rec { pname = "maliit-framework"; - version = "2.0.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "maliit"; repo = "framework"; - rev = version; - sha256 = "138jyvw130kmrldksbk4l38gvvahh3x51zi4vyplad0z5nxmbazb"; + rev = "refs/tags/${version}"; + sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY="; }; - # in master post 2.2.1, see https://github.com/maliit/framework/issues/106 - patches = [ - (fetchpatch { - name = "fix-pkg-config.patch"; - url = "https://github.com/maliit/framework/commit/1e20a4a5113f1c092295f5a5f04ab6e584f6fcff.patch"; - sha256 = "0h7jfqnqvjka626wx2z2g150rch4air7q3zbq59gcb12g7x6gfyn"; - }) - ]; - buildInputs = [ at-spi2-atk at-spi2-core From f146169c14e4aa291579499f0350ff6829912930 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 18 Nov 2022 04:13:34 -0500 Subject: [PATCH 12/66] maliit-keyboard: 2.0.0 -> 2.3.1 --- pkgs/applications/misc/maliit-keyboard/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix index fcbd6cbff19b..b662c2522df8 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -22,23 +22,15 @@ mkDerivation rec { pname = "maliit-keyboard"; - version = "2.0.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "maliit"; repo = "keyboard"; rev = version; - sha256 = "10dh0abxq90024dqq3fs8mjxww3igb4l09d19i2fq9f3flvh11hc"; + sha256 = "sha256-XH3sKQuNMLgJi2aV+bnU2cflwkFIw4RYVfxzQiejCT0="; }; - patches = [ - (fetchpatch { - # https://github.com/maliit/keyboard/pull/34 - url = "https://github.com/maliit/keyboard/commit/9848a73b737ad46b5790ebf713a559d340c91b82.patch"; - sha256 = "0qrsga0npahjrgbl6mycvl6d6vjm0d17i5jadcn7y6khbhq2y6rg"; - }) - ]; - postPatch = '' substituteInPlace data/schemas/org.maliit.keyboard.maliit.gschema.xml \ --replace /usr/share "$out/share" From 4ec2521ebb93a60b46d5d771b10294b760243c61 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 18 Nov 2022 04:34:14 -0500 Subject: [PATCH 13/66] nixos/plasma5: Sync kwinrc defaults with upstream This was missed when updating Plasma Mobile last time. --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 44faa19bc22a..a6ab3053087c 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -590,9 +590,9 @@ in }; }; kwinrc = { - Windows = { - # Forces windows to be maximized - Placement = lib.mkDefault "Maximizing"; + "Wayland" = { + "InputMethod[$e]" = "/run/current-system/sw/share/applications/com.github.maliit.keyboard.desktop"; + "VirtualKeyboardEnabled" = "true"; }; "org.kde.kdecoration2" = { # No decorations (title bar) From 679b5bde4eb49cbf4d701038c8e2d96e5d561848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sat, 19 Nov 2022 09:34:38 +0300 Subject: [PATCH 14/66] prismlauncher: add qtwayland to buildInputs --- pkgs/games/prismlauncher/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 71b82d47964a..3fceefc2d98d 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -11,6 +11,7 @@ , libpulseaudio , qtbase , qtsvg +, qtwayland , libGL , quazip , glfw @@ -20,8 +21,8 @@ , ghc_filesystem , msaClientID ? "" , jdks ? [ jdk jdk8 ] -, }: + let libnbtplusplus = fetchFromGitHub { owner = "PrismLauncher"; @@ -30,6 +31,7 @@ let sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4="; }; in + stdenv.mkDerivation rec { pname = "prismlauncher"; version = "5.2"; @@ -41,8 +43,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-sKAhcbDoRbWf/DuwcBmDjb+VSMM0K2C33gu1K9AlPoQ="; }; - nativeBuildInputs = [ extra-cmake-modules ghc_filesystem cmake file jdk wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg zlib quazip tomlplusplus ]; + nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ]; + buildInputs = [ + qtbase + qtsvg + zlib + quazip + ghc_filesystem + tomlplusplus + ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ]; From 1e64f5e60aa8b4a2a0cf0edb1510f086f722aeb5 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 19 Nov 2022 18:49:40 +0100 Subject: [PATCH 15/66] alkimia: switch from qtwebkit to qtwebengine See PR #201028 and issue #53079 --- pkgs/development/libraries/alkimia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index b1c040a057ec..186c2878cdeb 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -1,5 +1,5 @@ { mkDerivation, fetchurl, lib -, extra-cmake-modules, doxygen, graphviz, qtbase, qtwebkit, mpir +, extra-cmake-modules, doxygen, graphviz, qtbase, qtwebengine, mpir , kdelibs4support, plasma-framework, knewstuff, kpackage }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; - buildInputs = [ qtbase qtwebkit kdelibs4support plasma-framework knewstuff kpackage ]; + buildInputs = [ qtbase qtwebengine kdelibs4support plasma-framework knewstuff kpackage ]; propagatedBuildInputs = [ mpir ]; meta = { From d1cd75e56c763f040135cf2661f111e9566b0980 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 15:50:40 -0500 Subject: [PATCH 16/66] sagoin: 0.1.0 -> 0.2.0 --- pkgs/tools/misc/sagoin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/sagoin/default.nix b/pkgs/tools/misc/sagoin/default.nix index 7c6fb92b9d38..638acb962df6 100644 --- a/pkgs/tools/misc/sagoin/default.nix +++ b/pkgs/tools/misc/sagoin/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sagoin"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "0cp3sdck48kz7ssv9q0glz1m0awxis2n3lw8f8kvqm42zxa50ixm"; + sha256 = "sha256-BCsNsBD+ZkxhIy1yC+N0AqbEsQ2ElfWLtnBOG+0hHXk="; }; - cargoSha256 = "sha256-hPj1sj64JoIGEoHMIm2bE+G+ivokckvChhrxNoaUTo8="; + cargoSha256 = "sha256-B8P92utlmZlxNfzBidNUaGw7BhgkOPwD0yahtKZ2yto="; nativeBuildInputs = [ installShellFiles ]; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { GEN_ARTIFACTS = "artifacts"; meta = with lib; { - description = "A command-line submission tool for the UMD CS Submission Server"; + description = "A command-line submission tool for the UMD CS Submit Server"; homepage = "https://github.com/figsoda/sagoin"; changelog = "https://github.com/figsoda/sagoin/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Plus; From be61554ca1d5ded32dc3947d4d64aee2078434a6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 16:12:13 -0500 Subject: [PATCH 17/66] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 268 +++++++++--------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e79797471a8b..a2e477c4a8fb 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-11-14"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "ead0478037b08da5adc6bdaff61de85cbfd93d60"; - sha256 = "0qrj65ij1mxpk7m9j2qpi5h991al6jypcy5xzszi1yzm64ddcvi7"; + rev = "e40635a03538f73e67e68a18c82c63fe1832e304"; + sha256 = "0d3d02fylm4ng67yx1k67hb9gfrj9msbwxn3sd5vikx1qhgsfzvv"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-11-12"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "1702de03d551317a1bcd94ded2972857ebc16d74"; - sha256 = "03x3h95lhfqgfhdr2l0fbb8acyfymvixpv0x0sxvnlz70560zi0y"; + rev = "2d1de481a94a3be428c87ab0404c38e58b386813"; + sha256 = "0g780ykjiya6clc3yi8ky4lxhyj2ayc629wn5i2iq8siwm4ab07v"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -667,12 +667,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-11-12"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "4c1b475b07c022d423069eb3d7680bc8be63dfea"; - sha256 = "0a6spsgc5580d8w4f0sxhbs1kqz82igy5ghlkgkqakl2l0gc5rzn"; + rev = "6d5e981c56a9fec9e5b617eaaad3d302bfe18dd8"; + sha256 = "11qyggn16ghpa272nv9qflf0xbqn0n36qbmv8w4mmphpcf5mq6yz"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -751,12 +751,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-11-09"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "609c952a50ff1d415d79323364e934eba607fce0"; - sha256 = "1gv5h9zbjs83324sa0lm9xiy70yrvll3cgjdfmqnb51zvyx4anzx"; + rev = "04bae4b2b531f0420824acd8d411129712da96e3"; + sha256 = "044iwsa1c95354l470kakrd77bnp6xbl87bhxydmlzjfwpshs89i"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -799,24 +799,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-11-15"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "47d2d3f78e3fd011202bb2f68129ca94b42c354b"; - sha256 = "08ds5zmk4hdb6872gcwv431r5f057m6nm6amrcqmjmbqaqcwv0n2"; + rev = "36ed977ab56d3718c41f078d01db9b218d11250c"; + sha256 = "12b2ngkcgd89ky1dnqsfyv9x0qm7lw48wrf2pr6l1ddx2izlf7pq"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "ce386c58bfce6601ab23f83fe3737e9201443267"; - sha256 = "1ijybbpvjw3v2fqih8ldgs1ivhy84bbr59q4ipmph2rxxd4dwf8n"; + rev = "f13fad8217cabea67e4d06a82bba79fdcc56344b"; + sha256 = "103g4lzyd6amygksafhxb08ll74a33ahp66di9x7r0b7jqw53ym4"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1723,12 +1723,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-11-12"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "89cd42aea4cb91cac40fe96b756d43a34b442a64"; - sha256 = "1r7fyg53vhvsipnbg9w1a9mkyzm1zx7lszh3zxlh59apjaji4ncc"; + rev = "d227a0f0f15e1d9c7d3bb00628190ab153d13586"; + sha256 = "1zsy0i6i758g9bxjg6s0lf2zn7i42z0i7nk8fjs0vhn2wsi2nakz"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1807,12 +1807,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-10-14"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "ad7ffa8ed2279f1c8a90212c7d3851f9b783a3d6"; - sha256 = "1gy2caam9g1zhnplj6d943p62n4kqgasi4wwgq1ry7gzlm2gi5v0"; + rev = "5f01c1a89adafc52bf34e3bf690f80d9d726715d"; + sha256 = "0qgb1vx5ipzcgglphhk9wck55hdscx6bdh4lr2y7f7wfxg54r3d6"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -2011,24 +2011,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-11-18"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "b8a01364b727cdbc826005852ce69a36311f669e"; - sha256 = "11ma2b0pv7m1vc3ixmpwjnwng5q3ycysld95j2mh0fhknfls5jq6"; + rev = "3ba5d159c41915cb882781bd06f26f351338e54c"; + sha256 = "0kkkj677z3p89856hyhblx4zmzqyrllgfkv6glvj0cssyxs28h69"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-11-18"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "80b659a05f9317526d49a459b63cbcaf5dcca4a9"; - sha256 = "01w03w9f2hiw2q3j8gkwz5g0vl5wvasv2wfkv14hkl1v91pfrz66"; + rev = "a6a52bc30497222e95f81b99df5bc4b999f75ba0"; + sha256 = "0swxylqp3bn7abxfqs66pnhidxqzbngl14cv2373603xmbflkfj2"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2047,12 +2047,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-11-18"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "b9ff595175281277e3bdfa3ee059e87c4172f4c5"; - sha256 = "0i3cmf4cvqdsmyn9w69wglsii9xmynv3521pvfj1xphdg6y3bj22"; + rev = "07d1b5582e0b327becc9bfad7979699caf1da68a"; + sha256 = "109iddmkr5jw583jqs38vdskbsfm63ph489q6pyfvpf68a6jr1nc"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2625,12 +2625,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-11-09"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "8c1500069cafc9cfd93bf5521b17fde060008022"; - sha256 = "144zpfs26yhj7mnfdigql5mxl32caww46p8y504a98ls4kja7lp7"; + rev = "7894d5bc504deacf37f0a479a53fa4746fe30a45"; + sha256 = "1jw8y86lq7k9d1ss4dg3ch1ij8c3b196g8giz881jipdkjy9q7w1"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2674,12 +2674,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2022-11-11"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "91db270a7f458866102f420b457d17a59b48e83e"; - sha256 = "10rrls4ixgcbd5hqjsjz5yfnf0z9w4r5n3gy57fy40rvk8wmr11j"; + rev = "2af880947129f1ab776b732a4eecb92528472ef5"; + sha256 = "1rv70658l6f047qyqyfb4fsgypzsf8bgl4h0wi1k29ac888qdkiw"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -3455,12 +3455,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-11-18"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "da59ded100703c510dd0878d125a2a2e5454d305"; - sha256 = "0asf0vljs9nsrdsfjqd9p5f7wibnjkz67ph2ilj15flrfgngf7x4"; + rev = "146a4427391df19001cc1d9f9db8f7f31fbce2a9"; + sha256 = "1306hq56lqf7cid3dhfcdbsl6chxw0dxqi70d3z2ifzakyy8anfn"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3503,11 +3503,11 @@ final: prev: himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; - version = "2022-10-10"; + version = "2022-10-09"; src = fetchgit { url = "https://git.sr.ht/~soywod/himalaya-vim"; rev = "747ff2a6055839cb5b403b540883515af37b7117"; - sha256 = "sha256-0WP9JoKN/A5bmnRjQJnquk3mRC7NEflUAdqki7+zqBU="; + sha256 = "05d8nfzqp96s05agj4fd5r2fckdsxacl0qvlk9dhxz4dh8kgsqyi"; }; meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; @@ -3586,12 +3586,12 @@ final: prev: hydra-nvim = buildVimPluginFrom2Nix { pname = "hydra.nvim"; - version = "2022-11-15"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "hydra.nvim"; - rev = "aefadd3f61234d5ac51f59057965d44f63126778"; - sha256 = "1ak0ahda6a5265g823yykz1lr7kc9jxhd84ic6nbqg4xx05haf07"; + rev = "96119af8ebaf0f55567108638c662784d612eb97"; + sha256 = "0zix3lw4sm1j386vrbjfcxnmyj61g0qlz8y260gxhsc3vd2f5jdj"; }; meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; @@ -4031,12 +4031,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-11-08"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "c19e974cfd9d52dc5070ec7b68183da39702c877"; - sha256 = "1wdjmziq9910h51hvnmq27abqa8052fbpx5g065hbwk3jwsb5417"; + rev = "cd90202232806ec2dab9c76c7287bd2190a17459"; + sha256 = "0fk686d4hs7ld4a85gfhqmd4nk9f951bjjhkknbkkq0rijdrpysa"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4079,12 +4079,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-11-17"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "57dc3a09f91bc37aae7d3fc7bdc3a8411c8450d7"; - sha256 = "0d4fw65j4wbxywpmf3iwc8y5pq4p20bnq6gyb4d78dnk8ym6cpq2"; + rev = "984ea9552fce06d24afee3d9051813a7433e1439"; + sha256 = "0nb2ik2dx0akilfdfff3sjk2pfbrscih5rrr0dy0kxk1c86fdpqx"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -4967,12 +4967,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "95d286ef5c63e9d51d007822baefa29c1e23dd8b"; - sha256 = "0cfacdyqah6xf6f0pmb2a62p5ciwb9l0z2fkvb94b04zvzbwpkxc"; + rev = "071c8895bbff0e4d1d3d4c531adfe20e3a2a6e82"; + sha256 = "0qi0wl36m152ss2ca4hshyvf529xap19dhc0k5h98blq0h5ln0q9"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5051,12 +5051,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-11-12"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "cea50b7cf3ea3a8c6dc33881420cbe9926b26490"; - sha256 = "1p7w2ng1is3f4v4h8r5m6s8hpw77ajkwsknl80p0z1cgi5ym10id"; + rev = "0b46a9ae7e40037fced280131bef7fdc25a2041d"; + sha256 = "1klw05m8wicq1jn5qscy74nl16h50hr9pk8b3wbpy77jh7a0g753"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5111,12 +5111,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "36aa842f4f344929929110b8f22cbed2aeb4b83c"; - sha256 = "0n8lrsgqdfg0c8i4ffr05x4xrc4wvqjf51bxyxmkl8wk65ya1dzb"; + rev = "a11933e578e85dfd2defc4f83e0b83cf400e9e84"; + sha256 = "1b3kl97v9kvqbspk6pdv9fjzp5531a4bif14vjzp66ijsihg0az0"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5255,12 +5255,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-11-17"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "c2a0494480c9ad44f0fb31885f320a37cc09dbdd"; - sha256 = "02vfabdm8anjbrccwpajqmb4ccxbxx56n5za438i7nf6c54shpgd"; + rev = "d9d2cda9ff999d3bf32164029c67444071323eb1"; + sha256 = "0mkfbafrsz6zy2zamg72figqxxy6w2iq24cj7h2qsz1crc81pi9r"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5459,12 +5459,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "5ce70db0d8e3ab5dd58e2fcdc4679bb2f6b53245"; - sha256 = "0l4vx73s15p6f2abmr3js0wwx2bzsh34xv6hizhdp5nywdfx9alw"; + rev = "324701806c681d43dc4d7a6a777037af4d5f5ce3"; + sha256 = "16kgzr0fzgl6mw11akzn6pg9sk1h8gvqh9rh9cvv4zh7g41nk77z"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5495,12 +5495,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "a188be8559d625049010e3b814ad30a2447095bd"; - sha256 = "0y0nnyyng2d39ma41al6vl39zws0dxdwdgx1w7qz9cabj0gpzp7p"; + rev = "8a9e8a89eec87f86b6245d77f313a040a94081c1"; + sha256 = "1gkm3pl06xvzxl5phk2g2hg8zqdpznn3jd5hjjspjfycgwscxbsx"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5639,12 +5639,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-11-14"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "a861906c8d1c457965c64ce6e83ea5e930bf8fd1"; - sha256 = "0k13dybk67d2mbw269qr7afxyvl53vl1ij2587w2jad3gdvqlqgn"; + rev = "aec0163784ac3c6d25c3735fbabdd5b294f21670"; + sha256 = "1if4ccvc1v0ljh9y8ivjxjxa22rrsfzxjiwhims8yk36r4jc3drg"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -5747,12 +5747,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "615999cf0102722da322375c6313d660b8b040d1"; - sha256 = "1nm3ynjydam8j7rqd534zbz0p6iff4v5c221ri3h7rp9pja2dr45"; + rev = "a48ddd710c6daf9a2e90646978c99e5db500dfd3"; + sha256 = "0lk3gc8kicrz6xs57mpy1znxwi6wlc7zm44cg8q0yz7ka0f4520v"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5831,12 +5831,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-11-04"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "9812a18621e00286cb82008b9407e561ed801b03"; - sha256 = "07dlk8s1lfa297ry2ybnipnibn3gr7akmkiryg6s1ysjpaddkdn3"; + rev = "666ed80fcb78cf6355f3d5b7ebdbacef6465578c"; + sha256 = "1zncna7k5k3ifr24wfjzbsby1g79cyr718lkq1vfyz798f9pkk03"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5855,12 +5855,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-11-13"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "2b802ab1e94d595ca5cc7c55f9d1fb9b17f9754c"; - sha256 = "1k4nynkgq9wsx4302mqj3gkz07r0gi0kyzkn9bdczzz4yqr7aldi"; + rev = "0fd98b0d01bfc5603e56a959acb8e875e4039ac7"; + sha256 = "0xikn3mf5k7m9f79lfk8llvpp5ry7nc4bbznbxd2d1hxjd2iz604"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5927,12 +5927,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-11-02"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "2fad33454cd6e37527a2d41f310d77b552d8c1e0"; - sha256 = "1zdcnazqawkyab9gyfqi1mvnzzil9xvzj7mz7hjqd1w6g9r2c1ip"; + rev = "40c0ab2640a0e17c4fad7e17f260414d18852ce6"; + sha256 = "194r8p8nljvh5jb8i860qp8kr4i16s5q84nc6phqjygwacsq69s8"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6011,12 +6011,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-11-06"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "01876b4373b1764f45b4ea6036e144bef0e3721e"; - sha256 = "0qq7axd1yxa90xxsr218p21nrzm3469qrq93l178wvr5znwgzfyk"; + rev = "b10165f3727f519566d69382c4a4830f16375910"; + sha256 = "0ha1hdrw5cakgxnp0n5dzn0w7kbyxfw0y396rndp70mcqanqg34r"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -6035,12 +6035,12 @@ final: prev: nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2022-11-15"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "f8e4e60a2873b6f1a28c837ab217deb1bfdc723e"; - sha256 = "1v2bb9ckbhhp6jssbwcxzqlzvwifw5gk0mlrsjkvpvmvq1lgfiiy"; + rev = "7bd46fa036bde6b4483fb7403b0a7b0754faeeaa"; + sha256 = "0cpx916mbghxbpnkqs52y3n6h6dciaapj8bgas71w7qn4i6ygmhi"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; @@ -6059,12 +6059,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "1d83fecd27c6b4b66cc529930552d205fbecb660"; - sha256 = "18hxq7xm1mf5rpbvj5sgm5ykzh5v4rf0sqhbk6k72mkrgphb61vb"; + rev = "93380716d94e451c340e653ce09d73e9cabe54c6"; + sha256 = "0xzx9iwdyz95l9bxsbb74bc35bvp5va5855c56qvimc4bcflgp5a"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6083,24 +6083,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-11-16"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "1837751efb5fcfc584cb0ee900f09ff911cd6c0b"; - sha256 = "15ff6lk6gc50qq003ipgaljagjbw3hlbsgsyw2ay0r1hxin10sks"; + rev = "e38e061710c593d9b88c8ebb2c48f2842c89dc31"; + sha256 = "1i3lb7j3nwflidkxzxwpi78ha50qvy45lsb8i4rql1hlb7ya15sd"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-11-16"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "dc27512e0019dcf4b6fbf0e0d5f285b4c9858308"; - sha256 = "0r4by55md53d5lrp86k0hv02pvzizy5hdjznywgghr008a3zd6l2"; + rev = "24caa23402247cf03cfcdd54de8cdb8ed00690ba"; + sha256 = "0f10bcszvd3wj62mv198389gcd48glqy2vii7ddks17lccf3g8xm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6143,12 +6143,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "f456fc83a1024d795cb2a3e61b52ab3d5a213e8c"; - sha256 = "1m0i3chwz4pbyw4ny86h6r01yn3s5zc1mkvp2f2wwkd8v65z8s0q"; + rev = "1435ea532a3c9e6ea48ed3438fdf48bb37277578"; + sha256 = "1m3hfidjim2cy4x3np4rqcg67cq1kqz64yaqkcj7qlwlxd29gi6p"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6335,12 +6335,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "7f53486d04f389062bbdcf130e805e09e576a0d1"; - sha256 = "01y3klhjykrayyfvnfjn9cbpdw395qif1g1xsnkiq0aj6rx412hs"; + rev = "6de1c32d7b654e20a184ef93aa26930e1b699142"; + sha256 = "0fs3dfm10ki5q358217jcglrz730v07lnpry2gwa0ghjk0k0ar81"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6395,12 +6395,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "38fb73c39c95c2c598d7b26835909a0c133d4d0e"; - sha256 = "1v7w81g23ksb6lgpfxbn0k9gbycfpcy81qvjyqd67rykgpvm1yj6"; + rev = "b82cc5df76a766c0f585f4792db7339a73e25e77"; + sha256 = "16awk2x650aj56niwi9i87bwpqj572k1vzablchym0sbkaj3726a"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7323,12 +7323,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-10-01"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "47685f0adb89928fc1b2a9b812418680f29aaf27"; - sha256 = "03l86sr766kpggxxk97rc3fy6j4igsprsh19wdq8mzk119nmww0i"; + rev = "53cac3fdb5f5e4e63e243232b6eccf3c764ae18a"; + sha256 = "0qp3b6jd6khp8wmc4s8n6sc518p6m44l7f7ln8pr91jz6qh5z30p"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -9223,12 +9223,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-11-13"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "2b9dd2f1fe5ed51ec9d03773227802fdecfe9f59"; - sha256 = "0bjw7ymi57mrmnidbcy7kqlnvg37hsci1hc4sxvqzfk6qlwvpcsc"; + rev = "3494825e8f3e78869d2da4551fb00814f8e3f285"; + sha256 = "04mdfxwdp7c0l9c1wxfhsrldy6p3nxr0zk2wa5bxwyhqzzajq7mn"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -12190,12 +12190,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-10-30"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "a1e294454128062236d758cdaefee66664051a6c"; - sha256 = "0n35b7v4j95nj1n1h1j6xnp785dqm4k9fm4cpb9lx9kaf3168a7q"; + rev = "1acb5fa4aa29a24c36d559474b672cda9b9a9b6d"; + sha256 = "1rvga45kgz5sh7yc5nqsxm6ndhdamvq8a67pw8ci1zi3n53j9xij"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -13056,12 +13056,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-11-16"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a58ff49219416b0c3f3a8b7e20f695dbe6ccc407"; - sha256 = "1z0fjiia22yvv71v54j0ywi85b9g1w21hvqf08jjihaql9x0r5fc"; + rev = "b2a69e8f780709a4637f6e2fe809d6bd2a39af52"; + sha256 = "11h6bdndglq22y6w7fxzk43dia9kslgfc40l9z8r3cikd7w0pd0a"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13417,36 +13417,36 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "eb1daa495273039b0723496eb088b0566281bf83"; - sha256 = "198ivr25gwdi5jk9nd117qn0l1pnyidllrwiccfny7axsaysh91h"; + rev = "8d4b9ed1f9cb5a575a1fa25c506409416d347241"; + sha256 = "0q26mk92h1c6n0d9l6w3r6rpb6gka4iqd5as58p6bwxxbq23w6am"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-09-27"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "c9bbe18d3f22351c99c98eb53339ca0b2a1a18b5"; - sha256 = "1dgqsg4jc10ycgz94mjbr3c2rpjr5k6mymnjr3b5xzln2z2c8d0d"; + rev = "a98a00617cc8f158eee2c100eb97113cac7e3204"; + sha256 = "0ci0ww6alb6j5x7dsg58bq4nq2km49pzk53d07fs1piad3z3hsvx"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-11-18"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "0cf23d38e29c7dbc8dde02d5384f0567494dccc8"; - sha256 = "04cr4dph2b1yizp7icmggsl2hj60sg0nx2z94f1d8wmv40c8rfvz"; + rev = "e95c1a8d8c2a849c3da63bbf7c98772b92fad7e9"; + sha256 = "1zhyiwasy207khr8dbgnl9xvay32b6wxl4plvarrpi263099z0yk"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13477,12 +13477,12 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2022-10-24"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "ec6ef450645eb6a1af843f57a40bcaf4e278e1ac"; - sha256 = "1p2klqkrrbky6jfj36px8ipg5dpb1iqz57gi9nmi1mpq9zpmm2nq"; + rev = "2b5b1f777f0583ffb39086d6c16f39e6e37459c0"; + sha256 = "1a5v9ccbkm8759m24a9y85y7d6g4yg7yr2bidjn6vqw04alwvjf6"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; From 26a33e9913c15e0f7baabe15de2442b16b6e4246 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 16:12:21 -0500 Subject: [PATCH 18/66] vimPlugins: resolve github repository redirects --- .../editors/vim/plugins/generated.nix | 22 +++++++++---------- .../editors/vim/plugins/vim-plugin-names | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a2e477c4a8fb..aba33862e8a2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3501,17 +3501,6 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; - himalaya-vim = buildVimPluginFrom2Nix { - pname = "himalaya-vim"; - version = "2022-10-09"; - src = fetchgit { - url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "747ff2a6055839cb5b403b540883515af37b7117"; - sha256 = "05d8nfzqp96s05agj4fd5r2fckdsxacl0qvlk9dhxz4dh8kgsqyi"; - }; - meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; - }; - hiPairs = buildVimPluginFrom2Nix { pname = "hiPairs"; version = "2020-12-10"; @@ -3524,6 +3513,17 @@ final: prev: meta.homepage = "https://github.com/Yggdroot/hiPairs/"; }; + himalaya-vim = buildVimPluginFrom2Nix { + pname = "himalaya-vim"; + version = "2022-10-09"; + src = fetchgit { + url = "https://git.sr.ht/~soywod/himalaya-vim"; + rev = "747ff2a6055839cb5b403b540883515af37b7117"; + sha256 = "05d8nfzqp96s05agj4fd5r2fckdsxacl0qvlk9dhxz4dh8kgsqyi"; + }; + meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; + }; + hlint-refactor-vim = buildVimPluginFrom2Nix { pname = "hlint-refactor-vim"; version = "2015-12-05"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 8e9bb27161d1..cd04d9d42272 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -293,8 +293,8 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, -https://git.sr.ht/~soywod/himalaya-vim,, https://github.com/Yggdroot/hiPairs/,, +https://git.sr.ht/~soywod/himalaya-vim,, https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, From d074e6187671e032a9833ca4757723d682ab2357 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 16:12:28 -0500 Subject: [PATCH 19/66] vimPlugins.zenbones-nvim: init at 2022-10-22 --- 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 aba33862e8a2..9486403c9236 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13343,6 +13343,18 @@ final: prev: meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; + zenbones-nvim = buildVimPluginFrom2Nix { + pname = "zenbones.nvim"; + version = "2022-10-22"; + src = fetchFromGitHub { + owner = "mcchrish"; + repo = "zenbones.nvim"; + rev = "0f7e9eb1ef309098e69e5e317508e9a7af299d94"; + sha256 = "03439c2z4p286mqncgii6gyg2pz7kk9mdfqbbfyg14ycwmfn949a"; + }; + meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; + }; + zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; version = "2022-08-13"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index cd04d9d42272..291038bb6eb7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1119,6 +1119,7 @@ https://github.com/HerringtonDarkholme/yats.vim/,, https://github.com/elkowar/yuck.vim/,HEAD, https://github.com/KabbAmine/zeavim.vim/,, https://github.com/folke/zen-mode.nvim/,, +https://github.com/mcchrish/zenbones.nvim/,HEAD, https://github.com/jnurmine/zenburn/,, https://github.com/glepnir/zephyr-nvim/,, https://github.com/ziglang/zig.vim/,, From 797860ba47049e591fc692b260e77d4e9317cc74 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 16:17:00 -0500 Subject: [PATCH 20/66] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 58 +++++++++++++------ 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 09b70ad0f982..14c265b92840 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -14,6 +14,17 @@ }; meta.homepage = "https://github.com/AusCyberman/tree-sitter-agda"; }; + arduino = buildGrammar { + language = "arduino"; + version = "c473c09"; + source = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-arduino"; + rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8"; + hash = "sha256-aAw1ZgKuMWozQzmENUhkdkHV0BjSGmTdH4Bna7EfDaQ="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; + }; astro = buildGrammar { language = "astro"; version = "947e930"; @@ -27,12 +38,12 @@ }; awk = buildGrammar { language = "awk"; - version = "a799bc5"; + version = "e559793"; source = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "a799bc5da7c2a84bc9a06ba5f3540cf1191e4ee3"; - hash = "sha256-A/mvLYD9+Ms/nBdAebBF2edVkFUkWyz3TiEIt4G5iWc="; + rev = "e559793754c60c2cdf00cbb0409842d75f0a41dc"; + hash = "sha256-qLY8lpeP0jKqhNxoSLwBTOfulK79/0KOjgq/rKWUBSA="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; @@ -526,12 +537,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "bee6b49"; + version = "aee3725"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "bee6b49543e34c2967c6294a4b05e8bd2bf2da59"; - hash = "sha256-/6WsOONbKS/5xM5xKa5i8LuWWkWiXZiLnOpvayj1Nxk="; + rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e"; + hash = "sha256-DmrrRht3g0hG+OsJCHRL+xW4jflLqtG57AuFf7zd26c="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -548,12 +559,12 @@ }; heex = buildGrammar { language = "heex"; - version = "52b804b"; + version = "2e1348c"; source = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; - rev = "52b804b1cb2d57e58d90090326d3ef9bd19cf16c"; - hash = "sha256-fuxvX0AM9FEXVdpXu9/H6y7N+S+q6X/QYuLqKdb8PGI="; + rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a"; + hash = "sha256-6LREyZhdTDt3YHVRPDyqCaDXqcsPlHOoMFDb2B3+3xM="; }; meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; @@ -645,6 +656,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; + jq = buildGrammar { + language = "jq"; + version = "13990f5"; + source = fetchFromGitHub { + owner = "flurie"; + repo = "tree-sitter-jq"; + rev = "13990f530e8e6709b7978503da9bc8701d366791"; + hash = "sha256-pek2Vg1osMYAdx6DfVdZhuIDb26op3i2cfvMrf5v3xY="; + }; + meta.homepage = "https://github.com/flurie/tree-sitter-jq"; + }; jsdoc = buildGrammar { language = "jsdoc"; version = "189a6a4"; @@ -880,12 +902,12 @@ }; norg = buildGrammar { language = "norg"; - version = "dfac5ad"; + version = "8ad2005"; source = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "dfac5ad2740a79b18ae849590a924e7bad3f1b23"; - hash = "sha256-nH9Y2mYXRehqvq0kp1DkoI2dIAaCidFAxlKos8wZmks="; + rev = "8ad20059c6f128861c4506fff866150ffee1d6f4"; + hash = "sha256-1cKH3k/nbZhZleINZ91M+glG1m2SlBJR/AP7mz/SAvI="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1114,12 +1136,12 @@ }; rego = buildGrammar { language = "rego"; - version = "6174f05"; + version = "b2667c9"; source = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; - rev = "6174f05f58e8c35d8c82323dd8c599b90b3171b3"; - hash = "sha256-hO89IYKOHDLmuq+JrXJCi3tjxn3zMwjTnWxC6ld09YA="; + rev = "b2667c975f07b33be3ceb83bea5cfbad88095866"; + hash = "sha256-y3w+gfjXb9N8Vf6ZrafP1j50Ap2KPaNfwo5h06EqHKM="; }; meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego"; }; @@ -1235,12 +1257,12 @@ }; sql = buildGrammar { language = "sql"; - version = "70c5026"; + version = "4f1b912"; source = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "70c50264ae022193adb364ffa7a767d765ed9857"; - hash = "sha256-0HlkjL+Wy82SmVLSPXL7o3Y3l/zSDaPeBygLSvdCRZs="; + rev = "4f1b91246b43190e34957d9de9a0f3625879ba33"; + hash = "sha256-g1dQ897JQwthConYMlGY25hsypr4weDsDCOWyafriw8="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; From 94322d05409ee7c65dbaccd28babe0a12b6eea28 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 20 Nov 2022 00:01:41 +0100 Subject: [PATCH 21/66] pythonPackages.domeneshop: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/domeneshop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/domeneshop/default.nix b/pkgs/development/python-modules/domeneshop/default.nix index 5c55f5adfc38..b266412219b4 100644 --- a/pkgs/development/python-modules/domeneshop/default.nix +++ b/pkgs/development/python-modules/domeneshop/default.nix @@ -11,20 +11,20 @@ buildPythonPackage rec { pname = "domeneshop"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "tr3wsrscIU66kTz3nlvDHj2EXoEHCH3grD0yD7BU3Fc="; + hash = "sha256-kL0X1mEsmVWqnq5NgsMBxeAu48zjmi3muhZYryTCOMo="; }; propagatedBuildInputs = [ certifi urllib3 - ] ++ urllib3.optional-dependencies.secure; + ]; # There are none doCheck = false; From 549e76f7a4ad370ef5a41f1b62ee79d08359bb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 19 Nov 2022 16:53:53 -0600 Subject: [PATCH 22/66] =?UTF-8?q?exempi:=202.5.1=20=E2=86=92=202.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/exempi/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 332de1595a06..3586a674904b 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "exempi"; - version = "2.5.1"; + version = "2.6.2"; src = fetchurl { url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; - sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; + sha256 = "sha256-TRfUyT3yqV2j4xcsRbelvzF90x2v0cejQBaXKMcInR0="; }; configureFlags = [ @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; doCheck = stdenv.isLinux && stdenv.is64bit; + dontDisableStatic = doCheck; meta = with lib; { description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 456e253c52c1..711df5243893 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6466,11 +6466,7 @@ with pkgs; exactaudiocopy = callPackage ../applications/audio/exact-audio-copy { }; - exempi = callPackage ../development/libraries/exempi { - stdenv = if stdenv.isDarwin then stdenv - else gcc9Stdenv; - boost = if stdenv.isDarwin then boost else boost15x; - }; + exempi = callPackage ../development/libraries/exempi { }; executor = with python3Packages; toPythonApplication executor; From 53e8108d3a5bd695f4703a4adc8524581b607025 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 05:32:09 +0000 Subject: [PATCH 23/66] syft: 0.60.3 -> 0.62.0 --- pkgs/tools/admin/syft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index c221ea38eaea..54d6f780a24f 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.60.3"; + version = "0.62.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-btPH92cLCAZFzlVoRxivBBhqzDK1bASrKbk3jvwDNo8="; + sha256 = "sha256-hed2ikV9xVDSSpLedAVcCJx/cQI5EPsb+fG2h63ij98="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorSha256 = "sha256-gwj6Tj4JqZCCLOSw+K1DpwKhcWLtJ6YY5No20WbqQHU="; + vendorSha256 = "sha256-FJtyCUzp/osfXtNRWH/gK7PGoe4gd23YxBxbF4o1qos="; nativeBuildInputs = [ installShellFiles ]; From f4994c862cf812303d23b6f30d925e0c4cb8c977 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 20 Nov 2022 11:39:29 +0100 Subject: [PATCH 24/66] newsflash: 2.1.2 -> 2.2.2 --- .../networking/feedreaders/newsflash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index e049e9c63504..7b53d2210feb 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.1.3"; + version = "2.2.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-bor1wyClLBU2uI9az3WcLvI2SldBmnZj2xhEaZj4Vg8="; + sha256 = "sha256-QEfbuTJ0spp0g/XPoS0ZaqudSkWZtXMd3ZTzAHiv45Q="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${finalAttrs.pname}-${finalAttrs.version}"; src = finalAttrs.src; - sha256 = "sha256-VkwPoh7A9sA27yU9PfD5KwL4gHKdX7Ip1hm53FuY5sE="; + sha256 = "sha256-AGsiB+xNSZzaG/PFgjKNKQopRUcyX27sLdyhT626Gcc="; }; patches = [ From 89739b5f6adb3f22656c8ba30b7e6aca64ee9477 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 19 Nov 2022 19:17:51 +0100 Subject: [PATCH 25/66] kmymoney: switch from kdewebkit to qtwebengine (to get rid of transitive dependency on qtwebkit) See PR #201028 and issue #53079 --- pkgs/applications/office/kmymoney/default.nix | 10 ++++++++-- pkgs/development/libraries/alkimia/default.nix | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 6a6ddc28449e..64167b84247c 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -3,7 +3,7 @@ , autoPatchelfHook , akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive -, kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement +, kcmutils, kcontacts, qtwebengine, kdiagram, kholidays, kidentitymanagement , kitemmodels, libical, libofx, qgpgme , sqlcipher @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-OTi4B4tzkboy4Su0I5di+uE0aDoMLsGnUQXDAso+Xj8="; }; + cmakeFlags = [ + # Remove this when upgrading to a KMyMoney release that includes + # https://invent.kde.org/office/kmymoney/-/merge_requests/118 + "-DENABLE_WEBENGINE=ON" + ]; + # Hidden dependency that wasn't included in CMakeLists.txt: NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; @@ -33,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ akonadi alkimia aqbanking gmp gwenhywfar kactivities karchive kcmutils - kcontacts kdewebkit kdiagram kholidays kidentitymanagement kitemmodels + kcontacts qtwebengine kdiagram kholidays kidentitymanagement kitemmodels libical libofx qgpgme sqlcipher diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index 186c2878cdeb..95f87ba58f6c 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -14,6 +14,9 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; + # qtwebengine is not a mandatory dependency, but it adds some features + # we might need for alkimia's dependents. See: + # https://github.com/KDE/alkimia/blob/v8.1.1/CMakeLists.txt#L124 buildInputs = [ qtbase qtwebengine kdelibs4support plasma-framework knewstuff kpackage ]; propagatedBuildInputs = [ mpir ]; From 8d9eab433a0c23f25a7bdeb9e56b6170b0eeb9fb Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 19 Nov 2022 19:56:25 +0100 Subject: [PATCH 26/66] kdewebkit: remove kdewebkit doesn't seem to be used anymore and doesn't have any nixpkgs package maintainers. I'm not sure whether the entry at https://github.com/NixOS/nixpkgs/blob/6164b7bb61395b4488919ca4bbdf918d96a7d4ab/pkgs/development/libraries/kde-frameworks/srcs.nix#L230-L237 is also part of this, but that file has a DO NOT EDIT comment, so I'm leaving it as-is. --- .../libraries/kde-frameworks/default.nix | 1 - .../libraries/kde-frameworks/kdewebkit.nix | 14 -------------- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/kdewebkit.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 2014b00b1e54..516f1ea8850f 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -159,7 +159,6 @@ let kded = callPackage ./kded.nix {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; kdesu = callPackage ./kdesu {}; - kdewebkit = callPackage ./kdewebkit.nix {}; kemoticons = callPackage ./kemoticons.nix {}; kglobalaccel = callPackage ./kglobalaccel.nix {}; kiconthemes = callPackage ./kiconthemes {}; diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix deleted file mode 100644 index b6d548cabfcd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ mkDerivation, extra-cmake-modules -, kconfig, kcoreaddons, kio, kparts, qtwebkit -}: - -mkDerivation { - pname = "kdewebkit"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kio kparts ]; - propagatedBuildInputs = [ qtwebkit ]; - outputs = [ "out" "dev" ]; - cmakeFlags = [ - "-DBUILD_DESIGNERPLUGIN=OFF" - ]; -} From 46ff0fbe6f92f59f71443b28080b7712011318ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 13:22:57 +0000 Subject: [PATCH 27/66] wvkbd: 0.11 -> 0.12 --- pkgs/applications/accessibility/wvkbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index 44a602576136..ade7971a844a 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rMaJzePtT7K0X9o9/yT1hfKIo07W2CLEZKqHwfCLQBE="; + sha256 = "sha256-5m4aeuCqSJNgerQKyP9M6Qf7P4ijCtCY4Efew6E09Bc="; }; nativeBuildInputs = [ pkg-config ]; From 18ab6d062bbaa2af7b99e4493d4baff85b6c8f09 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:27:57 +0100 Subject: [PATCH 28/66] sphinxHook: inherit from python3Packages --- doc/languages-frameworks/python.section.md | 2 +- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 1723a1337e52..58be03c8de0b 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -789,7 +789,7 @@ documentation source root. ``` The hook is also available to packages outside the python ecosystem by -referencing it using `python3.pkgs.sphinxHook`. +referencing it using `sphinxHook` from top-level. ### Develop local package {#develop-local-package} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f69ba0f7d740..6a46330a7b41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22539,6 +22539,8 @@ with pkgs; sphinx-serve = with python3Packages; toPythonApplication sphinx-serve; + inherit (python3Packages) sphinxHook; + sphinxsearch = callPackage ../servers/search/sphinxsearch { }; spice = callPackage ../development/libraries/spice { }; From 7105c088a186e8f95d03b920cbd4eaa74b895522 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 12:37:10 +0100 Subject: [PATCH 29/66] openvswitch-lts: 2.5.12 -> 2.17.3 https://www.openvswitch.org/releases/NEWS-2.17.3.txt - Generate manpages into separate output - Enable test suite - Disables a test re bash arg completion that I can't get to work - Set up meta.changelog - Some reformatting --- pkgs/os-specific/linux/openvswitch/lts.nix | 105 ++++--- .../disable-bash-arg-completion-test.patch | 12 + .../linux/openvswitch/patches/lts-ssl.patch | 274 ------------------ 3 files changed, 83 insertions(+), 308 deletions(-) create mode 100644 pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch delete mode 100644 pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 15c6c05b0613..fba63a338da1 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,26 +1,70 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which -, procps, libcap_ng, openssl, python2, perl -, automake, autoconf, libtool, kernel ? null }: - -with lib; +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, installShellFiles +, iproute2 +, kernel ? null +, libcap_ng +, libtool +, openssl +, perl +, pkg-config +, procps +, python3 +, sphinxHook +, util-linux +, which +}: let _kernel = kernel; in stdenv.mkDerivation rec { - version = "2.5.12"; + version = "2.17.3"; pname = "openvswitch"; + kernel = lib.optional (_kernel != null) _kernel.dev; + src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0a8wa1lj5p28x3vq0yaxjhqmppp4hvds6hhm0j3czpp8mc09fsfq"; + hash = "sha256-RGgR/JGuJFzDGQSmk3H7C/BEb3sk6yOaA320ADUwEcA="; }; - patches = [ ./patches/lts-ssl.patch ]; + outputs = [ + "out" + "man" + ]; - kernel = optional (_kernel != null) _kernel.dev; + patches = [ + # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) + ./patches/disable-bash-arg-completion-test.patch + ]; - nativeBuildInputs = [ autoconf libtool automake pkg-config makeWrapper ]; - buildInputs = [ util-linux openssl libcap_ng python2 perl procps which ]; + nativeBuildInputs = [ + autoconf + automake + installShellFiles + libtool + pkg-config + sphinxHook + ]; + + sphinxBuilders = [ + "man" + ]; + + sphinxRoot = "./Documentation"; + + buildInputs = [ + libcap_ng + openssl + perl + procps + python3 + util-linux + which + ]; preConfigure = "./boot.sh"; @@ -28,7 +72,7 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sharedstatedir=/var" "--sbindir=$(out)/bin" - ] ++ (optionals (_kernel != null) ["--with-linux"]); + ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); # Leave /var out of this! installFlags = [ @@ -37,34 +81,26 @@ in stdenv.mkDerivation rec { "PKIDIR=$(TMPDIR)/dummy" ]; - postBuild = '' - # fix tests - substituteInPlace xenserver/opt_xensource_libexec_interface-reconfigure --replace '/usr/bin/env python' '${python2.interpreter}' - substituteInPlace vtep/ovs-vtep --replace '/usr/bin/env python' '${python2.interpreter}' - ''; - enableParallelBuilding = true; - doCheck = false; # bash-completion test fails with "compgen: command not found" postInstall = '' - cp debian/ovs-monitor-ipsec $out/share/openvswitch/scripts - makeWrapper \ - $out/share/openvswitch/scripts/ovs-monitor-ipsec \ - $out/bin/ovs-monitor-ipsec \ - --prefix PYTHONPATH : "$out/share/openvswitch/python" - substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ - --replace "UnixctlServer.create(None)" "UnixctlServer.create(os.environ['UNIXCTLPATH'])" - substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ - --replace "self.psk_file" "root_prefix + self.psk_file" - substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ - --replace "self.cert_dir" "root_prefix + self.cert_dir" + installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash + installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash ''; + doCheck = true; + checkInputs = [ + iproute2 + ] ++ (with python3.pkgs; [ + netaddr + pyparsing + pytest + ]); + meta = with lib; { - platforms = platforms.linux; + changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; description = "A multilayer virtual switch"; - longDescription = - '' + longDescription = '' Open vSwitch is a production quality, multilayer virtual switch licensed under the open source Apache 2.0 license. It is designed to enable massive network automation through @@ -73,9 +109,10 @@ in stdenv.mkDerivation rec { RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. - ''; + ''; homepage = "https://www.openvswitch.org/"; license = licenses.asl20; maintainers = with maintainers; [ netixx kmcopper ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch b/pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch new file mode 100644 index 000000000000..2b4542741763 --- /dev/null +++ b/pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch @@ -0,0 +1,12 @@ +diff --git a/tests/completion.at b/tests/completion.at +index b6155af25..6367cb545 100644 +--- a/tests/completion.at ++++ b/tests/completion.at +@@ -425,6 +425,7 @@ AT_CLEANUP + + + AT_SETUP([vsctl-bashcomp - argument completion]) ++AT_SKIP_IF([true]) + AT_SKIP_IF([test -z ${BASH_VERSION+x}]) + AT_SKIP_IF([eval 'test ${BASH_VERSINFO[[0]]} -lt 4']) + OVS_VSWITCHD_START( diff --git a/pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch b/pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch deleted file mode 100644 index 0d8ff5b0d523..000000000000 --- a/pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch +++ /dev/null @@ -1,274 +0,0 @@ -diff --git a/build-aux/automake.mk b/build-aux/automake.mk -new file mode 100644 -index 000000000..5d2657fd6 ---- /dev/null -+++ b/build-aux/automake.mk -@@ -0,0 +1,2 @@ -+EXTRA_DIST += \ -+ build-aux/generate-dhparams-c -diff --git a/build-aux/generate-dhparams-c b/build-aux/generate-dhparams-c -new file mode 100755 -index 000000000..bcd25e2d8 ---- /dev/null -+++ b/build-aux/generate-dhparams-c -@@ -0,0 +1,33 @@ -+#! /bin/sh -e -+ -+cat <<'EOF' -+/* Generated automatically; do not modify! -*- buffer-read-only: t -*- -+ * -+ * If you do need to regenerate this file, run "make generate-dhparams-c". */ -+ -+#include -+#include "lib/dhparams.h" -+#include "lib/util.h" -+ -+static int -+my_DH_set0_pqg(DH *dh, BIGNUM *p, const BIGNUM **q OVS_UNUSED, BIGNUM *g) -+{ -+ ovs_assert(q == NULL); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+ dh->p = p; -+ dh->g = g; -+ return 1; -+#else -+ return DH_set0_pqg(dh, p, NULL, g); -+#endif -+} -+EOF -+(openssl dhparam -C -in lib/dh1024.pem -noout && -+openssl dhparam -C -in lib/dh2048.pem -noout && -+openssl dhparam -C -in lib/dh4096.pem -noout) | sed ' -+ s/^static DH/DH/ -+ s/\(get_dh[0-9]*\)()/\1(void)/ -+ s/\(DH_set0_pqg\)/my_\1/ -+ s/[ ]*$// -+ s/ / /g -+' -diff --git a/lib/automake.mk b/lib/automake.mk -index 5387d519a..804a8b7d7 100644 ---- a/lib/automake.mk -+++ b/lib/automake.mk -@@ -399,15 +399,16 @@ lib_libopenvswitch_la_SOURCES += \ - lib/route-table-bsd.c - endif - -+.PHONY: generate-dhparams-c - if HAVE_OPENSSL --lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c --nodist_lib_libopenvswitch_la_SOURCES += lib/dhparams.c --lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem -- $(AM_V_GEN)(echo '#include "lib/dhparams.h"' && \ -- openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout && \ -- openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout && \ -- openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) \ -- | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp && \ -+lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c lib/dhparams.c -+ -+# Manually regenerates lib/dhparams.c. Not normally necessary since -+# lib/dhparams.c is part of the repository and doesn't normally need -+# updates. -+generate-dhparams-c: -+ $(AM_V_GEN)cd $(srcdir) && \ -+ build-aux/generate-dhparams-c > lib/dhparams.c.tmp && \ - mv lib/dhparams.c.tmp lib/dhparams.c - else - lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c -diff --git a/lib/dhparams.c b/lib/dhparams.c -new file mode 100644 -index 000000000..4e42efad2 ---- /dev/null -+++ b/lib/dhparams.c -@@ -0,0 +1,192 @@ -+/* Generated automatically; do not modify! -*- buffer-read-only: t -*- -+ * -+ * If you do need to regenerate this file, run "make generate-dhparams-c". */ -+ -+#include -+#include "lib/dhparams.h" -+#include "lib/util.h" -+ -+static int -+my_DH_set0_pqg(DH *dh, BIGNUM *p, const BIGNUM **q OVS_UNUSED, BIGNUM *g) -+{ -+ ovs_assert(q == NULL); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+ dh->p = p; -+ dh->g = g; -+ return 1; -+#else -+ return DH_set0_pqg(dh, p, NULL, g); -+#endif -+} -+#ifndef HEADER_DH_H -+# include -+#endif -+ -+DH *get_dh1024(void) -+{ -+ static unsigned char dhp_1024[] = { -+ 0xF4, 0x88, 0xFD, 0x58, 0x4E, 0x49, 0xDB, 0xCD, 0x20, 0xB4, -+ 0x9D, 0xE4, 0x91, 0x07, 0x36, 0x6B, 0x33, 0x6C, 0x38, 0x0D, -+ 0x45, 0x1D, 0x0F, 0x7C, 0x88, 0xB3, 0x1C, 0x7C, 0x5B, 0x2D, -+ 0x8E, 0xF6, 0xF3, 0xC9, 0x23, 0xC0, 0x43, 0xF0, 0xA5, 0x5B, -+ 0x18, 0x8D, 0x8E, 0xBB, 0x55, 0x8C, 0xB8, 0x5D, 0x38, 0xD3, -+ 0x34, 0xFD, 0x7C, 0x17, 0x57, 0x43, 0xA3, 0x1D, 0x18, 0x6C, -+ 0xDE, 0x33, 0x21, 0x2C, 0xB5, 0x2A, 0xFF, 0x3C, 0xE1, 0xB1, -+ 0x29, 0x40, 0x18, 0x11, 0x8D, 0x7C, 0x84, 0xA7, 0x0A, 0x72, -+ 0xD6, 0x86, 0xC4, 0x03, 0x19, 0xC8, 0x07, 0x29, 0x7A, 0xCA, -+ 0x95, 0x0C, 0xD9, 0x96, 0x9F, 0xAB, 0xD0, 0x0A, 0x50, 0x9B, -+ 0x02, 0x46, 0xD3, 0x08, 0x3D, 0x66, 0xA4, 0x5D, 0x41, 0x9F, -+ 0x9C, 0x7C, 0xBD, 0x89, 0x4B, 0x22, 0x19, 0x26, 0xBA, 0xAB, -+ 0xA2, 0x5E, 0xC3, 0x55, 0xE9, 0x2F, 0x78, 0xC7 -+ }; -+ static unsigned char dhg_1024[] = { -+ 0x02 -+ }; -+ DH *dh = DH_new(); -+ BIGNUM *dhp_bn, *dhg_bn; -+ -+ if (dh == NULL) -+ return NULL; -+ dhp_bn = BN_bin2bn(dhp_1024, sizeof (dhp_1024), NULL); -+ dhg_bn = BN_bin2bn(dhg_1024, sizeof (dhg_1024), NULL); -+ if (dhp_bn == NULL || dhg_bn == NULL -+ || !my_DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { -+ DH_free(dh); -+ BN_free(dhp_bn); -+ BN_free(dhg_bn); -+ return NULL; -+ } -+ return dh; -+} -+#ifndef HEADER_DH_H -+# include -+#endif -+ -+DH *get_dh2048(void) -+{ -+ static unsigned char dhp_2048[] = { -+ 0xF6, 0x42, 0x57, 0xB7, 0x08, 0x7F, 0x08, 0x17, 0x72, 0xA2, -+ 0xBA, 0xD6, 0xA9, 0x42, 0xF3, 0x05, 0xE8, 0xF9, 0x53, 0x11, -+ 0x39, 0x4F, 0xB6, 0xF1, 0x6E, 0xB9, 0x4B, 0x38, 0x20, 0xDA, -+ 0x01, 0xA7, 0x56, 0xA3, 0x14, 0xE9, 0x8F, 0x40, 0x55, 0xF3, -+ 0xD0, 0x07, 0xC6, 0xCB, 0x43, 0xA9, 0x94, 0xAD, 0xF7, 0x4C, -+ 0x64, 0x86, 0x49, 0xF8, 0x0C, 0x83, 0xBD, 0x65, 0xE9, 0x17, -+ 0xD4, 0xA1, 0xD3, 0x50, 0xF8, 0xF5, 0x59, 0x5F, 0xDC, 0x76, -+ 0x52, 0x4F, 0x3D, 0x3D, 0x8D, 0xDB, 0xCE, 0x99, 0xE1, 0x57, -+ 0x92, 0x59, 0xCD, 0xFD, 0xB8, 0xAE, 0x74, 0x4F, 0xC5, 0xFC, -+ 0x76, 0xBC, 0x83, 0xC5, 0x47, 0x30, 0x61, 0xCE, 0x7C, 0xC9, -+ 0x66, 0xFF, 0x15, 0xF9, 0xBB, 0xFD, 0x91, 0x5E, 0xC7, 0x01, -+ 0xAA, 0xD3, 0x5B, 0x9E, 0x8D, 0xA0, 0xA5, 0x72, 0x3A, 0xD4, -+ 0x1A, 0xF0, 0xBF, 0x46, 0x00, 0x58, 0x2B, 0xE5, 0xF4, 0x88, -+ 0xFD, 0x58, 0x4E, 0x49, 0xDB, 0xCD, 0x20, 0xB4, 0x9D, 0xE4, -+ 0x91, 0x07, 0x36, 0x6B, 0x33, 0x6C, 0x38, 0x0D, 0x45, 0x1D, -+ 0x0F, 0x7C, 0x88, 0xB3, 0x1C, 0x7C, 0x5B, 0x2D, 0x8E, 0xF6, -+ 0xF3, 0xC9, 0x23, 0xC0, 0x43, 0xF0, 0xA5, 0x5B, 0x18, 0x8D, -+ 0x8E, 0xBB, 0x55, 0x8C, 0xB8, 0x5D, 0x38, 0xD3, 0x34, 0xFD, -+ 0x7C, 0x17, 0x57, 0x43, 0xA3, 0x1D, 0x18, 0x6C, 0xDE, 0x33, -+ 0x21, 0x2C, 0xB5, 0x2A, 0xFF, 0x3C, 0xE1, 0xB1, 0x29, 0x40, -+ 0x18, 0x11, 0x8D, 0x7C, 0x84, 0xA7, 0x0A, 0x72, 0xD6, 0x86, -+ 0xC4, 0x03, 0x19, 0xC8, 0x07, 0x29, 0x7A, 0xCA, 0x95, 0x0C, -+ 0xD9, 0x96, 0x9F, 0xAB, 0xD0, 0x0A, 0x50, 0x9B, 0x02, 0x46, -+ 0xD3, 0x08, 0x3D, 0x66, 0xA4, 0x5D, 0x41, 0x9F, 0x9C, 0x7C, -+ 0xBD, 0x89, 0x4B, 0x22, 0x19, 0x26, 0xBA, 0xAB, 0xA2, 0x5E, -+ 0xC3, 0x55, 0xE9, 0x32, 0x0B, 0x3B -+ }; -+ static unsigned char dhg_2048[] = { -+ 0x02 -+ }; -+ DH *dh = DH_new(); -+ BIGNUM *dhp_bn, *dhg_bn; -+ -+ if (dh == NULL) -+ return NULL; -+ dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL); -+ dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL); -+ if (dhp_bn == NULL || dhg_bn == NULL -+ || !my_DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { -+ DH_free(dh); -+ BN_free(dhp_bn); -+ BN_free(dhg_bn); -+ return NULL; -+ } -+ return dh; -+} -+#ifndef HEADER_DH_H -+# include -+#endif -+ -+DH *get_dh4096(void) -+{ -+ static unsigned char dhp_4096[] = { -+ 0xFA, 0x14, 0x72, 0x52, 0xC1, 0x4D, 0xE1, 0x5A, 0x49, 0xD4, -+ 0xEF, 0x09, 0x2D, 0xC0, 0xA8, 0xFD, 0x55, 0xAB, 0xD7, 0xD9, -+ 0x37, 0x04, 0x28, 0x09, 0xE2, 0xE9, 0x3E, 0x77, 0xE2, 0xA1, -+ 0x7A, 0x18, 0xDD, 0x46, 0xA3, 0x43, 0x37, 0x23, 0x90, 0x97, -+ 0xF3, 0x0E, 0xC9, 0x03, 0x50, 0x7D, 0x65, 0xCF, 0x78, 0x62, -+ 0xA6, 0x3A, 0x62, 0x22, 0x83, 0xA1, 0x2F, 0xFE, 0x79, 0xBA, -+ 0x35, 0xFF, 0x59, 0xD8, 0x1D, 0x61, 0xDD, 0x1E, 0x21, 0x13, -+ 0x17, 0xFE, 0xCD, 0x38, 0x87, 0x9E, 0xF5, 0x4F, 0x79, 0x10, -+ 0x61, 0x8D, 0xD4, 0x22, 0xF3, 0x5A, 0xED, 0x5D, 0xEA, 0x21, -+ 0xE9, 0x33, 0x6B, 0x48, 0x12, 0x0A, 0x20, 0x77, 0xD4, 0x25, -+ 0x60, 0x61, 0xDE, 0xF6, 0xB4, 0x4F, 0x1C, 0x63, 0x40, 0x8B, -+ 0x3A, 0x21, 0x93, 0x8B, 0x79, 0x53, 0x51, 0x2C, 0xCA, 0xB3, -+ 0x7B, 0x29, 0x56, 0xA8, 0xC7, 0xF8, 0xF4, 0x7B, 0x08, 0x5E, -+ 0xA6, 0xDC, 0xA2, 0x45, 0x12, 0x56, 0xDD, 0x41, 0x92, 0xF2, -+ 0xDD, 0x5B, 0x8F, 0x23, 0xF0, 0xF3, 0xEF, 0xE4, 0x3B, 0x0A, -+ 0x44, 0xDD, 0xED, 0x96, 0x84, 0xF1, 0xA8, 0x32, 0x46, 0xA3, -+ 0xDB, 0x4A, 0xBE, 0x3D, 0x45, 0xBA, 0x4E, 0xF8, 0x03, 0xE5, -+ 0xDD, 0x6B, 0x59, 0x0D, 0x84, 0x1E, 0xCA, 0x16, 0x5A, 0x8C, -+ 0xC8, 0xDF, 0x7C, 0x54, 0x44, 0xC4, 0x27, 0xA7, 0x3B, 0x2A, -+ 0x97, 0xCE, 0xA3, 0x7D, 0x26, 0x9C, 0xAD, 0xF4, 0xC2, 0xAC, -+ 0x37, 0x4B, 0xC3, 0xAD, 0x68, 0x84, 0x7F, 0x99, 0xA6, 0x17, -+ 0xEF, 0x6B, 0x46, 0x3A, 0x7A, 0x36, 0x7A, 0x11, 0x43, 0x92, -+ 0xAD, 0xE9, 0x9C, 0xFB, 0x44, 0x6C, 0x3D, 0x82, 0x49, 0xCC, -+ 0x5C, 0x6A, 0x52, 0x42, 0xF8, 0x42, 0xFB, 0x44, 0xF9, 0x39, -+ 0x73, 0xFB, 0x60, 0x79, 0x3B, 0xC2, 0x9E, 0x0B, 0xDC, 0xD4, -+ 0xA6, 0x67, 0xF7, 0x66, 0x3F, 0xFC, 0x42, 0x3B, 0x1B, 0xDB, -+ 0x4F, 0x66, 0xDC, 0xA5, 0x8F, 0x66, 0xF9, 0xEA, 0xC1, 0xED, -+ 0x31, 0xFB, 0x48, 0xA1, 0x82, 0x7D, 0xF8, 0xE0, 0xCC, 0xB1, -+ 0xC7, 0x03, 0xE4, 0xF8, 0xB3, 0xFE, 0xB7, 0xA3, 0x13, 0x73, -+ 0xA6, 0x7B, 0xC1, 0x0E, 0x39, 0xC7, 0x94, 0x48, 0x26, 0x00, -+ 0x85, 0x79, 0xFC, 0x6F, 0x7A, 0xAF, 0xC5, 0x52, 0x35, 0x75, -+ 0xD7, 0x75, 0xA4, 0x40, 0xFA, 0x14, 0x74, 0x61, 0x16, 0xF2, -+ 0xEB, 0x67, 0x11, 0x6F, 0x04, 0x43, 0x3D, 0x11, 0x14, 0x4C, -+ 0xA7, 0x94, 0x2A, 0x39, 0xA1, 0xC9, 0x90, 0xCF, 0x83, 0xC6, -+ 0xFF, 0x02, 0x8F, 0xA3, 0x2A, 0xAC, 0x26, 0xDF, 0x0B, 0x8B, -+ 0xBE, 0x64, 0x4A, 0xF1, 0xA1, 0xDC, 0xEE, 0xBA, 0xC8, 0x03, -+ 0x82, 0xF6, 0x62, 0x2C, 0x5D, 0xB6, 0xBB, 0x13, 0x19, 0x6E, -+ 0x86, 0xC5, 0x5B, 0x2B, 0x5E, 0x3A, 0xF3, 0xB3, 0x28, 0x6B, -+ 0x70, 0x71, 0x3A, 0x8E, 0xFF, 0x5C, 0x15, 0xE6, 0x02, 0xA4, -+ 0xCE, 0xED, 0x59, 0x56, 0xCC, 0x15, 0x51, 0x07, 0x79, 0x1A, -+ 0x0F, 0x25, 0x26, 0x27, 0x30, 0xA9, 0x15, 0xB2, 0xC8, 0xD4, -+ 0x5C, 0xCC, 0x30, 0xE8, 0x1B, 0xD8, 0xD5, 0x0F, 0x19, 0xA8, -+ 0x80, 0xA4, 0xC7, 0x01, 0xAA, 0x8B, 0xBA, 0x53, 0xBB, 0x47, -+ 0xC2, 0x1F, 0x6B, 0x54, 0xB0, 0x17, 0x60, 0xED, 0x79, 0x21, -+ 0x95, 0xB6, 0x05, 0x84, 0x37, 0xC8, 0x03, 0xA4, 0xDD, 0xD1, -+ 0x06, 0x69, 0x8F, 0x4C, 0x39, 0xE0, 0xC8, 0x5D, 0x83, 0x1D, -+ 0xBE, 0x6A, 0x9A, 0x99, 0xF3, 0x9F, 0x0B, 0x45, 0x29, 0xD4, -+ 0xCB, 0x29, 0x66, 0xEE, 0x1E, 0x7E, 0x3D, 0xD7, 0x13, 0x4E, -+ 0xDB, 0x90, 0x90, 0x58, 0xCB, 0x5E, 0x9B, 0xCD, 0x2E, 0x2B, -+ 0x0F, 0xA9, 0x4E, 0x78, 0xAC, 0x05, 0x11, 0x7F, 0xE3, 0x9E, -+ 0x27, 0xD4, 0x99, 0xE1, 0xB9, 0xBD, 0x78, 0xE1, 0x84, 0x41, -+ 0xA0, 0xDF -+ }; -+ static unsigned char dhg_4096[] = { -+ 0x02 -+ }; -+ DH *dh = DH_new(); -+ BIGNUM *dhp_bn, *dhg_bn; -+ -+ if (dh == NULL) -+ return NULL; -+ dhp_bn = BN_bin2bn(dhp_4096, sizeof (dhp_4096), NULL); -+ dhg_bn = BN_bin2bn(dhg_4096, sizeof (dhg_4096), NULL); -+ if (dhp_bn == NULL || dhg_bn == NULL -+ || !my_DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { -+ DH_free(dh); -+ BN_free(dhp_bn); -+ BN_free(dhg_bn); -+ return NULL; -+ } -+ return dh; -+} From 92097927de79f25e165e9e24a7a7a75b9206d18c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:29:21 +0100 Subject: [PATCH 30/66] openvswitch: 2.7.12 -> 3.0.1 https://www.openvswitch.org/releases/NEWS-3.0.1.txt - Generate manpages into separate output - Enable test suite - Disables a test re bash arg completion that I can't get to work - Set up meta.changelog - Some reformatting --- .../os-specific/linux/openvswitch/default.nix | 97 ++++++++++++++----- 1 file changed, 72 insertions(+), 25 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 50cecbec3039..f5bc64168ce0 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,33 +1,72 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which -, procps, libcap_ng, openssl, python3 , perl -, kernel ? null }: - -with lib; +{ lib +, stdenv +, fetchurl +, installShellFiles +, iproute2 +, kernel ? null +, libcap_ng +, openssl +, perl +, pkg-config +, procps +, python3 +, sphinxHook +, util-linux +, which +}: let _kernel = kernel; - pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.17.2"; + version = "3.0.1"; pname = "openvswitch"; + kernel = lib.optional (_kernel != null) _kernel.dev; + src = fetchurl { - url = "https://www.openvswitch.org/releases/openvswitch-${version}.tar.gz"; - sha256 = "sha256-ai4NtCutuMvK9/O+vVtemicBMZ3x0EKU6aennpRQTWk="; + url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; + hash = "sha256-5KEXFtCRn1syOSKLMrrcEJtWGl/maLlUfhQ7CxlbvWg="; }; - kernel = optional (_kernel != null) _kernel.dev; - - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ - util-linux openssl libcap_ng pythonEnv perl procps which + outputs = [ + "out" + "man" ]; + patches = [ + # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) + ./patches/disable-bash-arg-completion-test.patch + ]; + + nativeBuildInputs = [ + installShellFiles + pkg-config + sphinxHook + ]; + + sphinxBuilders = [ + "man" + ]; + + sphinxRoot = "./Documentation"; + + buildInputs = [ + libcap_ng + openssl + perl + procps + python3 + util-linux + which + ]; + + preConfigure = "./boot.sh"; + configureFlags = [ "--localstatedir=/var" "--sharedstatedir=/var" "--sbindir=$(out)/bin" - ] ++ (optionals (_kernel != null) ["--with-linux"]); + ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); # Leave /var out of this! installFlags = [ @@ -36,20 +75,27 @@ in stdenv.mkDerivation rec { "PKIDIR=$(TMPDIR)/dummy" ]; - postBuild = '' - # fix tests - substituteInPlace xenserver/opt_xensource_libexec_interface-reconfigure --replace '/usr/bin/env python' '${pythonEnv.interpreter}' - substituteInPlace vtep/ovs-vtep --replace '/usr/bin/env python' '${pythonEnv.interpreter}' + enableParallelBuilding = true; + + postInstall = '' + installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash + installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash ''; - enableParallelBuilding = true; - doCheck = false; # bash-completion test fails with "compgen: command not found" + doCheck = true; + + checkInputs = [ + iproute2 + ] ++ (with python3.pkgs; [ + netaddr + pyparsing + pytest + ]); meta = with lib; { - platforms = platforms.linux; + changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; description = "A multilayer virtual switch"; - longDescription = - '' + longDescription = '' Open vSwitch is a production quality, multilayer virtual switch licensed under the open source Apache 2.0 license. It is designed to enable massive network automation through @@ -58,9 +104,10 @@ in stdenv.mkDerivation rec { RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. - ''; + ''; homepage = "https://www.openvswitch.org/"; license = licenses.asl20; maintainers = with maintainers; [ netixx kmcopper ]; + platforms = platforms.linux; }; } From 217cf995216ae8797079fdfd41e6398455d4a4ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:42:11 +0100 Subject: [PATCH 31/66] openvswitch: generalize builder --- .../os-specific/linux/openvswitch/default.nix | 113 +--------------- .../os-specific/linux/openvswitch/generic.nix | 123 ++++++++++++++++++ pkgs/os-specific/linux/openvswitch/lts.nix | 118 +---------------- 3 files changed, 127 insertions(+), 227 deletions(-) create mode 100644 pkgs/os-specific/linux/openvswitch/generic.nix diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index f5bc64168ce0..9d902fe9b70f 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,113 +1,4 @@ -{ lib -, stdenv -, fetchurl -, installShellFiles -, iproute2 -, kernel ? null -, libcap_ng -, openssl -, perl -, pkg-config -, procps -, python3 -, sphinxHook -, util-linux -, which -}: - -let - _kernel = kernel; -in stdenv.mkDerivation rec { +import ./generic.nix { version = "3.0.1"; - pname = "openvswitch"; - - kernel = lib.optional (_kernel != null) _kernel.dev; - - src = fetchurl { - url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-5KEXFtCRn1syOSKLMrrcEJtWGl/maLlUfhQ7CxlbvWg="; - }; - - outputs = [ - "out" - "man" - ]; - - patches = [ - # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) - ./patches/disable-bash-arg-completion-test.patch - ]; - - nativeBuildInputs = [ - installShellFiles - pkg-config - sphinxHook - ]; - - sphinxBuilders = [ - "man" - ]; - - sphinxRoot = "./Documentation"; - - buildInputs = [ - libcap_ng - openssl - perl - procps - python3 - util-linux - which - ]; - - preConfigure = "./boot.sh"; - - configureFlags = [ - "--localstatedir=/var" - "--sharedstatedir=/var" - "--sbindir=$(out)/bin" - ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); - - # Leave /var out of this! - installFlags = [ - "LOGDIR=$(TMPDIR)/dummy" - "RUNDIR=$(TMPDIR)/dummy" - "PKIDIR=$(TMPDIR)/dummy" - ]; - - enableParallelBuilding = true; - - postInstall = '' - installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash - installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash - ''; - - doCheck = true; - - checkInputs = [ - iproute2 - ] ++ (with python3.pkgs; [ - netaddr - pyparsing - pytest - ]); - - meta = with lib; { - changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; - description = "A multilayer virtual switch"; - longDescription = '' - Open vSwitch is a production quality, multilayer virtual switch - licensed under the open source Apache 2.0 license. It is - designed to enable massive network automation through - programmatic extension, while still supporting standard - management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, - RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to - support distribution across multiple physical servers similar - to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. - ''; - homepage = "https://www.openvswitch.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ netixx kmcopper ]; - platforms = platforms.linux; - }; + hash = "sha256-5KEXFtCRn1syOSKLMrrcEJtWGl/maLlUfhQ7CxlbvWg="; } diff --git a/pkgs/os-specific/linux/openvswitch/generic.nix b/pkgs/os-specific/linux/openvswitch/generic.nix new file mode 100644 index 000000000000..c3d180bcbb7f --- /dev/null +++ b/pkgs/os-specific/linux/openvswitch/generic.nix @@ -0,0 +1,123 @@ +{ version +, hash +}: + +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, installShellFiles +, iproute2 +, kernel ? null +, libcap_ng +, libtool +, openssl +, perl +, pkg-config +, procps +, python3 +, sphinxHook +, util-linux +, which +}: + +let + _kernel = kernel; +in stdenv.mkDerivation rec { + pname = "openvswitch"; + inherit version; + + kernel = lib.optional (_kernel != null) _kernel.dev; + + src = fetchurl { + url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; + inherit hash; + }; + + outputs = [ + "out" + "man" + ]; + + patches = [ + # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) + ./patches/disable-bash-arg-completion-test.patch + ]; + + nativeBuildInputs = [ + autoconf + automake + installShellFiles + libtool + pkg-config + sphinxHook + ]; + + sphinxBuilders = [ + "man" + ]; + + sphinxRoot = "./Documentation"; + + buildInputs = [ + libcap_ng + openssl + perl + procps + python3 + util-linux + which + ]; + + preConfigure = "./boot.sh"; + + configureFlags = [ + "--localstatedir=/var" + "--sharedstatedir=/var" + "--sbindir=$(out)/bin" + ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); + + # Leave /var out of this! + installFlags = [ + "LOGDIR=$(TMPDIR)/dummy" + "RUNDIR=$(TMPDIR)/dummy" + "PKIDIR=$(TMPDIR)/dummy" + ]; + + enableParallelBuilding = true; + + postInstall = '' + installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash + installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash + ''; + + doCheck = true; + + checkInputs = [ + iproute2 + ] ++ (with python3.pkgs; [ + netaddr + pyparsing + pytest + ]); + + meta = with lib; { + changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; + description = "A multilayer virtual switch"; + longDescription = '' + Open vSwitch is a production quality, multilayer virtual switch + licensed under the open source Apache 2.0 license. It is + designed to enable massive network automation through + programmatic extension, while still supporting standard + management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, + RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to + support distribution across multiple physical servers similar + to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. + ''; + homepage = "https://www.openvswitch.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ netixx kmcopper ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index fba63a338da1..453d05a5afc1 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,118 +1,4 @@ -{ lib -, stdenv -, fetchurl -, autoconf -, automake -, installShellFiles -, iproute2 -, kernel ? null -, libcap_ng -, libtool -, openssl -, perl -, pkg-config -, procps -, python3 -, sphinxHook -, util-linux -, which -}: - -let - _kernel = kernel; -in stdenv.mkDerivation rec { +import ./generic.nix { version = "2.17.3"; - pname = "openvswitch"; - - kernel = lib.optional (_kernel != null) _kernel.dev; - - src = fetchurl { - url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-RGgR/JGuJFzDGQSmk3H7C/BEb3sk6yOaA320ADUwEcA="; - }; - - outputs = [ - "out" - "man" - ]; - - patches = [ - # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) - ./patches/disable-bash-arg-completion-test.patch - ]; - - nativeBuildInputs = [ - autoconf - automake - installShellFiles - libtool - pkg-config - sphinxHook - ]; - - sphinxBuilders = [ - "man" - ]; - - sphinxRoot = "./Documentation"; - - buildInputs = [ - libcap_ng - openssl - perl - procps - python3 - util-linux - which - ]; - - preConfigure = "./boot.sh"; - - configureFlags = [ - "--localstatedir=/var" - "--sharedstatedir=/var" - "--sbindir=$(out)/bin" - ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); - - # Leave /var out of this! - installFlags = [ - "LOGDIR=$(TMPDIR)/dummy" - "RUNDIR=$(TMPDIR)/dummy" - "PKIDIR=$(TMPDIR)/dummy" - ]; - - enableParallelBuilding = true; - - postInstall = '' - installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash - installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash - ''; - - doCheck = true; - checkInputs = [ - iproute2 - ] ++ (with python3.pkgs; [ - netaddr - pyparsing - pytest - ]); - - meta = with lib; { - changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; - description = "A multilayer virtual switch"; - longDescription = '' - Open vSwitch is a production quality, multilayer virtual switch - licensed under the open source Apache 2.0 license. It is - designed to enable massive network automation through - programmatic extension, while still supporting standard - management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, - RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to - support distribution across multiple physical servers similar - to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. - ''; - homepage = "https://www.openvswitch.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ netixx kmcopper ]; - platforms = platforms.linux; - }; + hash = "sha256-RGgR/JGuJFzDGQSmk3H7C/BEb3sk6yOaA320ADUwEcA="; } From 7ce12e6fc0943eda8b7e04d778dd450966330ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 20 Nov 2022 10:14:45 -0600 Subject: [PATCH 32/66] pythonPackages.python-xmp-toolkit: disable some failing tests from unmaintained package --- .../python-modules/python-xmp-toolkit/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 463ccb25b7dc..428bf73beb15 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -2,7 +2,6 @@ , exempi , fetchFromGitHub , mock -, pythonOlder , pytz , lib, stdenv }: @@ -26,8 +25,6 @@ buildPythonPackage { buildInputs = [ exempi ]; - checkInputs = lib.optionals (pythonOlder "3.3") [ mock ]; - propagatedBuildInputs = [ pytz ]; postPatch = '' @@ -38,6 +35,10 @@ buildPythonPackage { # hangs on darwin + sandbox doCheck = !stdenv.isDarwin; + preCheck = '' + rm test/{test_exempi,test_files}.py + ''; + meta = with lib; { homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit"; description = "Python XMP Toolkit for working with metadata"; From db3f86f9203cf3b6a6cb73f269bc6eff4fe588a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 16:29:54 +0000 Subject: [PATCH 33/66] python310Packages.lsassy: 3.1.4 -> 3.1.6 --- pkgs/development/python-modules/lsassy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 8a47fb08404c..56cb4cc6ae8f 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "lsassy"; - version = "3.1.4"; + version = "3.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Hackndo"; repo = pname; - rev = "v${version}"; - hash = "sha256-/YDBzH8Mji6PWBEIbsgZcTvoAWAsBbJV3cHfySY/gGA="; + rev = "refs/tags/v${version}"; + hash = "sha256-Rdgz9hU2un1CKX2dRI8tVzL2lG7Ufd5HwninOxOsxjM="; }; propagatedBuildInputs = [ From dde2c6235817ed8f97cedbadb7e6be116d0c53bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 16:54:19 +0000 Subject: [PATCH 34/66] python310Packages.manimpango: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/manimpango/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index f77aa81bbb60..cb618a8b5029 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; - rev = "v${version}"; - hash = "sha256-ourSUYBAFONdupdsjo/PtwRQpXS7HqLxrHj0Ejr/Wdw="; + rev = "refs/tags/v${version}"; + hash = "sha256-ftoESXUMc+jnKmEzhmwZc/R7vVX9idsezPFHRUzPbaU="; }; nativeBuildInputs = [ From 957e368f3d822a7892d18da9493a8c1d48ee8bef Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Nov 2022 11:54:07 +0100 Subject: [PATCH 35/66] nixos/grafana: `provision.{datasources,dashboards}` can't be a list anymore The hack with `either` had the side-effect that the sub-options of the submodule didn't appear in the manual. I decided to remove this because the "migration" isn't that hard, you just need to fix some module declarations. However, `mkRenamedOptionModule` wouldn't work here because it'd create a "virtual" option for the deprecated path (i.e. `services.grafana.provision.{datasources,dashboards}`), but that's the already a new option, i.e. the submodule for the new stuff. To make sure that you still get errors, I implemented a small hack using `coercedTo` which throws an error if a list is specified (as it would be done on 22.05) which explains what to do instead to make the migration easier. Also, I linkified the options in the manual now to make it easier to navigate between those. --- nixos/modules/services/monitoring/grafana.nix | 111 ++++++++---------- nixos/tests/grafana/provision/default.nix | 70 +++-------- 2 files changed, 67 insertions(+), 114 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 52d5cab9f515..3ce52bc13e91 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -13,21 +13,9 @@ let settingsFormatIni = pkgs.formats.ini {}; configFile = settingsFormatIni.generate "config.ini" cfg.settings; - datasourceConfiguration = { - apiVersion = 1; - datasources = cfg.provision.datasources; - }; + datasourceFile = if (cfg.provision.datasources.path == null) then provisioningSettingsFormat.generate "datasource.yaml" cfg.provision.datasources.settings else cfg.provision.datasources.path; - datasourceFileNew = if (cfg.provision.datasources.path == null) then provisioningSettingsFormat.generate "datasource.yaml" cfg.provision.datasources.settings else cfg.provision.datasources.path; - datasourceFile = if (builtins.isList cfg.provision.datasources) then provisioningSettingsFormat.generate "datasource.yaml" datasourceConfiguration else datasourceFileNew; - - dashboardConfiguration = { - apiVersion = 1; - providers = cfg.provision.dashboards; - }; - - dashboardFileNew = if (cfg.provision.dashboards.path == null) then provisioningSettingsFormat.generate "dashboard.yaml" cfg.provision.dashboards.settings else cfg.provision.dashboards.path; - dashboardFile = if (builtins.isList cfg.provision.dashboards) then provisioningSettingsFormat.generate "dashboard.yaml" dashboardConfiguration else dashboardFileNew; + dashboardFile = if (cfg.provision.dashboards.path == null) then provisioningSettingsFormat.generate "dashboard.yaml" cfg.provision.dashboards.settings else cfg.provision.dashboards.path; notifierConfiguration = { apiVersion = 1; @@ -60,6 +48,26 @@ let # Get a submodule without any embedded metadata: _filter = x: filterAttrs (k: v: k != "_module") x; + # FIXME(@Ma27) remove before 23.05. This is just a helper-type + # because `mkRenamedOptionModule` doesn't work if `foo.bar` is renamed + # to `foo.bar.baz`. + submodule' = module: types.coercedTo + (mkOptionType { + name = "grafana-provision-submodule"; + description = "Wrapper-type for backwards compat of Grafana's declarative provisioning"; + check = x: + if builtins.isList x then + throw '' + Provisioning dashboards and datasources declaratively by + setting `dashboards` or `datasources` to a list is not supported + anymore. Use `services.grafana.provision.datasources.settings.datasources` + (or `services.grafana.provision.dashboards.settings.providers`) instead. + '' + else isAttrs x || isFunction x; + }) + id + (types.submodule module); + # http://docs.grafana.org/administration/provisioning/#datasources grafanaTypes.datasourceConfig = types.submodule { freeformType = provisioningSettingsFormat.type; @@ -564,17 +572,14 @@ in { datasources = mkOption { description = lib.mdDoc '' - Deprecated option for Grafana datasource configuration. Use either - `services.grafana.provision.datasources.settings` or - `services.grafana.provision.datasources.path` instead. + Declaratively provision Grafana's datasources. ''; - default = []; - apply = x: if (builtins.isList x) then map _filter x else x; - type = with types; either (listOf grafanaTypes.datasourceConfig) (submodule { + default = {}; + type = submodule' { options.settings = mkOption { description = lib.mdDoc '' Grafana datasource configuration in Nix. Can't be used with - `services.grafana.provision.datasources.path` simultaneously. See + [](#opt-services.grafana.provision.datasources.path) simultaneously. See for supported options. ''; @@ -630,28 +635,25 @@ in { options.path = mkOption { description = lib.mdDoc '' Path to YAML datasource configuration. Can't be used with - `services.grafana.provision.datasources.settings` simultaneously. + [](#opt-services.grafana.provision.datasources.settings) simultaneously. ''; default = null; type = types.nullOr types.path; }; - }); + }; }; dashboards = mkOption { description = lib.mdDoc '' - Deprecated option for Grafana dashboard configuration. Use either - `services.grafana.provision.dashboards.settings` or - `services.grafana.provision.dashboards.path` instead. + Declaratively provision Grafana's dashboards. ''; - default = []; - apply = x: if (builtins.isList x) then map _filter x else x; - type = with types; either (listOf grafanaTypes.dashboardConfig) (submodule { + default = {}; + type = submodule' { options.settings = mkOption { description = lib.mdDoc '' Grafana dashboard configuration in Nix. Can't be used with - `services.grafana.provision.dashboards.path` simultaneously. See + [](#opt-services.grafana.provision.dashboards.path) simultaneously. See for supported options. ''; @@ -684,12 +686,12 @@ in { options.path = mkOption { description = lib.mdDoc '' Path to YAML dashboard configuration. Can't be used with - `services.grafana.provision.dashboards.settings` simultaneously. + [](#opt-services.grafana.provision.dashboards.settings) simultaneously. ''; default = null; type = types.nullOr types.path; }; - }); + }; }; @@ -706,7 +708,7 @@ in { path = mkOption { description = lib.mdDoc '' Path to YAML rules configuration. Can't be used with - `services.grafana.provision.alerting.rules.settings` simultaneously. + [](#opt-services.grafana.provision.alerting.rules.settings) simultaneously. ''; default = null; type = types.nullOr types.path; @@ -715,7 +717,7 @@ in { settings = mkOption { description = lib.mdDoc '' Grafana rules configuration in Nix. Can't be used with - `services.grafana.provision.alerting.rules.path` simultaneously. See + [](#opt-services.grafana.provision.alerting.rules.path) simultaneously. See for supported options. ''; @@ -829,7 +831,7 @@ in { path = mkOption { description = lib.mdDoc '' Path to YAML contact points configuration. Can't be used with - `services.grafana.provision.alerting.contactPoints.settings` simultaneously. + [](#opt-services.grafana.provision.alerting.contactPoints.settings) simultaneously. ''; default = null; type = types.nullOr types.path; @@ -838,7 +840,7 @@ in { settings = mkOption { description = lib.mdDoc '' Grafana contact points configuration in Nix. Can't be used with - `services.grafana.provision.alerting.contactPoints.path` simultaneously. See + [](#opt-services.grafana.provision.alerting.contactPoints.path) simultaneously. See for supported options. ''; @@ -909,7 +911,7 @@ in { path = mkOption { description = lib.mdDoc '' Path to YAML notification policies configuration. Can't be used with - `services.grafana.provision.alerting.policies.settings` simultaneously. + [](#opt-services.grafana.provision.alerting.policies.settings) simultaneously. ''; default = null; type = types.nullOr types.path; @@ -918,7 +920,7 @@ in { settings = mkOption { description = lib.mdDoc '' Grafana notification policies configuration in Nix. Can't be used with - `services.grafana.provision.alerting.policies.path` simultaneously. See + [](#opt-services.grafana.provision.alerting.policies.path) simultaneously. See for supported options. ''; @@ -978,7 +980,7 @@ in { path = mkOption { description = lib.mdDoc '' Path to YAML templates configuration. Can't be used with - `services.grafana.provision.alerting.templates.settings` simultaneously. + [](#opt-services.grafana.provision.alerting.templates.settings) simultaneously. ''; default = null; type = types.nullOr types.path; @@ -987,7 +989,7 @@ in { settings = mkOption { description = lib.mdDoc '' Grafana templates configuration in Nix. Can't be used with - `services.grafana.provision.alerting.templates.path` simultaneously. See + [](#opt-services.grafana.provision.alerting.templates.path) simultaneously. See for supported options. ''; @@ -1059,7 +1061,7 @@ in { path = mkOption { description = lib.mdDoc '' Path to YAML mute timings configuration. Can't be used with - `services.grafana.provision.alerting.muteTimings.settings` simultaneously. + [](#opt-services.grafana.provision.alerting.muteTimings.settings) simultaneously. ''; default = null; type = types.nullOr types.path; @@ -1068,7 +1070,7 @@ in { settings = mkOption { description = lib.mdDoc '' Grafana mute timings configuration in Nix. Can't be used with - `services.grafana.provision.alerting.muteTimings.path` simultaneously. See + [](#opt-services.grafana.provision.alerting.muteTimings.path) simultaneously. See for supported options. ''; @@ -1168,8 +1170,8 @@ in { (optional ( let checkOpts = opt: any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) opt; - datasourcesUsed = if (cfg.provision.datasources.settings == null) then [] else cfg.provision.datasources.settings.datasources; - in if (builtins.isList cfg.provision.datasources) then checkOpts cfg.provision.datasources else checkOpts datasourcesUsed + datasourcesUsed = optionals (cfg.provision.datasources.settings != null) cfg.provision.datasources.settings.datasources; + in checkOpts datasourcesUsed ) '' Datasource passwords will be stored as plaintext in the Nix store! It is not possible to use file provider in provisioning; please provision @@ -1178,20 +1180,6 @@ in { (optional ( any (x: x.secure_settings != null) cfg.provision.notifiers ) "Notifier secure settings will be stored as plaintext in the Nix store! Use file provider instead.") - (optional ( - builtins.isList cfg.provision.datasources && cfg.provision.datasources != [] - ) '' - Provisioning Grafana datasources with options has been deprecated. - Use `services.grafana.provision.datasources.settings` or - `services.grafana.provision.datasources.path` instead. - '') - (optional ( - builtins.isList cfg.provision.datasources && cfg.provision.dashboards != [] - ) '' - Provisioning Grafana dashboards with options has been deprecated. - Use `services.grafana.provision.dashboards.settings` or - `services.grafana.provision.dashboards.path` instead. - '') (optional ( cfg.provision.notifiers != [] ) '' @@ -1204,7 +1192,7 @@ in { assertions = [ { - assertion = if (builtins.isList cfg.provision.datasources) then true else cfg.provision.datasources.settings == null || cfg.provision.datasources.path == null; + assertion = cfg.provision.datasources.settings == null || cfg.provision.datasources.path == null; message = "Cannot set both datasources settings and datasources path"; } { @@ -1213,12 +1201,11 @@ in { ({ type, access, ... }: type == "prometheus" -> access != "direct") opt; in - if (builtins.isList cfg.provision.datasources) then prometheusIsNotDirect cfg.provision.datasources - else cfg.provision.datasources.settings == null || prometheusIsNotDirect cfg.provision.datasources.settings.datasources; + cfg.provision.datasources.settings == null || prometheusIsNotDirect cfg.provision.datasources.settings.datasources; message = "For datasources of type `prometheus`, the `direct` access mode is not supported anymore (since Grafana 9.2.0)"; } { - assertion = if (builtins.isList cfg.provision.dashboards) then true else cfg.provision.dashboards.settings == null || cfg.provision.dashboards.path == null; + assertion = cfg.provision.dashboards.settings == null || cfg.provision.dashboards.path == null; message = "Cannot set both dashboards settings and dashboards path"; } { diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 7a707ab9fed1..c4cb9a54daa5 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -28,29 +28,6 @@ let }; extraNodeConfs = { - provisionOld = { - services.grafana.provision = { - datasources = [{ - name = "Test Datasource"; - type = "testdata"; - access = "proxy"; - uid = "test_datasource"; - }]; - - dashboards = [{ options.path = "/var/lib/grafana/dashboards"; }]; - - notifiers = [{ - uid = "test_notifiers"; - name = "Test Notifiers"; - type = "email"; - settings = { - singleEmail = true; - addresses = "test@test.com"; - }; - }]; - }; - }; - provisionNix = { services.grafana.provision = { datasources.settings = { @@ -172,57 +149,46 @@ in { testScript = '' start_all() - nodeOld = ("Nix (old format)", provisionOld) nodeNix = ("Nix (new format)", provisionNix) nodeYaml = ("Nix (YAML)", provisionYaml) - for nodeInfo in [nodeOld, nodeNix, nodeYaml]: - with subtest(f"Should start provision node: {nodeInfo[0]}"): - nodeInfo[1].wait_for_unit("grafana.service") - nodeInfo[1].wait_for_open_port(3000) + for description, machine in [nodeNix, nodeYaml]: + with subtest(f"Should start provision node: {description}"): + machine.wait_for_unit("grafana.service") + machine.wait_for_open_port(3000) - with subtest(f"Successful datasource provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful datasource provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/datasources/uid/test_datasource | grep Test\ Datasource" ) - with subtest(f"Successful dashboard provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful dashboard provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/dashboards/uid/test_dashboard | grep Test\ Dashboard" ) - - - with subtest(f"Successful notifiers provision with {nodeOld[0]}"): - nodeOld[1].succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/alert-notifications/uid/test_notifiers | grep Test\ Notifiers" - ) - - - - for nodeInfo in [nodeNix, nodeYaml]: - with subtest(f"Successful rule provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful rule provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/alert-rules/test_rule | grep Test\ Rule" ) - with subtest(f"Successful contact point provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful contact point provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/contact-points | grep Test\ Contact\ Point" ) - with subtest(f"Successful policy provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful policy provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/policies | grep Test\ Contact\ Point" ) - with subtest(f"Successful template provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful template provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/templates | grep Test\ Template" ) - with subtest("Successful mute timings provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest("Successful mute timings provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/mute-timings | grep Test\ Mute\ Timing" ) ''; From 252785fd9cce3474c6167d98b57e64509b1da37e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Nov 2022 12:31:26 +0100 Subject: [PATCH 36/66] nixos/doc: improve release-notes for services.grafana --- .../from_md/release-notes/rl-2211.section.xml | 135 ++++++++++++++++-- .../manual/release-notes/rl-2211.section.md | 54 ++++++- 2 files changed, 173 insertions(+), 16 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index a1e01bd92921..caeeae1aefa8 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1189,22 +1189,129 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - The services.grafana options were converted - to a + The module services.grafana was refactored + to be compliant with RFC - 0042 configuration. - - - - - The services.grafana.provision.datasources - and services.grafana.provision.dashboards - options were converted to a - RFC - 0042 configuration. They also now support specifying - the provisioning YAML file with path - option. + 0042. To be precise, this means that the following + things have changed: + + + + The newly introduced option + is an + attribute-set that will be converted into Grafana’s INI + format. This means that the configuration from + Grafana’s + configuration reference can be directly written as + attribute-set in Nix within this option. + + + + + The option + services.grafana.extraOptions has been + removed. This option was an association of environment + variables for Grafana. If you had an expression like + + +{ + services.grafana.extraOptions.SECURITY_ADMIN_USER = "foobar"; +} + + + your Grafana instance was running with + GF_SECURITY_ADMIN_USER=foobar in its + environment. + + + For the migration, it is recommended to turn it into the + INI format, i.e. to declare + + +{ + services.grafana.settings.security.admin_user = "foobar"; +} + + + instead. + + + The keys in + services.grafana.extraOptions have the + format + <INI section name>_<Key Name>. + Further details are outlined in the + configuration + reference. + + + Alternatively you can also set all your values from + extraOptions to + systemd.services.grafana.environment, + make sure you don’t forget to add the + GF_ prefix though! + + + + + Previously, the options + + and + + expected lists of datasources or dashboards for the + declarative + provisioning. + + + To declare lists of + + + + + datasources, please + rename your declarations to + . + + + + + dashboards, please + rename your declarations to + . + + + + + This change was made to support more features for that: + + + + + It’s possible to declare the + apiVersion of your dashboards and + datasources by + + (or + ). + + + + + Instead of declaring datasources and dashboards in + pure Nix, it’s also possible to specify configuration + directories with YAML instead using + + (or + . + This is useful when having provisioning files from + non-NixOS Grafana instances that you also want to + deploy to NixOS. + + + + + diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 642009e9f44e..091377d74a6f 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -372,9 +372,59 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `services.matrix-synapse` systemd unit has been hardened. -- The `services.grafana` options were converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. +- The module `services.grafana` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed: + - The newly introduced option [](#opt-services.grafana.settings) is an attribute-set that + will be converted into Grafana's INI format. This means that the configuration from + [Grafana's configuration reference](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/) + can be directly written as attribute-set in Nix within this option. + - The option `services.grafana.extraOptions` has been removed. This option was an association + of environment variables for Grafana. If you had an expression like -- The `services.grafana.provision.datasources` and `services.grafana.provision.dashboards` options were converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. They also now support specifying the provisioning YAML file with `path` option. + ```nix + { + services.grafana.extraOptions.SECURITY_ADMIN_USER = "foobar"; + } + ``` + + your Grafana instance was running with `GF_SECURITY_ADMIN_USER=foobar` in its environment. + + For the migration, it is recommended to turn it into the INI format, i.e. + to declare + + ```nix + { + services.grafana.settings.security.admin_user = "foobar"; + } + ``` + + instead. + + The keys in `services.grafana.extraOptions` have the format `_`. + Further details are outlined in the [configuration reference](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#override-configuration-with-environment-variables). + + Alternatively you can also set all your values from `extraOptions` to + `systemd.services.grafana.environment`, make sure you don't forget to add + the `GF_` prefix though! + - Previously, the options [](#opt-services.grafana.provision.datasources) and + [](#opt-services.grafana.provision.dashboards) expected lists of datasources + or dashboards for the [declarative provisioning](https://grafana.com/docs/grafana/latest/administration/provisioning/). + + To declare lists of + - **datasources**, please rename your declarations to [](#opt-services.grafana.provision.datasources.settings.datasources). + - **dashboards**, please rename your declarations to [](#opt-services.grafana.provision.dashboards.settings.providers). + + This change was made to support more features for that: + + - It's possible to declare the `apiVersion` of your dashboards and datasources + by [](#opt-services.grafana.provision.datasources.settings.apiVersion) (or + [](#opt-services.grafana.provision.dashboards.settings.apiVersion)). + + - Instead of declaring datasources and dashboards in pure Nix, it's also possible + to specify configuration directories with YAML instead using + [](#opt-services.grafana.provision.datasources.path) (or + [](#opt-services.grafana.provision.dashboards.path). This is useful when having + provisioning files from non-NixOS Grafana instances that you also want to + deploy to NixOS. - The `services.grafana.provision.alerting` option was added. It includes suboptions for every alerting-related objects (with the exception of `notifiers`), which means it's now possible to configure modern Grafana alerting declaratively. From 25b582469606561ff47aeda84ca71ea572126a00 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 Nov 2022 11:01:42 +0100 Subject: [PATCH 37/66] nixos/grafana: mark `services.grafana.extraOptions` as removed --- nixos/modules/services/monitoring/grafana.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 3ce52bc13e91..dc4fab28e864 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -284,6 +284,10 @@ in { (mkRemovedOptionModule [ "services" "grafana" "auth" "google" "clientSecretFile" ] '' This option has been removed. Use 'services.grafana.settings.google.client_secret' with file provider instead. '') + (mkRemovedOptionModule [ "services" "grafana" "extraOptions" ] '' + This option has been removed. Use 'services.grafana.settings' instead. For a detailed migration guide, please + review the release notes of NixOS 22.11. + '') (mkRemovedOptionModule [ "services" "grafana" "auth" "azuread" "tenantId" ] "This option has been deprecated upstream.") ]; From afd6199cff2d5b50c1b9458b0f3dcf35f63d16ae Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 Nov 2022 11:40:07 +0100 Subject: [PATCH 38/66] nixos/grafana: re-add legacy notifiers test, mention notifiers in release notes --- .../from_md/release-notes/rl-2211.section.xml | 10 +++++ .../manual/release-notes/rl-2211.section.md | 4 ++ nixos/tests/grafana/provision/default.nix | 39 +++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index caeeae1aefa8..e308fb059cb4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1309,6 +1309,16 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ deploy to NixOS. + + + + is not affected by this change because this feature + will is deprecated by Grafana and will probably + removed in Grafana 10. It’s recommended to use + services.grafana.provision.alerting.contactPoints + instead. + + diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 091377d74a6f..3ae9e341ee30 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -426,6 +426,10 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). provisioning files from non-NixOS Grafana instances that you also want to deploy to NixOS. + - [](#opt-services.grafana.provision.notifiers) is not affected by this change because + this feature will is deprecated by Grafana and will probably removed in Grafana 10. + It's recommended to use `services.grafana.provision.alerting.contactPoints` instead. + - The `services.grafana.provision.alerting` option was added. It includes suboptions for every alerting-related objects (with the exception of `notifiers`), which means it's now possible to configure modern Grafana alerting declaratively. - Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation. diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index c4cb9a54daa5..7ff7ed74a977 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -28,6 +28,35 @@ let }; extraNodeConfs = { + provisionLegacyNotifiers = { + services.grafana.provision = { + datasources.settings = { + apiVersion = 1; + datasources = [{ + name = "Test Datasource"; + type = "testdata"; + access = "proxy"; + uid = "test_datasource"; + }]; + }; + dashboards.settings = { + apiVersion = 1; + providers = [{ + name = "default"; + options.path = "/var/lib/grafana/dashboards"; + }]; + }; + notifiers = [{ + uid = "test_notifiers"; + name = "Test Notifiers"; + type = "email"; + settings = { + singleEmail = true; + addresses = "test@test.com"; + }; + }]; + }; + }; provisionNix = { services.grafana.provision = { datasources.settings = { @@ -191,5 +220,15 @@ in { machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/mute-timings | grep Test\ Mute\ Timing" ) + + with subtest("Successful notifiers provision"): + provisionLegacyNotifiers.wait_for_unit("grafana.service") + provisionLegacyNotifiers.wait_for_open_port(3000) + print(provisionLegacyNotifiers.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/alert-notifications/uid/test_notifiers" + )) + provisionLegacyNotifiers.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/alert-notifications/uid/test_notifiers | grep Test\ Notifiers" + ) ''; }) From 45e1ce7e3a3a6c69762d1892382d2dabeec02726 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 Nov 2022 11:51:57 +0100 Subject: [PATCH 39/66] nixos/grafana: get rid of unnecessary `flatten` for warnings --- nixos/modules/services/monitoring/grafana.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index dc4fab28e864..6019fad3ae56 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1166,12 +1166,12 @@ in { config = mkIf cfg.enable { warnings = let usesFileProvider = opt: defaultValue: builtins.match "^${defaultValue}$|^\\$__file\\{.*}$" opt != null; - in flatten [ + in (optional ( ! usesFileProvider cfg.settings.database.password "" || ! usesFileProvider cfg.settings.security.admin_password "admin" ) "Grafana passwords will be stored as plaintext in the Nix store! Use file provider instead.") - (optional ( + ++ (optional ( let checkOpts = opt: any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) opt; datasourcesUsed = optionals (cfg.provision.datasources.settings != null) cfg.provision.datasources.settings.datasources; @@ -1181,16 +1181,15 @@ in { It is not possible to use file provider in provisioning; please provision datasources via `services.grafana.provision.datasources.path` instead. '') - (optional ( + ++ (optional ( any (x: x.secure_settings != null) cfg.provision.notifiers ) "Notifier secure settings will be stored as plaintext in the Nix store! Use file provider instead.") - (optional ( + ++ (optional ( cfg.provision.notifiers != [] ) '' Notifiers are deprecated upstream and will be removed in Grafana 10. Use `services.grafana.provision.alerting.contactPoints` instead. - '') - ]; + ''); environment.systemPackages = [ cfg.package ]; From 03b34e85d43249d6b990b28b99bf0e72e93302a4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 Nov 2022 12:02:53 +0100 Subject: [PATCH 40/66] nixos/grafana: we only support single YAML files for provisioning --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2211.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index e308fb059cb4..dd3b974ff16d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1300,7 +1300,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ Instead of declaring datasources and dashboards in pure Nix, it’s also possible to specify configuration - directories with YAML instead using + files with YAML instead using (or . diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 3ae9e341ee30..11e1117c22f6 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -420,7 +420,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). [](#opt-services.grafana.provision.dashboards.settings.apiVersion)). - Instead of declaring datasources and dashboards in pure Nix, it's also possible - to specify configuration directories with YAML instead using + to specify configuration files with YAML instead using [](#opt-services.grafana.provision.datasources.path) (or [](#opt-services.grafana.provision.dashboards.path). This is useful when having provisioning files from non-NixOS Grafana instances that you also want to From febc8a43076c247beb3c868662a14cbb98b55f68 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 18:09:33 +0100 Subject: [PATCH 41/66] nixos/tests/grafana: demonstrate how to use the file provider Yes, it's still a store path, but it's only for demonstration purposes. Also we now have fewer warnings in the provision test. --- nixos/tests/grafana/provision/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 7ff7ed74a977..7ec1be6c4d1a 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -17,7 +17,7 @@ let security = { admin_user = "testadmin"; - admin_password = "snakeoilpwd"; + admin_password = "$__file{${pkgs.writeText "pwd" "snakeoilpwd"}}"; }; }; }; From b300ec349cf7ae63b3e2335cab673658b67c335e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 18:11:28 +0100 Subject: [PATCH 42/66] nixos/doc: wording fix --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 6 +++--- nixos/doc/manual/release-notes/rl-2211.section.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index dd3b974ff16d..4ee65193778d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1312,9 +1312,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - is not affected by this change because this feature - will is deprecated by Grafana and will probably - removed in Grafana 10. It’s recommended to use + is not affected by this change because this feature is + deprecated by Grafana and will probably removed in + Grafana 10. It’s recommended to use services.grafana.provision.alerting.contactPoints instead. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 11e1117c22f6..969d62c7af1b 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -427,7 +427,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). deploy to NixOS. - [](#opt-services.grafana.provision.notifiers) is not affected by this change because - this feature will is deprecated by Grafana and will probably removed in Grafana 10. + this feature is deprecated by Grafana and will probably removed in Grafana 10. It's recommended to use `services.grafana.provision.alerting.contactPoints` instead. - The `services.grafana.provision.alerting` option was added. It includes suboptions for every alerting-related objects (with the exception of `notifiers`), which means it's now possible to configure modern Grafana alerting declaratively. From 4ec456b7252a8afabff87fc40eab613c138f43d6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 19:37:45 +0100 Subject: [PATCH 43/66] nixos/grafana: fix secret-related warnings Closes #198646 * The options `password`/`basicAuthPassword` were removed for datasources in Grafana 9. The only option to declare them now is to use `secureJsonData`. * Fix description for contactPoints provisioning: when using file/env providers, nothing will be leaked into the store. * Fix regex in file-provider usage check: it's also possible to either use `$__env{FOO}` or `$FOO` to fetch secrets from the environment. * Fix warning for datasources: `password`/`basicAuthPassword` was removed, also check for each setting in `secureJsonData` if env/file-provider was used (then no warning is needed!). --- nixos/modules/services/monitoring/grafana.nix | 87 ++++++++++--------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 6019fad3ae56..69a25731f243 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -72,6 +72,17 @@ let grafanaTypes.datasourceConfig = types.submodule { freeformType = provisioningSettingsFormat.type; + imports = [ + (mkRemovedOptionModule [ "password" ] '' + `services.grafana.provision.datasources.settings.datasources..password` has been removed + in Grafana 9. Use `secureJsonData` instead. + '') + (mkRemovedOptionModule [ "basicAuthPassword" ] '' + `services.grafana.provision.datasources.settings.datasources..basicAuthPassword` has been removed + in Grafana 9. Use `secureJsonData` instead. + '') + ]; + options = { name = mkOption { type = types.str; @@ -101,28 +112,6 @@ let default = false; description = lib.mdDoc "Allow users to edit datasources from the UI."; }; - password = mkOption { - type = types.nullOr types.str; - default = null; - description = lib.mdDoc '' - Database password, if used. Please note that the contents of this option - will end up in a world-readable Nix store. Use the file provider - pointing at a reasonably secured file in the local filesystem - to work around that. Look at the documentation for details: - - ''; - }; - basicAuthPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = lib.mdDoc '' - Basic auth password. Please note that the contents of this option - will end up in a world-readable Nix store. Use the file provider - pointing at a reasonably secured file in the local filesystem - to work around that. Look at the documentation for details: - - ''; - }; secureJsonData = mkOption { type = types.nullOr types.attrs; default = null; @@ -600,6 +589,7 @@ in { description = lib.mdDoc "List of datasources to insert/update."; default = []; type = types.listOf grafanaTypes.datasourceConfig; + apply = map (flip builtins.removeAttrs [ "password" "basicAuthPassword" ]); }; deleteDatasources = mkOption { @@ -858,7 +848,7 @@ in { }; contactPoints = mkOption { - description = lib.mdDoc "List of contact points to import or update. Please note that sensitive data will end up in world-readable Nix store."; + description = lib.mdDoc "List of contact points to import or update."; default = []; type = types.listOf (types.submodule { freeformType = provisioningSettingsFormat.type; @@ -1165,31 +1155,44 @@ in { config = mkIf cfg.enable { warnings = let - usesFileProvider = opt: defaultValue: builtins.match "^${defaultValue}$|^\\$__file\\{.*}$" opt != null; + doesntUseFileProvider = opt: defaultValue: + let + regex = "${optionalString (defaultValue != null) "^${defaultValue}$|"}^\\$__(file|env)\\{.*}$|^\\$[^_\\$][^ ]+$"; + in builtins.match regex opt == null; in + # Ensure that no custom credentials are leaked into the Nix store. Unless the default value + # is specified, this can be achieved by using the file/env provider: + # https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion (optional ( - ! usesFileProvider cfg.settings.database.password "" || - ! usesFileProvider cfg.settings.security.admin_password "admin" - ) "Grafana passwords will be stored as plaintext in the Nix store! Use file provider instead.") + doesntUseFileProvider cfg.settings.database.password "" || + doesntUseFileProvider cfg.settings.security.admin_password "admin" + ) '' + Grafana passwords will be stored as plaintext in the Nix store! + Use file/env provider or an env-var instead. + '') + # Warn about deprecated notifiers. + ++ (optional (cfg.provision.notifiers != []) '' + Notifiers are deprecated upstream and will be removed in Grafana 10. + Use `services.grafana.provision.alerting.contactPoints` instead. + '') + # Ensure that `secureJsonData` of datasources provisioned via `datasources.settings` + # only uses file/env providers. ++ (optional ( let - checkOpts = opt: any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) opt; - datasourcesUsed = optionals (cfg.provision.datasources.settings != null) cfg.provision.datasources.settings.datasources; - in checkOpts datasourcesUsed - ) '' - Datasource passwords will be stored as plaintext in the Nix store! - It is not possible to use file provider in provisioning; please provision - datasources via `services.grafana.provision.datasources.path` instead. - '') + datasourcesToCheck = optionals + (cfg.provision.datasources.settings != null) + cfg.provision.datasources.settings.datasources; + declarationUnsafe = { secureJsonData, ... }: + secureJsonData != null + && any (flip doesntUseFileProvider null) (attrValues secureJsonData); + in any declarationUnsafe datasourcesToCheck + ) '' + Declarations in the `secureJsonData`-block of a datasource will be leaked to the + Nix store unless a file/env-provider or an env-var is used! + '') ++ (optional ( any (x: x.secure_settings != null) cfg.provision.notifiers - ) "Notifier secure settings will be stored as plaintext in the Nix store! Use file provider instead.") - ++ (optional ( - cfg.provision.notifiers != [] - ) '' - Notifiers are deprecated upstream and will be removed in Grafana 10. - Use `services.grafana.provision.alerting.contactPoints` instead. - ''); + ) "Notifier secure settings will be stored as plaintext in the Nix store! Use file provider instead."); environment.systemPackages = [ cfg.package ]; From 2f1dfb0db379c1bf13785a5c7d94ad31bd0eb46b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 20:04:23 +0100 Subject: [PATCH 44/66] nixos/grafana: fix w/o datasources or dashboard provisioning --- nixos/modules/services/monitoring/grafana.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 69a25731f243..8035abfc0044 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -13,9 +13,20 @@ let settingsFormatIni = pkgs.formats.ini {}; configFile = settingsFormatIni.generate "config.ini" cfg.settings; - datasourceFile = if (cfg.provision.datasources.path == null) then provisioningSettingsFormat.generate "datasource.yaml" cfg.provision.datasources.settings else cfg.provision.datasources.path; + mkProvisionCfg = name: attr: provisionCfg: + if provisionCfg.path != null + then provisionCfg.path + else + provisioningSettingsFormat.generate "${name}.yaml" + (if provisionCfg.settings != null + then provisionCfg.settings + else { + apiVersion = 1; + ${attr} = []; + }); - dashboardFile = if (cfg.provision.dashboards.path == null) then provisioningSettingsFormat.generate "dashboard.yaml" cfg.provision.dashboards.settings else cfg.provision.dashboards.path; + datasourceFile = mkProvisionCfg "datasource" "datasources" cfg.provision.datasources; + dashboardFile = mkProvisionCfg "dashboard" "providers" cfg.provision.dashboards; notifierConfiguration = { apiVersion = 1; From 9d7e9c5965c72f516285fe52af14ceeefb315fdc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Nov 2022 11:44:08 +0100 Subject: [PATCH 45/66] nixos/grafana: allow using both directories or single YAML files for non-Nix provisioning --- .../from_md/release-notes/rl-2211.section.xml | 2 +- .../manual/release-notes/rl-2211.section.md | 2 +- nixos/modules/services/monitoring/grafana.nix | 66 ++++++++++--------- nixos/tests/grafana/provision/default.nix | 19 +++++- 4 files changed, 55 insertions(+), 34 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 4ee65193778d..6044b70a200d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1300,7 +1300,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ Instead of declaring datasources and dashboards in pure Nix, it’s also possible to specify configuration - files with YAML instead using + files (or directories) with YAML instead using (or . diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 969d62c7af1b..2593b36912c0 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -420,7 +420,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). [](#opt-services.grafana.provision.dashboards.settings.apiVersion)). - Instead of declaring datasources and dashboards in pure Nix, it's also possible - to specify configuration files with YAML instead using + to specify configuration files (or directories) with YAML instead using [](#opt-services.grafana.provision.datasources.path) (or [](#opt-services.grafana.provision.dashboards.path). This is useful when having provisioning files from non-NixOS Grafana instances that you also want to diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 8035abfc0044..d8dc4d1124f1 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -25,42 +25,51 @@ let ${attr} = []; }); - datasourceFile = mkProvisionCfg "datasource" "datasources" cfg.provision.datasources; - dashboardFile = mkProvisionCfg "dashboard" "providers" cfg.provision.dashboards; + datasourceFileOrDir = mkProvisionCfg "datasource" "datasources" cfg.provision.datasources; + dashboardFileOrDir = mkProvisionCfg "dashboard" "providers" cfg.provision.dashboards; notifierConfiguration = { apiVersion = 1; notifiers = cfg.provision.notifiers; }; - notifierFile = pkgs.writeText "notifier.yaml" (builtins.toJSON notifierConfiguration); + notifierFileOrDir = pkgs.writeText "notifier.yaml" (builtins.toJSON notifierConfiguration); generateAlertingProvisioningYaml = x: if (cfg.provision.alerting."${x}".path == null) then provisioningSettingsFormat.generate "${x}.yaml" cfg.provision.alerting."${x}".settings else cfg.provision.alerting."${x}".path; - rulesFile = generateAlertingProvisioningYaml "rules"; - contactPointsFile = generateAlertingProvisioningYaml "contactPoints"; - policiesFile = generateAlertingProvisioningYaml "policies"; - templatesFile = generateAlertingProvisioningYaml "templates"; - muteTimingsFile = generateAlertingProvisioningYaml "muteTimings"; + rulesFileOrDir = generateAlertingProvisioningYaml "rules"; + contactPointsFileOrDir = generateAlertingProvisioningYaml "contactPoints"; + policiesFileOrDir = generateAlertingProvisioningYaml "policies"; + templatesFileOrDir = generateAlertingProvisioningYaml "templates"; + muteTimingsFileOrDir = generateAlertingProvisioningYaml "muteTimings"; - provisionConfDir = pkgs.runCommand "grafana-provisioning" { } '' + ln = { src, dir, filename }: '' + if [[ -d "${src}" ]]; then + pushd $out/${dir} &>/dev/null + lndir "${src}" + popd &>/dev/null + else + ln -sf ${src} $out/${dir}/${filename}.yaml + fi + ''; + provisionConfDir = pkgs.runCommand "grafana-provisioning" { nativeBuildInputs = [ pkgs.xorg.lndir ]; } '' mkdir -p $out/{datasources,dashboards,notifiers,alerting} - ln -sf ${datasourceFile} $out/datasources/datasource.yaml - ln -sf ${dashboardFile} $out/dashboards/dashboard.yaml - ln -sf ${notifierFile} $out/notifiers/notifier.yaml - ln -sf ${rulesFile} $out/alerting/rules.yaml - ln -sf ${contactPointsFile} $out/alerting/contactPoints.yaml - ln -sf ${policiesFile} $out/alerting/policies.yaml - ln -sf ${templatesFile} $out/alerting/templates.yaml - ln -sf ${muteTimingsFile} $out/alerting/muteTimings.yaml + ${ln { src = datasourceFileOrDir; dir = "datasources"; filename = "datasource"; }} + ${ln { src = dashboardFileOrDir; dir = "dashboards"; filename = "dashbaord"; }} + ${ln { src = notifierFileOrDir; dir = "notifiers"; filename = "notifier"; }} + ${ln { src = rulesFileOrDir; dir = "alerting"; filename = "rules"; }} + ${ln { src = contactPointsFileOrDir; dir = "alerting"; filename = "contactPoints"; }} + ${ln { src = policiesFileOrDir; dir = "alerting"; filename = "policies"; }} + ${ln { src = templatesFileOrDir; dir = "alerting"; filename = "templates"; }} + ${ln { src = muteTimingsFileOrDir; dir = "alerting"; filename = "muteTimings"; }} ''; # Get a submodule without any embedded metadata: _filter = x: filterAttrs (k: v: k != "_module") x; # FIXME(@Ma27) remove before 23.05. This is just a helper-type - # because `mkRenamedOptionModule` doesn't work if `foo.bar` is renamed + # because `mkRenamedOptionMthere's there's odule` doesn't work if `foo.bar` is renamed # to `foo.bar.baz`. submodule' = module: types.coercedTo (mkOptionType { @@ -342,19 +351,7 @@ in { Don't change the value of this option if you are planning to use `services.grafana.provision` options. ''; default = provisionConfDir; - defaultText = literalExpression '' - pkgs.runCommand "grafana-provisioning" { } \'\' - mkdir -p $out/{datasources,dashboards,notifiers,alerting} - ln -sf ''${datasourceFile} $out/datasources/datasource.yaml - ln -sf ''${dashboardFile} $out/dashboards/dashboard.yaml - ln -sf ''${notifierFile} $out/notifiers/notifier.yaml - ln -sf ''${rulesFile} $out/alerting/rules.yaml - ln -sf ''${contactPointsFile} $out/alerting/contactPoints.yaml - ln -sf ''${policiesFile} $out/alerting/policies.yaml - ln -sf ''${templatesFile} $out/alerting/templates.yaml - ln -sf ''${muteTimingsFile} $out/alerting/muteTimings.yaml - \'\' - ''; + defaultText = "directory with all provisioning files linked together"; type = types.path; }; }; @@ -641,6 +638,7 @@ in { description = lib.mdDoc '' Path to YAML datasource configuration. Can't be used with [](#opt-services.grafana.provision.datasources.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -692,6 +690,7 @@ in { description = lib.mdDoc '' Path to YAML dashboard configuration. Can't be used with [](#opt-services.grafana.provision.dashboards.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -714,6 +713,7 @@ in { description = lib.mdDoc '' Path to YAML rules configuration. Can't be used with [](#opt-services.grafana.provision.alerting.rules.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -837,6 +837,7 @@ in { description = lib.mdDoc '' Path to YAML contact points configuration. Can't be used with [](#opt-services.grafana.provision.alerting.contactPoints.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -917,6 +918,7 @@ in { description = lib.mdDoc '' Path to YAML notification policies configuration. Can't be used with [](#opt-services.grafana.provision.alerting.policies.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -986,6 +988,7 @@ in { description = lib.mdDoc '' Path to YAML templates configuration. Can't be used with [](#opt-services.grafana.provision.alerting.templates.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -1067,6 +1070,7 @@ in { description = lib.mdDoc '' Path to YAML mute timings configuration. Can't be used with [](#opt-services.grafana.provision.alerting.muteTimings.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 7ec1be6c4d1a..1eb927632eb7 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -163,6 +163,22 @@ let }; }; }; + + provisionYamlDirs = let + mkdir = p: pkgs.writeTextDir (baseNameOf p) (builtins.readFile p); + in { + services.grafana.provision = { + datasources.path = mkdir ./datasources.yaml; + dashboards.path = mkdir ./dashboards.yaml; + alerting = { + rules.path = mkdir ./rules.yaml; + contactPoints.path = mkdir ./contact-points.yaml; + policies.path = mkdir ./policies.yaml; + templates.path = mkdir ./templates.yaml; + muteTimings.path = mkdir ./mute-timings.yaml; + }; + }; + }; }; nodes = builtins.mapAttrs (_: val: mkMerge [ val baseGrafanaConf ]) extraNodeConfs; @@ -180,8 +196,9 @@ in { nodeNix = ("Nix (new format)", provisionNix) nodeYaml = ("Nix (YAML)", provisionYaml) + nodeYamlDir = ("Nix (YAML in dirs)", provisionYamlDirs) - for description, machine in [nodeNix, nodeYaml]: + for description, machine in [nodeNix, nodeYaml, nodeYamlDir]: with subtest(f"Should start provision node: {description}"): machine.wait_for_unit("grafana.service") machine.wait_for_open_port(3000) From 6ee5ae3e48512344e4ebed043cb62ce17417a33a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Nov 2022 11:49:04 +0100 Subject: [PATCH 46/66] nixos/grafana: make warning more clear --- nixos/modules/services/monitoring/grafana.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index d8dc4d1124f1..2d25ce93c4fc 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1183,7 +1183,7 @@ in { doesntUseFileProvider cfg.settings.security.admin_password "admin" ) '' Grafana passwords will be stored as plaintext in the Nix store! - Use file/env provider or an env-var instead. + Use file provider or an env-var instead. '') # Warn about deprecated notifiers. ++ (optional (cfg.provision.notifiers != []) '' @@ -1203,7 +1203,7 @@ in { in any declarationUnsafe datasourcesToCheck ) '' Declarations in the `secureJsonData`-block of a datasource will be leaked to the - Nix store unless a file/env-provider or an env-var is used! + Nix store unless a file-provider or an env-var is used! '') ++ (optional ( any (x: x.secure_settings != null) cfg.provision.notifiers From a17ea3aa437f8b934ff399f2fb542b7e4603f4ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 17:22:32 +0000 Subject: [PATCH 47/66] python310Packages.mautrix: 0.18.7 -> 0.18.8 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 61569abe30a2..68669248aacd 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.18.7"; + version = "0.18.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fxDkHSlfiyxDdCvz3CyAWeip08ozH+lqEzmM26a4/Xg="; + sha256 = "sha256-DRJhqHpeGbDzqhym6z9wCmzTz3VpnwJMdDKFT5vMVUE="; }; propagatedBuildInputs = [ From 404ef7091b064592eeceb4cb7fa9e418e0eedfb9 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 20 Nov 2022 18:14:16 +0100 Subject: [PATCH 48/66] ddh: init at 0.13.0 --- pkgs/tools/system/ddh/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/system/ddh/default.nix diff --git a/pkgs/tools/system/ddh/default.nix b/pkgs/tools/system/ddh/default.nix new file mode 100644 index 000000000000..cba8ade1f428 --- /dev/null +++ b/pkgs/tools/system/ddh/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, rustPlatform, ... }: +rustPlatform.buildRustPackage rec { + pname = "ddh"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "darakian"; + repo = pname; + rev = version; + sha256 = "XFfTpX4c821pcTAJZFUjdqM940fRoBwkJC6KTknXtCw="; + }; + + cargoSha256 = "6yPDkbag81TZ4k72rbmGT6HWKdGK4yfKxjGNFKEWXPI="; + + meta = with lib; { + description = "A fast duplicate file finder"; + longDescription = '' + DDH traverses input directories and their subdirectories. + It also hashes files as needed and reports findings. + ''; + homepage = "https://github.com/darakian/ddh"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ h7x4 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1ccb4d98efd..0e65f1de85ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5841,6 +5841,8 @@ with pkgs; dd_rescue = callPackage ../tools/system/dd_rescue { }; + ddh = callPackage ../tools/system/ddh { }; + ddrescue = callPackage ../tools/system/ddrescue { }; ddrescueview = callPackage ../tools/system/ddrescueview { }; From de997f4d0c0378d571dcbcdd19c558a2a6b4f133 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Tue, 15 Nov 2022 22:45:01 +0100 Subject: [PATCH 49/66] rocminfo: mark broken on aarch64 --- pkgs/development/tools/rocminfo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 078c4aa71d91..d89c90aa88d2 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; + broken = stdenv.isAarch64; }; } From 9959b6bba05ee0a0df268db48fb8f8c3203fd24e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 17:53:37 +0000 Subject: [PATCH 50/66] aliyun-cli: 3.0.134 -> 3.0.135 --- pkgs/tools/admin/aliyun-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 94a6a1fc3120..aac2804ffb18 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.134"; + version = "3.0.135"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-popi+eF0nIA0C9QHbV4cu1vKfv9QUUq8oOJW/XkEabg="; + sha256 = "sha256-iWowsrceAiWQih8hZoq1t3Q9a8TrKDUGMYfzdfkSU7Y="; }; - vendorSha256 = "sha256-rUYlFM9OlPXGzxXyOxweUs6md7HhjocC56F+OtT/IXo="; + vendorSha256 = "sha256-XKPpO+xpiceyucbuDt/camBtvP6Bk4MAJYBm00ngtjg="; subPackages = [ "main" ]; From 72e8f024d81840de6219e09b78a0747df055f2a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 18:29:20 +0000 Subject: [PATCH 51/66] appthreat-depscan: 3.0.0 -> 3.0.2 --- pkgs/development/tools/appthreat-depscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index f37e71387346..4afac4780de4 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-S86EfPWA3mZV/SLQJEdwzz5hZ1qK+WQ6k2xCs+J0jPk="; + hash = "sha256-AxdtphC9dVd/o52hW8L+5gaEDeP9wvR0vSZS3XY9sAw="; }; propagatedBuildInputs = with python3.pkgs; [ From 15f5602de83c2a6c9be3a4f51932572c41ab88cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 18:37:38 +0000 Subject: [PATCH 52/66] argocd-autopilot: 0.4.7 -> 0.4.8 --- .../networking/cluster/argocd-autopilot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 8aef3f81af51..e446773233c8 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-aC3U9Qeahji3xSuJWuMlf2TzKEqPDAOuB52A4Om/fRU="; + sha256 = "sha256-U1gvDv364x7FxuqXIeaiMZMl0324rGjiqs8vtlENAlY="; }; - vendorSha256 = "sha256-waEvrIEXQMyzSyHpPo7H0OwfD5Zo/rwWTpeWvipZXv8="; + vendorSha256 = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0="; proxyVendor = true; From 47c235956b564c0f304dcc27ba3945bbc1205c6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 19:40:10 +0100 Subject: [PATCH 53/66] python310Packages.lsassy: add changelog to meta --- pkgs/development/python-modules/lsassy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 56cb4cc6ae8f..ab422f709dab 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)"; homepage = "https://github.com/Hackndo/lsassy"; + changelog = "https://github.com/Hackndo/lsassy/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 2073ee4b6e962656bc3475e9fa3de71a3afc2729 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 19:42:05 +0100 Subject: [PATCH 54/66] appthreat-depscan: add changelog to meta --- pkgs/development/tools/appthreat-depscan/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 4afac4780de4..c4ba4b27939f 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -46,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to audit dependencies based on known vulnerabilities and advisories"; homepage = "https://github.com/AppThreat/dep-scan"; + changelog = "https://github.com/AppThreat/dep-scan/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 7a68a5d617dba0c75d16edc07ae2883d32c37715 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 19:48:04 +0100 Subject: [PATCH 55/66] python310Packages.mautrix: add changelog to meta --- .../python-modules/mautrix/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 68669248aacd..abf52ceae1d6 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -1,14 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder -, sqlalchemy, ruamel-yaml, CommonMark, lxml, aiosqlite +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, pythonOlder +, sqlalchemy +, ruamel-yaml +, CommonMark +, lxml +, aiosqlite }: buildPythonPackage rec { pname = "mautrix"; version = "0.18.8"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DRJhqHpeGbDzqhym6z9wCmzTz3VpnwJMdDKFT5vMVUE="; + hash = "sha256-DRJhqHpeGbDzqhym6z9wCmzTz3VpnwJMdDKFT5vMVUE="; }; propagatedBuildInputs = [ @@ -22,16 +33,17 @@ buildPythonPackage rec { lxml ]; - disabled = pythonOlder "3.8"; - # no tests available doCheck = false; - pythonImportsCheck = [ "mautrix" ]; + pythonImportsCheck = [ + "mautrix" + ]; meta = with lib; { + description = "Asyncio Matrix framework"; homepage = "https://github.com/tulir/mautrix-python"; - description = "A Python 3 asyncio Matrix framework."; + changelog = "https://github.com/mautrix/python/releases/tag/v${version}"; license = licenses.mpl20; maintainers = with maintainers; [ nyanloutre ma27 sumnerevans ]; }; From 996b3332419fe68dbacd6448caac4ce15e9f120a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 19:49:34 +0100 Subject: [PATCH 56/66] python310Packages.manimpango: add changelog to meta --- pkgs/development/python-modules/manimpango/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index cb618a8b5029..48487af1bc47 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Binding for Pango"; homepage = "https://github.com/ManimCommunity/ManimPango"; + changelog = "https://github.com/ManimCommunity/ManimPango/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ emilytrau ]; }; From 98cadbcf7004fb103e7e8701c4f496f3b3d6564e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 20 Nov 2022 18:25:03 +0100 Subject: [PATCH 57/66] nixos/grafana: review fixes --- nixos/modules/services/monitoring/grafana.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 2d25ce93c4fc..9b3068796d8e 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -69,7 +69,7 @@ let _filter = x: filterAttrs (k: v: k != "_module") x; # FIXME(@Ma27) remove before 23.05. This is just a helper-type - # because `mkRenamedOptionMthere's there's odule` doesn't work if `foo.bar` is renamed + # because `mkRenamedOptionModule` doesn't work if `foo.bar` is renamed # to `foo.bar.baz`. submodule' = module: types.coercedTo (mkOptionType { @@ -351,7 +351,7 @@ in { Don't change the value of this option if you are planning to use `services.grafana.provision` options. ''; default = provisionConfDir; - defaultText = "directory with all provisioning files linked together"; + defaultText = "directory with links to files generated from services.grafana.provision"; type = types.path; }; }; From bdc11efaf2f6321350bcc20620f3036f9423c039 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 20 Nov 2022 13:38:53 -0500 Subject: [PATCH 58/66] ruff: 0.0.129 -> 0.0.131 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 5f0d48d42033..a5a10ee33ca6 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.129"; + version = "0.0.131"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NjGNl92kQqEeKR1eR/ELwPVNdu/bxmEre80vINSsYTY="; + sha256 = "sha256-botqrFWfW0+hu0oi6UhDcz8jO5TCKWwgN+u6oaWB7pE="; }; - cargoSha256 = "sha256-Bg8sazATWnZXeWAf3lrFtraWkuAgugaMkmdzA8cPkW8="; + cargoSha256 = "sha256-5fDhwcdLOGDqtWcCR9C1BOonb1CIxfwlcMFZ3spvfGU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 4a73fad5155245e66323d422a373e3377da747aa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 20 Nov 2022 20:03:38 +0100 Subject: [PATCH 59/66] nixos/doc: also note that external YAML files for grafana will end up in the store --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 3 +++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 6044b70a200d..65b3129da7c1 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1308,6 +1308,13 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ non-NixOS Grafana instances that you also want to deploy to NixOS. + + Note: secrets from + these files will be leaked into the store unless you + use a + file-provider + or env-var for secrets! + diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 2593b36912c0..b4b52c0e873b 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -426,6 +426,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). provisioning files from non-NixOS Grafana instances that you also want to deploy to NixOS. + __Note:__ secrets from these files will be leaked into the store unless you use a + [**file**-provider or env-var](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider) for secrets! + - [](#opt-services.grafana.provision.notifiers) is not affected by this change because this feature is deprecated by Grafana and will probably removed in Grafana 10. It's recommended to use `services.grafana.provision.alerting.contactPoints` instead. From 797e763ef19b0b0d94c727791784beaab4a805a3 Mon Sep 17 00:00:00 2001 From: Kris La Date: Sun, 20 Nov 2022 16:40:30 +0100 Subject: [PATCH 60/66] remove sleepyhead --- pkgs/applications/misc/sleepyhead/default.nix | 45 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 -- 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 pkgs/applications/misc/sleepyhead/default.nix diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix deleted file mode 100644 index 63a45758d932..000000000000 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, mkDerivation, fetchgit, zlib, libGLU, libX11, qtbase, qtwebkit, qtserialport, wrapQtAppsHook }: - -mkDerivation { - pname = "sleepyhead"; - version = "1.0.0-beta-git"; - - src = fetchgit { - url = "https://gitlab.com/sleepyhead/sleepyhead-code.git"; - rev = "9e2329d8bca45693231b5e3dae80063717c24578"; - sha256 = "0448z8gyaxpgpnksg34lzmffj36jdpm0ir4xxa5gvzagkx0wk07h"; - }; - - buildInputs = [ - qtbase qtwebkit qtserialport - zlib - libGLU - libX11 - ]; - - nativeBuildInputs = [ wrapQtAppsHook ]; - - patchPhase = '' - patchShebangs configure - ''; - - installPhase = if stdenv.isDarwin then '' - mkdir -p $out/Applications - cp -r sleepyhead/SleepyHead.app $out/Applications - '' else '' - mkdir -p $out/bin - cp sleepyhead/SleepyHead $out/bin - ''; - - meta = with lib; { - homepage = "https://sleepyhead.jedimark.net/"; - description = "Review and explore data produced by CPAP and related machines"; - longDescription = '' - SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. - ''; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = [ maintainers.krav ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a1a21ac97e2a..239794471469 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1355,6 +1355,7 @@ mapAliases ({ skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2021-07-14 skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2020-10-31 slack-dark = slack; # Added 2020-03-27 + sleepyhead = throw "'sleepyhead' has been renamed to/replaced by 'OSCAR'"; # Added 2022-11-20 slic3r-prusa3d = throw "'slic3r-prusa3d' has been renamed to/replaced by 'prusa-slicer'"; # Converted to throw 2022-02-22 slurm-full = throw "'slurm-full' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-02-22 slurm-llnl = slurm; # renamed July 2017 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3af1f7983fe6..db5056e8a66e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11456,9 +11456,6 @@ with pkgs; sleuthkit = callPackage ../tools/system/sleuthkit {}; - # Not updated upstream since 2018, doesn't support qt newer than 5.12 - sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {}; - slides = callPackage ../applications/misc/slides { }; slirp4netns = callPackage ../tools/networking/slirp4netns { }; From 973bd58a62b50fd4af8ba52bec12630cb90ac819 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 20:35:13 +0100 Subject: [PATCH 61/66] python310Packages.teslajsonpy: add changelog to meta --- pkgs/development/python-modules/teslajsonpy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index b1afb348c346..10657cec000f 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to work with Tesla API"; homepage = "https://github.com/zabuldon/teslajsonpy"; + changelog = "https://github.com/zabuldon/teslajsonpy/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 46f309cf2741bcc6297e8ea82b6b2f79597c56f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 20:36:25 +0100 Subject: [PATCH 62/66] python310Packages.teslajsonpy: 3.1.0 -> 3.2.0 https://github.com/zabuldon/teslajsonpy/releases/tag/v3.2.0 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 10657cec000f..5461306622ad 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-y0HaHpdJdEUTVo/1xoCJdOtAohE4eaBGHdjMfbyGE2w="; + hash = "sha256-6xYMaKYKQkxbdm/vPOvKUxU8vnB+/cSiA6U7g9YPosQ="; }; nativeBuildInputs = [ From ffa2351fb4d4e7c810bae894cc135a826856df01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 20:43:52 +0100 Subject: [PATCH 63/66] ruff: add changelog to meta --- pkgs/development/tools/ruff/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index a5a10ee33ca6..7bbb333e48b8 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An extremely fast Python linter"; homepage = "https://github.com/charliermarsh/ruff"; + changelog = "https://github.com/charliermarsh/ruff/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; From 1eb3a69e3988d1a02c7aae43ce3f66eaa7325144 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 21 Nov 2022 06:51:10 +1000 Subject: [PATCH 64/66] nix-update: 0.8.0 -> 0.9.0 https://github.com/Mic92/nix-update/releases/tag/0.9.0 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 036cc53efc99..71af0ab1d159 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -8,14 +8,14 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.8.0"; + version = "0.9.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-EwEGHiJxdubecuXMuBrk6pDld3mNl2ortwlIa0Cdgu0="; + sha256 = "sha256-wivScgtcdapf5bfXR1sjuBIPQEgi6QGH/f+Aucc3CEQ="; }; makeWrapperArgs = [ From 711afefbd17b5cbe4cb64334d14221eae99facad Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Nov 2022 15:12:27 +0100 Subject: [PATCH 65/66] =?UTF-8?q?ocamlPackages.flac:=200.3.0=20=E2=86=92?= =?UTF-8?q?=200.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/flac/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix index e08841ac32fe..d79416b7053a 100644 --- a/pkgs/development/ocaml-modules/flac/default.nix +++ b/pkgs/development/ocaml-modules/flac/default.nix @@ -2,15 +2,13 @@ buildDunePackage rec { pname = "flac"; - version = "0.3.0"; - - useDune2 = true; + version = "0.3.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-flac"; rev = "v${version}"; - sha256 = "06gfbrp30sdxigzkix83y1b610ljzik6rrxmbl3ppmpx4dqlwnxa"; + sha256 = "sha256-oMmxZtphEX/OPfyTumjkWQJidAjSRqriygaTjVJTCG0="; }; nativeBuildInputs = [ pkg-config ]; From 419e261c1b1a9593cf2b8afcecd0f5c0e4b3e7e8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 20 Nov 2022 18:52:37 -0300 Subject: [PATCH 66/66] openshot-qt: update dependencies Because the old pyqt5-with-webkit depends on an old, buggy, full of CVEs WebKit implementation. --- .../video/openshot-qt/default.nix | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index c94dc643daad..5d8b68200ded 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -6,12 +6,12 @@ , doxygen , gtk3 , libopenshot -, python3Packages +, python3 , qtsvg , wrapGAppsHook }: -mkDerivationWith python3Packages.buildPythonApplication rec { +mkDerivationWith python3.pkgs.buildPythonApplication rec { pname = "openshot-qt"; version = "2.6.1"; @@ -19,7 +19,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv"; + hash = "sha256-29fAg4SDoAFzv6q43Dcs2HdaeKZfPEzlGqCcICiPSF0="; }; nativeBuildInputs = [ @@ -31,18 +31,15 @@ mkDerivationWith python3Packages.buildPythonApplication rec { gtk3 ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ httplib2 libopenshot - pyqt5_with_qtwebkit + pyqtwebengine pyzmq requests sip_4 ]; - dontWrapGApps = true; - dontWrapQtApps = true; - preConfigure = '' # tries to create caching directories during install export HOME=$(mktemp -d) @@ -64,19 +61,26 @@ mkDerivationWith python3Packages.buildPythonApplication rec { }) ]; + doCheck = false; + + dontWrapGApps = true; + dontWrapQtApps = true; + postFixup = '' wrapProgram $out/bin/openshot-qt \ '' # Fix toolbar icons on Darwin + lib.optionalString stdenv.isDarwin '' - --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ - '' - + '' - "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" + --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ + '' + '' + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" ''; - doCheck = false; + passthru = { + inherit libopenshot; + inherit (libopenshot) libopenshot-audio; + }; meta = with lib; { homepage = "http://openshot.org/"; @@ -92,9 +96,4 @@ mkDerivationWith python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; }; - - passthru = { - inherit libopenshot; - inherit (libopenshot) libopenshot-audio; - }; }