Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-02-10 12:02:02 +00:00 committed by GitHub
commit 30da98a1d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
67 changed files with 5797 additions and 578 deletions

View File

@ -51,7 +51,9 @@ let
# to install it because it would create a cyclic dependency between
# the outputs. We also need to enable the remote,
# which should not be done by default.
lib.optionalAttrs cfg.enableTestRemote (enableRemote cfg.package.installedTests "fwupd-tests")
lib.optionalAttrs
(cfg.daemonSettings.TestDevices or false)
(enableRemote cfg.package.installedTests "fwupd-tests")
);
in {
@ -86,15 +88,6 @@ in {
'';
};
enableTestRemote = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether to enable test remote. This is used by
[installed tests](https://github.com/fwupd/fwupd/blob/master/data/installed-tests/README.md).
'';
};
package = mkPackageOption pkgs "fwupd" { };
daemonSettings = mkOption {
@ -128,6 +121,15 @@ in {
or if this partition is not mounted at /boot/efi, /boot, or /efi
'';
};
TestDevices = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Create virtual test devices and remote for validating daemon flows.
This is only intended for CI testing and development purposes.
'';
};
};
};
default = {};
@ -159,7 +161,6 @@ in {
config = mkIf cfg.enable {
# Disable test related plug-ins implicitly so that users do not have to care about them.
services.fwupd.daemonSettings = {
DisabledPlugins = cfg.package.defaultDisabledPlugins;
EspLocation = config.boot.loader.efi.efiSysMountPoint;
};

View File

@ -276,9 +276,11 @@ in
ingressesSet = filterIngressSet tunnel.ingress;
ingressesStr = filterIngressStr tunnel.ingress;
fullConfig = {
fullConfig = filterConfig {
tunnel = name;
"credentials-file" = tunnel.credentialsFile;
warp-routing = filterConfig tunnel.warp-routing;
originRequest = filterConfig tunnel.originRequest;
ingress =
(map
(key: {
@ -294,6 +296,7 @@ in
(attrNames ingressesStr))
++ [{ service = tunnel.default; }];
};
mkConfigFile = pkgs.writeText "cloudflared.yml" (builtins.toJSON fullConfig);
in
nameValuePair "cloudflared-tunnel-${name}" ({
@ -322,5 +325,5 @@ in
};
};
meta.maintainers = with maintainers; [ bbigras ];
meta.maintainers = with maintainers; [ bbigras anpin ];
}

View File

@ -873,9 +873,11 @@ in {
{ systemd.timers.nextcloud-cron = {
wantedBy = [ "timers.target" ];
after = [ "nextcloud-setup.service" ];
timerConfig.OnBootSec = "5m";
timerConfig.OnUnitActiveSec = "5m";
timerConfig.Unit = "nextcloud-cron.service";
timerConfig = {
OnBootSec = "5m";
OnUnitActiveSec = "5m";
Unit = "nextcloud-cron.service";
};
};
systemd.tmpfiles.rules = map (dir: "d ${dir} 0750 nextcloud nextcloud - -") [
@ -992,15 +994,21 @@ in {
nextcloud-cron = {
after = [ "nextcloud-setup.service" ];
environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config";
serviceConfig.Type = "oneshot";
serviceConfig.User = "nextcloud";
serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${webroot}/cron.php";
serviceConfig = {
Type = "oneshot";
User = "nextcloud";
ExecCondition = "${lib.getExe phpPackage} -f ${webroot}/occ status -e";
ExecStart = "${lib.getExe phpPackage} -f ${webroot}/cron.php";
KillMode = "process";
};
};
nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable {
after = [ "nextcloud-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all";
serviceConfig.User = "nextcloud";
serviceConfig = {
Type = "oneshot";
ExecStart = "${occ}/bin/nextcloud-occ app:update --all";
User = "nextcloud";
};
startAt = cfg.autoUpdateApps.startAt;
};
};

View File

@ -1,11 +1,12 @@
{ pkgs, lib, makeInstalledTest, ... }:
{ pkgs, makeInstalledTest, ... }:
makeInstalledTest {
tested = pkgs.fwupd;
testConfig = {
services.fwupd.enable = true;
services.fwupd.daemonSettings.DisabledPlugins = lib.mkForce [ ]; # don't disable test plugin
services.fwupd.enableTestRemote = true;
services.fwupd = {
enable = true;
daemonSettings.TestDevices = true;
};
};
}

View File

@ -2,6 +2,7 @@
, stdenv
, appstream-glib
, desktop-file-utils
, deepfilternet
, fetchFromGitHub
, calf
, fftw
@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
buildInputs = [
appstream-glib
deepfilternet
fftw
fftwFloat
fmt_9
@ -95,6 +97,7 @@ stdenv.mkDerivation rec {
zam-plugins # maximizer
];
ladspaPlugins = [
deepfilternet # deep noise remover
rubberband # pitch shifting
];
in

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "5.0.19";
version = "5.0.20";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-ogr2tdXVQcUOE26PGsYeAGi8+5zbM5m/BVuHxemVNGM=";
sha256 = "sha256-wC3KnuKHsUw1jt7EXVAgPhB6Sk8630sVaM3yn6CGPqs=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -6,7 +6,7 @@
(require 'semaphore-promise)
(require 'url)
(require 'json)
(require 'cl)
(require 'cl-lib)
(require 'subr-x)
(require 'seq)
@ -77,7 +77,7 @@ return Promise to resolve in that process."
(defun parse-previous-archive (filename)
(let ((idx (make-hash-table :test 'equal)))
(loop for desc in
(cl-loop for desc in
(let ((json-object-type 'hash-table)
(json-array-type 'list)
(json-key-type 'symbol))
@ -166,7 +166,7 @@ return Promise to resolve in that process."
(defun recipe-info (recipe-index ename)
(if-let (desc (gethash ename recipe-index))
(destructuring-bind (rcp-commit . rcp-sha256) desc
(cl-destructuring-bind (rcp-commit . rcp-sha256) desc
`((commit . ,rcp-commit)
(sha256 . ,rcp-sha256)))
`((error . "No recipe info"))))
@ -204,7 +204,7 @@ return Promise to resolve in that process."
(seq-let [recipe-index unstable-sha stable-sha] res
(append `((ename . ,ename))
(if-let (desc (gethash ename recipe-index))
(destructuring-bind (rcp-commit . rcp-sha256) desc
(cl-destructuring-bind (rcp-commit . rcp-sha256) desc
(append `((commit . ,rcp-commit)
(sha256 . ,rcp-sha256))
(when (not unstable-aprops)
@ -257,10 +257,9 @@ return Promise to resolve in that process."
url (lambda (status)
(funcall resolve (condition-case err
(progn
(goto-char (point-min))
(search-forward "\n\n")
(url-http-parse-headers)
(goto-char url-http-end-of-headers)
(message (buffer-substring (point-min) (point)))
(delete-region (point-min) (point))
(funcall parser))
(funcall reject err))))))))

View File

@ -17,18 +17,19 @@
, json-glib
, libsecret
, libsoup_3
, libpeas2
}:
stdenv.mkDerivation rec {
pname = "boatswain";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "boatswain";
rev = version;
hash = "sha256-Q16ooTaCgwbwEqa0iRzAoaS5OHCSi6dXaiVgC3uc/zc=";
hash = "sha256-Yqf7NJMyE6mg1zJJCLrIr6Emwt/nvlLHLAEtCXqFT8M=";
};
nativeBuildInputs = [
@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
json-glib
libsecret
libsoup_3
libpeas2
];
meta = with lib; {

View File

@ -11,6 +11,7 @@
, ibus
, qtbase
, zstd
, fetchpatch
, withFcitx5Support ? false
, withIbusSupport ? false
}:
@ -29,6 +30,15 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# prevents runtime crash when fcitx5-based IM attempts to look in /usr
(fetchpatch {
name = "use-CMAKE_INSTALL_PREFIX-for-loading-data.patch";
url = "https://github.com/OpenBangla/OpenBangla-Keyboard/commit/f402472780c29eaa6b4cc841a70289adf171462b.diff";
hash = "sha256-YahvtyOxe8F40Wfe+31C6fdmm197QN26/Q67oinOplk=";
})
];
nativeBuildInputs = [
cmake
pkg-config
@ -65,13 +75,7 @@ stdenv.mkDerivation rec {
cargoRoot = "src/engine/riti";
postPatch = ''
cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock
substituteInPlace CMakeLists.txt \
--replace "/usr" "$out"
substituteInPlace src/shared/FileSystem.cpp \
--replace "/usr" "$out"
'';
'';
meta = {
isIbusEngine = withIbusSupport;

View File

@ -8,7 +8,7 @@ buildGoModule rec {
owner = "KubeNetworks";
repo = "kubevpn";
rev = "v${version}";
sha256 = "sha256-/WXJmqgfA2hG+1y62uvTMLbPWbamUObfGpgEBUJwgE4=";
hash = "sha256-inGqkkzXPjg2VHtPZEPWDTuioPchrf/kiLGjvgXpcI4=";
};
vendorHash = null;

View File

@ -19,7 +19,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "iotas";
version = "0.2.2";
version = "0.2.7";
format = "other";
src = fetchFromGitLab {
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "cheywood";
repo = pname;
rev = version;
hash = "sha256-oThsyTsNM3283e4FViISdFzmeQnU7qXHh4xEJWA2fkc=";
hash = "sha256-k3Qbi/BwkJlQzlyTlo9SjJ1M3zMFHo4669rzd+BBPzQ=";
};
nativeBuildInputs = [

View File

@ -27,13 +27,13 @@ assert !(pulseaudioSupport && portaudioSupport);
gnuradioMinimal.pkgs.mkDerivation rec {
pname = "gqrx";
version = "2.17.3";
version = "2.17.4";
src = fetchFromGitHub {
owner = "gqrx-sdr";
repo = "gqrx";
rev = "v${version}";
hash = "sha256-dHbDy/aIsqBQG1raeN9nM/QtiFgy+Qhoj/ThN8LV6gI=";
hash = "sha256-7TjmtF0B+dxUcoXXzpF47dHwxhNMKKQ8Mpf/FFTuwl4=";
};
nativeBuildInputs = [

View File

@ -1,45 +1,33 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok
, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm
, pcre, python3, qtsvg, qttools, wrapQtAppsHook, desktopToDarwinBundle
{ lib, stdenv, fetchgit, pkg-config, cmake, glib, boost, libsigrok
, libsigrokdecode, libserialport, libzip, libftdi1, hidapi, glibmm
, pcre, python3, qtsvg, qttools, bluez
, wrapQtAppsHook, desktopToDarwinBundle
}:
stdenv.mkDerivation rec {
pname = "pulseview";
version = "0.4.2";
version = "0.4.2-unstable-2024-01-26";
src = fetchurl {
url = "https://sigrok.org/download/source/pulseview/pulseview-${version}.tar.gz";
hash = "sha256-8EL3ej4bNb8wZmMw427Dj6uNJIw2k8N7fjXUAcO/q8s=";
src = fetchgit {
url = "git://sigrok.org/pulseview";
rev = "9b8b7342725491d626609017292fa9259f7d5e0e";
hash = "sha256-UEJunADzc1WRRfchO/n8qqxnyrSo4id1p7gLkD3CKaM=";
};
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]
++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
buildInputs = [
glib boost libsigrok libsigrokdecode libserialport libzip libusb1 libftdi1 glibmm
glib boost libsigrok libsigrokdecode libserialport libzip libftdi1 hidapi glibmm
pcre python3
qtsvg
] ++ lib.optional stdenv.isLinux udev;
patches = [
# Allow building with glib 2.68
# PR at https://github.com/sigrokproject/pulseview/pull/39
(fetchpatch {
url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch";
hash = "sha256-0PlE/z4tbN1JFfAUBeZiXc3ENzwuhCaulIBRmXTULh4=";
})
# Fixes replaced/obsolete Qt methods
(fetchpatch {
url = "https://github.com/sigrokproject/pulseview/commit/ae726b70a7ada9a4be5808e00f0c951318479684.patch";
hash = "sha256-6bFXFAnTO+MBUmslw55gWWSCCPwnejqKGpHeJOoH0e8=";
})
];
] ++ lib.optionals stdenv.isLinux [ bluez ];
meta = with lib; {
description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)";
homepage = "https://sigrok.org/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ bjornfor ];
maintainers = with maintainers; [ bjornfor vifino ];
platforms = platforms.unix;
};
}

5341
pkgs/by-name/de/deepfilternet/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "deepfilternet";
version = "0.5.6";
src = fetchFromGitHub {
owner = "Rikorose";
repo = "DeepFilterNet";
rev = "v${version}";
hash = "sha256-5bYbfO1kmduNm9YV5niaaPvRIDRmPt4QOX7eKpK+sWY=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"hdf5-0.8.1" = "sha256-qWF2mURVblSLPbt4oZSVxIxI/RO3ZNcZdwCdaOTACYs=";
};
};
# only the ladspa plugin part has been packaged so far...
buildAndTestSubdir = "ladspa";
postInstall = ''
mkdir $out/lib/ladspa
mv $out/lib/libdeep_filter_ladspa${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ladspa/
'';
meta = {
description = "Noise supression using deep filtering";
homepage = "https://github.com/Rikorose/DeepFilterNet";
license = with lib.licenses; [ mit asl20 ];
maintainers = with lib.maintainers; [ ralismark ];
changelog = "https://github.com/Rikorose/DeepFilterNet/releases/tag/${src.rev}";
};
}

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "eksctl";
version = "0.170.0";
version = "0.171.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
hash = "sha256-aYkydocr5PDpxUYO4Cee2AbNQzBgjJRdRo3lonQRPy8=";
hash = "sha256-+kM/RKC/HxGRH3qOzlhkzaxj1l60D+6aNGIkrDuTk7A=";
};
vendorHash = "sha256-cuLzn0OZ5VC+RWGsJ8DCdJN8wm0DrsjH55K/cnyuqB8=";

View File

@ -80,7 +80,7 @@ index c20a1a05e..5354bac7f 100644
@@ -56,12 +56,12 @@ configure_file(
output: 'vendor.conf',
configuration: con2,
install: true,
install: get_option('vendor_metadata'),
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)

View File

@ -6,7 +6,7 @@ index dfce86b1c..5e34c4fa6 100644
output: 'fwupd-tests.conf',
configuration: con2,
install: true,
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
- install_dir: join_paths(datadir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build

View File

@ -11,7 +11,6 @@
, libdrm
, polkit
, libxmlb
, glib
, gusb
, sqlite
, libarchive
@ -121,7 +120,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
version = "1.9.12";
version = "1.9.13";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@ -132,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd";
repo = "fwupd";
rev = finalAttrs.version;
hash = "sha256-hPRp61m/XTXFacYkBOb4SsG4fcFvWrdMfc+sxLk5/sQ=";
hash = "sha256-h2e9MFTb777xbNRlzKWXc5GUdu/BHSkJTaogEE5byjo=";
};
patches = [
@ -214,6 +213,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Dsysconfdir_install=${placeholder "out"}/etc"
"-Defi_os_dir=nixos"
"-Dplugin_modem_manager=enabled"
"-Dvendor_metadata=true"
# We do not want to place the daemon into lib (cyclic reference)
"--libexecdir=${placeholder "out"}/libexec"
] ++ lib.optionals (!enablePassim) [
@ -341,12 +341,6 @@ stdenv.mkDerivation (finalAttrs: {
"grub.d/35_fwupd"
];
# DisabledPlugins key in fwupd/daemon.conf
defaultDisabledPlugins = [
"test"
"test_ble"
];
# For updating.
inherit test-firmware;
@ -372,12 +366,6 @@ stdenv.mkDerivation (finalAttrs: {
assert len(package_etc - passthru_etc) == 0, f'fwupd package contains the following paths in /etc that are not listed in passthru.filesInstalledToEtc: {package_etc - passthru_etc}'
assert len(passthru_etc - package_etc) == 0, f'fwupd package lists the following paths in passthru.filesInstalledToEtc that are not contained in /etc: {passthru_etc - package_etc}'
config = configparser.RawConfigParser()
config.read('${finalAttrs.finalPackage}/etc/fwupd/fwupd.conf')
package_disabled_plugins = config.get('fwupd', 'DisabledPlugins').rstrip(';').split(';')
passthru_disabled_plugins = ${listToPy finalAttrs.passthru.defaultDisabledPlugins}
assert package_disabled_plugins == passthru_disabled_plugins, f'Default disabled plug-ins in the package {package_disabled_plugins} do not match those listed in passthru.defaultDisabledPlugins {passthru_disabled_plugins}'
pathlib.Path(os.getenv('out')).touch()
'';
};

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "gofumpt";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "mvdan";
repo = pname;
rev = "v${version}";
hash = "sha256-3buGLgxAaAIwLXWLpX+K7VRx47DuvUI4W8vw4TuXSts=";
hash = "sha256-94aaLqoalFredkxaSPgJEnFtKw7GmkkL5N+I8ws9zxY=";
};
vendorHash = "sha256-W0WKEQgOIFloWsB4E1RTICVKVlj9ChGSpo92X+bjNEk=";
vendorHash = "sha256-q8+Blzab9TLTRY2/KncIlVp53+K6YWzg1D0SS7FPM9I=";
CGO_ENABLED = "0";

View File

@ -1,7 +1,7 @@
{
"version": "0.25",
"srcHash": "sha256-EZ8waJiLHfButE/rI0EEwZ3VF5dwdgFQ4FBLebhyP2o=",
"version": "0.27",
"srcHash": "sha256-sGkK3SaQmzprgTiABgKfRZ3pUNFZNrt/8aNANH1RES8=",
"x86_64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8=",
"x86_64-darwin": "sha256-y8ETFWSg+czhyslKc7muTFRu2q+7eeVyZ7Tea/VCUWY=",
"aarch64-darwin": "sha256-y8ETFWSg+czhyslKc7muTFRu2q+7eeVyZ7Tea/VCUWY="
"x86_64-darwin": "sha256-A8T1FNPS1CguSmRyGl+i0o/DGy+LyTnKYKdNc8kTKS8=",
"aarch64-darwin": "sha256-A8T1FNPS1CguSmRyGl+i0o/DGy+LyTnKYKdNc8kTKS8="
}

View File

@ -0,0 +1,58 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, cmake
, glib
, boost
, libsigrok
, libserialport
, libzip
, libftdi1
, hidapi
, glibmm
, python3
, bluez
, pcre
, libsForQt5
, desktopToDarwinBundle
, qt5
}:
stdenv.mkDerivation rec {
pname = "smuview";
version = "0.0.5-unstable-2023-04-12";
src = fetchFromGitHub {
owner = "knarfS";
repo = "smuview";
rev = "a5ffb66287b725ebcdecc1eab04a4574c8585f66";
hash = "sha256-WH8X75yk0aMivbBBOyODcM1eBWwa5UO/3nTaKV1LCGs=";
};
nativeBuildInputs = [ cmake pkg-config qt5.wrapQtAppsHook ]
++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
buildInputs = [
glib
boost
libsigrok
libserialport
libzip
libftdi1
hidapi
glibmm
python3
pcre
libsForQt5.qwt
] ++ lib.optionals stdenv.isLinux [ bluez ];
meta = with lib; {
description = "A Qt based source measure unit GUI for sigrok";
longDescription = "SmuView is a GUI for sigrok that supports power supplies, electronic loads and all sorts of measurement devices like multimeters, LCR meters and so on";
homepage = "https://github.com/knarfS/smuview";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ vifino ];
platforms = platforms.unix;
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.31.0";
version = "2.31.1";
src = fetchFromGitHub {
owner = "spicetify";
repo = "spicetify-cli";
rev = "v${version}";
hash = "sha256-uaGZWLrWWzf6KlQ/rW3XQNdE0a0QVuismhzIrgfAtNA=";
hash = "sha256-FmL1AalQzsHIJ1yDtcAt1sjfRdzbpplYK5t0UAdwIyY=";
};
vendorHash = "sha256-T7aUjzb69ZAnpLCpHv5C6ZyUktfC8Zt94rIju8QplWI=";

View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "fg-virgil";
version = "0.17.0";
version = "0.17.3";
src = fetchFromGitHub {
owner = "excalidraw";
repo = "excalidraw";
rev = "v${finalAttrs.version}";
hash = "sha256-awd5jTz4sSiliEq7xt6dUR31C85oDcCP5GLuQn0ohj0=";
hash = "sha256-j8fT17RkgMQAAS4KsC2+uItT8Z300SZWnLkyo4XI1WY=";
};
installPhase = ''

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "smiley-sans";
version = "1.1.1";
version = "2.0.1";
src = fetchzip {
url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip";
sha256 = "sha256-/lsAZRHgmx1TMjm2O5Z0IOiHQM8LKJPXcBKZrlXt3RA=";
sha256 = "sha256-p6DwX5MBPemAfV99L9ayLkEWro31ip4tf+wBQr8mkbs=";
stripRoot = false;
};

View File

@ -1,133 +0,0 @@
{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false
}:
let
self = stdenv.mkDerivation ({
pname = "clang";
inherit version;
src = fetch "clang" "091bvcny2lh32zy8f3m9viayyhb2zannrndni7325rl85cwgr6pr";
unpackPhase = ''
unpackFile $src
mv clang-${version}* clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}
mv clang-tools-extra-* $sourceRoot/tools/extra
'';
nativeBuildInputs = [ cmake python3 ]
++ lib.optional enableManpages python3.pkgs.sphinx
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 libllvm ];
cmakeFlags = [
"-DCLANGD_BUILD_XPC=OFF"
"-DLLVM_ENABLE_RTTI=ON"
] ++ lib.optionals enableManpages [
"-DCLANG_INCLUDE_DOCS=ON"
"-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"
"-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"
];
patches = [
./purity.patch
# https://reviews.llvm.org/D51899
./compiler-rt-baremetal.patch
./gnu-install-dirs.patch
(substituteAll {
src = ../../clang-6-10-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];
postPatch = ''
sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
-e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \
lib/Driver/ToolChains/*.cpp
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace tools/extra/clangd/CMakeLists.txt \
--replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
'';
outputs = [ "out" "lib" "dev" "python" ];
postInstall = ''
ln -sv $out/bin/clang $out/bin/cpp
# Move libclang to 'lib' output
moveToOutput "lib/libclang.*" "$lib"
moveToOutput "lib/libclang-cpp.*" "$lib"
substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
--replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \
--replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp."
mkdir -p $python/bin $python/share/{clang,scan-view}
mv $out/bin/{git-clang-format,scan-view} $python/bin
if [ -e $out/bin/set-xcode-analyzer ]; then
mv $out/bin/set-xcode-analyzer $python/bin
fi
mv $out/share/clang/*.py $python/share/clang
mv $out/share/scan-view/*.py $python/share/scan-view
rm $out/bin/c-index-test
patchShebangs $python/bin
mkdir -p $dev/bin
cp bin/clang-tblgen $dev/bin
'';
passthru = {
inherit libllvm;
isClang = true;
hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ];
};
meta = llvm_meta // {
homepage = "https://clang.llvm.org/";
description = "A C language family frontend for LLVM";
longDescription = ''
The Clang project provides a language front-end and tooling
infrastructure for languages in the C language family (C, C++, Objective
C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project.
It aims to deliver amazingly fast compiles, extremely useful error and
warning messages and to provide a platform for building great source
level tools. The Clang Static Analyzer and clang-tidy are tools that
automatically find bugs in your code, and are great examples of the sort
of tools that can be built using the Clang frontend as a library to
parse C/C++ code.
'';
mainProgram = "clang";
};
} // lib.optionalAttrs enableManpages {
pname = "clang-manpages";
buildPhase = ''
make docs-clang-man
'';
installPhase = ''
mkdir -p $out/share/man/man1
# Manually install clang manpage
cp docs/man/*.1 $out/share/man/man1/
'';
outputs = [ "out" ];
doCheck = false;
meta = llvm_meta // {
description = "man page for Clang ${version}";
};
});
in self

View File

@ -1,145 +0,0 @@
{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false
, enablePolly ? false # TODO: get this info from llvm (passthru?)
}:
let
self = stdenv.mkDerivation ({
pname = "clang";
inherit version;
src = fetch "cfe" "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh";
unpackPhase = ''
unpackFile $src
mv cfe-${version}* clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}
mv clang-tools-extra-* $sourceRoot/tools/extra
'';
nativeBuildInputs = [ cmake python3 ]
++ lib.optional enableManpages python3.pkgs.sphinx
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libxml2 libllvm ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DCLANGD_BUILD_XPC=OFF"
"-DLLVM_ENABLE_RTTI=ON"
] ++ lib.optionals enableManpages [
"-DCLANG_INCLUDE_DOCS=ON"
"-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"
"-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"
] ++ lib.optionals enablePolly [
"-DWITH_POLLY=ON"
"-DLINK_POLLY_INTO_TOOLS=ON"
];
patches = [
../../common/clang/5-8-purity.patch
./xpc.patch
# Backport for -static-pie, which the latter touches, and which is nice in
# its own right.
./static-pie.patch
# Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is
# needed for our bootstrapping to not interfere with C.
./unwindlib.patch
# https://reviews.llvm.org/D51899
./compiler-rt-baremetal.patch
# make clang -xhip use $PATH to find executables
./HIP-use-PATH-8.patch
./gnu-install-dirs.patch
(substituteAll {
src = ../../clang-6-10-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
})
];
postPatch = ''
sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
-e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \
lib/Driver/ToolChains/*.cpp
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace tools/extra/clangd/CMakeLists.txt \
--replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
'';
outputs = [ "out" "lib" "dev" "python" ];
postInstall = ''
ln -sv $out/bin/clang $out/bin/cpp
# Move libclang to 'lib' output
moveToOutput "lib/libclang.*" "$lib"
substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
--replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
mkdir -p $python/bin $python/share/{clang,scan-view}
mv $out/bin/{git-clang-format,scan-view} $python/bin
if [ -e $out/bin/set-xcode-analyzer ]; then
mv $out/bin/set-xcode-analyzer $python/bin
fi
mv $out/share/clang/*.py $python/share/clang
mv $out/share/scan-view/*.py $python/share/scan-view
rm $out/bin/c-index-test
patchShebangs $python/bin
mkdir -p $dev/bin
cp bin/clang-tblgen $dev/bin
'';
passthru = {
inherit libllvm;
isClang = true;
hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ];
};
meta = llvm_meta // {
homepage = "https://clang.llvm.org/";
description = "A C language family frontend for LLVM";
longDescription = ''
The Clang project provides a language front-end and tooling
infrastructure for languages in the C language family (C, C++, Objective
C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project.
It aims to deliver amazingly fast compiles, extremely useful error and
warning messages and to provide a platform for building great source
level tools. The Clang Static Analyzer and clang-tidy are tools that
automatically find bugs in your code, and are great examples of the sort
of tools that can be built using the Clang frontend as a library to
parse C/C++ code.
'';
mainProgram = "clang";
};
} // lib.optionalAttrs enableManpages {
pname = "clang-manpages";
buildPhase = ''
make docs-clang-man
'';
installPhase = ''
mkdir -p $out/share/man/man1
# Manually install clang manpage
cp docs/man/*.1 $out/share/man/man1/
'';
outputs = [ "out" ];
doCheck = false;
meta = llvm_meta // {
description = "man page for Clang ${version}";
};
});
in self

View File

@ -1,51 +0,0 @@
--- lib/Support/Unix/Memory.inc
+++ lib/Support/Unix/Memory.inc
@@ -126,8 +126,12 @@
Result.Address = Addr;
Result.Size = NumPages*PageSize;
- if (PFlags & MF_EXEC)
- Memory::InvalidateInstructionCache(Result.Address, Result.Size);
+ // Rely on protectMappedMemory to invalidate instruction cache.
+ if (PFlags & MF_EXEC) {
+ EC = Memory::protectMappedMemory (Result, PFlags);
+ if (EC != std::error_code())
+ return MemoryBlock();
+ }
return Result;
}
@@ -156,15 +160,31 @@
return std::error_code(EINVAL, std::generic_category());
int Protect = getPosixProtectionFlags(Flags);
-
uintptr_t Start = alignAddr((uint8_t *)M.Address - PageSize + 1, PageSize);
uintptr_t End = alignAddr((uint8_t *)M.Address + M.Size, PageSize);
+
+ bool InvalidateCache = (Flags & MF_EXEC);
+
+#if defined(__arm__) || defined(__aarch64__)
+ // Certain ARM implementations treat icache clear instruction as a memory read,
+ // and CPU segfaults on trying to clear cache on !PROT_READ page. Therefore we need
+ // to temporarily add PROT_READ for the sake of flushing the instruction caches.
+ if (InvalidateCache && !(Protect & PROT_READ)) {
+ int Result = ::mprotect((void *)Start, End - Start, Protect | PROT_READ);
+ if (Result != 0)
+ return std::error_code(errno, std::generic_category());
+
+ Memory::InvalidateInstructionCache(M.Address, M.Size);
+ InvalidateCache = false;
+ }
+#endif
+
int Result = ::mprotect((void *)Start, End - Start, Protect);
if (Result != 0)
return std::error_code(errno, std::generic_category());
- if (Flags & MF_EXEC)
+ if (InvalidateCache)
Memory::InvalidateInstructionCache(M.Address, M.Size);
return std::error_code();

View File

@ -1,30 +0,0 @@
From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 18 May 2017 11:56:12 -0500
Subject: [PATCH] "purity" patch for 5.0
---
lib/Driver/ToolChains/Gnu.cpp | 7 -------
1 file changed, 7 deletions(-)
diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
index fe3c0191bb..c6a482bece 100644
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
if (!Args.hasArg(options::OPT_static)) {
if (Args.hasArg(options::OPT_rdynamic))
CmdArgs.push_back("-export-dynamic");
-
- if (!Args.hasArg(options::OPT_shared)) {
- const std::string Loader =
- D.DyldPrefix + ToolChain.getDynamicLinker(Args);
- CmdArgs.push_back("-dynamic-linker");
- CmdArgs.push_back(Args.MakeArgString(Loader));
- }
}
CmdArgs.push_back("-o");
--
2.11.0

View File

@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "25.3.2.8";
sha256 = "sha256-pS96jO1VBqTGWzaZO4XpXI9V+Whse4PjGnJRunFC98s=";
version = "25.3.2.9";
sha256 = "sha256-urj5wSNP/gOtN1O1IKesZLZg4jA640fbQBiWs/dUz8c=";
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "luau";
version = "0.611";
version = "0.612";
src = fetchFromGitHub {
owner = "luau-lang";
repo = "luau";
rev = version;
hash = "sha256-gtY/dv+9+1OcxPaU/r01vgMDyfxdB36wgQ7WEGKW17c=";
hash = "sha256-m7HIQIF6hiSg7Ho+QxMGEpKeoF7I6OWnzJZKRPP4BcM=";
};
nativeBuildInputs = [ cmake ];

View File

@ -50,7 +50,7 @@ in
stdenv.mkDerivation rec {
pname = "racket";
version = "8.11.1"; # always change at once with ./minimal.nix
version = "8.12"; # always change at once with ./minimal.nix
src = (lib.makeOverridable ({ name, hash }:
fetchurl {
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
}
)) {
name = "${pname}-${version}";
hash = "sha256-5ZqwMLkqeONYnsQFxdJfpRdojCCZAjO9aMs0Vo1lTAU=";
hash = "sha256-or26nirm5dGhg2S8to99BFOOSS2Oksn7Yb0y2L5b69c=";
};
FONTCONFIG_FILE = fontsConf;
@ -98,10 +98,6 @@ stdenv.mkDerivation rec {
--replace /bin/true ${coreutils}/bin/true
done
# Remove QuickScript register.rkt because it breaks on sandbox
# https://github.com/Metaxal/quickscript/issues/73
rm -f share/pkgs/quickscript/register.rkt
# The configure script forces using `libtool -o` as AR on Darwin. But, the
# `-o` option is only available from Apple libtool. GNU ar works here.
substituteInPlace src/ChezScheme/zlib/configure \

View File

@ -6,7 +6,7 @@ racket.overrideAttrs (oldAttrs: rec {
version = oldAttrs.version;
src = oldAttrs.src.override {
name = "${pname}-${version}";
hash = "sha256-H1X9bhQw9yOaESbK4+tveFWVb4EyMNGLKukwKAo588w=";
hash = "sha256-ZbE5I2dnPY0GamerTFPFWz53+V1Xxhtx3AVp2KpF7vw=";
};
meta = oldAttrs.meta // {

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, Security }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, Security }:
stdenv.mkDerivation (finalAttrs: {
pname = "libhv";
@ -11,6 +11,16 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-tVuQwj2HvAhp51urGCuNPjBEIaTu9yR031Ih/5or9Pk=";
};
patches = [
# Fix build failure on gcc-13:
# https://github.com/ithewei/libhv/pull/490
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/ithewei/libhv/commit/b3e61519fbdbbb956fed275c0a849ba5d4d6e45c.patch";
hash = "sha256-fuYI+B3qZkSAbLZc0p6/0fnqaHx6w9N9vhTEE2t6UUs=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ curl openssl ] ++ lib.optional stdenv.isDarwin Security;

View File

@ -365,14 +365,14 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.34.38";
version = "1.34.39";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-0eS0vVozFiDs3yXKEParV3EUrTxUoPSLHziz+GJ1eZA=";
hash = "sha256-ywCmGzid3oVaJllil8xm99ahgHUpi7iyA4GLOWOx0VM=";
};
nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.34.38";
version = "1.34.39";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-2oA3lMD3BMZuQI/oCaFDzMnH6p4zXpBmKtp9AfweUgg=";
hash = "sha256-LK8KDVR97UkwZAjqlZ2Uq6Od2WC33hGdkGwoKdFJ7OY=";
};
nativeBuildInputs = [

View File

@ -1,46 +1,55 @@
{ lib
, buildPythonPackage
, fetchPypi
, attrs
, setuptools
, requests
, future
, pyyaml
, jsonlines
, pythonOlder
, pytestCheckHook
, pytz
}:
buildPythonPackage rec {
pname = "cloudflare";
version = "2.17.0";
format = "setuptools";
version = "2.18.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-B2jTIYRKrMu+PXf3zifxW5NW3/rIHqlPrgErObuO6D4=";
hash = "sha256-dTD9HO26elFdfNMJxlyK1jKf4xWcz98/XrKI3EpUSsc=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
attrs
requests
future
pyyaml
jsonlines
];
# no tests associated with package
# tests require networking
doCheck = false;
pythonImportsCheck = [
"CloudFlare"
];
nativeCheckInputs = [
pytestCheckHook
pytz
];
meta = with lib; {
description = "Python wrapper for the Cloudflare v4 API";
homepage = "https://github.com/cloudflare/python-cloudflare";
changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md";
license = licenses.mit;
mainProgram = "cli4";
maintainers = with maintainers; [ ];
};
}

View File

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "dvc-ssh";
version = "3.0.0";
version = "4.0.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-Xlbav0mk+8/VTgS1MCide76QW8WhlflzNXQ7YM4N4iw=";
hash = "sha256-WaWcoWKXauNHZRFDt+MnqpFWjxzya+yAo0TRNQURViA=";
};
pythonRemoveDeps = [

View File

@ -9,20 +9,25 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "1.13.0";
format = "setuptools";
version = "1.13.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-2oGGbqPLcPdMuSjVCG9yIV0moEToLUxjVFW22yHbRzc=";
hash = "sha256-KJpHnWbmrFVcixfvKQ/nvDWLy4Sn1lVDVsjkS/2+p5w=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
google-api-core
proto-plus

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "3.5.0";
version = "3.6.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-dwO/R8iyEIYw0qJ15X9DJuPAceZmISrZorPVqAkMZ2c=";
hash = "sha256-uaaL/CbR4RM4YFU0xd/naGn3xSiLuRqI0/qyZNLKJ3Q=";
};
nativeBuildInputs = [

View File

@ -1,8 +1,11 @@
{ lib
, stdenv
, beautifulsoup4
, buildPythonPackage
, fetchFromGitHub
, html5lib
, jinja2
, lxml
, matplotlib
, odfpy
, openpyxl
@ -24,16 +27,16 @@
buildPythonPackage rec {
pname = "pandas-stubs";
version = "2.0.3.230814";
format = "pyproject";
version = "2.1.4.231227";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "pandas-dev";
repo = pname;
repo = "pandas-stubs";
rev = "refs/tags/v${version}";
hash = "sha256-V/igL+vPJADOL7LwBJljqs2a1BB3vDVYTWXIkK/ImYY=";
hash = "sha256-AkgMesDesKkVkwxNnGYG71IuIgF3G+BecpfWNWVucC8=";
};
nativeBuildInputs = [
@ -46,7 +49,10 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
beautifulsoup4
html5lib
jinja2
lxml
matplotlib
odfpy
openpyxl

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "24.2.0";
version = "24.2.1";
pyproject = true;
disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = "pontos";
rev = "refs/tags/v${version}";
hash = "sha256-vvI8jOqEdC0YPecoR7otPFmitFlD0j7s9DALlqwB9DU=";
hash = "sha256-lvmi/aYDGDHbiioFWovDpTCcqgh9hu97Wk2Lcqfd6qk=";
};
nativeBuildInputs = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "0.10.0.20240207";
version = "0.10.0.20240210";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-P9VC6y7hhhIM7+DCtLDDIWOwLQNdvdOqgLg/h+JAnhs=";
hash = "sha256-U19eJmRDA1Ozz6f81IbXepsXScf7yJZQiaNecqdsYK4=";
};
nativeBuildInputs = [

View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "pytenable";
version = "1.4.18";
version = "1.4.19";
pyproject = true;
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "tenable";
repo = "pyTenable";
rev = "refs/tags/${version}";
hash = "sha256-JAS+C1MeO/B8ZQ2BYsRwpVW08E9hGoJcvv9zOJZD3Gg=";
hash = "sha256-UvnDpt0PrK2stO9eRXtqApJjlzXCIXmwMq7ewx+fQ/0=";
};
nativeBuildInputs = [

View File

@ -38,7 +38,7 @@
buildPythonPackage rec {
pname = "sentry-sdk";
version = "1.40.0";
version = "1.40.3";
pyproject = true;
disabled = pythonOlder "3.7";
@ -47,7 +47,7 @@ buildPythonPackage rec {
owner = "getsentry";
repo = "sentry-python";
rev = "refs/tags/${version}";
hash = "sha256-cVBqSFMBSRoIIv2RmkSLhlQ+jrofJVT9QoAPyjyX0ms=";
hash = "sha256-durgUKpJ5H+xd4FBpNWVtfmMlreTbvQvUaTVPoJw5wQ=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, flit-core
, pytestCheckHook
, numpy
, xarray
, xarray-dataclasses
}:
buildPythonPackage rec {
pname = "spatial-image";
version = "1.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "spatial-image";
repo = "spatial-image";
rev = "refs/tags/v${version}";
hash = "sha256-nCsxPhIgGmZZntYbhQ3KnzptcKdN288eNixbQDgECSQ=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
numpy
xarray
xarray-dataclasses
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "spatial_image" ];
meta = with lib; {
description = "A multi-dimensional spatial image data structure for scientific Python";
homepage = "https://github.com/spatial-image/spatial-image";
changelog = "https://github.com/spatial-image/spatial-image/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "timezonefinder";
version = "6.4.0";
version = "6.4.1";
pyproject = true;
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "jannikmi";
repo = "timezonefinder";
rev = "refs/tags/${version}";
hash = "sha256-6hcReAzqTp4Od/PJN/W1uz4VS129yMFqQYznbsC/TRY=";
hash = "sha256-e9Zx236X76GYFuADCw9+5HWs2craeq44gVNclkc4th0=";
};
nativeBuildInputs = [

View File

@ -14,12 +14,13 @@
, pythonOlder
, pytz
, requests
, setuptools
}:
buildPythonPackage rec {
pname = "twilio";
version = "8.12.0";
format = "setuptools";
version = "8.13.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -27,9 +28,13 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-I2ktLhlSFeQ3f7/zcm5NKLv5Pm1R7EPkeMPREMa9bBA=";
hash = "sha256-HlHT7fJbDz8+7pTWHortK2xKDzoIQElJPbUTxmIdGCs=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiohttp
aiohttp-retry

View File

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, poetry-core
, pytestCheckHook
, numpy
, typing-extensions
, xarray
}:
buildPythonPackage rec {
pname = "xarray-dataclasses";
version = "1.7.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "astropenguin";
repo = "xarray-dataclasses";
rev = "refs/tags/v${version}";
hash = "sha256-fyRUH6t2+9tsxRQFfJR2EHinYtwCmWeCB77kpmBgdBA=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
numpy
typing-extensions
xarray
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "xarray_dataclasses" ];
meta = with lib; {
description = "xarray data creation made easy by dataclass";
homepage = "https://github.com/astropenguin/xarray-dataclasses";
changelog = "https://github.com/astropenguin/xarray-dataclasses/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "yalexs";
version = "1.11.0";
version = "1.11.2";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-PQPcD2klwXA/7uH1RrdCd26WGaLpcchp7r1M1RXxQ9Y=";
hash = "sha256-FHaHXbRtgbBrveHPbrPsP+vGIvscot3ilpPFucISces=";
};
propagatedBuildInputs = [

View File

@ -135,9 +135,9 @@ rec {
};
gradle_7 = gen {
version = "7.6.3";
version = "7.6.4";
nativeVersion = "0.22-milestone-25";
hash = "sha256-dAwuRy7kMmwzv3WlyfXNHmns8/m1gPbiNshtHz2Yz6w=";
hash = "sha256-vtHaM8yg9VerE2kcd/OLtnOIEZ5HlNET4FEDm4Cvm7E=";
defaultJava = jdk17;
};

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchgit
, autoreconfHook
, pkg-config
, libzip
, glib
@ -19,16 +20,17 @@
stdenv.mkDerivation rec {
pname = "libsigrok";
version = "0.5.2";
version = "0.5.2-unstable-2024-01-03";
src = fetchurl {
url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";
sha256 = "0g6fl684bpqm5p2z4j12c62m45j1dircznjina63w392ns81yd2d";
src = fetchgit {
url = "git://sigrok.org/libsigrok";
rev = "b503d24cdf56abf8c0d66d438ccac28969f01670";
hash = "sha256-9EW0UCzU6MqBX6rkT5CrBsDkAi6/CLyS9MZHsDV+1IQ=";
};
enableParallelBuilding = true;
nativeBuildInputs = [ doxygen pkg-config python ];
nativeBuildInputs = [ autoreconfHook doxygen pkg-config python ];
buildInputs = [
libzip glib libusb1 libftdi1 check libserialport glibmm hidapi
] ++ lib.optionals stdenv.isLinux [ libieee1284 bluez ];
@ -56,6 +58,6 @@ stdenv.mkDerivation rec {
homepage = "https://sigrok.org/";
license = licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ bjornfor ];
maintainers = with maintainers; [ bjornfor vifino ];
};
}

View File

@ -1,19 +1,15 @@
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, python3, check, libxcrypt }:
{ lib, stdenv, fetchgit, pkg-config, autoreconfHook, glib, python3, check, libxcrypt }:
stdenv.mkDerivation rec {
pname = "libsigrokdecode";
version = "0.5.3";
version = "0.5.3-unstable-2023-10-23";
src = fetchurl {
url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";
sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265";
src = fetchgit {
url = "git://sigrok.org/libsigrokdecode";
rev = "0c35c5c5845d05e5f624c99d58af992d2f004446";
hash = "sha256-1kQB7uk2c+6Uriw+1o6brThDcBLoCdPV0MVWAha7ohk=";
};
# upstream was rleased before Python 3.9 and thus only checks versions up to 3.8
postPatch = ''
substituteInPlace configure.ac --replace '[python-3.8-embed]' '[python3-embed]'
'';
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ glib python3 libxcrypt ];
nativeCheckInputs = [ check ];
@ -24,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = "https://sigrok.org/";
license = licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
maintainers = with maintainers; [ bjornfor vifino ];
};
}

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "fzf-make";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "kyu08";
repo = "fzf-make";
rev = "v${version}";
hash = "sha256-MeJRXvMshhnNWNkEtOfxKMLLqoLjOREuDGcRHTnOxS8=";
hash = "sha256-CXifWgf7+FgelVImsoASCrH4PtBL+ciw5Qr+JbsxnPU=";
};
cargoHash = "sha256-pHunUez3bsGwcSuQzx3DEDSKxx6UlUcuU35frEsc0+8=";
cargoHash = "sha256-yuhfxyrffa1pqNtIM2X3E1b1ebuBYHAu+dQrQZubCbQ=";
nativeBuildInputs = [ makeBinaryWrapper ];

View File

@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
# We remove phony 'FRC' target that forces rebuilds:
# 'version.h: FRC ...' is translated to 'version.h: ...'.
sed -i lib/dialects/*/Makefile -e 's/version.h:\s*FRC/version.h:/'
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1
'' + lib.optionalString stdenv.isDarwin ''
sed -i 's|lcurses|lncurses|g' Configure
'';

View File

@ -1,15 +1,16 @@
{ lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }:
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, glib, libsigrok, libsigrokdecode }:
stdenv.mkDerivation rec {
pname = "sigrok-cli";
version = "0.7.2";
version = "0.7.2-unstable-2023-04-10";
src = fetchurl {
url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-cdBEPzaJe/Vlcy3sIGgw2+oPJ4m2YBzxBTayhtEUCrg=";
src = fetchgit {
url = "git://sigrok.org/sigrok-cli";
rev = "9d9f7b82008e3b3665bda12a63a3339e9f7aabc3";
hash = "sha256-B2FJxRkfKELrtqxZDv5QTvntpu9zJnTK15CAUYbf+5M=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib libsigrok libsigrokdecode ];
meta = with lib; {
@ -17,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = "https://sigrok.org/";
license = licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
maintainers = with maintainers; [ bjornfor vifino ];
};
}

View File

@ -1,21 +1,23 @@
{ lib
, stdenv
, fetchurl
, fetchgit
, autoreconfHook
, sdcc
}:
stdenv.mkDerivation rec {
pname = "sigrok-firmware-fx2lafw";
version = "0.1.7";
version = "0.1.7-unstable-2024-02-03";
src = fetchurl {
url = "https://sigrok.org/download/source/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-${version}.tar.gz";
sha256 = "sha256-o/RA1qhSpG4sXRmfwcjk2s0Aa8BODVV2KY7lXQVqzjs=";
src = fetchgit {
url = "git://sigrok.org/sigrok-firmware-fx2lafw";
rev = "0f2d3242ffb5582e5b9a018ed9ae9812d517a56e";
hash = "sha256-xveVcwAwtqKGD3/UvnBz5ASvTyg/6jAlTedZElhV2HE=";
};
enableParallelBuilding = true;
nativeBuildInputs = [ sdcc ];
nativeBuildInputs = [ autoreconfHook sdcc ];
meta = with lib; {
description = "Firmware for FX2 logic analyzers";
@ -30,6 +32,6 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ fromSource ];
platforms = platforms.all;
maintainers = with maintainers; [ panicgh ];
maintainers = with maintainers; [ panicgh vifino ];
};
}

View File

@ -231,14 +231,16 @@ let self = {
};
};
echo = {
echo = rec {
name = "echo";
version = "0.63";
src = fetchFromGitHub {
name = "echo";
owner = "openresty";
repo = "echo-nginx-module";
rev = "v0.62";
sha256 = "0kr1y094yw1a9fyrf4w73ikq18w5ys463wza9n7yfl77xdwirnvl";
rev = "v${version}";
hash = "sha256-K7oOE0yxPYLf+3YMVbBsncpHRpGHXjs/8B5QPO3MQC4=";
};
meta = with lib; {
@ -371,12 +373,14 @@ let self = {
lua = rec {
name = "lua";
version = "0.10.26";
src = fetchFromGitHub {
name = "lua";
owner = "openresty";
repo = "lua-nginx-module";
rev = "v0.10.22";
sha256 = "sha256-TyeTL7/0dI2wS2eACS4sI+9tu7UpDq09aemMaklkUss=";
rev = "v${version}";
hash = "sha256-007up/XncaSBimBumHpbwgB1WnkXgBe8e/q/yT6vthI=";
};
inputs = [ luajit_openresty ];

View File

@ -2,19 +2,20 @@
buildFishPlugin rec {
pname = "plugin-git";
version = "0.1";
version = "0.2";
src = fetchFromGitHub {
owner = "jhillyerd";
repo = "plugin-git";
rev = "v0.1";
sha256 = "sha256-MfrRQdcj7UtIUgtqKjt4lqFLpA6YZgKjE03VaaypNzE";
rev = "refs/tags/v${version}";
hash = "sha256-MfrRQdcj7UtIUgtqKjt4lqFLpA6YZgKjE03VaaypNzE";
};
meta = with lib; {
description = "Git plugin for fish (similar to oh-my-zsh git)";
homepage = "https://github.com/jhillyerd/plugin-git";
changelog = "https://github.com/jhillyerd/plugin-git/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ unsolvedcypher ];
maintainers = with maintainers; [ GaetanLepage unsolvedcypher ];
};
}

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "qovery-cli";
version = "0.83.0";
version = "0.83.1";
src = fetchFromGitHub {
owner = "Qovery";
repo = "qovery-cli";
rev = "refs/tags/v${version}";
hash = "sha256-S2Is+fzPnn2OD10J73r5DZRIVksCfEKb/c4K3Qe2P2M=";
hash = "sha256-nsPXohmOkWeYYfJWgkwJmy6ulpH+Bnag7hyuS4JZLro=";
};
vendorHash = "sha256-HwDdThBUH2k7OodohJTt4zLArAxFh4p3xRZS3zhzidM=";
vendorHash = "sha256-XG0dOEpu+NoQmklsukxev1gc2OsZc7fLEkv0AGwkh7o=";
nativeBuildInputs = [
installShellFiles

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "infracost";
version = "0.10.32";
version = "0.10.33";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
sha256 = "sha256-/GXT8ptoE6AjW0yTyQ8oLFqok59hIu+bOoE8FpdrOrY=";
sha256 = "sha256-zIAf6lD9XFmrAgvVmIY+tXLn4FmkkdimjVCWasK7OCc=";
};
vendorHash = "sha256-ji9TpUcq0aUAn5vV5dnaC15i0Uli2Qsz/BrOKB3/Rl4=";

View File

@ -5,19 +5,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-tools";
version = "1.0.57";
version = "1.0.58";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-3syV4zPoSJtMiogmRu90pYTwNw2T/dRKFWczYI2J1r0=";
hash = "sha256-9IvfQqX65VvjvgyVC0Pn/uJa9EaFh2Y/ciDS+/0RvE4=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-w1BVh7/L4+CXTgjkQKzbzgqw3XE49hYrkWtaNmcfDi4=";
cargoHash = "sha256-JtIpBHX2ShGb/gaNefkGYzH4ltz2U7v8LwD/IBrfTgw=";
cargoBuildFlags = [ "--package" "wasm-tools" ];
cargoTestFlags = [ "--all" ];

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "cloudfox";
version = "1.13.2";
version = "1.13.3";
src = fetchFromGitHub {
owner = "BishopFox";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-kklFn8HDMwsOjS0KDrWznGazE7RZtk0crxYEE3RuH8s=";
hash = "sha256-Sq3ARcAK1EFbK6Y+pSCg8ayhVmnEmVQWF0eAiVhJNPs=";
};
vendorHash = "sha256-qPIMmyKTmZEmxlLLftRMnBXvo22WFROYlCAAsAb7jDg=";

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.67.4";
version = "3.67.5";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-SdOXHsd10nKD8Am5v3WUrptsHbUOe07i1bNwrHhWKpM=";
hash = "sha256-163tIYqWUvfbN4Vh+nqQ98nHHFwEg0esJplBB5ivqOY=";
};
vendorHash = "sha256-tYW6MP1ayF6ExM1XQVA6AeRzXNdqzQLeYIqo85jKLz4=";
vendorHash = "sha256-Kp78cAg3zpxZkJlVAvaxbq6GvUH/4HTH6Xz9EIo9tc0=";
ldflags = [
"-s"

View File

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, pcre
, pkg-config
@ -24,6 +25,15 @@ stdenv.mkDerivation rec {
hash = "sha256-axHFy7YwLhhww+lh+ORyW6YG+T385msysIHK5SMyhMk=";
};
# FIXME: make unconditional on staging
patches = lib.optionals (!stdenv.hostPlatform.isGnu && !stdenv.hostPlatform.isDarwin) [
(fetchpatch {
name = "musl.patch";
url = "https://github.com/VirusTotal/yara/commit/515ed861cf30e154b14a69ffd46c347fb81df72f.patch";
hash = "sha256-2scnUyz0SSkNRlsVQapPgI1ATIPXEogqtxbimYYq4Jo=";
})
];
nativeBuildInputs = [
autoreconfHook
pkg-config

View File

@ -28252,8 +28252,6 @@ with pkgs;
go-callvis = callPackage ../development/tools/go-callvis { };
gofumpt = callPackage ../development/tools/gofumpt { };
gotags = callPackage ../development/tools/gotags { };
go-task = callPackage ../development/tools/go-task { };

View File

@ -13607,6 +13607,8 @@ self: super: with self; {
sparse = callPackage ../development/python-modules/sparse { };
spatial-image = callPackage ../development/python-modules/spatial-image { };
spdx-tools = callPackage ../development/python-modules/spdx-tools { };
speaklater = callPackage ../development/python-modules/speaklater { };
@ -16327,6 +16329,8 @@ self: super: with self; {
xarray = callPackage ../development/python-modules/xarray { };
xarray-dataclasses = callPackage ../development/python-modules/xarray-dataclasses { };
xarray-einstats = callPackage ../development/python-modules/xarray-einstats { };
xattr = callPackage ../development/python-modules/xattr { };