diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e27a8a1d85ff..90a383c65119 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6348,6 +6348,12 @@ githubId = 1104419; name = "Lucas Hoffmann"; }; + lucasew = { + email = "lucas59356@gmail.com"; + github = "lucasew"; + githubId = 15693688; + name = "Lucas Eduardo Wendt"; + }; lde = { email = "lilian.deloche@puck.fr"; github = "lde"; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index a2b61a66e110..0867306e2f94 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.18.3"; - sha256 = "0nvvjc0ml1irn7vxyq4m43qimp128cx8hczk21y5m39i2rg4yzx4"; - manifestsSha256 = "1qgw9ij0b85vvdx03wmbbwanhq1hf69wphy58lsqwf33rdq0bb1m"; + version = "0.19.1"; + sha256 = "184f5q3aa4p6gjdmr8x6a97rzaj64ws8bf3q8sz4xjyznznwcpp0"; + manifestsSha256 = "1xxf572yvjmik7dvijz810lxzfj7irddznl4icidn7hrljzjrv95"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -23,22 +23,26 @@ buildGoModule rec { inherit sha256; }; - vendorSha256 = "0vgi5cnvmc98xa2ibpgvvqlc90hf3gj3v17yqncid596ig3dnqsc"; - - nativeBuildInputs = [ installShellFiles ]; - - subPackages = [ "cmd/flux" ]; - - ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; + vendorSha256 = "sha256-1ZIeS42LoreZKkzDNZxmF17HeDWWVo49CaZDrIR2U9g="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests ''; + patches = [ + ./patches/disable-tests-ssh_key.patch + ]; + + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; + + subPackages = [ "cmd/flux" ]; + # Required to workaround test error: # panic: mkdir /homeless-shelter: permission denied HOME="$TMPDIR"; + nativeBuildInputs = [ installShellFiles ]; + doInstallCheck = true; installCheckPhase = '' $out/bin/flux --version | grep ${version} > /dev/null diff --git a/pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch b/pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch new file mode 100644 index 000000000000..5e28589c69cf --- /dev/null +++ b/pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch @@ -0,0 +1,21 @@ +diff --git a/cmd/flux/create_secret_git_test.go b/cmd/flux/create_secret_git_test.go +index afa34ba..0d22cce 100644 +--- a/cmd/flux/create_secret_git_test.go ++++ b/cmd/flux/create_secret_git_test.go +@@ -20,16 +20,6 @@ func TestCreateGitSecret(t *testing.T) { + args: "create secret git podinfo-auth --url=https://github.com/stefanprodan/podinfo --username=my-username --password=my-password --namespace=my-namespace --export", + assert: assertGoldenFile("./testdata/create_secret/git/secret-git-basic.yaml"), + }, +- { +- name: "ssh key", +- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/rsa.private --namespace=my-namespace --export", +- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret.yaml"), +- }, +- { +- name: "ssh key with password", +- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/rsa-password.private --password=password --namespace=my-namespace --export", +- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret-password.yaml"), +- }, + } + + for _, tt := range tests { diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 78f47d5292cd..9b6c412fa211 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.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CBRBcRvMFE9Pdxac3O15z0brF/5D279/Hat0CSYGRyE="; + sha256 = "sha256-XJZg3uX++gU65bO1uqJblXXcVPzFXROCWFTn/gfkea0="; }; - vendorSha256 = "sha256-xlFIO33OOyLnIvbsbyHVNdyxh0vlwQOATbbZA7rsz9E="; + vendorSha256 = "sha256-+fx/Iy78gmhxRjXPkHYdixpaMkOwEANUsZA+KSdQkWU="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index abfc4f832a3b..c6bdb4012457 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -12,7 +12,7 @@ in assert lib.getVersion wineUnstable == patch.version; name = "${self.name}-staging"; - postPatch = self.postPatch or "" + '' + prePatch = self.prePatch or "" + '' patchShebangs tools cp -r ${patch}/patches . chmod +w patches diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a6fd0bea0efa..8da9639a5cfe 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -24,6 +24,19 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") + # Pinned due to API changes in aioesphomeapi>=10.0.0 + (self: super: { + aioesphomeapi = super.aioesphomeapi.overridePythonAttrs (oldAttrs: rec { + version = "9.1.5"; + src = fetchFromGitHub { + owner = "esphome"; + repo = "aioesphomeapi"; + rev = "v${version}"; + sha256 = "sha256-PPag65ZMz9KZEe9FmiB42/DgeM0vJw5L0haAG/jBjqg="; + }; + }); + }) + # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged (self: super: { diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 9933498d07e5..90148cbf2a45 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -55,13 +55,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "9.3"; + version = "9.4"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xV7griN453f63jwX5jTdW0KJdLi14Km7JengbNeh4iI="; + sha256 = "0ybs0dm7jskmfnmbg5fj8wi2aapbrwn4gbrx8ix6d8dzcl3pv78k"; }; inherit buildInputs propagatedBuildInputs; @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { echo "v${version}" > VERSION ./autogen.sh export PYTHON=${python3}/bin/python - ''; + ''; configureFlags = [ "--localstatedir=/var" - ]; + ]; nativeBuildInputs = [ rpcsvc-proto ]; @@ -179,7 +179,7 @@ in stdenv.mkDerivation rec { # this gets falsely loaded as module by glusterfind rm -r $out/bin/conf.py - ''; + ''; meta = with lib; { description = "Distributed storage system"; diff --git a/pkgs/tools/misc/fntsample/default.nix b/pkgs/tools/misc/fntsample/default.nix new file mode 100644 index 000000000000..4f67d564e452 --- /dev/null +++ b/pkgs/tools/misc/fntsample/default.nix @@ -0,0 +1,80 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, cmake +, pkg-config +, cairo +, fontconfig +, freetype +, glib +, libXdmcp +, makeWrapper +, pango +, pcre +, perlPackages +}: + +let + ucd-blocks = fetchurl { + url = "https://www.unicode.org/Public/14.0.0/ucd/Blocks.txt"; + hash = "sha256-WYhw3d73s0talykWUoxFav8nZbec1Plkf7WM63Z+fxc="; + }; +in +stdenv.mkDerivation rec { + pname = "fntsample"; + version = "5.4"; + + src = fetchFromGitHub { + owner = "eugmes"; + repo = pname; + rev = "release/${version}"; + hash = "sha256-O5RT68wPWwzCb51JZWWNcIubWoM7NZw/MRiaHXPDmF0="; + }; + + cmakeFlags = [ + "-DUNICODE_BLOCKS=${ucd-blocks.outPath}" + ]; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ + cmake + makeWrapper + pkg-config + ]; + + buildInputs = [ + cairo + fontconfig + freetype + glib + libXdmcp + pango + perlPackages.perl + pcre + ]; + + postFixup = + let + perlPath = with perlPackages; makePerlPath [ + ExporterTiny + ListMoreUtils + PDFAPI2 + libintl_perl + ]; + in '' + for cmd in pdfoutline pdf-extract-outline; do + wrapProgram "$out/bin/$cmd" --prefix PERL5LIB : "${perlPath}" + done + ''; + + meta = with lib; { + homepage = "https://github.com/eugmes/fntsample"; + description = "PDF and PostScript font samples generator"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} +# TODO: factor/package ucd-blocks diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb5b72dab2e6..98aa9a6a8dda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -434,6 +434,8 @@ with pkgs; etBook = callPackage ../data/fonts/et-book { }; + fntsample = callPackage ../tools/misc/fntsample { }; + fetchutils = callPackage ../tools/misc/fetchutils { }; fet-sh = callPackage ../tools/misc/fet-sh { };