diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-22 00:12:46 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-22 00:12:46 +0000 |
commit | f7723173d1a68f845895a46c19e1982ac5a5a23e (patch) | |
tree | a0d9064d3751189dcc1614c66e4b5e47c99ceec6 /pkgs | |
parent | 316bd962022d244e05028e1f814680e2aff44392 (diff) | |
parent | a10069fd242f411c729b1885722dedbc9d46e21b (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs')
114 files changed, 648 insertions, 420 deletions
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 9ef53b980b931..fb8bd527aa22e 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.3.02"; + version = "6.3.03"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-sn/GWCw1bxtFjUUKkrPZVOe5qRQ5ATyII52CPHmlB3g="; + sha256 = "sha256-Fb16sx+LVoXuiFASeiaYUMoNgZJXqKTBrUHFd2YXEJ0="; }; configurePhase = '' diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 9500c63a7af31..7b92626d5b339 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -160,6 +160,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ) ''; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c18509f6d8f06..668413bacf6f3 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -27,6 +27,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/"; }; + ChatGPT-nvim = buildVimPluginFrom2Nix { + pname = "ChatGPT.nvim"; + version = "2022-12-19"; + src = fetchFromGitHub { + owner = "jackMort"; + repo = "ChatGPT.nvim"; + rev = "ce7599398d8a5e3427d0344861006ed03b737fe4"; + sha256 = "0bc5ddgrdg97ir5xsgdk2nfzg48jai00i81s5f2xg58hak2g2ff9"; + }; + meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; + }; + CheckAttach = buildVimPluginFrom2Nix { pname = "CheckAttach"; version = "2019-05-08"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 6dc04fee00507..20b3d8bcafc48 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -123,6 +123,10 @@ self: super: { }; }); + ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs (old: { + dependencies = with self; [ nui-nvim plenary-nvim telescope-nvim ]; + }); + clang_complete = super.clang_complete.overrideAttrs (old: { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 9954dc98d823c..dc6aabeb52e32 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1,6 +1,7 @@ repo,branch,alias https://github.com/euclidianAce/BetterLua.vim/,, https://github.com/vim-scripts/BufOnly.vim/,, +https://github.com/jackMort/ChatGPT.nvim/,HEAD, https://github.com/chrisbra/CheckAttach/,, https://github.com/vim-scripts/Colour-Sampler-Pack/,, https://github.com/whonore/Coqtail/,, diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1e1db2ea8937e..16f723020d8ac 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0f5l720gc47dygbk7mahx7pb088a8bfrnf69j3igvczbnfapx5sy"; - x86_64-darwin = "0qmji8bfnqvrxv4yk3rscvns1hk5wfwwdng8jblh5bilf657g1fc"; - aarch64-linux = "0qcmcsb97q303izhw8k4242nsb72my1vnf24hsfml4vr76f5qqbd"; - aarch64-darwin = "1cc8p5s8vr5bml715yx2lzkqa9q85rziswrhl1d11zagymvswjzn"; - armv7l-linux = "086c3wazjk30f8r8dgi0bjsvzcc6sa9d80cy4500pim7rb7s6ppn"; + x86_64-linux = "0xdj5v2n34d6p49ng13qr9d4yyyvqr96qv15la2fda9s7n1s659c"; + x86_64-darwin = "0jgrf534qy39nki0rfc8lrdbdb8ghzarckd3cx9fzq6bw1p2jy1f"; + aarch64-linux = "133577j6i709dq4ircnh2yklylcmy0kgs6lhly7mx8nrag8qi9c1"; + aarch64-darwin = "18346igq8b1d0kywy9alvzm0glb46aalznnhr5mql5rhaana92xw"; + armv7l-linux = "0l0wvgi981ryqbhyh5qalr8lasyf3pg4pzqs9f9hc75ppk4d6sny"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.74.1"; + version = "1.74.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index f1ae106df46af..ae38f5d3326fd 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { }) // rec { inherit version src; - pname = prevName + lib.optionalString supportFlags.waylandSupport "wayland"; + pname = prevName + lib.optionalString supportFlags.waylandSupport "-wayland"; # Fixes "Compiler cannot create executables" building wineWow with mingwSupport strictDeps = true; diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index a7b289e33b397..e726704722726 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.22"; + version = "0.0.23"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-OlOnr1Spy8kdie9CyLVOQkY1+ib6Uwcd/xP5TSaZkYg="; + sha256 = "sha256-wRqQ7x6eQTrzFU++Qgq/7NXXo5F1onlZBdQ9ttNvvEw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 2074addb1b216..f9a1faaf036d8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -25,6 +25,7 @@ , sqlite , wrapQtAppsHook , xdg-utils +, wrapGAppsHook , unrarSupport ? false }: @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { pkg-config qmake removeReferencesTo + wrapGAppsHook wrapQtAppsHook ]; @@ -169,6 +171,7 @@ stdenv.mkDerivation rec { # Wrap manually dontWrapQtApps = true; + dontWrapGApps = true; # Remove some references to shrink the closure size. This reference (as of # 2018-11-06) was a single string like the following: @@ -178,7 +181,9 @@ stdenv.mkDerivation rec { $out/lib/calibre/calibre/plugins/podofo.so for program in $out/bin/*; do - wrapQtApp $program \ + wrapProgram $program \ + ''${qtWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} \ --prefix PYTHONPATH : $PYTHONPATH \ --prefix PATH : ${poppler_utils.out}/bin done diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 4255127b3dfe6..0245fadb171a7 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: +{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook, gobject-introspection }: python3.pkgs.buildPythonApplication { pname = "pdf-quench"; @@ -11,10 +11,9 @@ python3.pkgs.buildPythonApplication { sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = with pkgs; [ gtk3 - gobject-introspection goocanvas2 poppler_gi ]; diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 1c619c403291a..3986859c4ee40 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.1"; + version = "0.13.3"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-bdejXGyvY+HAE4sOxhsZYZ5fCISEVxvfOlEjL/CgBLQ="; + hash = "sha256-fNGdaIlGlel0kx9XNhM/nJqiUDeAiG0IygUv6FiPubY="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-+4eRdr5MY9d0ordaDv8hZf4wGoZsp14MpOEp1vhr75w="; + vendorHash = "sha256-1aAF1qwfHaI5Lab97hEvSlw5o8+f1YbDyHrIBIGnsHQ="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 0728a03e976b8..de9f2e78f9616 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.33"; + version = "1.12.37"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-T/fkQxRcwDYppGpAu1sBg8Oe8dAa4Bk/jt4jYMikPBE="; + hash = "sha256-3dm60ySi/IdiAzZ+LWMLwxUJRv2HX0tQR5s+XMFqyGg="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-G26BfTdXMQP0U4FDRYkJNfUOGfqow714WPNBnBrXLZQ="; + vendorSha256 = "sha256-b4Nl6uuZmcbxht4IRupyzQJL/o8nj4fIUuHvlHZWYTU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index d19a764e4eb1d..7794cd81de2c1 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "colima"; - version = "0.4.6"; + version = "0.5.0"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mVEp/4iL23rrw6HSl/7qMGK4YCJ6I+9gcSIhyPsAWzc="; + sha256 = "sha256-Ey/h9W1WFMJdO5U9IeHhVTYDEJi8w18h2PY0lB0S/BU="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-tsMQMWEkTE1NhevcqBETGWiboqL6QTepgnIo4B5Y4wQ="; + vendorSha256 = "sha256-v0U7TorUwOtBzBQ/OQQSAX6faDI1IX/IDIJnY8UFsu8="; CGO_ENABLED = 1; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 7f08891385b1e..4460c5f90b76b 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=\${out}" "SYSCONFDIR=\${out}/etc" "MANDIR=\${out}/share/man" ]; postInstall = '' mv $out/bin/i3lock $out/bin/i3lock-color + ln -s $out/bin/i3lock-color $out/bin/i3lock mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1 sed -i 's/\(^\|\s\|"\)i3lock\(\s\|$\)/\1i3lock-color\2/g' $out/share/man/man1/i3lock-color.1 ''; diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix index 8884b1d5100ce..29bd81fe872c9 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D i3lock-fancy-rapid $out/bin/i3lock-fancy-rapid + ln -s $out/bin/i3lock-fancy-rapid $out/bin/i3lock ''; meta = with lib; { diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 9a1b959690a2c..f3963b43b54af 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy/icons cp i3lock-fancy $out/bin/i3lock-fancy + ln -s $out/bin/i3lock-fancy $out/bin/i3lock cp icons/lock*.png $out/share/i3lock-fancy/icons ''; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index c797587dd07f2..ac9569fc95fc6 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.7.0"; + version = "16.8.2"; 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 0edc0984cea14..a1da74c34b6c8 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 = "0wyi99j9zangbfj8rdfwgmgnl7f2s4d07pc8pvkjnzw8n4nz4rkn"; - iosevka-aile = "1szwyzri6j9rfgw3jrppg1gnj48bl77pvgm944jiwxhdl1dhzlqh"; - iosevka-curly = "0mzdq2shi51c6hhca8waxbj8i0pb3jw7b4rn0h4941kq8y9qddzs"; - iosevka-curly-slab = "106f97mh5ph2ykk2mk4am9vbavr41vznl8f2w02jaj81wk5xv6gd"; - iosevka-etoile = "1axnc8hvwvn0y2pzfid63s3lzzwh3ig89hj7k80cdcrsnbv5wvpi"; - iosevka-slab = "0mgrngn2g5i1s5285ds6x53gwl3ragdr3pkmp3kwk7m88jivx4n8"; - iosevka-ss01 = "0r0zn3dickzpkcqfdy6lw245301v8hqiy073bk7q7dykg7514wic"; - iosevka-ss02 = "05ifncnsy9bfb66qxpx57hkadq4vwa8bb5qki69skwfsfrfc217y"; - iosevka-ss03 = "1hh1x10v3igagaa70xmw7hhfa6jm99pn46w4wlgv0ydfz441hfcd"; - iosevka-ss04 = "13cwjc472gqvkz72lxx82xp9ka71ycdid7zldl5r38sakjqymxcv"; - iosevka-ss05 = "0y4zgda1n4shcqrw950w55jmlh71mi7fc9g6fjjb1ik5v227k8h3"; - iosevka-ss06 = "15xcg3dqjqb9hzzaf7pvq7lnn0qrvk828xy9ngq9xznhdzzlh0s3"; - iosevka-ss07 = "1w2lyqcvcn6k70a00xdi650rsw91lb8rgrbdpb92m4p3lr7b4vzg"; - iosevka-ss08 = "08b38c8vrvys8cxq3gqscr33ijm0wn6xnw6wjr21r8f6y2i1rhfp"; - iosevka-ss09 = "1mgp38665llp1rqlmzr62z5vxxlwl5g75mdd9qf8zah17babi88p"; - iosevka-ss10 = "06f8mkxfrxl7kkph9ljzsgsxf5qlnw0ggkb2bv518ajpycc9g77c"; - iosevka-ss11 = "17nxf0215s8vgyicbj6rhqia4hw5gsrljdk1jc5hd1yd50c8351q"; - iosevka-ss12 = "152f4bljjm3w49x4wfr1fr557pi4qpvgyk6icccrbig4r3idkqhg"; - iosevka-ss13 = "04kh77ry46gdgmp87p3nwbqmrkbwjjvfk2mrb43lw19vwmbax3aw"; - iosevka-ss14 = "1fln5kz531yp8gk447cw71xm9ddvw70dwyamjd9sl39vay32b534"; - iosevka-ss15 = "0iwy88pfxan94zhvjnqxsh9i39r1nzi0hc0q4xi1mqyaygml3y6c"; - iosevka-ss16 = "1xxir89gqbcqms158c1znlnbky39safjcgzyd1qvr5w78w7dz5gc"; - iosevka-ss17 = "0dac2m9vxif6s02ryzx9kw9j87dgm53cjjzh4h6bqm3wqjmy3hgy"; - iosevka-ss18 = "0igj1k7jm1xk649hpn2h3c1n9j8dcb7l5kvr6wb97r8w2s5kiz20"; - sgr-iosevka = "1f6c3sd022ss0m8myb03fpr03d4mmw6yapgamkp8xbskxny11sik"; - sgr-iosevka-aile = "02h8bd89pxdalfd7ysybzr6lrga5vilwsdsmbl9f6c74pdxp9wsq"; - sgr-iosevka-curly = "015wqd61iww7q15hfp4ifk7yb8p2070v0vi1v7jb0zqgim7lky4g"; - sgr-iosevka-curly-slab = "132ixkvfny95nsmil4b68zyag2gg9dxsn7yzfdmzr6ld392a2gxn"; - sgr-iosevka-etoile = "0vgkf40q81bgcm2q8nb4z40lzvib50k5mmsardgwaigwlhsjpnr1"; - sgr-iosevka-fixed = "0y7jrly440k8dq5av6yx257wyvaprh4nr6a0axqd9v9h0kw27s00"; - sgr-iosevka-fixed-curly = "1xvjsnay8bqji6mw13llfmnyzrahqwyymwbalc9gdgxd85abdndm"; - sgr-iosevka-fixed-curly-slab = "0q2s371z6cgnh07g1svl2jn10655kn2wyill1w274sb8qvx972m7"; - sgr-iosevka-fixed-slab = "0q41blbalb9r40c56gci184nbp2nyvglbqyyr2rmv87c2qqvnzrj"; - sgr-iosevka-fixed-ss01 = "05lvvnfa35p2xa1j2ygbwzwmn5jj8djafm2ykjv17992ljs6zlns"; - sgr-iosevka-fixed-ss02 = "1c13rybqmzikjvq7m4nkjkl147m6w7i389r5a9vl3c8v281g89q8"; - sgr-iosevka-fixed-ss03 = "0wykv3wa18i53659avb4n0wirrbcrj24wslwx1g151an9vrfbixq"; - sgr-iosevka-fixed-ss04 = "11k74l40323q0bcz3zf4a7gnpgnf4j2rjrgqqla6nfmjkacbfngy"; - sgr-iosevka-fixed-ss05 = "0p78q0ik8m815shbac2pyw5yas25rbzw7r9abb94md1fh175csx5"; - sgr-iosevka-fixed-ss06 = "1rg0nagpf3nrgmnlmy3lvrr665492ygkdqaxi1js5hqnmy9xhsml"; - sgr-iosevka-fixed-ss07 = "0j2iiv6jzd9v4ggdj88hpyqhmf04rsq8jc6llg50mx6nr89y7fbf"; - sgr-iosevka-fixed-ss08 = "10zlla2qkr6xpvdchawlixfn3yxnakhi0lg3naskk0zj00vifxay"; - sgr-iosevka-fixed-ss09 = "1l0h7m292hi6613j9spfxpy25n74718s0b96sn8ycw3qbpjlybkm"; - sgr-iosevka-fixed-ss10 = "064hjwhi78a7lb3gn8s1ga6kw2sk5j1y38cqrmxizja76msw3cxm"; - sgr-iosevka-fixed-ss11 = "1adnn6fpkx20zfmip62csxrasfn0fs7gxv00q8wkd69chgzz7k6l"; - sgr-iosevka-fixed-ss12 = "1yqv5b8az0dxilvrabm82lkrnvn1x8z43jg1pfh6ykd49kgim5ma"; - sgr-iosevka-fixed-ss13 = "0vkxzb3b3r61z0k6rix6j9paw5kxgd5k3a76k3ri0mw6fnh3kzks"; - sgr-iosevka-fixed-ss14 = "111ck61z1bbcrgrryw3dc1ariicfs7brga8zzrs9angg8xwcdky9"; - sgr-iosevka-fixed-ss15 = "0hb4lh87f0dw7acra9w6j7r17lc9xpfjh8hkp5096fbjfffyn786"; - sgr-iosevka-fixed-ss16 = "1rq4s7rqj0nnkq1b94ahhlqma9x50kagndrfc8wxqz26x1na88a6"; - sgr-iosevka-fixed-ss17 = "1jz54ilc36q6z6s8xqffbrb9g2w6yhikwyr8hjvghb0imvwa99vi"; - sgr-iosevka-fixed-ss18 = "1nsbxq4m2h1vbwcl0zfwmfrd48brlrmi5cb1099ybqqp9lkrpddf"; - sgr-iosevka-slab = "15k6r7847al2wh9df0fzq04brn8scix5d0wwnbbnyy2p8hg8r0jk"; - sgr-iosevka-ss01 = "0yaw30j2wj0i876xkpvh3k76hyyjjbqqm3vfwqn0nahn83sk7lq9"; - sgr-iosevka-ss02 = "048bgm59gnk5qpxfpflj4q8iryjlcnybyaqcmdkwhklqyracqada"; - sgr-iosevka-ss03 = "151ai1pkiszrd1zrdviqd7701hqmp48gqkfn86xz4bw7p84qniyv"; - sgr-iosevka-ss04 = "03ih3c0n0ab3wkp9w6ngzn4x6fmn4z19p506r0fvkg0n8rcmx35v"; - sgr-iosevka-ss05 = "0zh9zb2vl5z2xc4j0ascv2ps6789ll9qgjmvd6hhb23rf540d371"; - sgr-iosevka-ss06 = "15wd5sni08ckpbqr8cnkiv9pwhnqp9jh70nl3wv93bwvyqzycx6p"; - sgr-iosevka-ss07 = "12lgjhqaqj8qag59xz49l0d2wb39aymigfknhxj72yjgqrv6nmli"; - sgr-iosevka-ss08 = "1f8g0rsdjpykq1061hxbk46wl6x7rr6n4n5mx0kxl0q0rry8zk29"; - sgr-iosevka-ss09 = "0zjn4wyldmynldinhiqadpw3mldi46vsnw3wgsq8w0j90hcz1rg8"; - sgr-iosevka-ss10 = "0bxyvm2xs1iqdpwv6vhz0zc6k6h1jd2xr9alc6jhavyzwzgwsrnq"; - sgr-iosevka-ss11 = "1fl2insp3i1q697pim7jbk569cx2dpv0ivs8q1sgk7kl86mq5k8m"; - sgr-iosevka-ss12 = "1h003xf0g5w6jmcl8882lmsi3ri0dqnayiq37rwlygbi3zhchgpi"; - sgr-iosevka-ss13 = "1r30r7inci5clyp7wxl5a8jcvanlipwwbx5nc7vwq8n7q48n3i0j"; - sgr-iosevka-ss14 = "0h2fqnlrg3f5hba7v2v2xnfp7z0cdipkgj9g1iyzr71r1fpm4wwi"; - sgr-iosevka-ss15 = "03kdf4lvg9x6g9130l4by4q5bh0fra3mpvyap29rs1gm47w0n84k"; - sgr-iosevka-ss16 = "0cmkw1654figbsj9biqcjh6x86dffhn10b05y0s4qlj1ackzpciz"; - sgr-iosevka-ss17 = "0iyi20lzswcshikqvxlmbf8wkyfs8xz8bjw6lxix81818skgavhx"; - sgr-iosevka-ss18 = "0m82akjnb1xkqissh86s3vhm1fbsy9wlkqabcfhk1jyhj3w2q3i8"; - sgr-iosevka-term = "0r1v50n1fjy40df16kjcv92ihnka9sb1h1lkwigvy12pp8df0fbw"; - sgr-iosevka-term-curly = "1hk42bsf157131smbxali2g681jwh4fynjhnswsd05k04p20lndp"; - sgr-iosevka-term-curly-slab = "092fx48mf26zpaj2qvbbhr2qi3bpqhyhynznffdjadzdqnsqyxyy"; - sgr-iosevka-term-slab = "0kndz8q7him9wkfiaxkjfjkqsmsqg5y6n9bmzh0gvz304019s1gz"; - sgr-iosevka-term-ss01 = "0awxqg4r5pq7kcvqjabsgzjagmf66ads8bp0w1bw27w6f5vc21hf"; - sgr-iosevka-term-ss02 = "1zfvjw32z8kf25j9gvdq7aa4p94s4r8vvh7kncnxcm2prrc40fvc"; - sgr-iosevka-term-ss03 = "122qm2s6w6clw4fgy59cj8p54mlyavyfr81g06zjgy46i8skrpsw"; - sgr-iosevka-term-ss04 = "14y4rarp17qm0qy59rshhd581pdn1niqx6h2y74yyc6kms6q94rn"; - sgr-iosevka-term-ss05 = "18cv0bl7ngb4gp5phzh77r8q0y863ym598px2n5jf00maaigfahc"; - sgr-iosevka-term-ss06 = "14rp2kd2b609ijhg8gmnc5sgjniwgbfkcnp5xa5m9bbshbjmikqn"; - sgr-iosevka-term-ss07 = "09sppprv46d62cyp0aw77p3wr6s514qzc5p3lb1qxiakic5gn2js"; - sgr-iosevka-term-ss08 = "02slv5va9yn09pcscmx6snjp2swjznrrhnwjf9fwi74siypza1xx"; - sgr-iosevka-term-ss09 = "0hdhsd1rkiqgz91x9kkn2rd37ya6q91qkyv3w5ry8flfffba421z"; - sgr-iosevka-term-ss10 = "13b29x2znqm8l3ydakc0sq5skr1mk4xjfikvayp5vc1a4krjyzwn"; - sgr-iosevka-term-ss11 = "15qq6lvf7mdnch20shsigrr7xk7qbgr2wz7qbqwyaidd1vlk57px"; - sgr-iosevka-term-ss12 = "09nyj7dcc7ldi7kn8scxjaszp8gxzdxq860zig1bpsjrssm20870"; - sgr-iosevka-term-ss13 = "0v28swz2dbg8kc2wx5h4llkki5i1rpdk5f6ip08xjzlb35bphwwk"; - sgr-iosevka-term-ss14 = "1q94pvfs2yqz8sjvpchs44w83rnf08v6njz27pz4da5g1v7qg4s2"; - sgr-iosevka-term-ss15 = "077cl1259xgfb26p67wih69vq2vw20ardq479jajc5r7cn2cbxia"; - sgr-iosevka-term-ss16 = "0fy1810yxi2faacdc1fsy0nlzh781fijs6l8kfsh2xb22sk2ydf2"; - sgr-iosevka-term-ss17 = "1m8jv2rvxsj0aj1lwz38radvq2fivx1qgivsaly2sf992lga5w3v"; - sgr-iosevka-term-ss18 = "0rm8ki7g0brwcxmidapyn5r2jd55n9hlx2prhzskgyph4ikmnmrh"; + iosevka = "1zdjwczfmb6swa4yza4nydhvspj9wvi1lvd4d9inr9ssc0ky0h0k"; + iosevka-aile = "15ahii9597g8p2m0abx3zha26093gsnihn66nm9l1jqrda8s3bfx"; + iosevka-curly = "1xqxzj9zxfxy3mpq9kjfzjxpi106qp6dq9x32vdfm192l2kcz4dq"; + iosevka-curly-slab = "0rp6p5v1jd4ihgkshmzm90b9i2kafz94ng2f0lxqrjkh88xg2qkz"; + iosevka-etoile = "1ml7wmkq7im97z9zgg184bw0a3wzk5rd10jx29ybb4hfklp5mpgk"; + iosevka-slab = "1dydq9pw0n9kj1nwbyrcb7cxsmjbs69fj91rnl9ayjp6fis2npfl"; + iosevka-ss01 = "0q26f6n986cs6bzbyqsd0rnk064cxyr7z6iskn1gbf3138cj1q2j"; + iosevka-ss02 = "1g93qx9b7l5fq5lbxjgvfxmzzmmplgd3cygc3kl7z0xdqfzqh735"; + iosevka-ss03 = "0vfg0qr0w22yq0igzm0wpd3gf74n2w1xsk7lpzsxcrpljzmjrry5"; + iosevka-ss04 = "10phf294w91b4m259pgddpih5r9ys49fib419vnh0rcn3f3c0vmz"; + iosevka-ss05 = "074551ir5a45c7k00bfsbp162vc537xyqdqgi6h7j7lkhn7rfjvg"; + iosevka-ss06 = "09jn7lk0gc3ns3640g2ng2jh44g180kjcx4fcyacipx5sfwwhjaf"; + iosevka-ss07 = "18jn9png6jqh5g7883v50za44sa1h78ni8jmpzmfpnhhsvxfq6f2"; + iosevka-ss08 = "0drgk3r1p4pn5vvdjrms3vivzizd7jkpla40z0gvi7832cssxk0d"; + iosevka-ss09 = "0xynk2m5nhhlk34c2d3962mcz8mh7n2f64jd4n8l6v3mibcmjh8n"; + iosevka-ss10 = "1yygdiikbdklk7ddyg3mmvypcmwbm9iym63qvabv0n2dxm5fjylz"; + iosevka-ss11 = "0as42f552xdpla332sabrxf98l33rv17qzig8f2g38cvwhdp7wc1"; + iosevka-ss12 = "179499aa1yh5hp0zlwvbyfixi72qky59lba5hd9b53s81jxph778"; + iosevka-ss13 = "0dprpbcykq5a4gz9941vbiaj7l36xvwip19l1g0422ffg9yrlqvg"; + iosevka-ss14 = "04843xsmab4y3hxicpkv6ard7kynm6dhyxxsmyz0n3rvl0jk4krj"; + iosevka-ss15 = "1j0ljgpz3x5wkcj1jx8dnb5ccp1fcyg4i8p40cr01azmbxhwj5m5"; + iosevka-ss16 = "0gn6x6f03mccfq6lfglbfzxgg74v30k7nadqjlj08fsxp37iiqzc"; + iosevka-ss17 = "1qnh6bqz15h1xaxcqjsbiidaqbrjikc20fys5fwjflh213csy2n8"; + iosevka-ss18 = "0p85kp81ylm8fm5fgyp6sv9rcf8gvznpfgn7mbw26y1lx7gmh6xy"; + sgr-iosevka = "1g97vv4n020r8j9k4w7dzam2xvfqs80nbfvmxkswsnfg3kys1n58"; + sgr-iosevka-aile = "0ysds3663psv1nr6nyzwxm47vg02jhpgssm3lmdls4g07y93f1fl"; + sgr-iosevka-curly = "1kzclraj9ndcask13f4iwvf360zm7p78xqf645wbfa9h4rzd93l5"; + sgr-iosevka-curly-slab = "12y4fyf22mzrnbzl9785ffg6pqcgbdbss1hambf03av2cdvc7sfi"; + sgr-iosevka-etoile = "1d04q0wnsymfv3zklfz77yvq1xa1zlj1fi2ihljlzrlfw8ybn90c"; + sgr-iosevka-fixed = "0p6h9hhqbjn9y7dvf78fm0jy6wd884gh4cn4k6070v0psm5xp0y1"; + sgr-iosevka-fixed-curly = "0l4yd4p8gzsmxgfh90l7z2x6l8v56v5jwsyshq6jawc8xcbny3rb"; + sgr-iosevka-fixed-curly-slab = "13cg8by9j57r2vbh0anms61dcxvxrzf3yw91s1g6nmhllqd5aqrq"; + sgr-iosevka-fixed-slab = "03v8i2p2sww6p2dmzq1xqrrik2k1qz91xn9d9ww2zwz47hkgbysm"; + sgr-iosevka-fixed-ss01 = "1caliz8g63cny7zrq5gkan2366c381d2rl48jnqmmpij3zsx8axz"; + sgr-iosevka-fixed-ss02 = "01sgb5mrrry2nln0yfzm5z00x5rv28iav3xpww33xcrgwvvvxfp0"; + sgr-iosevka-fixed-ss03 = "076ayn5y5gxla7w9ildg445wlc2r36vfnhqim7wkphach9mqjn1j"; + sgr-iosevka-fixed-ss04 = "0x1bd9vy8a0afykb97yl669hsf5mn2gjm9ly5hlb3bnmxaw8dchj"; + sgr-iosevka-fixed-ss05 = "0f6yn9z3sv28ilx1j0sh0yw19m0kzi81razq7q601k7q4klzm7dw"; + sgr-iosevka-fixed-ss06 = "0qjsg1xl6x6355c5x2lakh5cbv1vjs1z1s13ikbqhv8wckklmbb0"; + sgr-iosevka-fixed-ss07 = "0z8yy005l4srqgi2sh64vj1238ydw04kg4vqzj612bmydp5r4vbj"; + sgr-iosevka-fixed-ss08 = "0dh9gr3qhpw2ap3j69nnsbiqi04y59rgvpwxgw2z8jcdksh7syal"; + sgr-iosevka-fixed-ss09 = "1lf4vi363rz7mchin262zwz21lpnp1k77v934858qyspc8fkgf1j"; + sgr-iosevka-fixed-ss10 = "0i7lkr892mq1nks2fsll2lhrzgad0q4hpvl4wafd2jx9wi21b158"; + sgr-iosevka-fixed-ss11 = "13p1z9x9yi064p1jh0gybrbv2np5ynyggmasf7259cs1l89fqci4"; + sgr-iosevka-fixed-ss12 = "1ydkj92f9nyyxhvcscxahnjp75pd66ps0flj09f8kk7lbs9vcx4f"; + sgr-iosevka-fixed-ss13 = "1gkzv8l298kyvgkil47d6gshjvjfdgr0chjhnkl7yqqmwwl23rn2"; + sgr-iosevka-fixed-ss14 = "0klm69qmirappqijsl0si5yv8pk56k5d5jqpib8l0scb99pxvi2y"; + sgr-iosevka-fixed-ss15 = "0ym7zdvh0g52jkpijls572hjyv8jk47srq4nqvig0qygkx3w24nf"; + sgr-iosevka-fixed-ss16 = "0clhkh8lxn0garhsj9jca2iw173gihac10bcm12i0mq8ca8qxrhl"; + sgr-iosevka-fixed-ss17 = "1225rd8w2c65zvmq5gbg2f8n7bnmqdjf9g0cjqi42gwns840k81h"; + sgr-iosevka-fixed-ss18 = "0r47grjpbdk6ccrdvdz7vsln5923wl4xb4xcm3q803p8sfb4h38x"; + sgr-iosevka-slab = "1f96ml19ph39bnkdfrag84z1w7d6r7l5sk8vl2gw55hqwb9h423y"; + sgr-iosevka-ss01 = "167s8175qcq544d0j21rwrjispdrw8q41p3dfd9kri4x3cbgqndy"; + sgr-iosevka-ss02 = "0hj18h8hz18ggqm4mj4cdqhp7aa2w8p647y2my5rh989k8y5pgw8"; + sgr-iosevka-ss03 = "012mxn8azidrjq39jvvscmlazvx4lv94ibvfp3acfp7chhgshi4g"; + sgr-iosevka-ss04 = "1g1wi82baa71p1596430akdd0hhxzp7fa1gimjkvl871h7nal5r3"; + sgr-iosevka-ss05 = "1s1jmr4aam0584gy9jbk8fxymn2y9vfz6yd12bkd7l8m73y819bw"; + sgr-iosevka-ss06 = "1bqrm6g8q77g8b9b14dbwnj9gc0g68niw32fw7fjzpypgsgwh5y3"; + sgr-iosevka-ss07 = "0mw4qmfnjdncyk8r30km1pvcmv46dlps6zkq7c8szy2lsnlshspf"; + sgr-iosevka-ss08 = "0kikssw16p3bnlm796fbdkzl5vwm496lz4j9c5ms9hgpk7j1qxcc"; + sgr-iosevka-ss09 = "02vrzi199qszm10jmnijx786lmkcx0npfaachp51n9lpsvs23i64"; + sgr-iosevka-ss10 = "138lhzjxq9ar8dmm1cdjdvdkn3blhi423hcvhr6wfxps629xvlw2"; + sgr-iosevka-ss11 = "08ry7fbfswri4vq20513lj4xfjv70dqvs8aadqx0gwkcknmdawq2"; + sgr-iosevka-ss12 = "1nlzzxkp2gn5hx2js33c86w7823ircpi2d2s63a6irgqwzm0dc53"; + sgr-iosevka-ss13 = "0yrzqhns7a82fpwl7gndjpaln3251s89vc91rc1lc4rcmqzpjdfy"; + sgr-iosevka-ss14 = "1km2bvnrp5g1axfl59agh9qrkdayh5h23pdmf6dxw8a8s3sknf7w"; + sgr-iosevka-ss15 = "0fym1sgf375d8y8qbgyjx9x2y5h0iidnbd7fxqk1jdzcm4ndnrv5"; + sgr-iosevka-ss16 = "0h5rcvqw1xwvhkcdb082zbd3hl0ymnv8nxvf9g8lprpwb222ag8b"; + sgr-iosevka-ss17 = "1s7p4ydpgkhxfjsp3vqn059l43gpxmlf54pawl6i53ldzgjsfx1a"; + sgr-iosevka-ss18 = "0rpfvl3yffpg5c3155pmswpg31qj2wd2zh1k42r5k84ws9l9ns7d"; + sgr-iosevka-term = "0i2bxrfpvcg4agrsj6d6dfiim2lz9p7xm17b5928xbk5cxl08v9b"; + sgr-iosevka-term-curly = "0k0zqfkkjk8fi88gqnr44hcbm3y4wpx4p99dqv51ssra7ggqbs5z"; + sgr-iosevka-term-curly-slab = "1krc6mva1mif6xlnfxxqnxxfaljszg3zkivgvmbkaqgb7y39ph87"; + sgr-iosevka-term-slab = "0r4f29218l2mql9bld488bdmzzgqav81i757vfj6qrc5m6w6znah"; + sgr-iosevka-term-ss01 = "1hvi8xc0zagx267vfhwymnyq5y1bb9p6d7vs5nijrkq7hlkyl8j3"; + sgr-iosevka-term-ss02 = "0pha6nz5736ygv6mhf6xk5kp29wxg5sn336rh45w3q9dh3df2bh0"; + sgr-iosevka-term-ss03 = "169lxbrr6i40cpa45381r04q0q8vgmhaypdzp30lg8gm69wpgs87"; + sgr-iosevka-term-ss04 = "0273cinikxp1xrxzcs0dn51xsi1h59yw7pdvaciqys62vb09cai8"; + sgr-iosevka-term-ss05 = "0rax2nwzgy9pmw4qld2spfpsv98vs4mpqz0zw6zr1dd6jdhzvr3b"; + sgr-iosevka-term-ss06 = "1r2ja3idf68kvsk7r3mjx2zqjdx41rvsb9xhxnp9llga51r3y4f7"; + sgr-iosevka-term-ss07 = "0rb1wq206p4g6i5v32x0y2lr1vs93qg5hfichbpi3bdjjpwlvg10"; + sgr-iosevka-term-ss08 = "1bsnmvdabnrj65s9d9i0s3q4zn1b2w2xvsqsjjgs3iwsbhy5b7n3"; + sgr-iosevka-term-ss09 = "1vm3jkv58n1zf96hgd28mrqls23zdk8cpml9wvmlj7p9y7x0qcxs"; + sgr-iosevka-term-ss10 = "0120gip4r40dzmc5vpl9avhzyfh16w0vdqw8ks259arcd72s0j4v"; + sgr-iosevka-term-ss11 = "14rf4h9zdnvkjsvwcikmgpnlpypk1qpdld1sw5wf1drbarpxynkl"; + sgr-iosevka-term-ss12 = "0g6rrsz0fc2szjxp4hxsw0ji4vcdhq5qx32hq83is2iqkkbylsz9"; + sgr-iosevka-term-ss13 = "19nk2wn13xnacih8qydxsjcpqwaqyklc6dsrx9b2rv7x8ksxyzdp"; + sgr-iosevka-term-ss14 = "16cjsfk5gn77f4h5g29cx5jj3zrxcl26izyivs5n161xvrq95inb"; + sgr-iosevka-term-ss15 = "07y306f40dmfdzzgfk2mmq3aipwzqcsff7yjcd3g9hn6cznn85jq"; + sgr-iosevka-term-ss16 = "0lbmqlsd7zlrfy9fxrj6ngnw2lwvv437z3ibw33qgch1vv4qz4yz"; + sgr-iosevka-term-ss17 = "08w4x5dd7klnafp6ifnd61m1s3q9ncbr1llx8ywa00s1dfxxsc0f"; + sgr-iosevka-term-ss18 = "0b2vxkc8c2jmpxlvj2gdy2ghygsiifrp4pivmpgp3amwa913smsk"; } diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index 4001e358e8516..68d94abb33b63 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "43.alpha"; + version = "43.0"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "utrp972m+lch2regi4I3p15TJcDJpmlJj/VPdyFG5M8="; + sha256 = "dFdMSjwycyfxotbQs/k3vir7B6YVm21425wZLeZmfws="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index ce0da404bb595..22ea8bf782521 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -16,6 +16,7 @@ , kconfig , krunner , kinit +, kirigami-addons , kwayland , kwin , plasma-framework @@ -50,6 +51,7 @@ mkDerivation { kconfig krunner kinit + kirigami-addons kwayland kwin plasma-framework diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 8a376862d9c9e..2d3d9c5d4e011 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -12,9 +12,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.4"; + version = "0.6.5"; - sha256 = "sha256-H/qAfgwM0qaIxpVlSAUJJ4/Z3WtvYxJb2TtjKHK6AjE="; + sha256 = "sha256-NUEqQk9EcDl23twbo+DUt7QYZrPmWpsRzmi5wIdolqw="; buildInputs = [ gtk3 diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index ace9f16e42615..9bbc524eab0f4 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -1,14 +1,14 @@ -{ lib, mkXfceDerivation, exo, gtk3, libwnck, libXmu }: +{ lib, mkXfceDerivation, exo, gtk3, libxfce4ui, xfconf, libwnck, libXmu }: mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.4.2"; + version = "1.5.5"; - sha256 = "sha256-jcICXPtG/7t0U0xqgvU52mjiA8wsyw7JQ0OmNjwA89A="; + sha256 = "sha256-worHYB9qibRxMaCYQ0+nHA9CSTColewgahyrXiPOnQA="; nativeBuildInputs = [ exo ]; - buildInputs = [ gtk3 libwnck libXmu ]; + buildInputs = [ gtk3 libxfce4ui xfconf libwnck libXmu ]; meta = with lib; { description = "Easy to use task manager for Xfce"; diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 1a63a62510c98..99c8741851fa0 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -11,6 +11,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; + NIX_CFLAGS_COMPILE = "-I${libxfce4ui.dev}/include/xfce4"; + passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal; meta = with lib; { diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix index 131181031847c..3820cae101a8d 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix @@ -7,6 +7,12 @@ mkXfceDerivation { sha256 = "sha256-EgmTk19p9OBmz3rWQB0LoPhhoDm4u1V6/vvgitOzUuc="; + # https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/merge_requests/3 + postPatch = '' + substituteInPlace configure.ac.in \ + --replace "2.16" "2.26" + ''; + buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ]; meta = with lib; { diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 27a5041eac02a..bb8a846c50095 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "exo"; - version = "4.16.4"; + version = "4.18.0"; - sha256 = "sha256-/BKgQYmDaiptzlTTFqDm2aHykTCHm4MIvWnjxKYi6Es="; + sha256 = "sha256-oWlKeUD1v2qqb8vY+2Cu9VJ1iThFPVboP12m/ob5KSQ="; nativeBuildInputs = [ libxslt diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/pkgs/desktops/xfce/core/garcon/default.nix index 740022550ebbc..656ff4ba5e0b0 100644 --- a/pkgs/desktops/xfce/core/garcon/default.nix +++ b/pkgs/desktops/xfce/core/garcon/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "garcon"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-KimO6w82lkUBSzJbBMI3W8w1eXPARE1oVyJEUk6olow="; + sha256 = "sha256-l1wGitD8MM1GrR4FyyPIxHSqK+AqKKyjTIN7VOaVzpM="; nativeBuildInputs = [ gobject-introspection ]; diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index fc3535127fa29..e664ae7788272 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw="; + sha256 = "sha256-AYjnIi9l3l4g+wqGrPhS2AEsYNJwK1KMofCeyEz+VHs="; nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ]; diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix index 4262a03930352..a2bdee37eb695 100644 --- a/pkgs/desktops/xfce/core/libxfce4util/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4util/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4util"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-q2vH4k1OiergjITOaA9+m92C3Q/sbPoKVrAFxG60Gtw="; + sha256 = "sha256-m4O/vTFqzkF6rzyGVw8xdwcX7S/SyOSJo8aCZjniXAw="; nativeBuildInputs = [ gobject-introspection vala ]; diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix index 3fe2df6f1b62d..33b34e5beee8d 100644 --- a/pkgs/desktops/xfce/core/thunar-volman/default.nix +++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix @@ -3,11 +3,11 @@ mkXfceDerivation { category = "xfce"; pname = "thunar-volman"; - version = "4.16.0"; + version = "4.18.0"; buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; - sha256 = "sha256-A9APQ5FLshb+MXQErCExegax6hqbHnlfI2hgtnWfVgA="; + sha256 = "sha256-NRVoakU8jTCJVe+iyJQwW1xPti2vjd/8n8CYrIYGII0="; odd-unstable = false; diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index dd8e8f9809480..2a6878fbf76d2 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.16.11"; + version = "4.18.0"; - sha256 = "sha256-xan0HuHYLVArx3dGzzxsCjQ8eWsXNk0LtZGAejA2iGI="; + sha256 = "sha256-vsc5vEdyYEtpKktBiIRayZl7MjHrxKzL7iwzvBCAqG0="; nativeBuildInputs = [ docbook_xsl @@ -44,9 +44,9 @@ let unwrapped = mkXfceDerivation { xfconf ]; - patches = [ - ./thunarx_plugins_directory.patch - ]; + configureFlags = [ "--with-custom-thunarx-dirs-enabled" ]; + + NIX_CFLAGS_COMPILE = "-I${libxfce4ui.dev}/include/xfce4"; # the desktop file … is in an insecure location» # which pops up when invoking desktop files that are diff --git a/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch b/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch deleted file mode 100644 index 594a81c829efa..0000000000000 --- a/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c -index 94b11545..1f66c982 100644 ---- a/thunarx/thunarx-provider-factory.c -+++ b/thunarx/thunarx-provider-factory.c -@@ -150,12 +150,19 @@ static GList* - thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory) - { - ThunarxProviderModule *module; -+ const gchar *thunar_dir; - const gchar *name; - GList *modules = NULL; - GList *lp; - GDir *dp; - -- dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL); -+ thunar_dir = g_getenv("THUNARX_MODULE_DIR"); -+ if (NULL == thunar_dir) -+ { -+ thunar_dir = THUNARX_DIRECTORY; -+ } -+ -+ dp = g_dir_open (thunar_dir, 0, NULL); - if (G_LIKELY (dp != NULL)) - { - /* determine the types for all existing plugins */ -diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c -index 023ad2ae..b1d1be8f 100644 ---- a/thunarx/thunarx-provider-module.c -+++ b/thunarx/thunarx-provider-module.c -@@ -174,10 +174,17 @@ static gboolean - thunarx_provider_module_load (GTypeModule *type_module) - { - ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module); -+ const gchar *thunar_dir; - gchar *path; - -+ thunar_dir = g_getenv("THUNARX_MODULE_DIR"); -+ if (NULL == thunar_dir) -+ { -+ thunar_dir = THUNARX_DIRECTORY; -+ } -+ - /* load the module using the runtime link editor */ -- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL); -+ path = g_build_filename (thunar_dir, type_module->name, NULL); - module->library = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - g_free (path); - diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix index 584c356547b38..43531f2012329 100644 --- a/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -9,10 +9,10 @@ symlinkJoin { postBuild = '' wrapProgram "$out/bin/thunar" \ - --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3" + --set "THUNARX_DIRS" "$out/lib/thunarx-3" wrapProgram "$out/bin/thunar-settings" \ - --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3" + --set "THUNARX_DIRS" "$out/lib/thunarx-3" # NOTE: we need to remove the folder symlink itself and create # a new folder before trying to substitute any file below. diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix index ee5413fdda5a1..9d47d1ec7a35f 100644 --- a/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/pkgs/desktops/xfce/core/tumbler/default.nix @@ -7,6 +7,7 @@ , libgsf , poppler , gst_all_1 +, libxfce4util }: # TODO: add libopenraw @@ -14,11 +15,12 @@ mkXfceDerivation { category = "xfce"; pname = "tumbler"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-f2pCItNHTB0ggovIddpwNWEhaohfxD2otN8x9VfwR4k="; + sha256 = "sha256-qxbS0PMhwVk2I3fbblJEeIuI72xSWVsQx5SslhOvg+c="; buildInputs = [ + libxfce4util ffmpegthumbnailer freetype gdk-pixbuf diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix index d98353a070afb..b479a574d97b9 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-Xr8iiCDQYmxiLR2+TeuJggV1dLM/U4b7u7kpvFWT+uQ="; + sha256 = "sha256-/VYZpWk08OQPZ/DQ5SqSL4F4KDdh+IieQBDOZUxZvtw="; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix index 16c35e6002bfe..25b3e6f805990 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix @@ -14,9 +14,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-dev-tools"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-5r9dJfCgXosXoOAtNg1kaPWgFEAmyw/pWTtdG+K1h3A="; + sha256 = "sha256-VgQiTRMPD1VeUkUnFkX78C2VrsrXFWCdmupL8PQc7+c="; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index fed25720e3364..d76523a94c3cd 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -17,9 +17,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.16.5"; + version = "4.18.0"; - sha256 = "sha256-RK4sEir8CvB1aa2dZWJftA+2n4YPUEkhF9afOfOTA0Y="; + sha256 = "sha256-CnZk0Ca3IG6nmiwe7eIvPqpzJgRZHIyqeoTA5cPpU7s="; nativeBuildInputs = [ gobject-introspection diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index 107357d5a7318..d14752fbab469 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-power-manager"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-Qk++1db+agiU99p+QW8/WNnNqFVejV/BcnmgvfoB3OU="; + sha256 = "sha256-vl0SfZyVGxZYnSa2nCnYlqT05Hm7PLzOxgAGzapkKVI="; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf xfce4-panel ]; diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index 5ce96c1b02b6a..f8dc8b92da302 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-LIRAQ1YAkAHwIzC5NYV/0iFLkAP5V96wuTIrYTGbGy0="; + sha256 = "sha256-eSQXVMdwxr/yE806Tly8CLimmJso6k4muuTR7RHPU3U="; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ]; diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index bf003fca5a475..6e0990e9098dd 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.16.5"; + version = "4.18.0"; - sha256 = "sha256-ZVQw/oqN+jCOWj8O+1ldVCvbzY+QcebaQI5oFOdMOew="; + sha256 = "sha256-T0sPcsyGqa0hEXIb/mhxb29OnuLmHey6Tt/iB4nQvoM="; postPatch = '' for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index c3946258292bd..18bc54436b4a5 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfconf"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-w8wnHFj1KBX6lCnGbVLgWPEo2ul4SwfemUYVHioTlwE="; + sha256 = "sha256-8zl2EWV1DRHsH0QUNa13OKvfIVDVOhIO0FCMbU978Js="; nativeBuildInputs = [ gobject-introspection vala ]; diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index bc3c714eb0a44..7d67741657992 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-JecuD0DJASHaxL6gwmL3hcmAEA7sVIyaM0ushrdq4/Y="; + sha256 = "sha256-HZVu5UVLKDCWaUpw1SV8E0JLGRG946w4QLlA51rg/Bo="; buildInputs = [ exo diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index efc12dd91eb96..abd08f5a6f3d3 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-CwRJk+fqu3iC4Vb6fKGOIZZk2hxTqYF3sNvm6WKqHdI="; + sha256 = "sha256-nTPgxC0XMBJ48lPCeQgCvWWK1/2ZIoQOYsMeaxDpE1c="; nativeBuildInputs = [ exo librsvg ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix index fb070ed3652dc..bba028bfe5368 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; - version = "1.2.7"; - sha256 = "sha256-M+BehEYcHZlnuYwBlI7F0aPxPGwExTL5I9Jf6W5ugOY="; + version = "1.2.8"; + sha256 = "sha256-wEVv3zBS9PRLOMusFPzTnffVDvTaBnTCyGjstJRQRCo="; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index 8a2cd770944ba..ad0110a564292 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -13,10 +13,10 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-cpugraph-plugin"; - version = "1.2.6"; + version = "1.2.7"; rev-prefix = "xfce4-cpugraph-plugin-"; odd-unstable = false; - sha256 = "sha256-Elm10ZGN93R+1XZ4vJJZZIJ6OcaHpsrH0nQRMMuFnLY="; + sha256 = "sha256-IgxljHJAg9Bp/OFFZiQ6QwE5vtAtQ0WmYHs78NVsmCw="; buildInputs = [ exo diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index 2e82deb2d3f18..fbc40f1902553 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-sensors-plugin"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FxwCNfcMZfD/7lh+lg2dp5soSFXfIhMCOerCYnLsBsk="; + sha256 = "sha256-bBYFpzjl30DghNCKyT+WLNRFCTOW3h6b+tx6tFiMNrY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index 78b0adcaadfba..95eba5d7fb36e 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -16,10 +16,9 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? !(stdenv.isDarwin - || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - || stdenv.isAarch32 # broken for the armv7l builder -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? true }: diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index 1623d06c7f7a9..2123efdf23519 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -16,10 +16,9 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? !(stdenv.isDarwin - || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - || stdenv.isAarch32 # broken for the armv7l builder -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false # TODO should be on by default }: diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index d330b73875955..b04eeb3c72693 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -16,10 +16,9 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? !(stdenv.isDarwin - || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - || stdenv.isAarch32 # broken for the armv7l builder -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false }: diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 5b8ec69853f21..0cdc79a4a57e9 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -17,10 +17,9 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? !(stdenv.isDarwin - || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - || stdenv.isAarch32 # broken for the armv7l builder -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false }: diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 673cd31460e83..1134f0a6ab123 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -18,10 +18,9 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? !(stdenv.isDarwin - || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - || stdenv.isAarch32 # broken for the armv7l builder -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false } @args: diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index 1aa85f543ea26..da72bb8b35ae3 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -16,10 +16,9 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? !(stdenv.isDarwin - || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - || stdenv.isAarch32 # broken for the armv7l builder - ) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false }: diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 3e01c7ac9ca11..5c381a896e152 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -16,10 +16,9 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? !(stdenv.isDarwin - || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - || stdenv.isAarch32 # broken for the armv7l builder -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false }: diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index 6c0a37cadd900..f8b6a8170f85a 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -16,10 +16,9 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? !(stdenv.isDarwin - || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - || stdenv.isAarch32 # broken for the armv7l builder -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false }: diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index afd60ec2aebc7..a9b6e156b8743 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -21,7 +21,7 @@ with python3.pkgs; buildPythonApplication rec { --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ - --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.19.*")' 'uvicorn>=0.16,<=0.19"' \ + --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.19.*")' 'uvicorn>=0.16"' \ --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1,<=0.21"' \ --replace 'tabulate==%s" % ("0.8.10" if PY36 else "0.9.*")' 'tabulate>=0.8.10,<=0.9"' \ --replace 'wsproto==' 'wsproto>=' diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 1766c45995a37..6e4c18c961eff 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -4,11 +4,13 @@ , genBytecode ? false , bqn-path ? null , mbqn-source ? null +, enableReplxx ? false , libffi , pkg-config }: let + # TODO: these submodules should be separated libraries cbqn-bytecode-files = fetchFromGitHub { name = "cbqn-bytecode-files"; owner = "dzaima"; @@ -16,6 +18,13 @@ let rev = "3df8ae563a626ff7ae0683643092f0c3bc2481e5"; hash = "sha256:0rh9qp1bdm9aa77l0kn9n4jdy08gl6l7898lncskxiq9id6xvyb8"; }; + replxx-submodule = fetchFromGitHub { + name = "replxx-submodule"; + owner = "dzaima"; + repo = "replxx"; + rev = "ba94c293caad52486df8712e808783df9a8f4501"; + hash = "sha256-pMLvURksj/5k5b6BTwWxjomoROMOE5+GRjyaoqu/iYE="; + }; in assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); @@ -26,8 +35,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; - rev = "dbc7c83f7085d05e87721bedf1ee38931f671a8e"; - hash = "sha256:0nal1fs9y7nyx4d5q1qw868lxk7mivzw2y16wc3hw97pq4qf0dpb"; + rev = "49c0d9a355698f54fff2c0caa177e2b341fabb45"; + hash = "sha256-jm2ZzFxhr9o4nFR2rjYJz/4GH+WFnfU4QDovrOPI3jQ="; }; nativeBuildInputs = [ @@ -47,7 +56,8 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" - ]; + ] + ++ lib.optional enableReplxx "REPLXX=1"; preBuild = '' # Purity: avoids git downloading bytecode files @@ -56,7 +66,15 @@ stdenv.mkDerivation rec { ${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/ '' else '' cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} build/bytecodeLocal/gen/ - ''); + '') + + lib.optionalString enableReplxx '' + cp -r ${replxx-submodule} build/replxxLocal/ + '' + # Need to adjust ld flags for darwin manually + # https://github.com/dzaima/CBQN/issues/26 + + lib.optionalString stdenv.hostPlatform.isDarwin '' + makeFlagsArray+=(LD_LIBS="-ldl -lffi") + ''; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 71e32e074c8f6..e00cda47da6d5 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy"; }; + patches = [ + # Add patch from Arch Linux to fix corrupted display with Cheese + # https://gitlab.gnome.org/GNOME/cheese/-/issues/51 + # https://github.com/archlinux/svntogit-packages/tree/packages/clutter-gst/trunk + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/c4dd0bbda35aa603ee790676f6e15541f71b6d36/trunk/0001-video-sink-Remove-RGBx-BGRx-support.patch"; + sha256 = "sha256-k1fCiM/u7q81UrDYgbqhN/C+q9DVQ+qOyq6vmA3hbSQ="; + }) + ]; + propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index f5e5a2e03d2cc..a5f15e38740a0 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.7.1"; + version = "3.0"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c="; + sha256 = "sha256-rhuu2C1etU3IHaLSvUiJKMwgnPpcm1g40xjwDprc2LU="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/paho-mqtt-c/default.nix b/pkgs/development/libraries/paho-mqtt-c/default.nix index 37a829088d819..836f9fe625dfb 100644 --- a/pkgs/development/libraries/paho-mqtt-c/default.nix +++ b/pkgs/development/libraries/paho-mqtt-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "paho.mqtt.c"; - version = "1.3.11"; + version = "1.3.12"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.c"; rev = "v${version}"; - hash = "sha256-TGCWA9tOOx0rCb/XQWqLFbXb9gOyGS8u6o9fvSRS6xI="; + hash = "sha256-LxyMbMA6Antt8Uu4jCvmvYT9+Vm4ZUVz4XXFdd0O7Kk="; }; postPatch = '' diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index fe6e304d9f318..fbab2d259ac1c 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -376,7 +376,7 @@ with prev; ]; }); - lush-nvim = prev.luaLib.overrideLuarocks prev.lush-nvim (drv: rec { + lush-nvim = prev.luaLib.overrideLuarocks prev.lush-nvim (drv: { doCheck = false; }); @@ -398,10 +398,9 @@ with prev; patches = [ ./luuid.patch ]; - postConfigure = let inherit (prev.luuid) version pname; in - '' - sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|' - ''; + postConfigure = '' + sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|' + ''; }); diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index dabe3f748a924..d25bb93d49f4c 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.186"; + version = "0.6.197"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h8PUxSjC21BsjqFgOOvDPClFLwOTFTTEB57zxUtbuTw="; + sha256 = "sha256-+elot37F8VW7BP18zB8wHbxTHLgnTlXLUJlr82/Y05w="; }; vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8="; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 4e5b04e62404c..1356c39f0f823 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -410,7 +410,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-VsecNo0Ca3+bDTzSpJqIpdupKVhhQ8aOYeWc09JlUM89knqvhSrlMrg0U8BiOD4tFrY1OPaCcraK8leDBxKMBg=="; + sha512 = "sha512-DWIhxvxt8f4h6MDd35mz7BJff+fu7HItW3WPDIEpCR3RzcOWyiHBbLQW5/DOgmf+pRLTjwXQob7kuTZVYUAw5w=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index c723f201a2b05..943cd1287ef71 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.4.4"; + version = "2.5.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-wlLCoiGZVviAif/CQrQsjLkwCjaP04kNY5QOT8llI0U="; + sha256 = "tXFhDlRReF92OJoI6VddkcPW44/uHfepcI/jBwE8hCQ="; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 26a3d7451a943..23a13707b9b2c 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.29"; + version = "9.2.30"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-Yso47p4d8buJTdXOrm7luvtxpFu+oTFhqTBueQaXqII="; + hash = "sha256-zl4qk/cDRISzTNK+fapxGr5yzugueAD3erzzUA51BJI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index a9357f7943c84..356d4d8bee426 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.29"; + version = "9.2.30"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-cAruoJhQpxK/+sRcyoLoBlG35b11UV2Tjwt2+QUx46E="; + hash = "sha256-UCXxKCvxzGr/c4WuAAFLfEp2QOlKD3n8tqSGI4fjEDo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 714e57f6eb478..aa283b601e5e2 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.29"; + version = "9.2.30"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-kS7NTlZnWwcvuRV/Eq3K0MJ/bGYcR5BWIbdPONuTqII="; + hash = "sha256-IJr5Xk/0n5AfoUAQfI6DrMJ3ulCttKZkVgFZ42C3poE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 42c6965302f66..460f143d8761a 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bZ2kT9yIIHFd3/INIuJh3MdKzF8NCYNeVS/Egg5+S7I="; + hash = "sha256-MMsg1laEk9cKU4oMhjKI47ulLNaGPH6QjAdx/wuAvMM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index 28ba5a2f4d194..e140cf22925c8 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "caio"; - version = "0.9.8"; + version = "0.9.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hUG5EaraoKj3D3K+Qm2Nm1AFe19qwRy/FnEb1SXWKDM="; + hash = "sha256-BFlpjbC2yxwGtCAMfn1VM5zmioyN5fFNMJDDWceB+LE="; }; checkInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "File operations with asyncio support"; homepage = "https://github.com/mosquito/caio"; + changelog = "https://github.com/mosquito/caio/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 7fb0cba7820ef..7cb8a96dc2402 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.29"; + version = "9.2.30"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-X2c1TVbf/KTUOfjQ8Izt+vyxhQrAki3hCBBwKxgkxbw="; + hash = "sha256-cN9Mfi572JFH3lfgLp9nnkO+wOUmDfiEtqZUA0U2JEw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 9a4180f0fd083..24d6ede50306e 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.29"; + version = "9.2.30"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-fK0j6+UqQVadQPU34oLp50gB+/0YnNnNg/rGuIt5I54="; + hash = "sha256-ZLMbV4H1JWfnMlSsN1nZhQVmsEyJF2sIii0sSOxe+2E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index 12e1a46025a9f..aee115f5e0c54 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "coqpit"; - version = "0.0.16"; + version = "0.0.17"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-f1FLjR4VzSOA/VaeseVA4F1NWVJIvokIZIDW1k7fNqU="; + sha256 = "sha256-FY3PYd8dY5HFKkhD6kBzPt0k1eFugdqsO3yIN4oDk3E="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index 640c06a7bcc36..4b7e1c21e4b3c 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "0.8.1"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "v${version}"; - sha256 = "sha256-Gjs4x52LwCsE0zAJjLO1N0w5r1jDJkZoVY1JVZB8bmE="; + sha256 = "sha256-FBcDEEWgfV+OgHriSOZKWZPt0O89nDe2CsY3oqX/6zo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix index 5597238626257..674af37074300 100644 --- a/pkgs/development/python-modules/gios/default.nix +++ b/pkgs/development/python-modules/gios/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { pname = "gios"; - version = "2.1.0"; + version = "2.3.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-WjuDsu0EA+KtErusw5VADyvleVegXHCTEkuQ1lU/SRU="; + hash = "sha256-/lAENP9wKZ+h2Iq2e9S7s7Naa0CTl/I2cwCxBEAwsrA="; }; propagatedBuildInputs = [ @@ -47,11 +48,14 @@ buildPythonPackage rec { "test_invalid_station_id" ]; - pythonImportsCheck = [ "gios" ]; + pythonImportsCheck = [ + "gios" + ]; meta = with lib; { description = "Python client for getting air quality data from GIOS"; homepage = "https://github.com/bieniu/gios"; + changelog = "https://github.com/bieniu/gios/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index e01bf4678ca1d..3c1b875b5836b 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.25.0"; + version = "0.25.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LOxk1qQmFJ9gzr6M+Q48KKQmkjuKMxKgrc5ZSbNSFHo="; + hash = "sha256-DBjwqQ7tmvpHa0FZYS6Jsb/wQ7cnoynhybBWl9PNejs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index 143822de63b97..8cf09df8bad73 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -50,8 +50,8 @@ buildPythonPackage rec { requests-toolbelt setuptools rich - pysocks - ]; + ] ++ requests.optional-dependencies.socks; + checkInputs = [ pytest-httpbin @@ -64,10 +64,9 @@ buildPythonPackage rec { postInstall = '' # install completions - installShellCompletion --bash \ - --name http.bash extras/httpie-completion.bash - installShellCompletion --fish \ - --name http.fish extras/httpie-completion.fish + installShellCompletion --cmd http \ + --bash extras/httpie-completion.bash \ + --fish extras/httpie-completion.fish # convert the docs/README.md file pandoc --standalone -f markdown -t man docs/README.md -o docs/http.1 @@ -91,6 +90,19 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_stdin_read_warning" + # Re-evaluate those tests with the next release + "test_duplicate_keys_support_from_response" + "test_invalid_xml" + "test_json_formatter_with_body_preceded_by_non_json_data" + "test_pretty_options_with_and_without_stream_with_converter" + "test_response_mime_overwrite" + "test_terminal_output_response_charset_detection" + "test_terminal_output_response_charset_override" + "test_terminal_output_response_content_type_charset_with_stream" + "test_terminal_output_response_content_type_charset" + "test_valid_xml" + "test_xml_format_options" + "test_xml_xhtm" ] ++ lib.optionals stdenv.isDarwin [ # flaky "test_daemon_runner" @@ -99,7 +111,8 @@ buildPythonPackage rec { meta = with lib; { description = "A command line HTTP client whose goal is to make CLI human-friendly"; homepage = "https://httpie.org/"; + changelog = "https://github.com/httpie/httpie/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ antono relrod schneefux SuperSandro2000 ]; + maintainers = with maintainers; [ antono relrod schneefux ]; }; } diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 149cb32cbdd84..d9e35db651144 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.10"; + version = "2.5.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4/p2m2A+0RDxQZHAJFSqk4x49bMWQo4R3aDOu3jI6FQ="; + sha256 = "sha256-KnOPrJoHaT0XMhv2HoGKt+a6bsLHouCqZqdl1LlB+9g="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 080ce93389330..b5a81037adb4b 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.2.6"; + version = "0.2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-3kjg0Q7nXMSjBq2suPtIUvUEGCJr6pTo53ZbjMC5uZ0="; + hash = "sha256-D/hxL8iKaLCFUJU1QLvf5qRhp1vrvrZSrLp2v0oen18="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index d11338a0f0708..140221e3c66ae 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.10.1"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/tu29RIszjzYQKeyYe+8Zkud3L/HBoWdXdpNcilWERs="; + hash = "sha256-g02IvD8ktWvt1BjeoGXIf+YNnLtQ2ALCIW4uomeCe4E="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index eeb9ebe59e213..5c40ac3da5489 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.2.8"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-Vzi+v+M0LfptNq/6nc3usnf3YLzBwYcij2hAt835Or8="; + hash = "sha256-9zFZ/M2xwDF7rxrBwQvTv3bCR2oB0IezcYOlPZb+oaQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 7e9642a2bc280..5fd696523d845 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -1,31 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , flake8 , python +, pythonOlder }: buildPythonPackage rec { pname = "pep8-naming"; - version = "0.13.1"; + version = "0.13.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "sha256-NG4hLZcOMKprUyMnzkHRmUCFGyYgvT6ydBQNpgWE9h0="; + hash = "sha256-l7zZUOMWyTxnTbkFkzfABY/eVMKnv0kNJ0UPzJo0W1Y="; }; - patches = [ - # Fixes tests for flake8 => 5 - # Remove on next release - (fetchpatch { - url = "https://github.com/PyCQA/pep8-naming/commit/c8808a0907f64b5d081cff8d3f9443e5ced1474e.patch"; - sha256 = "sha256-4c+a0viS0rXuxj+TuIfgrKZjnrjiJjDoYBbNp3+6Ed0="; - }) - ]; - propagatedBuildInputs = [ flake8 ]; @@ -41,8 +35,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/PyCQA/pep8-naming"; description = "Check PEP-8 naming conventions, plugin for flake8"; + homepage = "https://github.com/PyCQA/pep8-naming"; + changelog = "https://github.com/PyCQA/pep8-naming/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; }; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 644c346e4b0c8..eb960cc49fd87 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -14,6 +14,7 @@ , pytest-asyncio , pytest-timeout , pytestCheckHook +, pythonRelaxDepsHook , pythonOlder , requests , srptools @@ -25,24 +26,39 @@ buildPythonPackage rec { version = "0.10.3"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ng5KfW93p2/N2a6lnGbRJC6aWOQgTl0imBLdUIUlDic="; + hash = "sha256-ng5KfW93p2/N2a6lnGbRJC6aWOQgTl0imBLdUIUlDic="; }; postPatch = '' substituteInPlace setup.py \ --replace "pytest-runner" "" - # Remove all version pinning - - substituteInPlace base_versions.txt \ - --replace "protobuf==3.19.1,<4" "protobuf>=3.19.0,<4" ''; + pythonRelaxDeps = [ + "aiohttp" + "async_timeout" + "bitarray" + "chacha20poly1305-reuseable" + "cryptography" + "ifaddr" + "mediafile" + "miniaudio" + "protobuf" + "requests" + "srptools" + "zeroconf" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ aiohttp bitarray @@ -72,6 +88,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Test doesn't work in the sandbox "tests/protocols/companion/test_companion_auth.py" + "tests/protocols/mrp/test_mrp_auth.py" ]; __darwinAllowLocalNetworking = true; @@ -83,7 +100,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for the Apple TV"; homepage = "https://github.com/postlund/pyatv"; + changelog = "https://github.com/postlund/pyatv/blob/v${version}/CHANGES.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 5461dc44523ab..11e7b778a4515 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , parameterized , pycryptodome +, pytest-aiohttp , pytestCheckHook , pythonOlder , pyyaml @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "0.6.3"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "jbarrancos"; repo = pname; rev = version; - hash = "sha256-yGUBCs1IxbGKBo21gExFIqDawM2EHlO+jiRqonEUnPk="; + hash = "sha256-pN/QILpXJoQAccB7CSDLxCDYfijf/VJbYw+NRUI4kvs="; }; postPatch = '' @@ -41,6 +42,7 @@ buildPythonPackage rec { checkInputs = [ parameterized + pytest-aiohttp pytestCheckHook requests-mock responses @@ -53,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Rainbird controllers"; homepage = "https://github.com/jbarrancos/pyrainbird/"; + changelog = "https://github.com/jbarrancos/pyrainbird/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 0e25985cf3375..5ad8815509ac6 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.26.5"; + version = "0.26.6"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-YW+Oi/ORXjeFLQfeVxCKgyRGBVx4TZKGeKMCgYkEIzo="; + hash = "sha256-A/P59fhXlMu1QF1Nc7zeE9q4KgS6ABe7FraZWZPYDys="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 672a70e091def..0e609c59d2a60 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.29"; + version = "9.2.30"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-buqtEiifBKbR7FP08ne5v0nWqkO+d2cVHxNCCZJDrdU="; + hash = "sha256-lSjO8GLJN5pAOEusw0Uak7DsEE11MVexyRvkiLbkAjA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 2ae91cff1a62e..96a1e10555ebc 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-EvlGi/HlaPq3SYJDtGLwV58BKi7EZDCSAAxlSUqwztk="; + hash = "sha256-ObJFxDqWy+a191j0FEIkviKIKlhhTwXmK2W8Wz8BR58="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index fbb573fa98f80..87834f6c72c76 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.12.0"; + version = "1.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-22GQO3y24xlbZgxNsD8eEWj/pVWcOlYiRV52jKTf7sc="; + hash = "sha256-ugCbjhOZTJ1+DeTKDTQJMIO6wjkqVL5tvPGoRrZKwGI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index e81183c02fb30..01af1111a2412 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.21.0"; + version = "2.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YhFhqbWqAVaBwu4buIc87i7mtEDYQEDanSpXzWf31eU="; + hash = "sha256-uLnumxbOJZ49utvHi0DzdgzcTMM9t9kwJS7HkJEhdtA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 26d23f08afa40..e48536e66359d 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -11,19 +11,22 @@ , uvloop , watchfiles , websockets +, hatchling , pythonOlder }: buildPythonPackage rec { pname = "uvicorn"; - version = "0.18.2"; - disabled = pythonOlder "3.6"; + version = "0.20.0"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - hash = "sha256-nxtDqYh2OmDtoV10CEBGYQrQBf+Xtuf5k9yR6UfCgYc="; + hash = "sha256-yca6JI3/aqdZF7SxFeYr84GOeQnLBmbm1dIXjngX9Ng="; }; outputs = [ @@ -31,6 +34,8 @@ buildPythonPackage rec { "testsout" ]; + nativeBuildInputs = [ hatchling ]; + propagatedBuildInputs = [ click h11 diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix index b9cd883f43c03..116a9f1d28d0e 100644 --- a/pkgs/development/python-modules/uvicorn/tests.nix +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -16,6 +16,8 @@ buildPythonPackage rec { pname = "uvicorn-tests"; inherit (uvicorn) version; + format = "other"; + src = uvicorn.testsout; dontBuild = true; @@ -44,6 +46,8 @@ buildPythonPackage rec { disabledTests = [ "test_supported_upgrade_request" "test_invalid_upgrade" + "test_no_server_headers" + "test_multiple_server_header" ]; } diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index 8b551f1c66a0e..e9de15488ddc4 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -12,13 +12,15 @@ buildPythonPackage rec { pname = "webauthn"; version = "1.6.0"; - disabled = pythonOlder "3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Ts0zKnQg1EaBNB9xQmzOpEVwDSFwHNjIhEP1jTwEOFI="; + hash = "sha256-Ts0zKnQg1EaBNB9xQmzOpEVwDSFwHNjIhEP1jTwEOFI="; }; propagatedBuildInputs = [ @@ -32,11 +34,19 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "webauthn" ]; + pythonImportsCheck = [ + "webauthn" + ]; + + disabledTests = [ + # TypeError: X509StoreContextError.__init__() missing 1 required... + "test_throws_on_bad_root_cert" + ]; meta = with lib; { - homepage = "https://github.com/duo-labs/py_webauthn"; description = "Implementation of the WebAuthn API"; + homepage = "https://github.com/duo-labs/py_webauthn"; + changelog = "https://github.com/duo-labs/py_webauthn/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index ba03da0a8520d..6527f2311de3e 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.300.0"; + version = "2.300.2"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-pEBudX285qMz0W8Sog0ph2CA5UclBItQ+ixaBi6dl8I="; + hash = "sha256-4TCClrCCHMVtbGAlxmAhZt63nQlMxkaLLZ9EOgurSMA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index b0a417d1b0541..a811426a6d211 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -13,19 +13,19 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-mpKrCRZQ7CS/Rf2KfpszE2/KACNClHxfrLFJ+iaVhZE="; + sha256 = "sha256-+L8w7FG74V6z9IUfkQHo2B7/vjLhdVHeoVBttgqoUNc="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-NIbOx0xR5qStIfe8TptMqu3Dx6zVl2qBDzr/41ANsrk="; + cargoSha256 = "sha256-CQFTO43/b0ymYtnAtvySrp8cOF7rRdzY8mvcYTiiUp0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 9246fb9b8a08f..e80e4c8b4d441 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.47.1"; + version = "0.48.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-ozOtAXI2mlzZc66oPgLotpjAai2qxvMpJdoDBJqj3Oc="; + sha256 = "0sdmfdmxgks9bbzg8nn1gdx55g7qiwpdxkx6p9lwa71mdfc14r2z"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index d2855861dc8fc..95b5512c6fca0 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -7,29 +7,34 @@ let setoptconf-tmp = python3.pkgs.callPackage ./setoptconf.nix { }; in -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "prospector"; - version = "1.7.7"; + version = "1.8.3"; format = "pyproject"; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "PyCQA"; repo = pname; - rev = version; - hash = "sha256-sbPZmVeJtNphtjuZEfKcUgty9bJ3E/2Ya9RuX3u/XEs="; + rev = "refs/tags/v${version}"; + hash = "sha256-R3Sc4Qx6bht+XJhNj+fy32akzDOgSDF5LP3WE1qEyms="; }; - nativeBuildInputs = [ + pythonRelaxDeps = [ + "pyflakes" + "pep8-naming" + "flake8" + ]; + + nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ bandit dodgy + flake8 + gitpython mccabe mypy pep8-naming @@ -50,25 +55,24 @@ buildPythonApplication rec { vulture ]; - checkInputs = [ + checkInputs = with python3.pkgs; [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'requirements-detector = "^0.7"' 'requirements-detector = "*"' \ - --replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' \ - --replace 'mccabe = "^0.6.0"' 'mccabe = "*"' \ - --replace 'pycodestyle = ">=2.6.0,<2.9.0"' 'pycodestyle = "*"' - ''; - pythonImportsCheck = [ "prospector" ]; + disabledTestPaths = [ + # distutils.errors.DistutilsArgError: no commands supplied + "tests/tools/pyroma/test_pyroma_tool.py" + ]; + + meta = with lib; { description = "Tool to analyse Python code and output information about errors, potential problems, convention violations and complexity"; homepage = "https://github.com/PyCQA/prospector"; + changelog = "https://github.com/PyCQA/prospector/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kamadorueda ]; }; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index f1949e8f4e100..4930b87e9458a 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.188"; + version = "0.0.189"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xe9opiFZ68plNqs5QkkM13ADUCQGcRR7hpELnxwvT3o="; + sha256 = "sha256-KyYQD9Ieg15ZT5JN4EGRusYqBkANw23ao2Of7A9tFE0="; }; - cargoSha256 = "sha256-c0gma/KL4OnCppu9ZEALB3KjDyV97qZcknuncU03cm8="; + cargoSha256 = "sha256-v++DabAqhcvVhKnbVtsiX8empbkDp7oTfUdYTNLpYO8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 4129b30035bd7..8fa00e11ef767 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.18"; + version = "1.0.19"; src = fetchCrate { inherit pname version; - sha256 = "sha256-BlWPdZb85XaTGV6ZE3XRVKHJyXimfrezhRyqJVmCFMY="; + sha256 = "sha256-TlHb974Dtmz5qW+4L3BE6GQ3SbkwtIrZxE6FpJrgNdY="; }; - cargoSha256 = "sha256-1qtlsItLP8MdxebgktzTr3R4Kq+PBIAiHGaikbQ796E="; + cargoSha256 = "sha256-np1rln9tD+J4s410/Pv4/eKAxyzK8qtLoON86JR1T94="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/pkgs/os-specific/darwin/plistwatch/default.nix b/pkgs/os-specific/darwin/plistwatch/default.nix new file mode 100644 index 0000000000000..852c9c23aa9bf --- /dev/null +++ b/pkgs/os-specific/darwin/plistwatch/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "plistwatch"; + version = "unstable-2020-12-22"; + + src = fetchFromGitHub { + owner = "catilac"; + repo = "plistwatch"; + rev = "c3a9afd8d3e5ffa8dcc379770bc4216bae88a671"; + sha256 = "0a5rfmpy6h06p02z9gdilh7vr3h9cc6n6zzygpjk6zvnqs3mm3vx"; + }; + + vendorSha256 = "sha256-Layg1axFN86OFgxEyNFtIlm6Jtx317jZb/KH6IjJ8e4="; + + #add missing dependencies and hashes + patches = [ ./go-modules.patch ]; + + doCheck = false; + + meta = with lib; { + description = "Monitors and prints changes to MacOS plists in real time"; + homepage = "https://github.com/catilac/plistwatch"; + maintainers = with maintainers; [ gdinh ]; + license = licenses.mit; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/plistwatch/go-modules.patch b/pkgs/os-specific/darwin/plistwatch/go-modules.patch new file mode 100644 index 0000000000000..94d7cc01e24e3 --- /dev/null +++ b/pkgs/os-specific/darwin/plistwatch/go-modules.patch @@ -0,0 +1,19 @@ +--- a/go.mod ++++ b/go.mod +@@ -3,1 +3,6 @@ + go 1.14 ++ require( ++ github.com/jessevdk/go-flags v1.5.0 ++ howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 ++ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect ++ ) +--- a/go.sum ++++ b/go.sum +@@ -9,1 +9,7 @@ + howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= ++ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU= ++ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= ++ github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= ++ github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= ++ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 h1:EZ2mChiOa8udjfp6rRmswTbtZN/QzUQp4ptM4rnjHvc= ++ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 9d902fe9b70f7..3fc597beaab33 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.0.1"; - hash = "sha256-5KEXFtCRn1syOSKLMrrcEJtWGl/maLlUfhQ7CxlbvWg="; + version = "3.0.3"; + hash = "sha256-9QZlCnbx8s7737WD80NBIQLxcKvFXG/4dWd5Jrm9lGM="; } diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 453d05a5afc17..d5ceae939a40d 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "2.17.3"; - hash = "sha256-RGgR/JGuJFzDGQSmk3H7C/BEb3sk6yOaA320ADUwEcA="; + version = "2.17.5"; + hash = "sha256-Woye+zUikjdGWIp8pRDBC7CsUrnInfJ23byGcxFtwQY="; } diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index dce740a985428..1bee79918927c 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "22.05.6.1"; + version = "22.05.7.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1aa1ddlacr9dpk1g1syj9ml5dninv3dzvw8vlm1s3j3ybp6lz8bd"; + sha256 = "1hr62c9g0z3brgpa2l68pskraqxk52dk1iq1xkb0dr5w0cwhdpij"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 83360ed2131be..7b8fdcff2b102 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.12.7"; + version = "2022.12.8"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 12cb7778cdfee..24d59402d2818 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -8,6 +8,8 @@ , ffmpeg-headless , inetutils , nixosTests +, home-assistant +, testers # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] @@ -188,7 +190,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.12.7"; + hassVersion = "2022.12.8"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -205,8 +207,8 @@ in python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "home-assistant"; repo = "core"; - rev = version; - hash = "sha256-9dukY04sh35kj5vUbNmqnN+MPGqJT/YUuHC64pHzWjw="; + rev = "refs/tags/${version}"; + hash = "sha256-oJwA0YELlgMbnf1XiLDGlMLrvFaLP7WMv9/0KOI4XDI="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -359,6 +361,10 @@ in python.pkgs.buildPythonApplication rec { tests = { nixos = nixosTests.home-assistant; components = callPackage ./tests.nix { }; + version = testers.testVersion { + package = home-assistant; + command = "hass --version"; + }; }; }; diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index 46e81508b4d2b..47c43917ec6ce 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -1,28 +1,28 @@ { lib , python3 +, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "dmarc-metrics-exporter"; - version = "0.6.1"; + version = "0.8.0"; disabled = python3.pythonOlder "3.7"; format = "pyproject"; - src = python3.pkgs.fetchPypi { - inherit pname version; - hash = "sha256-VYmSHDde3zLq7NcsX7xp1JYe6x6RKFEravpakIzW390="; + src = fetchFromGitHub { + owner = "jgosmann"; + repo = "dmarc-metrics-exporter"; + rev = "v${version}"; + hash = "sha256-uZCPEUoWNrcSz5qV24eFdZOOxKkoz+Qn6HpELBwOK2I="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'uvicorn = {extras = ["standard"], version = "^0.15.0"}' 'uvicorn = {version = "^0.15.0"}' \ - --replace '"^' '">=' - ''; + pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 8859b8c7e11ea..ae3825c3907da 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.9.2"; + version = "0.10.1"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z+FZ5AtxgO+tCB9HHZhyttXt8LXbCi/6tG8WkNRuhgk="; + sha256 = "sha256-IFyiopURkza22VYW5VM23hZ+GAKr+ykxn7r/MyQfGAI="; }; - vendorSha256 = "sha256-AQX4O25PR0icR0Llz66t+2AdJm58RDimhOO5NBMRu7s="; + vendorSha256 = "sha256-5iT67xJ9pH/QhkMTKvYIU0NsMWg6KVum+trNyt2a2rg="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix index e0b836ae851dd..359dbfb5979dd 100644 --- a/pkgs/servers/syncstorage-rs/default.nix +++ b/pkgs/servers/syncstorage-rs/default.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.12.5"; + version = "0.13.1"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = version; - hash = "sha256-rayJvJ8+y1mw2BEKuaZqGnsIqtVKgBoFkINntRLtTLs="; + hash = "sha256-aRLTuP5He8rHsi4Qw+CptyGhp2JdQwL/jLNmHUPcYBU="; }; nativeBuildInputs = [ @@ -43,11 +43,11 @@ rustPlatform.buildRustPackage rec { ]; preFixup = '' - wrapProgram $out/bin/syncstorage \ + wrapProgram $out/bin/syncserver \ --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoSha256 = "sha256-FUWyR2mfXHyQ/WdyyV4/pIniBV9pr80WwpFA4c8D1UY="; + cargoSha256 = "sha256-95wK0jFbuu1xFacOAJFAQitm/tlvMUIny2As49QukQE="; buildFeatures = [ "grpcio/openssl" ]; @@ -59,5 +59,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mozilla-services/syncstorage-rs"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ pennae ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/shells/fzf-git-sh/default.nix b/pkgs/shells/fzf-git-sh/default.nix new file mode 100644 index 0000000000000..598c2d0eb0b2e --- /dev/null +++ b/pkgs/shells/fzf-git-sh/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, bash +, bat +, coreutils +, fetchFromGitHub +, findutils +, fzf +, gawk +, git +, gnugrep +, gnused +, tmux +, util-linux +, xdg-utils +}: + +stdenv.mkDerivation rec { + pname = "fzf-git-sh"; + version = "unstable-2022-09-30"; + + src = fetchFromGitHub { + owner = "junegunn"; + repo = "fzf-git.sh"; + rev = "9190e1bf7273d85f435fa759a5c3b20e588e9f7e"; + sha256 = "sha256-2CGjk1oTXip+eAJMuOk/X3e2KTwfwzcKTcGToA2xPd4="; + }; + + dontBuild = true; + + postPatch = '' + sed -i \ + -e "s,\bawk\b,${gawk}/bin/awk," \ + -e "s,\bbash\b,${bash}/bin/bash," \ + -e "s,\bbat\b,${bat}/bin/bat," \ + -e "s,\bcat\b,${coreutils}/bin/cat," \ + -e "s,\bcut\b,${coreutils}/bin/cut," \ + -e "s,\bhead\b,${coreutils}/bin/head," \ + -e "s,\buniq\b,${coreutils}/bin/uniq," \ + -e "s,\bcolumn\b,${util-linux}/bin/column," \ + -e "s,\bfzf-tmux\b,${fzf}/bin/fzf-tmux," \ + -e "/display-message/!s,\bgit\b,${git}/bin/git,g" \ + -e "s,\bgrep\b,${gnugrep}/bin/grep," \ + -e "s,\bsed\b,${gnused}/bin/sed," \ + -e "/fzf-tmux/!s,\btmux\b,${tmux}/bin/tmux," \ + -e "s,\bxargs\b,${findutils}/bin/xargs," \ + -e "s,\bxdg-open\b,${xdg-utils}/bin/xdg-open," \ + -e "s,__fzf_git=.*BASH_SOURCE.*,__fzf_git=$out/share/${pname}/fzf-git.sh," \ + -e "/__fzf_git=.*readlink.*/d" \ + fzf-git.sh + ''; + + installPhase = '' + install -D fzf-git.sh $out/share/${pname}/fzf-git.sh + ''; + + meta = with lib; { + homepage = "https://github.com/junegunn/fzf-git.sh"; + description = "Bash and zsh key bindings for Git objects, powered by fzf"; + license = licenses.mit; + maintainers = with maintainers; [ deejayem ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix index 46e293c40ecd0..c229667db474a 100644 --- a/pkgs/tools/misc/cyberchef/default.nix +++ b/pkgs/tools/misc/cyberchef/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://gchq.github.io/CyberChef"; maintainers = with maintainers; [ sebastianblunt ]; license = licenses.asl20; + platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index be95d26fa34f9..5b390c7dd42c3 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -20,16 +20,16 @@ let in buildGoModule rec { pname = "xray"; - version = "1.6.1"; + version = "1.6.6-2"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - sha256 = "0g2bmy522lhip0rgb3hqyi3bidf4ljyjvvv3n1kb6lvm0p3br51b"; + sha256 = "sha256-nNG1HNsV/ITWdM9a4KkV44Oq/P92yD/oQjO7+pSBX38="; }; - vendorSha256 = "sha256-QAF/05/5toP31a/l7mTIetFhXuAKsT69OI1K/gMXei0="; + vendorSha256 = "sha256-64pyrhPplki0R+rsjh6pi+PCOzWVbES40r0Z1Vhk44o="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index 32030fe0ecf58..8dd91679d0934 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -5,20 +5,21 @@ buildGoModule rec { pname = "gobuster"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "OJ"; repo = "gobuster"; rev = "v${version}"; - hash = "sha256-bh48TAhK0HwwNvE5Fr4KtCI+Nz1Wb9vaV916RzGG8/I="; + hash = "sha256-GSpCmJx60DMGr6hDaL//i0gteJniU2jJO+sEDp+eUvg="; }; - vendorHash = "sha256-fuz9Sj/wKJWp7Q/g5LBb44a50QKGMCPHJ38TBhTCn00="; + vendorHash = "sha256-xY+RoM19bsoSCRJk7caMjU3jkUoWkOYRYKHfQjiVVPo="; meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; homepage = "https://github.com/OJ/gobuster"; + changelog = "https://github.com/OJ/gobuster/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ pamplemousse ]; }; diff --git a/pkgs/tools/system/gkraken/default.nix b/pkgs/tools/system/gkraken/default.nix index cd5e02d9a0481..b5bb7fd03c1b3 100644 --- a/pkgs/tools/system/gkraken/default.nix +++ b/pkgs/tools/system/gkraken/default.nix @@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ meson pkg-config + gobject-introspection glib ninja gtk3 diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/tools/text/scraper/default.nix index 4118387a34a54..ba5c6507fa7ff 100644 --- a/pkgs/tools/text/scraper/default.nix +++ b/pkgs/tools/text/scraper/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "scraper"; - version = "0.13.0"; + version = "0.14.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-5fFO51I6DqH1BBELt9FW2BCwYcsXVXaQLgocMn446Bs="; + sha256 = "sha256-ucArD3xElLpOukNYHiErCTKDSlW2aDn00D3gr5L8Sm0="; }; - cargoSha256 = "sha256-Y4m7C7v4ekJfb3BoWwDF+X8uuRH9muaTwPECgu4WaMQ="; + cargoSha256 = "sha256-62rJWpDi2vPHFnJnIrisyj0sEZTzRra+zoMb06zmxdE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21744ea2ce94e..62c196b97b286 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13565,6 +13565,8 @@ with pkgs; fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); + fzf-git-sh = callPackage ../shells/fzf-git-sh {}; + ion = callPackage ../shells/ion { inherit (darwin) Security; }; @@ -15757,7 +15759,9 @@ with pkgs; mbqn = callPackage ../development/interpreters/bqn/mlochbaum-bqn { }; cbqn = cbqn-bootstrap.phase2; + cbqn-replxx = cbqn-bootstrap.phase2-replxx; cbqn-standalone = cbqn-bootstrap.phase0; + cbqn-standalone-replxx = cbqn-bootstrap.phase0-replxx; # Below, the classic self-bootstrapping process cbqn-bootstrap = lib.dontRecurseIntoAttrs { @@ -15782,6 +15786,14 @@ with pkgs; mbqn-source = null; }; + phase0-replxx = callPackage ../development/interpreters/bqn/cbqn { + inherit (cbqn-bootstrap) stdenv; + genBytecode = false; + bqn-path = null; + mbqn-source = null; + enableReplxx = true; + }; + phase1 = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; genBytecode = true; @@ -15793,6 +15805,13 @@ with pkgs; genBytecode = true; bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn"; }; + + phase2-replxx = callPackage ../development/interpreters/bqn/cbqn { + inherit (cbqn-bootstrap) mbqn-source stdenv; + genBytecode = true; + bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn"; + enableReplxx = true; + }; }; dbqn = callPackage ../development/interpreters/bqn/dzaima-bqn { @@ -25441,6 +25460,8 @@ with pkgs; osxsnarf = callPackage ../os-specific/darwin/osxsnarf { }; + plistwatch = callPackage ../os-specific/darwin/plistwatch { }; + power-calibrate = callPackage ../os-specific/linux/power-calibrate { }; powercap = callPackage ../os-specific/linux/powercap { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 8c1e259525044..c270dd2220ddf 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -205,4 +205,23 @@ impure-cmds // appleSourcePackages // chooseLibs // { discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { }; + # See doc/builders/special/darwin-builder.section.md + builder = + let + toGuest = builtins.replaceStrings [ "darwin" ] [ "linux" ]; + + nixos = import ../../nixos { + configuration = { + imports = [ + ../../nixos/modules/profiles/macos-builder.nix + ]; + + virtualisation.host = { inherit pkgs; }; + }; + + system = toGuest stdenv.hostPlatform.system; + }; + + in + nixos.config.system.build.macos-builder-installer; }) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 261f92c498ca5..73a4efae15b71 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -59,19 +59,19 @@ in # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; - luxio = callPackage ({ fetchurl, which, pkg-config }: buildLuaPackage { + luxio = callPackage ({ fetchurl, which, pkg-config }: buildLuaPackage rec { pname = "luxio"; version = "13"; src = fetchurl { - url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2"; + url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-${version}.tar.bz2"; sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; }; nativeBuildInputs = [ which pkg-config ]; postPatch = '' - patchShebangs . + patchShebangs const-proc.lua ''; preBuild = '' @@ -80,7 +80,7 @@ in INST_LUADIR="$out/share/lua/${lua.luaversion}" LUA_BINDIR="$out/bin" INSTALL=install - ); + ); ''; meta = with lib; { @@ -91,14 +91,14 @@ in maintainers = with maintainers; [ richardipsum ]; platforms = platforms.unix; }; - }); + }) {}; nfd = callPackage ../development/lua-modules/nfd { inherit (pkgs.gnome) zenity; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; - vicious = (callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec { + vicious = callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec { pname = "vicious"; version = "2.5.1"; @@ -124,6 +124,5 @@ in maintainers = with maintainers; [ makefu mic92 McSinyx ]; platforms = platforms.linux; }; - }) {}); - + }) {}; } |