Unverified Commit e76d867f authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #333366 from adamcstephens/kanidm/1.3.1 

kanidm: 1.2.3 -> 1.3.2
parents 8987be1f a29f18d7

pkgs/by-name/ka/kanidm/package.nix

+9 −6
Original line number Diff line number Diff line
@@ -20,16 +20,16 @@ let 
in

rustPlatform.buildRustPackage rec {

  pname = "kanidm";

  version = "1.2.3";

  version = "1.3.2";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-J02IbAY5lyoMaq6wJiHizqeFBd5hB6id2YMPxlPsASM=";

    hash = "sha256-YFmWZlDcsSk+7EGkoK0SkAhNsrIQa55IRIVqisX3zqE=";

  };



  cargoHash = "sha256-JuTKHXpEhWga2vAZhCpyPFy4w6+9UaasD70oBcrr0Rw=";

  cargoHash = "sha256-8ZENe576gqm+FkQPCgz6mScqdacHilARFWmfe+kDL2A=";



  KANIDM_BUILD_PROFILE = "release_nixos_${arch}";
@@ -41,13 +41,15 @@ rustPlatform.buildRustPackage rec { 
        cpu_flags = if stdenv.isx86_64 then "x86_64_legacy" else "none";

        default_config_path = "/etc/kanidm/server.toml";

        default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";

        htmx_ui_pkg_path = "@htmx_ui_pkg_path@";

        web_ui_pkg_path = "@web_ui_pkg_path@";

      };

    in

    ''

      cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml

      substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml \

        --replace '@web_ui_pkg_path@' "${placeholder "out"}/ui"

        --replace '@htmx_ui_pkg_path@' "${placeholder "out"}/ui/hpkg" \

        --replace '@web_ui_pkg_path@' "${placeholder "out"}/ui/pkg"

    '';



  nativeBuildInputs = [
@@ -67,8 +69,9 @@ rustPlatform.buildRustPackage rec { 
  postBuild = ''

    # We don't compile the wasm-part form source, as there isn't a rustc for

    # wasm32-unknown-unknown in nixpkgs yet.

    mkdir $out

    cp -r server/web_ui/pkg $out/ui

    mkdir -p $out/ui

    cp -r server/web_ui/pkg $out/ui/pkg

    cp -r server/core/static $out/ui/hpkg

  '';



  # Otherwise build breaks on some unused code