Skip to content

Commit

Permalink
Merge pull request #321563 from liclac/nix-web-0.4.2
Browse files Browse the repository at this point in the history
nix-web: 0.3.0 -> 0.4.2
  • Loading branch information
Aleksanaa committed Jun 22, 2024
2 parents f914aa4 + 4a6a82f commit 0bb47ac
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions pkgs/by-name/ni/nix-web/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,20 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "nix-web";
version = "0.3.0";
version = "0.4.2";

src = fetchFromGitea {
domain = "codeberg.org";
owner = "gorgon";
repo = "gorgon";
rev = "nix-web-v${version}";
hash = "sha256-/tjcin3p+nE9Y7bhTCj7D4lpjKEFGM1bRqKE8T6igJE=";

# Various unit tests contain /nix/store/* paths. This breaks the fetcher in a very funny way:
# error: illegal path references in fixed-output derivation '/nix/store/52nmkc6v9qhdyzszlvbncndxyrcdfjn3-source.drv'
nativeBuildInputs = [ nukeReferences ];
postFetch = ''
find $out -name "*.rs" -print0 | xargs -0 nuke-refs
'';
hash = "sha256-lAk2VfhclHswsctA0RQgEj5oEX1fowh8TCaKykGEioY=";
};
cargoHash = "sha256-5pPn6APz0kdxuBdz9pgqvECTk6KhXnW/YTjxKgiuD9Q=";
cargoHash = "sha256-romL/RALr/pmwUA8/SN4AOwc+Vndspd1Yrqs0AHPYRY=";

nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optional (!stdenv.isDarwin) openssl
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);

postPatch = ''
substituteInPlace nix-web/nix-web.service \
Expand All @@ -47,11 +40,6 @@ rustPlatform.buildRustPackage rec {

cargoBuildFlags = cargoFlags;
cargoTestFlags = cargoFlags;
checkFlags = [
# Skip tests that rely on store paths nuked by `nuke-refs`.
"--skip=test_env_value_to_html_store_path_subpath"
"--skip=test_env_value_to_html_store_path"
];

NIX_WEB_BUILD_NIX_CLI_PATH = "${nixPackage}/bin/nix";

Expand Down

0 comments on commit 0bb47ac

Please sign in to comment.