ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 06:06:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Weijia Wang 2024-02-23 06:29:25 +01:00
commit 4ec69afa51
45 changed files with 241 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/lib/test-driver/pyproject.toml
View File

@ -37,7 +37,6 @@ target-version = ['py39']
include = '\.pyi?$'
[tool.mypy]
python_version = "3.10"
warn_redundant_casts = true
disallow_untyped_calls = true
disallow_untyped_defs = true

15
pkgs/applications/misc/synergy/darwin-no-UserNotifications-includes.patch
View File

@ -1,15 +0,0 @@
diff --git a/src/gui/src/OSXHelpers.mm b/src/gui/src/OSXHelpers.mm
index 0c98afc1..38c190a6 100644
--- a/src/gui/src/OSXHelpers.mm
+++ b/src/gui/src/OSXHelpers.mm
@@ -20,10 +20,6 @@
#import <Foundation/Foundation.h>
#import <CoreData/CoreData.h>
#import <Cocoa/Cocoa.h>
-#import <UserNotifications/UNNotification.h>
-#import <UserNotifications/UNUserNotificationCenter.h>
-#import <UserNotifications/UNNotificationContent.h>
-#import <UserNotifications/UNNotificationTrigger.h>
#import <QtGlobal>

15
pkgs/applications/misc/synergy/default.nix
View File

