diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-05 00:44:16 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-05 00:44:16 +0200 |
| commit | 253ca4957d2e59a4d44ea47705c42629b2e133dd (patch) | |
| tree | 6c345b7d7c7f392a6bfad262235371c81631d76e /pkgs/tools/text | |
| parent | 48177fb6ea88f89f0bac48aeb2f5bca826ae1dec (diff) | |
| parent | af4fc0bf1cb83a126d16bece462ad8d186d6ce73 (diff) | |
| download | nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.gz nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.bz2 nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.lz nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.xz nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.zst nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/mdbook-linkcheck/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/text/schema2ldif/default.nix | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/tools/text/mdbook-linkcheck/default.nix b/pkgs/tools/text/mdbook-linkcheck/default.nix index eaccd05eb9c..0d2533eba48 100644 --- a/pkgs/tools/text/mdbook-linkcheck/default.nix +++ b/pkgs/tools/text/mdbook-linkcheck/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-linkcheck"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "Michael-F-Bryan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZEOuA8W05800cnArscaGGOWTgzU6V3/wJiQcSx1MVkY="; + sha256 = "sha256-ZbraChBHuKAcUA62EVHZ1RygIotNEEGv24nhSPAEj00="; }; - cargoSha256 = "sha256-EtPhbKvPHSnmPXemCzOXujlqqfdDSFaJpcZVJoHQq6U="; + cargoSha256 = "sha256-AwixlCL5ZcLgj9wYeBvkSy2U6J8alXf488l8DMn73w4="; buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix index 84196ae1119..fc4a2153d66 100644 --- a/pkgs/tools/text/schema2ldif/default.nix +++ b/pkgs/tools/text/schema2ldif/default.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: +{ lib, stdenvNoCC, fetchurl, makeWrapper, perlPackages }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "schema2ldif"; version = "1.3"; src = fetchurl { url = "https://repos.fusiondirectory.org/sources/schema2ldif/schema2ldif-${version}.tar.gz"; - sha256 = "00cd9xx9g0mnnfn5lvay3vg166z84jla0ya1x34ljdc8bflxsr9a"; + hash = "sha256-KmXdqVuINUnJ6EF5oKgk6BsT3h5ebVqss7aCl3pPjQE="; }; + postPatch = '' + # Removes the root check and changes the temporary location + # from the nix store to $PWD + sed -i \ + -e '/You have to run this script as root/d' \ + -e 's|/\^(\.\*)\\\.schema\$/|/.*\\/(.*)\\.schema$/|g' \ + bin/ldap-schema-manager + ''; + buildInputs = [ perlPackages.perl ]; nativeBuildInputs = [ makeWrapper ]; |