Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
6cc772a6fa
|
|
@ -25,7 +25,6 @@ perl.section.md
|
|||
pkg-config.section.md
|
||||
postgresql-test-hook.section.md
|
||||
python.section.md
|
||||
qt-4.section.md
|
||||
scons.section.md
|
||||
tetex-tex-live.section.md
|
||||
unzip.section.md
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
# Qt 4 {#qt-4}
|
||||
|
||||
Sets the `QTDIR` environment variable to Qt’s path.
|
||||
|
|
@ -192,10 +192,12 @@ in
|
|||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{ assertion = cfg.package.pname != "sudo-rs";
|
||||
message = "The NixOS `sudo` module does not work with `sudo-rs` yet."; }
|
||||
];
|
||||
assertions = [ {
|
||||
assertion = cfg.package.pname != "sudo-rs";
|
||||
message = ''
|
||||
NixOS' `sudo` module does not support `sudo-rs`; see `security.sudo-rs` instead.
|
||||
'';
|
||||
} ];
|
||||
|
||||
security.sudo.extraRules =
|
||||
let
|
||||
|
|
|
|||
|
|
@ -25,6 +25,18 @@
|
|||
|
||||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
let
|
||||
# Fix for https://github.com/ihabunek/toot/pull/405. Includes
|
||||
# https://github.com/ihabunek/toot/pull/405. TOREMOVE when
|
||||
# toot > 0.38.1
|
||||
patched-toot = pkgs.toot.overrideAttrs (old: {
|
||||
version = "unstable-24-09-2023";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "ihabunek";
|
||||
repo = "toot";
|
||||
rev = "30857f570d64a26da80d0024227a8259f7cb65b5";
|
||||
sha256 = "sha256-BxrI7UY9bfqPzS+VLqCFSmu4PkIkvhntcEeNJb1AzOs=";
|
||||
};
|
||||
});
|
||||
send-toot = pkgs.writeScriptBin "send-toot" ''
|
||||
set -eux
|
||||
# toot is using the requests library internally. This library
|
||||
|
|
@ -164,9 +176,12 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
'';
|
||||
|
||||
tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
||||
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' -days 36500
|
||||
mkdir -p $out
|
||||
cp key.pem cert.pem $out
|
||||
openssl req -x509 \
|
||||
-subj '/CN=pleroma.nixos.test/' -days 49710 \
|
||||
-addext 'subjectAltName = DNS:pleroma.nixos.test' \
|
||||
-keyout "$out/key.pem" -newkey ed25519 \
|
||||
-out "$out/cert.pem" -noenc
|
||||
'';
|
||||
|
||||
hosts = nodes: ''
|
||||
|
|
@ -180,7 +195,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ];
|
||||
networking.extraHosts = hosts nodes;
|
||||
environment.systemPackages = with pkgs; [
|
||||
toot
|
||||
patched-toot
|
||||
send-toot
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
, poppler
|
||||
, qt5compat
|
||||
, qttools
|
||||
, qtwayland
|
||||
, withLua ? true, lua
|
||||
, withPython ? true, python3 }:
|
||||
|
||||
|
|
@ -36,7 +37,8 @@ stdenv.mkDerivation rec {
|
|||
qt5compat
|
||||
qttools
|
||||
] ++ lib.optional withLua lua
|
||||
++ lib.optional withPython python3;
|
||||
++ lib.optional withPython python3
|
||||
++ lib.optional stdenv.isLinux qtwayland;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DQT_DEFAULT_MAJOR_VERSION=6"
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kaniko";
|
||||
version = "1.17.0";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "kaniko";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-O4FPz62QnvG+Q2l4Gr/O0XFpkXE2G4RO/G6KNDdanzk=";
|
||||
hash = "sha256-EMBCJc9x4oduFSHMYajc/Pf8nHwRP7qMsvJUbnDkjdk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "starboard";
|
||||
version = "0.15.16";
|
||||
version = "0.15.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n4gChQQMVdtEKW2WqQAEVtlU2fFxLxBem2yAJzDjx2Q=";
|
||||
sha256 = "sha256-RzwLc29f+u/m1x5R199M8XQQ5nn33ofYi3AyMCimMtA=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tektoncd-cli";
|
||||
version = "0.32.1";
|
||||
version = "0.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tektoncd";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qxKWyNQRWc0krdIfG6Mkn8ZZSkCkb0V41nIUsN5azGo=";
|
||||
sha256 = "sha256-CNjZpiIKkky4BVmz6pN5tdADIt6hlnWY8ig9Rdt6qmI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
let
|
||||
thunderbird-unwrapped = thunderbirdPackages.thunderbird-115;
|
||||
|
||||
version = "115.3.2";
|
||||
version = "115.4.2";
|
||||
majVer = lib.versions.major version;
|
||||
|
||||
betterbird-patches = fetchFromGitHub {
|
||||
owner = "Betterbird";
|
||||
repo = "thunderbird-patches";
|
||||
rev = "${version}-bb15";
|
||||
rev = "${version}-bb17";
|
||||
postFetch = ''
|
||||
echo "Retrieving external patches"
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ let
|
|||
. ./external.sh
|
||||
rm external.sh
|
||||
'';
|
||||
hash = "sha256-6alAGEid7ipr01I52TB0xrlLroCIc03N2IagGJq8te8=";
|
||||
hash = "sha256-hfM1VzYD0TsjZik0MLXBAkD5ecyvbg7jn2pKdrzMEfo=";
|
||||
};
|
||||
in ((buildMozillaMach {
|
||||
pname = "betterbird";
|
||||
|
|
@ -49,7 +49,7 @@ in ((buildMozillaMach {
|
|||
src = fetchurl {
|
||||
# https://download.cdn.mozilla.net/pub/thunderbird/releases/
|
||||
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
||||
hash = "sha256-kn35avKqUdMix8VJrKJjSWViMLe/WnnxNasPpM7/cdM=";
|
||||
hash = "sha256-PAjj7FvIA7uB0yngkL4KYKZoYU1CF2qQTF5+sG2VLtI=";
|
||||
};
|
||||
|
||||
extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ ''
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seafile-client";
|
||||
version = "9.0.3";
|
||||
version = "9.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zoo34mhNZTEwxjSy8XgmZfEjkujmWj34OtDJQSCb/zk=";
|
||||
sha256 = "sha256-Qt4Y7s2BMwuKXTYjHAzK40HgAsxlk98af3irOXT4/Vs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "storj-uplink";
|
||||
version = "1.90.1";
|
||||
version = "1.90.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LJtNsemNbN+TLyUxSgB/wftKxOfI/y/t+qv1TjcsXzQ=";
|
||||
hash = "sha256-VEO9LV6hzEd4IDnSPE5H0CDlwgRFEg4cheDx/RUGQug=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gridtracker";
|
||||
version = "1.23.0402";
|
||||
version = "1.23.1112";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gridtracker.org";
|
||||
repo = "gridtracker";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6SQuFN8Fi0fbWCYrQIIeSaXR2haI7uux4txCPKEoJvo=";
|
||||
sha256 = "sha256-0A1/P57RtUExxflr2XayHPEyr28B6UDYY7pVCAJpWX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -28,8 +28,16 @@
|
|||
, spfft
|
||||
, enableElpa ? false
|
||||
, elpa
|
||||
, gpuBackend ? "none"
|
||||
, cudaPackages
|
||||
, rocmPackages
|
||||
, config
|
||||
, gpuBackend ? (
|
||||
if config.cudaSupport
|
||||
then "cuda"
|
||||
else if config.rocmSupport
|
||||
then "rocm"
|
||||
else "none"
|
||||
)
|
||||
# gpuVersion needs to be set for both CUDA as well as ROCM hardware.
|
||||
# gpuArch is only required for the ROCM stack.
|
||||
# Change to a value suitable for your target GPU.
|
||||
|
|
@ -37,7 +45,6 @@
|
|||
# and for Nvidia see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2i-cuda-optional-improved-performance-on-gpu-systems
|
||||
, gpuVersion ? "Mi100"
|
||||
, gpuArch ? "gfx908"
|
||||
, rocmPackages
|
||||
}:
|
||||
|
||||
assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ];
|
||||
|
|
|
|||
|
|
@ -7,23 +7,19 @@
|
|||
let
|
||||
# Upstream replaces minor versions, so use cached URLs.
|
||||
srcs = {
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://web.archive.org/web/20220907001049/https://ftp.perforce.com/perforce/r22.1/bin.linux26x86/helix-core-server.tgz";
|
||||
sha256 = "e9cf27c9dd2fa6432745058a93896d151543aff712fce9f7322152d6ea88a12a";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://web.archive.org/web/20220907001202/https://ftp.perforce.com/perforce/r22.1/bin.linux26x86_64/helix-core-server.tgz";
|
||||
sha256 = "9c272b67574264a4f49fe846ccda24fbd4baeb282665af74b6fbccff26a43558";
|
||||
url = "https://web.archive.org/web/20231109221336id_/https://ftp.perforce.com/perforce/r23.1/bin.linux26x86_64/helix-core-server.tgz";
|
||||
sha256 = "b68c4907cf9258ab47102e8f0e489c11d528a8f614bfa45e3a2fa198639e2362";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://web.archive.org/web/20220907001334/https://ftp.perforce.com/perforce/r22.1/bin.macosx1015x86_64/helix-core-server.tgz";
|
||||
sha256 = "2500a23fe482a303bd400f0de460b7624ad3f940fef45246004b9f956e90ea45";
|
||||
url = "https://web.archive.org/web/20231109221937id_/https://ftp.perforce.com/perforce/r23.1/bin.macosx1015x86_64/helix-core-server.tgz";
|
||||
sha256 = "fcbf09787ffc29f7237839711447bf19a37ae18a8a7e19b2d30deb3715ae2c11";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "p4d";
|
||||
version = "2022.1.2305383";
|
||||
version = "2023.1.2513900";
|
||||
|
||||
src =
|
||||
assert lib.assertMsg (builtins.hasAttr stdenv.hostPlatform.system srcs) "p4d is not available for ${stdenv.hostPlatform.system}";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, cudaSupport ? config.cudaSupport
|
||||
, cudaPackages ? { }
|
||||
|
||||
, rocmSupport ? false
|
||||
, rocmSupport ? config.rocmSupport
|
||||
, rocmPackages ? { }
|
||||
|
||||
, openclSupport ? false
|
||||
|
|
|
|||
|
|
@ -21,9 +21,16 @@
|
|||
, eigen
|
||||
, libvdwxc
|
||||
, llvmPackages
|
||||
, gpuBackend ? "none"
|
||||
, cudaPackages
|
||||
, rocmPackages
|
||||
, config
|
||||
, gpuBackend ? (
|
||||
if config.cudaSupport
|
||||
then "cuda"
|
||||
else if config.rocmSupport
|
||||
then "rocm"
|
||||
else "none"
|
||||
)
|
||||
}:
|
||||
|
||||
assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ];
|
||||
|
|
|
|||
|
|
@ -6,9 +6,16 @@
|
|||
, mpi
|
||||
, gfortran
|
||||
, llvmPackages
|
||||
, gpuBackend ? "none"
|
||||
, cudaPackages
|
||||
, rocmPackages
|
||||
, config
|
||||
, gpuBackend ? (
|
||||
if config.cudaSupport
|
||||
then "cuda"
|
||||
else if config.rocmSupport
|
||||
then "rocm"
|
||||
else "none"
|
||||
)
|
||||
}:
|
||||
|
||||
assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ];
|
||||
|
|
|
|||
|
|
@ -6,9 +6,16 @@
|
|||
, blas
|
||||
, gfortran
|
||||
, llvmPackages
|
||||
, gpuBackend ? "none"
|
||||
, cudaPackages
|
||||
, rocmPackages
|
||||
, config
|
||||
, gpuBackend ? (
|
||||
if config.cudaSupport
|
||||
then "cuda"
|
||||
else if config.rocmSupport
|
||||
then "rocm"
|
||||
else "none"
|
||||
)
|
||||
}:
|
||||
|
||||
assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ];
|
||||
|
|
|
|||
40
pkgs/data/themes/utterly-round-plasma-style/default.nix
Normal file
40
pkgs/data/themes/utterly-round-plasma-style/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "utterly-round-plasma-style";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HimDek";
|
||||
repo = pname;
|
||||
rev = "c3677d5223286f69871f6745cdb3b71367229d40";
|
||||
hash = "sha256-mlqRMz0cAZnnM4xE6p7fMzhGlqCQcM4FxmDlVnbGUgQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/{aurorae/themes,plasma/desktoptheme}
|
||||
|
||||
cp -a aurorae/dark/translucent $out/share/aurorae/themes/Utterly-Round-Dark
|
||||
cp -a aurorae/dark/solid $out/share/aurorae/themes/Utterly-Round-Dark-Solid
|
||||
cp -a aurorae/light/translucent $out/share/aurorae/themes/Utterly-Round-Light
|
||||
cp -a aurorae/light/solid $out/share/aurorae/themes/Utterly-Round-Light-Solid
|
||||
|
||||
cp -a desktoptheme/translucent $out/share/plasma/desktoptheme/Utterly-Round
|
||||
cp -a desktoptheme/solid $out/share/plasma/desktoptheme/Utterly-Round-Solid
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A rounded desktop theme and window borders for Plasma 5 that follows any color scheme";
|
||||
homepage = "https://himdek.com/Utterly-Round-Plasma-Style/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,8 +8,9 @@
|
|||
, libxml2
|
||||
, libffi
|
||||
, makeWrapper
|
||||
, config
|
||||
, rocmPackages
|
||||
, rocmSupport ? false
|
||||
, rocmSupport ? config.rocmSupport
|
||||
}:
|
||||
let
|
||||
inherit (llvmPackages_15) stdenv;
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libime";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "libime";
|
||||
rev = version;
|
||||
sha256 = "sha256-0+NVGxujFOJvxX+Tk4mVYsk2Nl7WK6hjl0oylrT6PXU=";
|
||||
sha256 = "sha256-C34hcea0htc9ayytjqy/t08yA2xMC18sAkDc9PK/Hhc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ qtModule
|
||||
, qtbase
|
||||
, qtquick3d
|
||||
, qtdeclarative
|
||||
, wayland
|
||||
, pkg-config
|
||||
, libdrm
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
|
|
@ -12,4 +12,12 @@ qtModule {
|
|||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
buildInputs = [ wayland libdrm ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
patches = [
|
||||
# Fix a freezing bug with fcitx5.
|
||||
# https://codereview.qt-project.org/c/qt/qtwayland/+/517601
|
||||
(fetchpatch {
|
||||
url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=6fe83f6076423068b652fa4fcb0b5adbd297f2a8";
|
||||
hash = "sha256-TlZozKezpYm90B9qFP9qv76asRdIt+5bq9E3GcmFiDc=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@
|
|||
, libpthreadstubs
|
||||
, magmaRelease
|
||||
, ninja
|
||||
, rocmSupport ? false
|
||||
, config
|
||||
, rocmSupport ? config.rocmSupport
|
||||
, static ? false
|
||||
, stdenv
|
||||
, symlinkJoin
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, config
|
||||
, enableCuda ? config.cudaSupport
|
||||
, cudatoolkit
|
||||
, enableRocm ? false
|
||||
, enableRocm ? config.rocmSupport
|
||||
, rocmPackages
|
||||
}:
|
||||
|
||||
|
|
|
|||
8761
pkgs/development/node-packages/node-packages.nix
generated
8761
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexapi";
|
||||
version = "4.15.5";
|
||||
version = "4.15.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kguy8sZtc8vHuWWqQqPPuDE5DgyWs/H62yxjv5VabFY=";
|
||||
hash = "sha256-VU1HVAxAOraTd4VQIqG/MLkw77xciCICIh1zbzGn/dQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "psygnal";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "pyapp-kit";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1oy0gXHDAoCIPXAitQv6MRb3p2j89zBaZvpUni6wT8A=";
|
||||
hash = "sha256-eDfGWmTKJrkkzRy1I3wl3WYPCxtPHSRzqAoOiO7QQ9Y=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -40,8 +40,9 @@
|
|||
pythonOlder,
|
||||
|
||||
# ROCm dependencies
|
||||
rocmSupport ? false,
|
||||
gpuTargets ? [ ], rocmPackages
|
||||
rocmSupport ? config.rocmSupport,
|
||||
rocmPackages,
|
||||
gpuTargets ? [ ]
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "act";
|
||||
version = "0.2.53";
|
||||
version = "0.2.54";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-p2ujmHWIBUcH5UpHHO72ddqSb1C0gWAyKUIT9E6Oyxk=";
|
||||
hash = "sha256-1DYK47pucEh423ySyBy3hwi6QeB/nNQvwapEJZYRX8E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W50NodoaKY7s4x7Goyvydxd5Q2lz9m9pFwgcQ9wRGVM=";
|
||||
vendorHash = "sha256-45UPm7ThTSRTgzaD4tXoTaeT4hRlMKn01mvgJS1I7zI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -123,13 +123,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hydra";
|
||||
version = "2023-08-23";
|
||||
version = "2023-10-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "hydra";
|
||||
rev = "00d30874da759eb0f44f446415b2469920ff41b5";
|
||||
sha256 = "sha256-e+68WCN1e1h2rf1pmwNNukTt5EBtF9KQNXhqJtoyJzo=";
|
||||
rev = "33f8a36736ea52d0cc31b947dc7e500134866a92";
|
||||
hash = "sha256-ovt2GZQ4Ia+q6D0XboBNIdXrzy1rWC52UYzxmcMlgYk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "samba";
|
||||
version = "4.19.1";
|
||||
version = "4.19.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-zjt/DRi/kapf1kbouzhaOzU3W3A8blEjsCuFoavIGHk=";
|
||||
hash = "sha256-nmPwUF4cYx8dsLepNJpR6SXAJsoDrz/V2BIii7WX05M=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ser2net";
|
||||
version = "4.5.0";
|
||||
version = "4.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cminyard";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AmTJfjLpnPHtPMKP9djKTZozNPkojPqRJ3eoypY53bA=";
|
||||
hash = "sha256-OFj9lYwI42zEcyUtsAwnkNUAaa6J4Ids4pMXquUcpJA=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "static-web-server";
|
||||
version = "2.23.0";
|
||||
version = "2.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "static-web-server";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+2j/dSDuSl7bA35qOVlJFTi65aJZg2zQb3HcCxtynKI=";
|
||||
hash = "sha256-NJjzfl44qRPph3M6u1jYELSvMzsPww8aD8DDNXSQjOo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7ISSq0amoKbmHRsBEEm6MGkc4+SDgWBmicAiswzs+84=";
|
||||
cargoHash = "sha256-gHs8aFZozWgF4uE2mp/qRb9J3hRAohRwu15Q5/FLtTs=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonApplication
|
||||
, fetchFromGitea
|
||||
, pythonImportsCheckHook
|
||||
, six
|
||||
, sphinxHook
|
||||
, sphinx-rtd-theme
|
||||
}:
|
||||
|
|
@ -21,6 +22,7 @@ buildPythonApplication rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pythonImportsCheckHook
|
||||
six
|
||||
sphinxHook
|
||||
sphinx-rtd-theme
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "squashfuse";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vasi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gK1k1Ooue3HLtBmPFMZdW4h2Ee1Uy4T26EOBeQICQpM=";
|
||||
sha256 = "sha256-nCdAO5WPYt/aHdNnfkIJqz0T59COgsSGeXho4bFZVTY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook libtool pkg-config ];
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5";
|
||||
version = "5.1.1";
|
||||
version = "5.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-R8stzpfQttBZFFSu8ikUz/2eL+b98/X672uVFsha9H0=";
|
||||
hash = "sha256-HclPnxeDtWzlyOEXKgTrypiHVJezuUCBhfUW+9ytPVg=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-anthy";
|
||||
version = "5.1.1";
|
||||
version = "5.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-kUelkzVr1zOC4bbNP2EFPnhtygkJnKCFdlHeSkBGLGw=";
|
||||
sha256 = "sha256-7kKHes8jacDQcOQsngstzTrRoc81ybQoSyrY4s8KPSg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-chewing";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Zjwt7JHwCfXlY46qRTXSmXI69fANZNI7DY1ixpMEqPM=";
|
||||
sha256 = "sha256-boIkbtNLPTNXY9e5gdQklhJuDU36ZswOqY2X8nRKqho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ in
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "fcitx5-chinese-addons";
|
||||
version = "5.1.1";
|
||||
version = "5.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-XC8NQYVvGhh6GFrKtJi9GeBHxWrtw9DJzeeDvKAQEdk=";
|
||||
sha256 = "sha256-DrgZlj3SUR1lFVvDXoCKvil22YRW6YJkGwihdGdWaHM=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -9,17 +9,18 @@
|
|||
, libXdmcp
|
||||
, qtbase
|
||||
, qt6
|
||||
, wayland
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "fcitx5-qt";
|
||||
version = "5.1.1";
|
||||
version = "5.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-IkaaLFMyPVaL5taRN4e+QxMEsNhhXlA1fWBn/6PeGnI=";
|
||||
sha256 = "sha256-qXQ5nvPV5YHD8MFfeqgF8kyk0zf28lWxM8SUo3T6TzA=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -31,7 +32,7 @@ mkDerivation rec {
|
|||
|
||||
cmakeFlags = [
|
||||
# adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies
|
||||
"-DCMAKE_PREFIX_PATH=${qt6.qtbase}"
|
||||
"-DCMAKE_PREFIX_PATH=${qt6.qtbase};${qt6.qtwayland}"
|
||||
"-DENABLE_QT4=0"
|
||||
"-DENABLE_QT6=1"
|
||||
];
|
||||
|
|
@ -46,6 +47,7 @@ mkDerivation rec {
|
|||
qtx11extras
|
||||
libxcb
|
||||
libXdmcp
|
||||
wayland
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-rime";
|
||||
version = "5.1.2";
|
||||
version = "5.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-0WcBM6kOKATuh6I8yEzl+HkK5/k4Ku6brZ+s1ncKlpw=";
|
||||
hash = "sha256-qFojAwwR6lqP7RKSJ3LPAxDEscjKJ6wNZFpdlwz+QzM=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mongo-tools";
|
||||
version = "100.7.5";
|
||||
version = "100.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-tools";
|
||||
rev = version;
|
||||
sha256 = "sha256-7osM21fLDwO5eFv+28hbkzmqFCVbmI7vOria5vbnrP0=";
|
||||
sha256 = "sha256-c+pzpDUDx6xqpELLM32z0T5mGlF0qk6wqyS1OU9NkRs=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tbls";
|
||||
version = "1.70.2";
|
||||
version = "1.71.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "tbls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LSICkg99veFHLmdcQZmnyfTbdqx7k2XI13W7Cjuj3qA=";
|
||||
hash = "sha256-cV5t4gNhPODGzJoLZdft6/9gBBVio50BJKYEI24a8qg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-84h+LQzk/xy/Gapy7IxB8IPvsVGRsJP7udd9HhLskew=";
|
||||
vendorHash = "sha256-1w1pQyHTuEJ1w01lJIZhXuEArFigjoFKGvi0cpFd8m0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "snowflake";
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
|
|
@ -10,10 +10,10 @@ buildGoModule rec {
|
|||
owner = "anti-censorship/pluggable-transports";
|
||||
repo = "snowflake";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3gLcSZv8GpEio+yvPyBVVceb1nO0HzhpQKhEgf4nQvU=";
|
||||
sha256 = "sha256-vurNOJuu9bKmyLM3Agr8wHwMybLrtrJFSrlrc+lWiWQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MjxDB9fcPM6nIeGk6YvJOKXI/ThlMrxqJl9ROAREwXk=";
|
||||
vendorHash = "sha256-Bjd3HIVEQgrcBffcZPQhQygN/ZOPWTbN9oimmX4B1oQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "System to defeat internet censorship";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
|
@ -15,6 +16,12 @@ python3.pkgs.buildPythonApplication rec {
|
|||
hash = "sha256-dorIqnJuAS/y9W6gyt65QjwGwx4bJHKLmdqRPzY25yA=";
|
||||
};
|
||||
|
||||
patches = fetchpatch {
|
||||
name = "py3compat-utils.patch";
|
||||
url = "https://github.com/cybiere/baboossh/commit/f7a75ebeda0c69ab5b119894b9e1488fc0a935a8.patch";
|
||||
hash = "sha256-gctuu/Qd3nmJIWv2mTyrGwjlQD1U+OhGK6Zh/Un06/E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
cmd2
|
||||
tabulate
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@
|
|||
assert withBlueshark -> stdenv.hostPlatform.isLinux;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proxmark3";
|
||||
version = "4.17140";
|
||||
version = "4.17511";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RfidResearchGroup";
|
||||
repo = "proxmark3";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-l66syIpTM4P0733eJKEjnEYHvQlIc7KKxXLcc7XBnHE=";
|
||||
hash = "sha256-L842Hvdy3M+k67IPiWMcxxpuD0ggCF7j6TDs8YdISZ4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ index 188ebfc6..4a34a922 100644
|
|||
|
||||
FetchContent_Declare(gRPC
|
||||
- GIT_REPOSITORY https://github.com/CanonicalLtd/grpc.git
|
||||
- GIT_TAG ba8e7f72
|
||||
- GIT_TAG e3acf245
|
||||
- GIT_SHALLOW TRUE
|
||||
- GIT_SUBMODULES "third_party/abseil-cpp third_party/cares/cares third_party/protobuf third_party/re2 third_party/zlib"
|
||||
- GIT_SUBMODULES_RECURSE false
|
||||
|
|
|
|||
14
pkgs/tools/virtualization/multipass/cmake_warning.patch
Normal file
14
pkgs/tools/virtualization/multipass/cmake_warning.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/src/cert/CMakeLists.txt b/src/cert/CMakeLists.txt
|
||||
index d44a0b09..de440f24 100644
|
||||
--- a/src/cert/CMakeLists.txt
|
||||
+++ b/src/cert/CMakeLists.txt
|
||||
@@ -22,7 +22,7 @@ add_library(cert STATIC
|
||||
target_include_directories(cert PRIVATE
|
||||
${OPENSSL_INCLUDE_DIR})
|
||||
|
||||
-foreach(flag -Wno-nested-anon-types -Wno-gnu -Wno-pedantic -Wno-ignored-qualifiers)
|
||||
+foreach(flag -Wno-nested-anon-types -Wno-gnu -Wno-pedantic -Wno-ignored-qualifiers -Wno-ignored-attributes)
|
||||
check_cxx_compiler_flag(${flag} SUPPORTED)
|
||||
if(SUPPORTED)
|
||||
target_compile_options(cert PRIVATE ${flag})
|
||||
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
let
|
||||
pname = "multipass";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
# This is done here because a CMakeLists.txt from one of it's submodules tries
|
||||
# to modify a file, so we grab the source for the submodule here, copy it into
|
||||
|
|
@ -33,8 +33,8 @@ let
|
|||
grpc_src = fetchFromGitHub {
|
||||
owner = "CanonicalLtd";
|
||||
repo = "grpc";
|
||||
rev = "ba8e7f72a57b9e0b25783a4d3cea58c79379f194";
|
||||
hash = "sha256-DS1UNLCUdbipn5w4p2aVa8LgHHhdJiAfzfEdIXNO69o=";
|
||||
rev = "e3acf245";
|
||||
hash = "sha256-tDc2iGxIV68Yi4RL8ES4yglJNlu8yH6FlpVvZoWjoXk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
in
|
||||
|
|
@ -46,13 +46,14 @@ stdenv.mkDerivation
|
|||
owner = "canonical";
|
||||
repo = "multipass";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8wRho/ECWxiE6rNqjBzaqFaIdhXzOzFuCcQ4zzfSmb4=";
|
||||
hash = "sha256-OWZiVw3ztx1g1slq/5a7/JcLdDNB5RqYT5U3w1UXUpg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./lxd_socket_path.patch
|
||||
./cmake_no_fetch.patch
|
||||
./cmake_warning.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swaykbdd";
|
||||
version = "1.2";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artemsen";
|
||||
repo = "swaykbdd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QHNUIFJb5XYjUC07NQo96oD57nU8jd8sUW32iJSW+SU=";
|
||||
sha256 = "sha256-FtXmn5Lf0PhL99xGl/SHWNaE6vAMOF2Ok4xVJT2Bf/s=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -24660,7 +24660,7 @@ with pkgs;
|
|||
});
|
||||
|
||||
libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix {
|
||||
inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope;
|
||||
inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsBuildHost;
|
||||
});
|
||||
|
||||
# plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
|
||||
|
|
@ -30173,6 +30173,8 @@ with pkgs;
|
|||
inherit (libsForQt5) breeze-icons kdeclarative kirigami2 plasma-framework plasma-workspace;
|
||||
};
|
||||
|
||||
utterly-round-plasma-style = callPackage ../data/themes/utterly-round-plasma-style { };
|
||||
|
||||
uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { };
|
||||
|
||||
u001-font = callPackage ../data/fonts/u001 { };
|
||||
|
|
|
|||
|
|
@ -123,6 +123,12 @@ let
|
|||
feature = "build packages with CUDA support by default";
|
||||
};
|
||||
|
||||
rocmSupport = mkMassRebuild {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
feature = "build packages with ROCm support by default";
|
||||
};
|
||||
|
||||
showDerivationWarnings = mkOption {
|
||||
type = types.listOf (types.enum [ "maintainerless" ]);
|
||||
default = [];
|
||||
|
|
|
|||
|
|
@ -14084,7 +14084,6 @@ self: super: with self; {
|
|||
toposort = callPackage ../development/python-modules/toposort { };
|
||||
|
||||
torch = callPackage ../development/python-modules/torch {
|
||||
inherit (pkgs.config) cudaSupport;
|
||||
magma =
|
||||
if pkgs.config.cudaSupport
|
||||
then pkgs.magma-cuda-static
|
||||
|
|
|
|||
|
|
@ -10,11 +10,15 @@
|
|||
, __splicedPackages
|
||||
, makeScopeWithSplicing'
|
||||
, generateSplicesForMkScope
|
||||
, pkgsBuildHost
|
||||
}:
|
||||
|
||||
let
|
||||
pkgs = __splicedPackages;
|
||||
qt5 = __splicedPackages.qt5;
|
||||
# qt5 set should not be pre-spliced to prevent spliced packages being a part of an unspliced set
|
||||
# 'pkgsCross.aarch64-multiplatform.pkgsBuildTarget.targetPackages.libsForQt5.qtbase' should not have a `__spliced` but if qt5 is pre-spliced then it will have one.
|
||||
# pkgsBuildHost == pkgs
|
||||
qt5 = pkgsBuildHost.qt5;
|
||||
in
|
||||
|
||||
makeScopeWithSplicing' {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user