diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-09 00:02:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-09 00:02:46 +0000 |
| commit | 1c0ef46804d0c6edecf281507ec1aa63bc8a130a (patch) | |
| tree | f0276b59fb704353368c856b33fef0aa5674fd12 /pkgs/data/misc | |
| parent | 60b28ae00d2defbe9e1fdb7b9ceb583ebc4270b5 (diff) | |
| parent | 34fde40edd9bf8a8f071cfbfd05965921b16bf66 (diff) | |
| download | nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar.gz nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar.bz2 nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar.lz nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar.xz nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar.zst nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/publicsuffix-list/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix index db74b74f22d..063e120d3c4 100644 --- a/pkgs/data/misc/publicsuffix-list/default.nix +++ b/pkgs/data/misc/publicsuffix-list/default.nix @@ -11,8 +11,10 @@ in fetchFromGitHub { sha256 = "sha256-Q8uIXM1CMu8dlWcVoL17M1XRGu3kG7Y7jpx0oHQh+2I="; postFetch = '' - tar xf $downloadedFile --strip=1 - install -Dm0444 public_suffix_list.dat tests/test_psl.txt -t $out/share/publicsuffix + install -Dm0444 $out/public_suffix_list.dat $out/tests/test_psl.txt -t $out/share/publicsuffix + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; meta = with lib; { |