@ -27,12 +27,12 @@
, avahi-compat
# MacOS / darwin
, darwin
, ApplicationServices
, Carbon
, Cocoa
, CoreServices
, ScreenSaver
, UserNotifications
}:
stdenv.mkDerivation rec {
@ -50,10 +50,6 @@ stdenv.mkDerivation rec {
patches = [
# Without this OpenSSL from nixpkgs is not detected
./darwin-non-static-openssl.patch
] ++ lib.optionals (stdenv.isDarwin && !(darwin.apple_sdk.frameworks ? UserNotifications)) [
# We cannot include UserNotifications because of a build failure in the Apple SDK.
# The functions used from it are already implicitly included anyways.
./darwin-no-UserNotifications-includes.patch
];
postPatch = ''
@ -79,8 +75,7 @@ stdenv.mkDerivation rec {
Cocoa
CoreServices
ScreenSaver
] ++ lib.optionals (stdenv.isDarwin && darwin.apple_sdk.frameworks ? UserNotifications) [
darwin.apple_sdk.frameworks.UserNotifications
UserNotifications
] ++ lib.optionals stdenv.isLinux [
util-linux
libselinux
@ -110,6 +105,10 @@ stdenv.mkDerivation rec {
checkPhase = ''
runHook preCheck
'' + lib.optionalString stdenv.isDarwin ''
# filter out tests failing with sandboxing on darwin
export GTEST_FILTER=-ServerConfigTests.serverconfig_will_deem_equal_configs_with_same_cell_names:NetworkAddress.hostname_valid_parsing
'' + ''
bin/unittests
runHook postCheck
'';
@ -126,7 +125,7 @@ stdenv.mkDerivation rec {
cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
substitute ../res/synergy.desktop $out/share/applications/synergy.desktop \
--replace "/usr/bin" "$out/bin"
'' + lib.optionalString stdenv.isDarwin ''
'' + lib.optionalString (stdenv.isDarwin && withGUI) ''
mkdir -p $out/Applications
cp -r bundle/Synergy.app $out/Applications
ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS

4
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -93,11 +93,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.62.165";
version = "1.63.161";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-FyTHFoPP4u5BF3vrgBnM5aFLPfijMzmkq06HXMDvv4k=";
hash = "sha256-FAoQ/b88HtrtTq+yEiUzlsZAnUbps9bb0V9Iy3IIMR0=";
};
dontConfigure = true;

19
pkgs/tools/text/cringify/default.nix → pkgs/by-name/cr/cringify/package.nix
View File

@ -1,29 +1,36 @@
{ lib
, rustPlatform
, fetchFromGitHub
, python3
, testers
, cringify
}:
rustPlatform.buildRustPackage rec {
pname = "cringify";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitHub {
owner = "sansyrox";
repo = "cringify";
rev = "dd753818f8dd4b343be9370d2c29a6be070ad791";
hash = "sha256-6hSgOk9DzDfGtZX1vt6AQsKSLdPdqy2Mz3UtK6d2AuA=";
rev = "857c2620ac9f1f53139d3a599e55679a75e77053";
hash = "sha256-U0tKYFRZToMALSeItn9yia7Dl7omETDTkuRlWJ8EZEo=";
};
cargoHash = "sha256-w6lqPyUCaXZBQ1EmMyj0sVnEHugMD6JugIIK0rEa19Y=";
cargoHash = "sha256-OQXGn6m6VdSlxaCPRonjvEo/GOpsEiZkqL12UdoLu0Q=";
postPatch = ''
# Upstream forgot to update the version value
substituteInPlace src/main.rs --replace '0.1.0' ${version}
# Upstream doesn't set the version string itself
substituteInPlace src/main.rs --replace '0.0.1' ${version}
'';
nativeBuildInputs = [ python3 ];
# No tests are present in the repository
doCheck = false;
passthru.tests.version = testers.testVersion { package = cringify; };
meta = {
description = "Annoy your friends with the cringified text";
homepage = "https://github.com/sansyrox/cringify";

2
pkgs/development/compilers/llvm/11/clang/default.nix
View File

@ -50,7 +50,7 @@ let
# https://reviews.llvm.org/D51899
./gnu-install-dirs.patch
(substituteAll {
src = ../../clang-11-15-LLVMgold-path.patch;
src = ../../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];

2
pkgs/development/compilers/llvm/11/libcxx/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation {
})
./gnu-install-dirs.patch
] ++ lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
../../common/libcxx/libcxx-0001-musl-hacks.patch
];
# Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"

2
pkgs/development/compilers/llvm/11/libcxxabi/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.isDarwin ''
export TRIPLE=x86_64-apple-darwin
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch}
patch -p1 -d libcxx -i ${../../common/libcxx/libcxx-0001-musl-hacks.patch}
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch}
'';

4
pkgs/development/compilers/llvm/11/llvm/default.nix
View File

@ -86,7 +86,7 @@ in stdenv.mkDerivation (rec {
# of the flags used for the normal LLVM build. To avoid the need for building
# a native libLLVM.so (which would fail) we force llvm-config to be linked
# statically against the necessary LLVM components always.
../../llvm-config-link-static.patch
../../common/llvm/llvm-config-link-static.patch
./gnu-install-dirs.patch
# On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test.
@ -149,7 +149,7 @@ in stdenv.mkDerivation (rec {
--replace "Path.cpp" ""
rm unittests/Support/Path.cpp
'' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../../TLI-musl.patch}
patch -p1 -i ${../../common/llvm/TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

2
pkgs/development/compilers/llvm/12/clang/default.nix
View File

@ -47,7 +47,7 @@ let
# https://reviews.llvm.org/D51899
./gnu-install-dirs.patch
(substituteAll {
src = ../../clang-11-15-LLVMgold-path.patch;
src = ../../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];

2
pkgs/development/compilers/llvm/12/libcxx/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
patches = [
./gnu-install-dirs.patch
] ++ lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
../../common/libcxx/libcxx-0001-musl-hacks.patch
];
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''

2
pkgs/development/compilers/llvm/12/libcxxabi/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.isDarwin ''
export TRIPLE=x86_64-apple-darwin
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch}
patch -p1 -d libcxx -i ${../../common/libcxx/libcxx-0001-musl-hacks.patch}
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch}
'';

4
pkgs/development/compilers/llvm/12/llvm/default.nix
View File

@ -87,7 +87,7 @@ in stdenv.mkDerivation (rec {
# of the flags used for the normal LLVM build. To avoid the need for building
# a native libLLVM.so (which would fail) we force llvm-config to be linked
# statically against the necessary LLVM components always.
../../llvm-config-link-static.patch
../../common/llvm/llvm-config-link-static.patch
# Fix llvm being miscompiled by some gccs. See llvm/llvm-project#49955
# Fix llvm being miscompiled by some gccs. See https://github.com/llvm/llvm-project/issues/49955
./fix-llvm-issue-49955.patch
@ -138,7 +138,7 @@ in stdenv.mkDerivation (rec {
# TODO: Fix failing tests:
rm test/DebugInfo/X86/vla-multi.ll
'' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../../TLI-musl.patch}
patch -p1 -i ${../../common/llvm/TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

2
pkgs/development/compilers/llvm/13/clang/default.nix
View File

@ -43,7 +43,7 @@ let
./revert-malloc-alignment-assumption.patch
../../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../../clang-11-15-LLVMgold-path.patch;
src = ../../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];

2
pkgs/development/compilers/llvm/13/libcxx/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
patches = [
./gnu-install-dirs.patch
] ++ lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
../../common/libcxx/libcxx-0001-musl-hacks.patch
];
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''

4
pkgs/development/compilers/llvm/13/llvm/default.nix
View File

@ -81,7 +81,7 @@ in stdenv.mkDerivation (rec {
# of the flags used for the normal LLVM build. To avoid the need for building
# a native libLLVM.so (which would fail) we force llvm-config to be linked
# statically against the necessary LLVM components always.
../../llvm-config-link-static.patch
../../common/llvm/llvm-config-link-static.patch
./gnu-install-dirs.patch
@ -128,7 +128,7 @@ in stdenv.mkDerivation (rec {
rm unittests/IR/PassBuilderCallbacksTest.cpp
rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test
'' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../../TLI-musl.patch}
patch -p1 -i ${../../common/llvm/TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

2
pkgs/development/compilers/llvm/14/clang/default.nix
View File

@ -46,7 +46,7 @@ let
./gnu-install-dirs.patch
../../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../../clang-11-15-LLVMgold-path.patch;
src = ../../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];

2
pkgs/development/compilers/llvm/14/libcxx/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
patches = [
./gnu-install-dirs.patch
] ++ lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
../../common/libcxx/libcxx-0001-musl-hacks.patch
];
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''

2
pkgs/development/compilers/llvm/14/llvm/default.nix
View File

@ -116,7 +116,7 @@ in stdenv.mkDerivation (rec {
rm unittests/IR/PassBuilderCallbacksTest.cpp
rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test
'' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../../TLI-musl.patch}
patch -p1 -i ${../../common/llvm/TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

2
pkgs/development/compilers/llvm/15/clang/default.nix
View File

@ -52,7 +52,7 @@ let
./gnu-install-dirs.patch
../../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../../clang-11-15-LLVMgold-path.patch;
src = ../../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];

2
pkgs/development/compilers/llvm/15/libcxx/default.nix
View File

@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
relative = "libcxx";
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
../../common/libcxx/libcxx-0001-musl-hacks.patch
];
postPatch = ''

2
pkgs/development/compilers/llvm/15/llvm/default.nix
View File

@ -230,7 +230,7 @@ in stdenv.mkDerivation (rec {
# timing-based tests are trouble
rm utils/lit/tests/googletest-timeout.py
'' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../../TLI-musl.patch}
patch -p1 -i ${../../common/llvm/TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

2
pkgs/development/compilers/llvm/16/clang/default.nix
View File

@ -52,7 +52,7 @@ let
./gnu-install-dirs.patch
../../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../../clang-at-least-16-LLVMgold-path.patch;
src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];

2
pkgs/development/compilers/llvm/16/llvm/default.nix
View File

@ -223,7 +223,7 @@ in
# timing-based tests are trouble
rm utils/lit/tests/googletest-timeout.py
'' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../../TLI-musl.patch}
patch -p1 -i ${../../common/llvm/TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

2
pkgs/development/compilers/llvm/17/clang/default.nix
View File

@ -53,7 +53,7 @@ let
./gnu-install-dirs.patch
../../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../../clang-at-least-16-LLVMgold-path.patch;
src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];

2
pkgs/development/compilers/llvm/17/llvm/default.nix
View File

@ -220,7 +220,7 @@ stdenv.mkDerivation (rec {
rm unittests/IR/PassBuilderCallbacksTest.cpp
rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test
'' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../../TLI-musl.patch}
patch -p1 -i ${../../common/llvm/TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

2
pkgs/development/compilers/llvm/9/clang/default.nix
View File

@ -52,7 +52,7 @@ let
./HIP-use-PATH-9.patch
./gnu-install-dirs.patch
(substituteAll {
src = ../../clang-6-10-LLVMgold-path.patch;
src = ../../common/clang/clang-6-10-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];

2
pkgs/development/compilers/llvm/9/libcxx/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation {
patches = [
./gnu-install-dirs.patch
] ++ lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
../../common/libcxx/libcxx-0001-musl-hacks.patch
];
# Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"

2
pkgs/development/compilers/llvm/9/libcxxabi/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.isDarwin ''
export TRIPLE=x86_64-apple-darwin
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch}
patch -p1 -d $(ls -d libcxx-*) -i ${../../common/libcxx/libcxx-0001-musl-hacks.patch}
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
patch -p1 -d $(ls -d llvm-*) -i ${../../common/libcxxabi/wasm.patch}
'';

6
pkgs/development/compilers/llvm/9/llvm/default.nix
View File

@ -86,12 +86,12 @@ in stdenv.mkDerivation (rec {
# of the flags used for the normal LLVM build. To avoid the need for building
# a native libLLVM.so (which would fail) we force llvm-config to be linked
# statically against the necessary LLVM components always.
../../llvm-config-link-static.patch
../../common/llvm/llvm-config-link-static.patch
./gnu-install-dirs.patch
# Force a test to evaluate the saved benchmark for a CPU for which LLVM has
# an execution model. See NixOS/nixpkgs#119673.
../../exegesis-force-bdver2.patch
./exegesis-force-bdver2.patch
# Fix missing includes for GCC 11
(fetchpatch {
@ -137,7 +137,7 @@ in stdenv.mkDerivation (rec {
--replace "Path.cpp" ""
rm unittests/Support/Path.cpp
'' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../../TLI-musl.patch}
patch -p1 -i ${../../common/llvm/TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

0
pkgs/development/compilers/llvm/exegesis-force-bdver2.patch → pkgs/development/compilers/llvm/9/llvm/exegesis-force-bdver2.patch
View File

0
pkgs/development/compilers/llvm/clang-11-15-LLVMgold-path.patch → pkgs/development/compilers/llvm/common/clang/clang-11-15-LLVMgold-path.patch
View File

0
pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch → pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch
View File

0
pkgs/development/compilers/llvm/clang-at-least-16-LLVMgold-path.patch → pkgs/development/compilers/llvm/common/clang/clang-at-least-16-LLVMgold-path.patch
View File

0
pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch → pkgs/development/compilers/llvm/common/libcxx/libcxx-0001-musl-hacks.patch
View File

0
pkgs/development/compilers/llvm/TLI-musl.patch → pkgs/development/compilers/llvm/common/llvm/TLI-musl.patch
View File

0
pkgs/development/compilers/llvm/llvm-config-link-static.patch → pkgs/development/compilers/llvm/common/llvm/llvm-config-link-static.patch
View File

2
pkgs/development/compilers/llvm/git/clang/default.nix
View File

@ -54,7 +54,7 @@ let
./gnu-install-dirs.patch
../../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../../clang-at-least-16-LLVMgold-path.patch;
src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];

2
pkgs/development/compilers/llvm/git/llvm/default.nix
View File

@ -224,7 +224,7 @@ stdenv.mkDerivation (rec {
rm unittests/IR/PassBuilderCallbacksTest.cpp
rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test
'' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../../TLI-musl.patch}
patch -p1 -i ${../../common/llvm/TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

1
pkgs/development/interpreters/maude/default.nix
View File

@ -56,7 +56,6 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
meta = {
broken = stdenv.isDarwin;
homepage = "http://maude.cs.illinois.edu/";
description = "High-level specification language";
license = lib.licenses.gpl2Plus;

4
pkgs/development/python-modules/dask-jobqueue/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "dask-jobqueue";
version = "0.8.2";
version = "0.8.5";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-01QHoFoFNDR8XZWK50m5+FNb7FKYV9ATtuVknN5DkUo=";
hash = "sha256-9pI/nX/4lLlu+/cGEYss03/Td1HVZ+kcIt/T4uqpMgI=";
};
propagatedBuildInputs = [

499
pkgs/development/tools/language-servers/millet/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/tools/language-servers/millet/default.nix
View File

@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
version = "0.14.2";
version = "0.14.3";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
hash = "sha256-UtdkflM9ftmSVQI4CF0PAlLlbQ9l0EHF5SzJL4sU08Q=";
hash = "sha256-V1FToLhBzeZd3ve+eKAHniHN6oveEg0FBHnkSZPxBqo=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"char-name-0.1.0" = "sha256-zi5XI0exL0D0RMN5FlNqdXl5DDFEnvWOBZvgeUTMKKc=";
"chain-map-0.1.0" = "sha256-nds+lPGCbxw3GqrgfmTbKnPkiV3F6f5A2xr82qV33iI=";
"sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8=";
};
};

4
pkgs/tools/security/exploitdb/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2024-02-20";
version = "2024-02-22";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-cvz+yiB0Ei37W/RlW60oLCmQSCHZI6QB5JJtX4aUyuo=";
hash = "sha256-+5N7qe7YuNNBiizzI2aBKZCsl64ODkit5Y9QlhNWVMw=";
};
nativeBuildInputs = [

5
pkgs/top-level/all-packages.nix
View File

@ -7254,8 +7254,6 @@ with pkgs;
createrepo_c = callPackage ../tools/package-management/createrepo_c { };
cringify = callPackage ../tools/text/cringify { };
cromfs = callPackage ../tools/archivers/cromfs { };
cron = callPackage ../tools/system/cron { };
@ -35403,7 +35401,8 @@ with pkgs;
};
synergy = libsForQt5.callPackage ../applications/misc/synergy {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver UserNotifications;
};
synergyWithoutGUI = synergy.override { withGUI = false; };