diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-16 12:01:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-16 12:01:02 +0000 |
| commit | 301fcc69ba3bc67deb1754ecd61fdba6ba50a2b4 (patch) | |
| tree | 8fd7e94caaf21af427053d9945ad4bd7049e604b /pkgs/tools | |
| parent | 9387784ad3b81596b6be6266019f2c0c45d0cc9f (diff) | |
| parent | 7fb490674fbe789dafe09f018ae7470143ed5a3c (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/pspg/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/yt-dlp/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/bfs/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index f14339e007f5a..e0da056c48c7b 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.8.0"; + version = "5.8.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-VkWGVKLN8arc6BOivmjSk8MtMbp2WYqZE9lM8oTQe+U="; + sha256 = "sha256-nsGBBGw66LCwOuNdBjlz6u9RT+BX6iZmZeDY9yJoc+c="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 9218e24230f6e..c9c1caff8018c 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2023.11.14"; + version = "2023.11.16"; src = fetchPypi { inherit pname version; - hash = "sha256-s8JTU7oQaSLYcKWlnk1qLrhXg+vRfinsQ1vD4XZN6L4="; + hash = "sha256-8Mza8S4IsVkCYBpGccerEpBtexHeOudfplBoEcJOxdo="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 757e6bcd9dd32..17f6af921c788 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098 preConfigure = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace "-flto" "" + substituteInPlace GNUMakefile --replace "-flto=auto" "" ''; makeFlags = [ "PREFIX=$(out)" ]; |