diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/libraries/librist | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/librist')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/librist/darwin.patch | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/librist/default.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/librist/darwin.patch b/nixpkgs/pkgs/development/libraries/librist/darwin.patch index f9571fd434f7..6a5cc8459a36 100644 --- a/nixpkgs/pkgs/development/libraries/librist/darwin.patch +++ b/nixpkgs/pkgs/development/libraries/librist/darwin.patch @@ -1,3 +1,5 @@ +diff --git a/tools/srp_shared.c b/tools/srp_shared.c +index f782126..23e82a5 100644 --- a/tools/srp_shared.c +++ b/tools/srp_shared.c @@ -173,7 +173,11 @@ void user_verifier_lookup(char * username, @@ -5,9 +7,9 @@ return; +#if defined(__APPLE__) -+ *generation = (buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec; ++ *generation = ((uint64_t)buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec; +#else - *generation = (buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec; + *generation = ((uint64_t)buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec; +#endif #endif diff --git a/nixpkgs/pkgs/development/libraries/librist/default.nix b/nixpkgs/pkgs/development/libraries/librist/default.nix index c88353090703..3f56ff324876 100644 --- a/nixpkgs/pkgs/development/libraries/librist/default.nix +++ b/nixpkgs/pkgs/development/libraries/librist/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "librist"; - version = "0.2.8"; + version = "0.2.10"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "rist"; repo = "librist"; rev = "v${version}"; - hash = "sha256-E12TS+N47UQapkF6oO0Lx66Z3lHAyP0R4tVnx/uKBwQ="; + hash = "sha256-8N4wQXxjNZuNGx/c7WVAV5QS48Bff5G3t11UkihT+K0="; }; patches = [ |