diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix index db7b24f0829e..9b1ebfd37522 100644 --- a/nixos/modules/services/system/self-deploy.nix +++ b/nixos/modules/services/system/self-deploy.nix @@ -140,6 +140,7 @@ in path = with pkgs; [ git gnutar + gzip nix ] ++ lib.optionals (cfg.switchCommand == "boot") [ systemd ]; diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index f6c4dcbbbf86..c1b49e4e8e87 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "erigon"; - version = "2022.08.03"; + version = "2022.09.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z+YghJjJfeGO/LuwcLb5A9ghZUcL1OoppMZPsa38ahQ="; + sha256 = "sha256-vcppzHJ6yLIqp/5Gl9JIgkTVR1mKKAj1vhWY/bCvbPQ="; fetchSubmodules = true; }; - vendorSha256 = "sha256-2+9oXLIDYZfWzQfnjwJet4QT01tGzLlQJFjN4ZbG6uw="; + vendorSha256 = "sha256-mY8m5bXm09pmq1imCo8uiBBnzPzrVuka8XtZyxL9LWo="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/editors/emacs/28.nix b/pkgs/applications/editors/emacs/28.nix index 948fa52c0797..7ed37e0dfb54 100644 --- a/pkgs/applications/editors/emacs/28.nix +++ b/pkgs/applications/editors/emacs/28.nix @@ -1,5 +1,5 @@ import ./generic.nix (rec { - version = "28.1"; - sha256 = "sha256-D33wnlxhx0LyG9WZaQDj2II3tG0HcJdZTC4dSA3lrgY="; + version = "28.2"; + sha256 = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; patches = _: [ ]; }) diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 9e3374064e6e..42671599a643 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "f3d"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "f3d-app"; repo = "f3d"; rev = "v${version}"; - sha256 = "sha256-Yn1IcGWAbXjG0wJQjRimvreozFu9mf0FMwyGNYc4P+U="; + hash = "sha256-dOpiX7xJWDKHqPLGvlgv7NHgfzyeZhJd898+KzAmD4Q="; }; nativeBuildInputs = [ cmake ]; @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ libGL libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + # conflict between VTK and Nixpkgs; + # see https://github.com/NixOS/nixpkgs/issues/89167 + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_BINDIR=bin" + ]; + meta = with lib; { description = "Fast and minimalist 3D viewer using VTK"; homepage = "https://f3d-app.github.io/f3d"; diff --git a/pkgs/applications/graphics/kphotoalbum/default.nix b/pkgs/applications/graphics/kphotoalbum/default.nix new file mode 100644 index 000000000000..d32cf9d950c2 --- /dev/null +++ b/pkgs/applications/graphics/kphotoalbum/default.nix @@ -0,0 +1,47 @@ +{ mkDerivation +, fetchurl +, lib +, extra-cmake-modules +, kdoctools +, wrapGAppsHook +, exiv2 +, ffmpeg +, libkdcraw +, phonon +, libvlc +, kconfig +, kiconthemes +, kio +, kinit +, kpurpose +}: + +mkDerivation rec { + pname = "kphotoalbum"; + version = "5.9.1"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-kejzDYpBQEoGKgPzVcUVlGKmd1OoXx+W7t9p3MNNw/A="; + }; + + # not sure if we really need phonon when we have vlc, but on KDE it's bound to + # be on the system anyway, so there is no real harm including it + buildInputs = [ exiv2 phonon libvlc ]; + + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + + propagatedBuildInputs = [ kconfig kiconthemes kio kinit kpurpose libkdcraw ]; + + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" + ]; + + meta = with lib; { + description = "Efficient image organization and indexing"; + homepage = "https://www.kphotoalbum.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ peterhoeg ]; + inherit (kconfig.meta) platforms; + }; +} diff --git a/pkgs/applications/misc/tilemaker/default.nix b/pkgs/applications/misc/tilemaker/default.nix index cc87c529e34d..dd05604501e9 100644 --- a/pkgs/applications/misc/tilemaker/default.nix +++ b/pkgs/applications/misc/tilemaker/default.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages, cmake, installShellFiles -, boost, lua, protobuf, rapidjson, shapelib, sqlite, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages, cmake, installShellFiles +, boost, lua, protobuf, rapidjson, shapelib, sqlite, zlib, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tilemaker"; version = "2.2.0"; src = fetchFromGitHub { owner = "systemed"; - repo = pname; - rev = "v${version}"; + repo = "tilemaker"; + rev = "v${finalAttrs.version}"; hash = "sha256-st6WDCk1RZ2lbfrudtcD+zenntyTMRHrIXw3nX5FHOU="; }; + patches = [ + # Fix build with Boost >= 1.79, remove on next upstream release + (fetchpatch { + url = "https://github.com/systemed/tilemaker/commit/252e7f2ad8938e38d51783d1596307dcd27ed269.patch"; + hash = "sha256-YSkhmpzEYk/mxVPSDYdwZclooB3zKRjDPzqamv6Nvyc="; + }) + ]; + postPatch = '' substituteInPlace src/tilemaker.cpp \ --replace "config.json" "$out/share/tilemaker/config-openmaptiles.json" \ @@ -25,11 +33,18 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DPROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"; + NIX_CFLAGS_COMPILE = [ "-DTM_VERSION=${finalAttrs.version}" ]; + postInstall = '' installManPage ../docs/man/tilemaker.1 install -Dm644 ../resources/* -t $out/share/tilemaker ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "tilemaker --help"; + }; + meta = with lib; { description = "Make OpenStreetMap vector tiles without the stack"; homepage = "https://tilemaker.org/"; @@ -37,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index dc9521be2987..8da73d834aa8 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sSmadO7iKkJb/kd9rnH34/DyAHqdNtbvGDt9xkK4t8E="; + sha256 = "sha256-v2zvcUDbzjisJVxEic6VDZewaE0kp1rcB2NK8y3utnQ="; }; - vendorSha256 = "sha256-pe6AaO3vTbix+b21GqEICxdej8mbXXpzNrF4eKbEnSE="; + vendorSha256 = "sha256-MlfDvdzkegtS8sW/GjkOMLQTK30G6RipHaYzNcwIkEE="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/data/fonts/i-dot-ming/default.nix b/pkgs/data/fonts/i-dot-ming/default.nix index 766440032f3a..d15d7bcc245e 100644 --- a/pkgs/data/fonts/i-dot-ming/default.nix +++ b/pkgs/data/fonts/i-dot-ming/default.nix @@ -1,17 +1,39 @@ -{ lib, fetchzip }: +{ lib, fetchurl, writeScript }: let - version = "7.01"; + version = "8.00"; in -fetchzip { +fetchurl { name = "i.ming-${version}"; url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; - sha256 = "1b2dj7spkznpkad8a0blqigj9f6ism057r0wn9wdqg5g88yp32vd"; + hash = "sha256-JGu9H0+IdJL6QQtLwvqlFLEaJdq1JVRiqLm5zptwjyE="; + recursiveHash = true; + downloadToTemp = true; postFetch = '' install -DT -m444 $downloadedFile $out/share/fonts/truetype/I.Ming/I.Ming.ttf ''; + passthru = { + updateScript = writeScript "updater" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnused + set -e + version=$(curl -i -s https://github.com/ichitenfont/I.Ming/releases/latest | sed -n -E 's|^location.*releases/tag/([0-9.]+).*$|\1|p') + if [[ $version != ${version} ]]; then + tmp=$(mktemp -d) + curl -Lo $tmp/I.Ming.ttf https://raw.githubusercontent.com/ichitenfont/I.Ming/$version/$version/I.Ming-$version.ttf + install -DT -m444 $tmp/I.Ming.ttf $tmp/share/fonts/truetype/I.Ming/I.Ming.ttf + rm $tmp/I.Ming.ttf + hash=$(nix hash path --type sha256 --base32 --sri $tmp) + sed -i -E \ + -e "s/version = \"[0-9.]+\"/version = \"$version\"/" \ + -e "s|hash = \".*\"|hash = \"$hash\"|" \ + pkgs/data/fonts/i-dot-ming/default.nix + fi + ''; + }; + meta = with lib; { description = "An open source Pan-CJK serif typeface"; homepage = "https://github.com/ichitenfont/I.Ming"; diff --git a/pkgs/development/tools/deadnix/default.nix b/pkgs/development/tools/deadnix/default.nix index e2594bde55b3..471f29b2f034 100644 --- a/pkgs/development/tools/deadnix/default.nix +++ b/pkgs/development/tools/deadnix/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "deadnix"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "astro"; repo = "deadnix"; rev = "v${version}"; - sha256 = "sha256-uvW+PCJdpYHaIIi7YM+kXmHlhQgMbkXBGvAd0mzSb1U="; + sha256 = "sha256-4IK+vv3R3UzF5anH1swypPIzXXZmTCJ2kS2eGUcYvLk="; }; - cargoSha256 = "sha256-cDInmOv1yMedJWHzwGT2wmoUd58ZwKh6IDcOvG65RV8="; + cargoSha256 = "sha256-GmvSrU7wDOKc22GU43oFJoYCYiVKQ5Oe6qrLQXLtcyM="; meta = with lib; { description = "Find and remove unused code in .nix source files"; diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/development/tools/mix2nix/default.nix index 21520d9dbe3d..80ec10ce44ea 100644 --- a/pkgs/development/tools/mix2nix/default.nix +++ b/pkgs/development/tools/mix2nix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mix2nix"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "ydlr"; repo = "mix2nix"; rev = version; - sha256 = "0q4yq8glrdj72j7b9xnwb6j3cli3cccimh9sb7acb4npaiivvf69"; + sha256 = "0flsw8r4x27qxyrlazzjmjq3zkkppgw9krcdcqj7wbq06r2dck3q"; }; nativeBuildInputs = [ elixir ]; diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/tools/misc/tea/default.nix index 5ff739c46ba5..cc68fa7c55fd 100644 --- a/pkgs/tools/misc/tea/default.nix +++ b/pkgs/tools/misc/tea/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "tea"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "tea"; rev = "v${version}"; - sha256 = "sha256-LtLel6JfmYr2Zu7g7oBjAqDcl5y7tJL3XGL7gw+kHxU="; + sha256 = "sha256-Bvee8m/BXvPtaaD8xjVg9qzorO0ln6xHP1upPgWoD+A="; }; - vendorSha256 = null; + vendorSha256 = "sha256-nb0lQEAaIYlGpodFQLhMk/24DmTgg5K3zQ4s/XY+Z1w="; meta = with lib; { description = "Gitea official CLI client"; homepage = "https://gitea.com/gitea/tea"; license = licenses.mit; - maintainers = [ maintainers.j4m3s ]; + maintainers = with maintainers; [ j4m3s techknowlogick ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b8de739bd09..3528a280d508 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8060,6 +8060,8 @@ with pkgs; kpcli = callPackage ../tools/security/kpcli { }; + kphotoalbum = libsForQt5.callPackage ../applications/graphics/kphotoalbum { }; + kratos = callPackage ../applications/misc/kratos { }; krename = libsForQt5.callPackage ../applications/misc/krename { };