diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7d031b591356..564828de1909 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14055,6 +14055,13 @@ fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; }]; }; + the-argus = { + email = "i.mcfarlane2002@gmail.com"; + github = "the-argus"; + name = "Ian McFarlane"; + githubId = 70479099; + matrix = "@eyes1238:matrix.org"; + }; TheBrainScrambler = { email = "esthromeris@riseup.net"; github = "TheBrainScrambler"; diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 8038ef5bf937..2be471650a6e 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.32"; + version = "0.8.9.36"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1lczH8xTZV1XVVByLAGXJbjXd20JUJALIJJ3s9+orxM="; + hash = "sha256-xEFjyVly1VyDz9ALtVwxxrEs856joP+pe/mappyKrPU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 0376e3af6bfb..d0b38bcd35a8 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }: stdenv.mkDerivation rec { - version = "0.8.18.1"; + version = "0.8.19"; pname = "leafpad"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz"; - sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; + sha256 = "sha256-B9P3EvTb0KMyUf0d7hTiGv3J+SCQ/HaMEasKxVatvpc="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 409f99e37afa..138c886e7639 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.10"; + version = "1.9.20"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-FWUrhTTV1TCoBhitopQc469I7SRy4UDKdRLifVKhCCg="; + sha256 = "sha256-rpJ+HBYmGuhxnZbJn59mc+IokBc5834X2uyriIGnsqA="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 37898709493e..1618bf746ce0 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-3T0vpyAw21u2+csqaz3Yf10G8IQRDyjReedIo+I4fvw="; + sha256 = "sha256-Z5j5tSIF3AZiZjkFFtyyi3hMqWMXtf6ont2CQ/FSEjk="; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index 71fe5b97b8bf..0afe9466b4cb 100644 --- a/pkgs/applications/networking/circumflex/default.nix +++ b/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "2.6"; + version = "2.8"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-pcY2PXiOazKAi8mAAbmftXDae01fcUw/u9JPOHQVclI="; + hash = "sha256-knN+T/dmIwHLqT3MJBjQhGlSeAu0lE2ZOv6tLqkcwS0="; }; - vendorHash = "sha256-rF1Hu4Pf9AF2MTx4GAPmzSn0M38uTxPS1bsAkO23SdI="; + vendorHash = "sha256-Xwek2xlvdGO6C/T0a96RGuMcX7jCbvntEYBf10tvmAo="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index d23669bb1f09..cae6540e39fe 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.14.0"; + version = "0.15.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-xQS7qCUTM3X4SpUZfxKHb08poJ2W52R7+TNe4BFL5sY="; + sha256 = "sha256-u+j1ulM6B238qXvLMJZwLqglr9CGk81MsnBYiNiZVJQ="; }; - vendorSha256 = "sha256-u8Ezk78CrAhSeeMVXj09/Hiegtx+ZNKlr/Fg0O7+iOY="; + vendorHash = "sha256-taJAQPa0EA0Ph9OpCs7jzLqBV61kVstZrWyNEYc/GBk="; subPackages = [ "cmd/kubectl-kuttl" ]; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 0b02b87a1b2f..71eece9e3bac 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-7iTQZ7SiESsKK8F8BpLrRNkj8JhHo64kliaOvMvYGvw="; + sha256 = "sha256-cKmzq155/dCl5wZA2SE3XjfCocHxTh4Wa2IdfzSfQHg="; }; nativeBuildInputs = [ makeWrapper gettext ]; diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index 7e59c2865e56..db0411f1337a 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitLab { owner = "free-astro"; repo = pname; rev = version; - sha256 = "sha256-1NPMTHPbYKPmaG+xRyKFU4/4Iio2ptn+HOvnsg4hoFE="; + sha256 = "sha256-KFCA3fUMVFHmh1BdKed5/dkq0EeYcmoWec97WX9ZHUc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index ba0f3ee2e255..98db5682e7e7 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fast-downward"; - version = "22.06.1"; + version = "22.12.0"; src = fetchFromGitHub { owner = "aibasel"; repo = "downward"; rev = "release-${version}"; - sha256 = "sha256-SBksyZoLR1MtyJUbGigGIbT72qVpN+nznU/bmJGYRz8="; + sha256 = "sha256-GwZ5BGzLRMgWNBaA7M2D2p9OxvdyWqm+sTwxGpcI/qY="; }; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index ee258373dc33..c037e41d74c6 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -35,16 +35,25 @@ mkDerivation rec { pname = "recoll"; - version = "1.33.2"; + version = "1.33.4"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-ql4VHiblIn8uihUbF1htPnpvjw0qMxdzW8HLGlUrZW0="; + sha256 = "sha256-ffD49sGYWYEWAFPRtpyDU/CYFvkrEDL21Ddq3QsXCvc="; }; - configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ] - ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] - ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); + configureFlags = [ + "--enable-recollq" + "--disable-webkit" + "--without-systemd" + ] ++ lib.optionals (!withGui) [ + "--disable-qtgui" + "--disable-x11mon" + ] ++ (if stdenv.isLinux then [ + "--with-inotify" + ] else [ + "--without-inotify" + ]); NIX_CFLAGS_COMPILE = [ "-DNIXPKGS" ]; @@ -54,13 +63,23 @@ mkDerivation rec { ]; nativeBuildInputs = [ - file pkg-config python3Packages.setuptools which + file + pkg-config + python3Packages.setuptools + which ]; buildInputs = [ - bison chmlib python3Packages.python xapian zlib - ] ++ lib.optional withGui qtbase - ++ lib.optional stdenv.isDarwin libiconv; + bison + chmlib + python3Packages.python + xapian + zlib + ] ++ lib.optional withGui [ + qtbase + ] ++ lib.optional stdenv.isDarwin [ + libiconv + ]; # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with @@ -108,7 +127,8 @@ mkDerivation rec { members, email attachments. ''; homepage = "https://www.lesbonscomptes.com/recoll/"; - license = licenses.gpl2; + changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${version}.html"; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ jcumming ]; }; diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 06c819d4bb1b..6873558830be 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "sha256-VJAFa4I5nHuS/aXhiiXztUh2MjCq5zdwCtK0oSsOrGQ="; + sha256 = "sha256-jEzZ6MWFaNXBS8CAzfn/ufMPpWcua9HhBFzetWMlH1Y="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 819f9bf8b716..e00853393e05 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -14,13 +14,13 @@ buildGoPackage rec { pname = "forgejo"; - version = "1.18.2-0"; + version = "1.18.2-1"; src = fetchurl { name = "${pname}-src-${version}.tar.gz"; # see https://codeberg.org/forgejo/forgejo/releases - url = "https://codeberg.org/attachments/5d59ec04-9f29-4b32-a1ef-bec5c3132e26"; - hash = "sha256-RLShwdx8geyFr1Jk5qDVbsEt2hCjdrwX0lNHea7P+pk="; + url = "https://codeberg.org/attachments/44ff6fcb-1515-4bba-85bf-3d3795ced2f7"; + hash = "sha256-XSh17AwPtC+Y24lgjjXJzT/uBHg+0hWZ2RZ/eNF4mCY="; }; outputs = [ "out" "data" ]; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index aae814440423..24fc850b31b0 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.14.2"; + version = "3.14.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-uIVt7pneJq7l/kMSa7VqhcQgXhHCrpBGEqE7QZaDyQQ="; + hash = "sha256-VOny8r00JYUT4Z7LukvWTH9ZTn86vn2Dc1YhPmtdE5s="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index 78d70d594a19..938d2311779c 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "jftui"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TkSnNZBnmDSMsxTFQx1OcFDLQBUqxIrFXQeeslXKqA0="; + sha256 = "sha256-4j0ypzszNWjHbb4RkMIoqvgz624zoKCKiIpidQUPIF4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index e6cf8fef4d4e..859cd8e8cc36 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.4.093"; + version = "2.4.221"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "refs/tags/v${version}"; - sha256 = "sha256-l8jB+3vY9jOlCaLDHAvDm1Ko7viHbnRBIMEXLb/k2z0="; + sha256 = "sha256-A5p4olnXak22410DOKIPpZ6MQGR5aS2ARWO+083bSuQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 88c5f3779df6..58c303a46c40 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.66.2"; + version = "1.67.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-mZzDvD+40YiC8cBpLlYd7K1p5UBYpso9OMCDijopuik="; + hash = "sha256-iSL5ogS8BLcxge3eo+kCqtsGmj7P1wbi+/84nA9fO2Q="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 03d049477b5d..29dd9b27232e 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -1,31 +1,41 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , qemu +, xcbuild +, sigtool , makeWrapper }: buildGoModule rec { pname = "lima"; - version = "0.13.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM="; + sha256 = "sha256-g4FvkjBviI1m8zlc+GK/09dIqVkTQ2MqqK1Wkyu4qBc="; }; - vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY="; + vendorSha256 = "sha256-l53MTxLY/uid+0U/eY96l0aBWKImST1gN2BARilh2K0="; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ makeWrapper installShellFiles ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; # clean fails with read only vendor dir postPatch = '' - substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' + substituteInPlace Makefile \ + --replace 'binaries: clean' 'binaries:' \ + --replace 'codesign --entitlements vz.entitlements -s -' 'codesign --force --entitlements vz.entitlements -s -' ''; + # It attaches entitlements with codesign and strip removes those, + # voiding the entitlements and making it non-operational. + dontStrip = stdenv.isDarwin; + buildPhase = '' runHook preBuild make "VERSION=v${version}" binaries diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/data/fonts/last-resort/default.nix index 8cad990ac973..7b298c73169f 100644 --- a/pkgs/data/fonts/last-resort/default.nix +++ b/pkgs/data/fonts/last-resort/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl }: let - version = "14.000"; + version = "15.000"; in fetchurl { name = "last-resort-${version}"; @@ -13,7 +13,7 @@ in fetchurl { ''; recursiveHash = true; - sha256 = "sha256-rb69V4oExSFx4GpedpyVvGuS6o+MxmxTCSZhoe9kUhI="; + sha256 = "sha256-mkRIA6Hajl5e9j/qb3WSKaIaHmekjl5wGUSszWMfmjw="; meta = with lib; { description = "Fallback font of last resort"; diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix new file mode 100644 index 000000000000..051294c5d3a8 --- /dev/null +++ b/pkgs/data/icons/rose-pine/default.nix @@ -0,0 +1,47 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, gtk3 +}: + +stdenvNoCC.mkDerivation rec { + pname = "rose-pine-icon-theme"; + version = "unstable-2022-09-01"; + + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "gtk"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + # avoid the makefile which is only for the theme maintainers + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + mv icons/rose-pine-icons $out/share/icons/rose-pine + mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn + mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Rosé Pine icon theme for GTK"; + homepage = "https://github.com/rose-pine/gtk"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [romildo the-argus]; + }; +} diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix index d139876e1429..4211864139df 100644 --- a/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/pkgs/data/themes/rose-pine-gtk/default.nix @@ -1,20 +1,20 @@ -{ stdenv -, fetchFromGitHub +{ stdenvNoCC , lib +, fetchFromGitHub , gnome-themes-extra , gtk-engine-murrine , gtk_engines }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "rose-pine-gtk-theme"; - version = "unstable-2021-02-22"; + version = "unstable-2022-09-01"; src = fetchFromGitHub { owner = "rose-pine"; repo = "gtk"; - rev = "9cd2dd449f911973ec549231a57a070d256da9fd"; - sha256 = "0lqx8dmv754ix3xbg7h440x964n0bg4lb06vbzvsydnbx79h7lvy"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; }; buildInputs = [ @@ -26,11 +26,18 @@ stdenv.mkDerivation rec { gtk-engine-murrine # murrine engine for Gtk2 ]; + # avoid the makefile which is only for theme maintainers + dontBuild = true; + installPhase = '' runHook preInstall + mkdir -p $out/share/themes - cp -a Rose-Pine $out/share/themes - rm $out/share/themes/*/LICENSE + mv gtk3/rose-pine-gtk $out/share/themes/rose-pine + mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon + mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn + mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon + runHook postInstall ''; @@ -39,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rose-pine/gtk"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [romildo the-argus]; }; } diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index 3197e3abed9e..75841b5d0d71 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "dyncall"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "https://www.dyncall.org/r${version}/dyncall-${version}.tar.gz"; - # https://www.dyncall.org/r1.3/SHA256 - sha256 = "sha256-q/Ys/DHr1/IWWNqhNwp3gcxRQxYrwIaDhKwH3vnj05A="; + # https://www.dyncall.org/r1.4/SHA256 + sha256 = "sha256-FEN9u+87bckkg/ZQfq+CWrl5ZKie7K6Ms0emvsnDKq4="; }; # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index f3d3587c14fa..443e4de04d9e 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }: +{ lib +, stdenv +, fetchurl +, flex +, bison +, bluez +, libxcrypt +, pkg-config +, withBluez ? false +, withRemote ? false +}: with lib; @@ -11,6 +21,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ="; }; + buildInputs = optionals withRemote [ libxcrypt ]; + nativeBuildInputs = [ flex bison ] ++ optionals withBluez [ bluez.dev pkg-config ]; @@ -20,6 +32,8 @@ stdenv.mkDerivation rec { "--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}" ] ++ optionals stdenv.isDarwin [ "--disable-universal" + ] ++ optionals withRemote [ + "--enable-remote" ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "ac_cv_linux_vers=2" ]; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 446952b30051..4df98d28fd09 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openwsman"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "Openwsman"; repo = "openwsman"; rev = "v${version}"; - sha256 = "sha256-/fSVzpGPObMkJIu7j6eR6A7Gtf2jttoPhcSayBvn3IU="; + sha256 = "sha256-CH2pqWs64Dznim3IljmsthKEQfACVlaAKQ/07MgryHo="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index 195ec563d50f..27e329c92855 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyopengl-accelerate"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonAtLeast "3.10"; # fails to compile src = fetchPypi { pname = "PyOpenGL-accelerate"; inherit version; - sha256 = "01iggy5jwxv7lxnj51zbmlbhag9wcb7dvrbwgi97i90n0a5m3r8j"; + sha256 = "sha256-rYowAlbsolIoJh3hb3QeUaMPNPHhsc9oNZ9cYtvNzcM="; }; meta = { diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index 9dec5087cb06..58bf890921c1 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-vipaccess"; - version = "0.14"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "d5013d306e5891ecfe523c9ef52d074fe8b6ca29ee259c0deeb8a83ae9884ce0"; + sha256 = "sha256-vBFCRXwZ91C48GuOet2Obbo7gM02M2c9+7rhp0l6w54="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 211a4b60c813..6bac02af7f80 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "5731a31cb7452c0c6930dd1a284e0170b39eee959851a2aceb8d6af4134a5fa8"; + sha256 = "sha256-ap/z/TMKYCh4BOpzcKhBZrYk6/S3rZ7XiLfFd3m2UmM="; }; meta = with lib; { diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 4695854dbfad..fdc20a3eefb8 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.49.0"; + version = "6.53.0"; src = fetchurl { url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip"; - hash = "sha256-dEKfQIdWkx6XAKnEBHaVI0l729Xj2RnjoHl59t0Kal0="; + hash = "sha256-pHEGBIvC4XAuzWZpws7ldRGabfKhAqZnaahqVdNpUJE="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 22b14dd283b3..abf87bd0ba19 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.0-beta10"; + version = "4.0-beta14"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; - rev = "d0398f62f08ce0cfba80990b21c6af4181f93fe9"; - sha256 = "sha256-h4DpK7YC7/qMc6GAD2nvNVmrlGjKT5d7OK+1NcuZCMg="; + rev = "28a24639c3c6a95b5b9828f5f02bf0dc2f5ce54b"; + sha256 = "sha256-qAotCc2YUg8FMK+JFHi5B4OL/cAtvWO/pYRRz8RcNUY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 0e809bb32f76..c814517520f6 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.7.4"; + version = "3.8.1"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-VUavNwj5MCMZFV9WASF3olOdZb4JNBYbcQdgUfvPS8k="; + sha256 = "sha256-DBWPKy17pYU5VWEOxnaP2AKoiskNCBbt9QqO6xxf7eI="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index 289e90aec31d..e4af4f24e19a 100644 --- a/pkgs/development/tools/neil/default.nix +++ b/pkgs/development/tools/neil/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.1.45"; + version = "0.1.47"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-QEeJWR4aBx1DsXjlTanhDSQn91I9JzEitU+Az+wTVFY="; + sha256 = "sha256-fsFIBT1voh6QcGRoGYx10JoKqZuV3xcA+eOo03DYz1s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index e1676cf56805..3ba0b5ff4240 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "13.1.2"; + version = "13.3.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/of1jeyHdVyXJ5O8aAN/InaJ5CtCPVFUTk96Q9n5Gr4="; + hash = "sha256-ssZbeb1UczWEjeRY1WJBQPnbG/p6XcUSWVHLdreGJkk="; }; vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E="; diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix index 6fb5507b87d6..6652e5547f12 100644 --- a/pkgs/development/tools/relic/default.nix +++ b/pkgs/development/tools/relic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "relic"; - version = "7.5.3"; + version = "7.5.4"; src = fetchFromGitHub { owner = "sassoftware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-urueDWvHhDsIiLIAatAforBM//UEJz8wUHEVyhwV7JY="; + sha256 = "sha256-rm52XrN0554copqIllfaNC9EIZ+6rxVeZWTWR2y9X14="; }; - vendorSha256 = "sha256-wlylASK2RES0nbf6UZHJBrYQaz9jrq5j7/KF1wYOqE0="; + vendorHash = "sha256-389ki4hsx7l2gHSiOHledo/ZP+I3NAkk1K8anq2kfEE="; meta = with lib; { homepage = "https://github.com/sassoftware/relic"; diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index 2a6ae96cef11..cb33eb1c214c 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -10,7 +10,7 @@ index b0ff5b106..13ac380d0 100644 ) endif diff --git a/data/meson.build b/data/meson.build -index 3a77a7bfc..747bd1988 100644 +index 865b20e26..ff1c2657b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -26,7 +26,7 @@ endif @@ -20,8 +20,8 @@ index 3a77a7bfc..747bd1988 100644 - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - plugin_quirks += join_paths(meson.current_source_dir(), 'power.quirk') - plugin_quirks += join_paths(meson.current_source_dir(), 'cfi.quirk') + plugin_quirks += files([ + 'power.quirk', diff --git a/data/pki/meson.build b/data/pki/meson.build index 3649fecea..c3462744b 100644 --- a/data/pki/meson.build @@ -57,28 +57,27 @@ index 3649fecea..c3462744b 100644 ) endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index 1d1698a7e..5469d00a6 100644 +index c20a1a05e..87b1fa930 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build -@@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false' - install_data([ - 'lvfs-testing.conf', - ], -- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d') -+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d') - ) - con3 = configuration_data() - if get_option('lvfs') == 'disabled' -@@ -15,7 +15,7 @@ if build_standalone and get_option('lvfs') != 'false' +@@ -15,14 +15,14 @@ if build_standalone and get_option('lvfs') != 'false' output: 'lvfs.conf', configuration: con3, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), + ) + configure_file( + input: 'lvfs-testing.conf', + output: 'lvfs-testing.conf', + configuration: con3, + install: true, +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) i18n.merge_file( input: 'lvfs.metainfo.xml', -@@ -49,12 +49,12 @@ configure_file( +@@ -54,12 +54,12 @@ configure_file( output: 'vendor.conf', configuration: con2, install: true, @@ -94,10 +93,10 @@ index 1d1698a7e..5469d00a6 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index e7980e965..2c66e2dc4 100644 +index d3e08af43..30011f548 100644 --- a/meson.build +++ b/meson.build -@@ -195,6 +195,12 @@ endif +@@ -193,6 +193,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -111,7 +110,7 @@ index e7980e965..2c66e2dc4 100644 gio = dependency('gio-2.0', version: '>= 2.45.8') giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index 6cf92e72e..2e8568292 100644 +index 204690640..6fc7e8437 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ @@ -120,10 +119,10 @@ index 6cf92e72e..2e8568292 100644 option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'}) option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support') diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build -index 67bd3b9d9..ad04a91b6 100644 +index 88c039f85..62a7691f3 100644 --- a/plugins/dell-esrt/meson.build +++ b/plugins/dell-esrt/meson.build -@@ -38,6 +38,6 @@ configure_file( +@@ -27,6 +27,6 @@ configure_file( output: 'dell-esrt.conf', configuration: con2, install: true, @@ -132,7 +131,7 @@ index 67bd3b9d9..ad04a91b6 100644 ) endif diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build -index d626c3ad3..5a2f847d5 100644 +index 23ec5ec82..b03826fc0 100644 --- a/plugins/msr/meson.build +++ b/plugins/msr/meson.build @@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'], @@ -142,27 +141,27 @@ index d626c3ad3..5a2f847d5 100644 - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - shared_module('fu_plugin_msr', - fu_hash, + plugin_builtins += static_library('fu_plugin_msr', + sources: [ diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 95606e478..e5355e520 100644 +index 1e35b6ce9..33ca1447f 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -43,7 +43,7 @@ shared_module('fu_plugin_redfish', - ) +@@ -35,7 +35,7 @@ plugin_builtin_redfish = static_library('fu_plugin_redfish', + plugin_builtins += plugin_builtin_redfish install_data(['redfish.conf'], - install_dir: join_paths(sysconfdir, 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'fwupd'), + install_mode: 'rw-r-----', ) - if get_option('tests') diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build -index 5f8ffbf90..9ba323e75 100644 +index 71d930e62..399fb5781 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -32,7 +32,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', - ) +@@ -19,7 +19,7 @@ plugin_builtin_thunderbolt = static_library('fu_plugin_thunderbolt', + plugin_builtins += plugin_builtin_thunderbolt install_data(['thunderbolt.conf'], - install_dir: join_paths(sysconfdir, 'fwupd') @@ -171,7 +170,7 @@ index 5f8ffbf90..9ba323e75 100644 # we use functions from 2.52 in the tests if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build -index ef38dc03e..78ff65e1d 100644 +index b4b038313..9c5407c3f 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -20,7 +20,7 @@ if host_machine.system() == 'linux' @@ -183,7 +182,7 @@ index ef38dc03e..78ff65e1d 100644 ) elif host_machine.system() == 'freebsd' backend_srcs += 'fu-uefi-backend-freebsd.c' -@@ -110,7 +110,7 @@ if get_option('compat_cli') and get_option('man') +@@ -87,7 +87,7 @@ if get_option('compat_cli') and get_option('man') endif install_data(['uefi_capsule.conf'], diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 66cfbef940bf..457160879871 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -15,6 +15,7 @@ , gusb , sqlite , libarchive +, libredirect , curl , libjcat , elfutils @@ -30,6 +31,7 @@ , protobufc , python3 , wrapGAppsNoGuiHook +, ensureNewerSourcesForZipFilesHook , json-glib , bash-completion , shared-mime-info @@ -85,13 +87,13 @@ let test-firmware = let - version = "unstable-2021-11-02"; + version = "unstable-2022-04-02"; src = fetchFromGitHub { name = "fwupd-test-firmware-${version}"; owner = "fwupd"; repo = "fwupd-test-firmware"; - rev = "aaa2f9fd68a40684c256dd85b86093cba38ffd9d"; - sha256 = "Slk7CNfkmvmOh3WtIBkPs3NYT96co6i8PwqcbpeVFgA="; + rev = "39954e434d63e20e85870dd1074818f48a0c08b7"; + hash = "sha256-d4qG3fKyxkfN91AplRYqARFz+aRr+R37BpE450bPxi0="; passthru = { inherit src version; # For update script updateScript = unstableGitUpdater { @@ -114,7 +116,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.4"; + version = "1.8.9"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -123,7 +125,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-rfoHQ0zcKexBxA/vRg6Nlwlj/gx+hJ3sfzkyrbFh+IY="; + hash = "sha256-cZp5GsS6WYiuuT7EJ3i9ZdM8sHXQwJO1wE5eFoK+Uoo="; }; patches = [ @@ -147,6 +149,8 @@ let ]; nativeBuildInputs = [ + # required for firmware zipping + ensureNewerSourcesForZipFilesHook meson ninja gi-docgen @@ -187,7 +191,7 @@ let libmbim libcbor libqmi - xz # for liblzma. + xz # for liblzma ] ++ lib.optionals haveDell [ libsmbios ] ++ lib.optionals haveFlashrom [ @@ -210,14 +214,9 @@ let "-Dsysconfdir_install=${placeholder "out"}/etc" "-Defi_os_dir=nixos" "-Dplugin_modem_manager=enabled" - # Requires Meson 0.63 - "-Dgresource_quirks=disabled" # We do not want to place the daemon into lib (cyclic reference) "--libexecdir=${placeholder "out"}/libexec" - # Our builder only adds $lib/lib to rpath but some things link - # against libfwupdplugin which is in $out/lib. - "-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib" ] ++ lib.optionals (!haveDell) [ "-Dplugin_dell=disabled" "-Dplugin_synaptics_mst=disabled" @@ -232,8 +231,7 @@ let # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF dontWrapGApps = true; - # /etc/os-release not available in sandbox - # doCheck = true; + doCheck = true; # Environment variables @@ -254,16 +252,18 @@ let postPatch = '' patchShebangs \ contrib/generate-version-script.py \ - meson_post_install.sh \ po/test-deps - # This checks a version of a dependency of gi-docgen but gi-docgen is self-contained in Nixpkgs. - echo "Clearing docs/test-deps.py" - test -f docs/test-deps.py - echo > docs/test-deps.py - substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ --replace "gdbus" ${glib.bin}/bin/gdbus + + # tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found + sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build + sed -i 's/test(.*)//' plugins/mtd/meson.build + # fails on amd cpu + sed -i 's/test(.*)//' libfwupdplugin/meson.build + # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf + sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build ''; preBuild = '' @@ -273,6 +273,10 @@ let preCheck = '' addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" + + echo "12345678901234567890123456789012" > machine-id + export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so ''; preInstall = '' @@ -349,7 +353,6 @@ let defaultDisabledPlugins = [ "test" "test_ble" - "invalid" ]; # For updating. diff --git a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch index afee6d9f61ea..a91adc1a69b9 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch @@ -1,13 +1,13 @@ diff --git a/meson.build b/meson.build -index b91dd037..01d70a61 100644 +index 7ac8c937a..5a23d0c80 100644 --- a/meson.build +++ b/meson.build -@@ -413,7 +413,7 @@ if build_standalone and efiboot.found() and efivar.found() +@@ -419,7 +419,7 @@ if build_standalone and efiboot.found() and efivar.found() conf.set('HAVE_EFI_TIME_T', '1') endif - efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') -+ efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi') ++ efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi') conf.set_quoted('EFI_APP_LOCATION', efi_app_location) if host_cpu == 'x86' diff --git a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch index f3369b6e1333..e6269ae840bb 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch @@ -1,37 +1,14 @@ -diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build -index 1afa28e1..3da81d30 100644 ---- a/libfwupdplugin/meson.build -+++ b/libfwupdplugin/meson.build -@@ -220,7 +220,8 @@ fwupdplugin = library( - ], - link_args: cc.get_supported_link_arguments([vflag]), - link_depends: fwupdplugin_mapfile, -- install: true -+ install: true, -+ install_dir: bindir / '..' / 'lib', - ) - - fwupdplugin_pkgg = import('pkgconfig') -@@ -280,7 +281,8 @@ if introspection.allowed() - girtargets, - fwupd_gir[0], - ], -- install: true -+ install: true, -+ install_dir_typelib: bindir / '..' / 'lib' / 'girepository-1.0', - ) - - # Verify the map file is correct -- note we can't actually use the generated diff --git a/meson.build b/meson.build -index b91dd037..f97b4c26 100644 +index 9ae278b66..7cddf1a0d 100644 --- a/meson.build +++ b/meson.build -@@ -504,7 +504,7 @@ if build_standalone +@@ -507,7 +507,7 @@ if build_standalone if host_machine.system() == 'windows' - plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current) + libdir_pkg = 'fwupd-@0@'.format(fwupd_version) else -- plugin_dir = join_paths(libdir, 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) -+ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) +- libdir_pkg = join_paths(libdir, 'fwupd-@0@'.format(fwupd_version)) ++ libdir_pkg = join_paths(prefix, 'lib', 'fwupd-@0@'.format(fwupd_version)) endif - conf.set_quoted('FWUPD_PLUGINDIR', plugin_dir) + conf.set_quoted('FWUPD_LIBDIR_PKG', libdir_pkg) endif + diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch index 49bca65d9c60..a914f56c66db 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,19 +1,19 @@ diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build -index b8ec916f..38209b36 100644 +index be3d5c6d9..14d45dcaf 100644 --- a/data/installed-tests/meson.build +++ b/data/installed-tests/meson.build @@ -83,5 +83,5 @@ configure_file( - output : 'fwupd-tests.conf', - configuration : con2, + output: 'fwupd-tests.conf', + configuration: con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b91dd037..d7e20b18 100644 +index 30011f548..7ac8c937a 100644 --- a/meson.build +++ b/meson.build -@@ -188,8 +188,8 @@ else +@@ -186,8 +186,8 @@ else datadir = join_paths(prefix, get_option('datadir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -24,7 +24,7 @@ index b91dd037..d7e20b18 100644 daemon_dir = join_paths(libexecdir, 'fwupd') endif mandir = join_paths(prefix, get_option('mandir')) -@@ -492,6 +492,7 @@ gnome = import('gnome') +@@ -498,6 +498,7 @@ gnome = import('gnome') i18n = import('i18n') conf.set_quoted('FWUPD_PREFIX', prefix) @@ -33,10 +33,10 @@ index b91dd037..d7e20b18 100644 conf.set_quoted('FWUPD_LIBDIR', libdir) conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) diff --git a/meson_options.txt b/meson_options.txt -index d00038db..be1c45b4 100644 +index 6fc7e8437..29832fd08 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -56,6 +56,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: +@@ -57,6 +57,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: option('systemd_unit_user', type : 'string', description : 'User account to use for fwupd-refresh.service (empty for DynamicUser)') option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on') option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'}) @@ -44,16 +44,3 @@ index d00038db..be1c45b4 100644 option('tests', type : 'boolean', value : true, description : 'enable tests') option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support') option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'}) -diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c -index 4d19e560..91cfaa61 100644 ---- a/plugins/redfish/fu-self-test.c -+++ b/plugins/redfish/fu-self-test.c -@@ -27,7 +27,7 @@ fu_test_is_installed_test(void) - const gchar *builddir = g_getenv("G_TEST_BUILDDIR"); - if (builddir == NULL) - return FALSE; -- return g_str_has_prefix(builddir, FWUPD_PREFIX); -+ return g_str_has_prefix(builddir, FWUPD_INSTALLED_TEST_PREFIX); - } - - static void diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index efd2078d99ae..e9ee3c518fed 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "sha256-TbeofUQAQNM/Nxzgl8GP2+Y4iR7bVXm4dQaPkYMSdqc="; + sha256 = "sha256-nEMfwOvWd3FRk+1RS1NPT+LcfWi4lDLCGYqH7KuPw7o="; }; postPatch = '' diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 1943d107ad0f..b7973a8e1d41 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.8.8"; # ensure that jellyfin-web has matching version + version = "10.8.9"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "3+JwcHZGENX9PgHdtRmzffi6p2p68Ngs3WOiEwAY8zU="; + sha256 = "kvtC9qtVuewR9W6sq963/tNgZbWSpygpBqcXnHuvX0Q="; }; patches = [ diff --git a/pkgs/servers/jellyfin/disable-warnings.patch b/pkgs/servers/jellyfin/disable-warnings.patch index 0127513b5ea7..1e13f77d0f1a 100644 --- a/pkgs/servers/jellyfin/disable-warnings.patch +++ b/pkgs/servers/jellyfin/disable-warnings.patch @@ -1,8 +1,8 @@ diff --git a/jellyfin.ruleset b/jellyfin.ruleset -index 5ac5f4923..88621857b 100644 +index 1c834de82..bf70fef1e 100644 --- a/jellyfin.ruleset +++ b/jellyfin.ruleset -@@ -54,6 +54,31 @@ +@@ -54,6 +54,33 @@ @@ -31,6 +31,8 @@ index 5ac5f4923..88621857b 100644 + + + ++ ++ diff --git a/pkgs/servers/jellyfin/node-deps.nix b/pkgs/servers/jellyfin/node-deps.nix index 73c65f0037ae..ceb53197182e 100644 --- a/pkgs/servers/jellyfin/node-deps.nix +++ b/pkgs/servers/jellyfin/node-deps.nix @@ -11817,8 +11817,8 @@ let args = { name = "jellyfin-web"; packageName = "jellyfin-web"; - version = "10.8.8"; - src = ../../../../../../../nix/store/bbsfbkaiq91gnf5ffcyh4gl8r9mqlyc4-source; + version = "10.8.9"; + src = ../../../../../../../nix/store/yvn7h8hrydjxiw23fhqj5ya6yilj0d57-source; dependencies = [ sources."@ampproject/remapping-2.1.2" (sources."@apideck/better-ajv-errors-0.3.3" // { diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix index bf7c4d25d236..7dbab6683f3e 100644 --- a/pkgs/servers/jellyfin/web.nix +++ b/pkgs/servers/jellyfin/web.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jellyfin-web"; - version = "10.8.8"; + version = "10.8.9"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - sha256 = "pIoMpNxRtIvs6bhFEoSlFU8aHZ2CBbHnZaA/FVAkGOI="; + sha256 = "hHZ8HVf8fidd5VPs06kB3/BHBHFxoV3fVObBesqfRJo="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index 3b4708ca5a15..a60c5c07a509 100644 --- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -6,14 +6,14 @@ with python3.pkgs; buildPythonPackage rec { pname = "mailman-hyperkitty"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EQBx1KX3z/Wv3QAHOi+s/ihLOjpiupIQBYyE6IPbJto="; + sha256 = "sha256-+Nad+8bMtYKJbUCpppRXqhB1zdbvvFXTTHlwJLQLzDg="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 02bb13f5f7e3..726552f3093b 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: let - version = "4.0.5"; + version = "4.1.1"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-m4LyAg/C/ZV3nBD4gNFNjwI6glg7ZAH2nSGg0mU2DsI="; + sha256 = "sha256-w6N/jFYieL+yJXlDr1/9AATChSqiatx+aJl0XSOSL0s="; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 28266b6e6166..ce75c2f346b5 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.20.4"; + version = "1.21.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-e1D+9EejlVZxOyErg6eRgawth5gAhv6KpgjhK06ErZc="; + sha256 = "sha256-YfasTKCABvMtncrfoWR1Su9QxzCqPED18/BTXaJHttg="; }; strictDeps = true; diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index a19333f1cc83..9181dff70d34 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-0diHZFD4+glTdGWWJk/5amr0mDsvKV5OibKGQNtitIk="; + sha256 = "sha256-TDA1T36iY3xRFX0mBYazKeyzoDD7RPWRxQfUF7Rv5vA="; }; - cargoSha256 = "sha256-Rg1wmDLmkDC25meZIe94WZ3Wp8a93VAqRJXjmaE6k18="; + cargoHash = "sha256-rBZ9cYk5Gzs8hy8fRgO8I0zaBncl8CwQoX5I0qzHBYE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 7f9bd4e61de7..ecb9d18fd6c0 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "06pnr3ilywqxch942l8xdg7k053xrqjkkziivx9h89bvy5j7hgvg"; + sha256 = "sha256-1zYHYJXVhJdWQKeM0VVM4VzL3r3XPXebfR7IAEgyt+c="; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; diff --git a/pkgs/tools/games/er-patcher/default.nix b/pkgs/tools/games/er-patcher/default.nix index 1eaad03a3291..4440277b664d 100644 --- a/pkgs/tools/games/er-patcher/default.nix +++ b/pkgs/tools/games/er-patcher/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "er-patcher"; - version = "1.06-2"; + version = "1.06-3"; src = fetchFromGitHub { owner = "gurrgur"; repo = "er-patcher"; rev = "v${version}"; - sha256 = "sha256-rFIuswn55FNVmBoDfIpG2cKxybNDaTwOeIUFFoncGF0="; + sha256 = "sha256-w/5cXxY4ua5Xo1BSz3MYRV+SdvVGFAx53KMIORS1uWE="; }; buildInputs = [ diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 0f3096cc4b06..a2bd46321b74 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20221111"; + version = "20221229"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-asC/ZqWAc3gP3rdGMRT1HYCxzJ6O8djHNjBT/Nwxgac="; + sha256 = "sha256-a2oQmsrwVpz3Zg0g3NFTuD4yjpuT2uTnO5hbvMaxi/g="; }; meta = with lib; { diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index a2757d1bced7..db52bae523f6 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakatime"; - version = "1.60.1"; + version = "1.61.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-HOSNNeLtqyLahjG8AzhpfOb9Nmtd0XpI+AA03mlUBCQ="; + sha256 = "sha256-pd6kK1591dLEau9oKdd+A2y8rRerFQ+z2yY+/BsNUAI="; }; - vendorSha256 = "sha256-ANRcgeZYtcWGbK8c9KE8joo97d8LKvKA8/A+/rrjOoM="; + vendorHash = "sha256-R+VqIw8fztBH2WTf5vjqtMfASNnOTjA3DEndXYyyMi4="; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index fc5e675ec9aa..4d6c54564bb2 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.45.0"; + version = "0.46.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ybcc1k0XSX+ZiG7Z1Bwai1RCypZfrHqhi3uJNhJYILo="; + sha256 = "sha256-/itziNmIDIuj3sKpB+SEiiwvJqdH5nmTkpFdMSY5L0g="; }; - vendorSha256 = "sha256-ZwBSptOsFcxz+xBpjrsvnLvky8kSN4uFx1fXcdDwAmk="; + vendorHash = "sha256-dU9rhYgYgP1qTPR3ykUgyg+B1bBVJwizWooyCpdpnm0="; doCheck = false; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 353aea94a894..041fe636bd96 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.44.0"; + version = "2.45.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-9LnT0613z2I9bA0FhcTgINBnXG17ulz6flA13B1Vijs="; + sha256 = "sha256-gyHnLoELjL/IQbtgH2W25xw30l+9akH7jgQfjp4y5sg="; }; buildInputs = [ boost zlib openssl ] diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index 01c82c1fff54..b630c62c3a9b 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.0.35"; + version = "3.0.36"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-GTqB2wyDguzxrVgnkGiQGgkDVt+caaoyRvUdpeItPcA="; + sha256 = "sha256-nJsjGTtTM9ZjsqZCKKZFrLPZ4jIp1F0Spi6RzeuCzak="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 25525fc2b602..ddc0eae97e6a 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "sha256-Wycs2Dtn1iiKI06hX4ns2TtPrdpl7dxE57X8svOVthU="; + sha256 = "sha256-IWMxaS4QwS1/JXlF53eSjXm9CREX8+T/tbMS6yygv3w="; }; buildInputs = [ libpcap ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0907e93be2d..af8689ea805b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27446,6 +27446,7 @@ with pkgs; roapi-http = callPackage ../servers/roapi/http.nix { }; rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { }; + rose-pine-icon-theme = callPackage ../data/icons/rose-pine { }; route159 = callPackage ../data/fonts/route159 { }; @@ -37294,7 +37295,9 @@ with pkgs; colima = callPackage ../applications/virtualization/colima { }; - lima = callPackage ../applications/virtualization/lima { }; + lima = callPackage ../applications/virtualization/lima { + inherit (darwin) sigtool; + }; logtop = callPackage ../tools/misc/logtop { };