diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch b/nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch index 24b95f1ca18b..667fc23b4f1f 100644 --- a/nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch +++ b/nixpkgs/pkgs/tools/misc/onefetch/zstd-pkg-config.patch @@ -1,31 +1,26 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 202cda0..bc864cc 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -872,6 +872,7 @@ dependencies = [ - "tokei", - "toml", +@@ -2498,6 +2498,7 @@ dependencies = [ + "typetag", + "winres", "yaml-rust", -+ "zstd-sys", ++ "zstd", ] [[package]] -@@ -1678,4 +1679,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" +@@ -4052,4 +4053,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" dependencies = [ "cc", "libc", + "pkg-config", ] -diff --git a/Cargo.toml b/Cargo.toml -index 8e0b5ff..48959b4 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -57,6 +57,8 @@ libc = "0.2.112" - [dev-dependencies] - more-asserts = "0.2" - paste = "1.0.7" -+# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library -+zstd-sys = { version = "1", features = [ "pkg-config" ] } +@@ -49,6 +49,7 @@ time-humanize = { version = "0.1.3", features = ["time"] } + tokei = "12.1.2" + typetag = "0.2" + yaml-rust = "0.4.5" ++zstd = { version = "*", features = ["pkg-config"] } - [features] - fail-on-deprecated = [] + [dev-dependencies] + criterion = "0.4.0" |