diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-06-04 13:31:26 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-06-04 13:31:26 +0100 |
| commit | f27b3096c37e5a90e3415074bc489c39116a99b6 (patch) | |
| tree | c259ea73368fcb7eb4b73511a245cd583122ab1e /pkgs/misc | |
| parent | 765c5edfb6861a4001ef5e1478fa5a32f1593b0e (diff) | |
| parent | 50a127f8fccd0d24712c8ab146ca251f27cc4cb0 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/os-specific/linux/util-linux/default.nix
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cliscord/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index 1f8de323efe3b..bdfa620ef3f2f 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -4,7 +4,6 @@ , openssl , pkg-config , fetchFromGitHub -, fetchpatch , Security }: |