Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-12-17 06:02:03 +00:00 committed by GitHub
commit 4804305f6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 482 additions and 347 deletions

View file

@ -32,3 +32,22 @@ mypkg = let
}});
in callPackage { inherit cudaPackages; };
```
The CUDA NVCC compiler requires flags to determine which hardware you
want to target for in terms of SASS (real hardware) or PTX (JIT kernels).
Nixpkgs tries to target support real architecture defaults based on the
CUDA toolkit version with PTX support for future hardware. Experienced
users may optmize this configuration for a variety of reasons such as
reducing binary size and compile time, supporting legacy hardware, or
optimizing for specific hardware.
You may provide capabilities to add support or reduce binary size through
`config` using `cudaCapabilities = [ "6.0" "7.0" ];` and
`cudaForwardCompat = true;` if you want PTX support for future hardware.
Please consult [GPUs supported](https://en.wikipedia.org/wiki/CUDA#GPUs_supported)
for your specific card(s).
Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/)
and release notes for their software package.

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,27 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mdDoc mkEnableOption mkIf mkPackageOption singleton;
cfg = config.services.xserver.windowManager.katriawm;
in
{
###### interface
options = {
services.xserver.windowManager.katriawm = {
enable = mkEnableOption (mdDoc "katriawm");
package = mkPackageOption pkgs "katriawm" {};
};
};
###### implementation
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton {
name = "katriawm";
start = ''
${cfg.package}/bin/katriawm &
waitPID=$!
'';
};
environment.systemPackages = [ cfg.package ];
};
}

View file

@ -33,16 +33,13 @@ buildNpmPackage rec {
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
# Override installPhase so we can copy the only folders that matter (app and node_modules)
# Override installPhase so we can copy the only directory that matters (app)
installPhase = ''
runHook preInstall
# prune unused deps
npm prune --omit dev --no-save $npmFlags
# copy built app and node_modules directories
mkdir -p $out/lib/node_modules/open-stage-control
cp -r app node_modules $out/lib/node_modules/open-stage-control/
cp -r app $out/lib/node_modules/open-stage-control/
# copy icon
install -Dm644 resources/images/logo.png $out/share/icons/hicolor/256x256/apps/open-stage-control.png

View file

@ -44,6 +44,13 @@ stdenv.mkDerivation rec {
hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c=";
};
outputs = [
"out"
"dev"
"lib"
"man"
];
nativeBuildInputs = [
autoreconfHook
autoconf-archive

View file

@ -22,16 +22,16 @@
, flake8
# python dependencies
, certifi
, dbus-python
, distro
, evdev
, lxml
, pillow
, pygobject3
, pypresence
, pyyaml
, requests
, keyring
, python-magic
# commands that lutris needs
, xrandr
@ -84,13 +84,13 @@ let
in
buildPythonApplication rec {
pname = "lutris-original";
version = "0.5.11";
version = "0.5.12";
src = fetchFromGitHub {
owner = "lutris";
repo = "lutris";
rev = "refs/tags/v${version}";
sha256 = "sha256-D2qMKYmi5TC8jEAECcz2V0rUrmp5kjXJ5qyW6C4re3w=";
sha256 = "sha256-rsiXm7L/M85ot6NrTyy//lMRFlLPJYve9y6Erg9Ugxg=";
};
nativeBuildInputs = [ wrapGAppsHook ];
@ -104,20 +104,20 @@ buildPythonApplication rec {
libnotify
pango
webkitgtk
python-magic
] ++ gstDeps;
# See `install_requires` in https://github.com/lutris/lutris/blob/master/setup.py
propagatedBuildInputs = [
evdev
distro
lxml
pyyaml
pygobject3
requests
pillow
certifi
dbus-python
keyring
python-magic
distro
evdev
lxml
pillow
pygobject3
pypresence
pyyaml
requests
];
postPatch = ''

View file

@ -2,11 +2,10 @@
, opencv3, gtest, blas, gomp, llvmPackages, perl
, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11
, cudnnSupport ? cudaSupport
, cudaCapabilities ? [ "3.7" "5.0" "6.0" "7.0" "7.5" "8.0" "8.6" ]
}:
let
inherit (cudaPackages) cudatoolkit cudnn;
inherit (cudaPackages) cudatoolkit cudaFlags cudnn;
in
assert cudnnSupport -> cudaSupport;
@ -51,7 +50,7 @@ stdenv.mkDerivation rec {
"-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743
"-DCUDA_ARCH_NAME=All"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
"-DMXNET_CUDA_ARCH=${lib.concatStringsSep ";" cudaCapabilities}"
"-DMXNET_CUDA_ARCH=${cudaFlags.cudaCapabilitiesSemiColonString}"
] else [ "-DUSE_CUDA=OFF" ])
++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";

View file

@ -0,0 +1,43 @@
{ lib
, stdenv
, fetchzip
, libX11
, libXft
, libXrandr
, pkg-config
}:
stdenv.mkDerivation (finalAttrs: {
pname = "katriawm";
version = "21.09";
src = fetchzip {
name = finalAttrs.pname + "-" + finalAttrs.version;
url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz";
hash = "sha256-xt0sWEwTcCs5cwoB3wVbYcyAKL0jx7KyeCefEBVFhH8=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libX11
libXft
libXrandr
];
preBuild = ''
cd src
'';
installFlags = [ "prefix=$(out)" ];
meta = with lib; {
homepage = "https://www.uninformativ.de/git/katriawm/file/README.html";
description = "A non-reparenting, dynamic window manager with decorations";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
inherit (libX11.meta) platforms;
};
})

View file

@ -1,27 +0,0 @@
{ lib, stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms
, xcbutilwm
}:
stdenv.mkDerivation rec {
pname = "sxhkd";
version = "0.6.2";
src = fetchFromGitHub {
owner = "baskerville";
repo = "sxhkd";
rev = version;
sha256 = "1winwzdy9yxvxnrv8gqpigl9y0c2px27mnms62bdilp4x6llrs9r";
};
buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Simple X hotkey daemon";
homepage = "https://github.com/baskerville/sxhkd";
license = licenses.bsd2;
maintainers = with maintainers; [ vyp ];
platforms = platforms.linux;
};
}

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "bulky";
version = "2.6";
version = "2.7";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "bulky";
rev = version;
hash = "sha256-OI7sIPMZOTmVoWj4Y7kEH0mxay4DwO5kPjclgRDVMus=";
hash = "sha256-Ps7ql6EAdoljQ6S8D2JxNSh0+jtEVZpnQv3fpvWkQSk=";
};
nativeBuildInputs = [

View file

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "pix";
version = "2.8.8";
version = "2.8.9";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-dvxbnf6tvBAwYM0EKpd/mPfW2PXeV1H2khYl8LIJqa0=";
sha256 = "sha256-7g0j1cWgNtWlqKWzBnngUA2WNr8Zh8YO/jJ8OdTII7Y=";
};
nativeBuildInputs = [

View file

@ -15,7 +15,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "warpinator";
version = "1.4.2";
version = "1.4.3";
format = "other";
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-aiHlBeWGYqSaqvRtwL7smqt4iueIKzQoDawdFSCn6eg=";
hash = "sha256-blsDOAdfu0N6I+6ZvycL+BIIsZPIjwYm+sJnbZtHJE8=";
};
nativeBuildInputs = [

View file

@ -10,6 +10,8 @@ final: prev: let
### Add classic cudatoolkit package
cudatoolkit = buildCudaToolkitPackage ((attrs: attrs // { gcc = prev.pkgs.${attrs.gcc}; }) cudatoolkitVersions.${final.cudaVersion});
cudaFlags = final.callPackage ./flags.nix {};
in {
inherit cudatoolkit;
inherit cudatoolkit cudaFlags;
}

View file

@ -0,0 +1,78 @@
{ config
, lib
, cudatoolkit
}:
let
# Flags are determined based on your CUDA toolkit by default. You may benefit
# from improved performance, reduced file size, or greater hardware suppport by
# passing a configuration based on your specific GPU environment.
#
# config.cudaCapabilities: list of hardware generations to support (e.g., "8.0")
# config.cudaForwardCompat: bool for compatibility with future GPU generations
#
# Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351
defaultCudaCapabilities = rec {
cuda9 = [
"3.0"
"3.5"
"5.0"
"5.2"
"6.0"
"6.1"
"7.0"
];
cuda10 = cuda9 ++ [
"7.5"
];
cuda11 = [
"3.5"
"5.0"
"5.2"
"6.0"
"6.1"
"7.0"
"7.5"
"8.0"
"8.6"
];
};
cudaMicroarchitectureNames = {
"3" = "Kepler";
"5" = "Maxwell";
"6" = "Pascal";
"7" = "Volta";
"8" = "Ampere";
"9" = "Hopper";
};
defaultCudaArchList = defaultCudaCapabilities."cuda${lib.versions.major cudatoolkit.version}";
cudaRealCapabilities = config.cudaCapabilities or defaultCudaArchList;
capabilitiesForward = "${lib.last cudaRealCapabilities}+PTX";
dropDot = ver: builtins.replaceStrings ["."] [""] ver;
archMapper = feat: map (ver: "${feat}_${dropDot ver}");
gencodeMapper = feat: map (ver: "-gencode=arch=compute_${dropDot ver},code=${feat}_${dropDot ver}");
cudaRealArchs = archMapper "sm" cudaRealCapabilities;
cudaPTXArchs = archMapper "compute" cudaRealCapabilities;
cudaArchs = cudaRealArchs ++ [ (lib.last cudaPTXArchs) ];
cudaArchNames = lib.unique (map (v: cudaMicroarchitectureNames.${lib.versions.major v}) cudaRealCapabilities);
cudaCapabilities = cudaRealCapabilities ++ lib.optional (config.cudaForwardCompat or true) capabilitiesForward;
cudaGencode = gencodeMapper "sm" cudaRealCapabilities ++ lib.optionals (config.cudaForwardCompat or true) (gencodeMapper "compute" [ (lib.last cudaPTXArchs) ]);
cudaCapabilitiesCommaString = lib.strings.concatStringsSep "," cudaCapabilities;
cudaCapabilitiesSemiColonString = lib.strings.concatStringsSep ";" cudaCapabilities;
cudaRealCapabilitiesCommaString = lib.strings.concatStringsSep "," cudaRealCapabilities;
in
{
inherit cudaArchs cudaArchNames cudaCapabilities cudaCapabilitiesCommaString cudaCapabilitiesSemiColonString
cudaRealCapabilities cudaRealCapabilitiesCommaString cudaGencode cudaRealArchs cudaPTXArchs;
}

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudaPackages, libpthreadstubs, lapack, blas }:
let
inherit (cudaPackages) cudatoolkit;
inherit (cudaPackages) cudatoolkit cudaFlags;
in
assert let majorIs = lib.versions.major cudatoolkit.version;
@ -10,36 +10,6 @@ assert let majorIs = lib.versions.major cudatoolkit.version;
let
version = "2.6.2";
# We define a specific set of CUDA compute capabilities here,
# because CUDA 11 does not support compute capability 3.0. Also,
# we use it to enable newer capabilities that are not enabled
# by magma by default. The list of supported architectures
# can be found in magma's top-level CMakeLists.txt.
cudaCapabilities = rec {
cuda9 = [
"Kepler" # 3.0, 3.5
"Maxwell" # 5.0
"Pascal" # 6.0
"Volta" # 7.0
];
cuda10 = [
"Turing" # 7.5
] ++ cuda9;
cuda11 = [
"sm_35" # sm_30 is not supported by CUDA 11
"Maxwell" # 5.0
"Pascal" # 6.0
"Volta" # 7.0
"Turing" # 7.5
"Ampere" # 8.0
];
};
capabilityString = lib.strings.concatStringsSep ","
cudaCapabilities."cuda${lib.versions.major cudatoolkit.version}";
in stdenv.mkDerivation {
pname = "magma";
inherit version;
@ -53,7 +23,9 @@ in stdenv.mkDerivation {
buildInputs = [ cudatoolkit libpthreadstubs lapack blas ];
cmakeFlags = [ "-DGPU_TARGET=${capabilityString}" ];
cmakeFlags = [
"-DGPU_TARGET=${builtins.concatStringsSep "," cudaFlags.cudaRealArchs}"
];
doCheck = false;

View file

@ -41,7 +41,6 @@
, zlib
# CUDA flags:
, cudaCapabilities ? [ "sm_35" "sm_50" "sm_60" "sm_70" "sm_75" "compute_80" ]
, cudaSupport ? false
, cudaPackages ? {}
@ -50,7 +49,7 @@
}:
let
inherit (cudaPackages) cudatoolkit cudnn nccl;
inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl;
pname = "jaxlib";
version = "0.3.22";
@ -165,7 +164,7 @@ let
build --action_env TF_CUDA_PATHS="${cudatoolkit_joined},${cudnn},${nccl}"
build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudatoolkit.version}"
build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}"
build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${lib.concatStringsSep "," cudaCapabilities}"
build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${cudaFlags.cudaRealCapabilitiesCommaString}"
'' + ''
CFG
'';

View file

@ -22,8 +22,6 @@
, tensorboardSupport ? true
# XLA without CUDA is broken
, xlaSupport ? cudaSupport
# Default from ./configure script
, cudaCapabilities ? [ "sm_35" "sm_50" "sm_60" "sm_70" "sm_75" "compute_80" ]
, sse42Support ? stdenv.hostPlatform.sse4_2Support
, avx2Support ? stdenv.hostPlatform.avx2Support
, fmaSupport ? stdenv.hostPlatform.fmaSupport
@ -32,7 +30,7 @@
}:
let
inherit (cudaPackages) cudatoolkit cudnn nccl;
inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl;
in
assert cudaSupport -> cudatoolkit != null
@ -305,7 +303,7 @@ let
TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}";
GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin";
GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc";
TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities;
TF_CUDA_COMPUTE_CAPABILITIES = builtins.concatStringsSep "," cudaFlags.cudaRealArchs;
postPatch = ''
# bazel 3.3 should work just as well as bazel 3.1

View file

@ -3,7 +3,6 @@
mklDnnSupport ? true, useSystemNccl ? true,
MPISupport ? false, mpi,
buildDocs ? false,
cudaArchList ? null,
# Native build inputs
cmake, util-linux, linkFarm, symlinkJoin, which, pybind11, removeReferencesTo,
@ -33,7 +32,7 @@
isPy3k, pythonOlder }:
let
inherit (cudaPackages) cudatoolkit cudnn nccl;
inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl;
in
# assert that everything needed for cuda is present and that the correct cuda versions are used
@ -52,64 +51,6 @@ let
paths = [ cudatoolkit.out cudatoolkit.lib nccl.dev nccl.out ];
};
# Give an explicit list of supported architectures for the build, See:
# - pytorch bug report: https://github.com/pytorch/pytorch/issues/23573
# - pytorch-1.2.0 build on nixpks: https://github.com/NixOS/nixpkgs/pull/65041
#
# This list was selected by omitting the TORCH_CUDA_ARCH_LIST parameter,
# observing the fallback option (which selected all architectures known
# from cudatoolkit_10_0, pytorch-1.2, and python-3.6), and doing a binary
# searching to find offending architectures.
#
# NOTE: Because of sandboxing, this derivation can't auto-detect the hardware's
# cuda architecture, so there is also now a problem around new architectures
# not being supported until explicitly added to this derivation.
#
# FIXME: CMake is throwing the following warning on python-1.2:
#
# ```
# CMake Warning at cmake/public/utils.cmake:172 (message):
# In the future we will require one to explicitly pass TORCH_CUDA_ARCH_LIST
# to cmake instead of implicitly setting it as an env variable. This will
# become a FATAL_ERROR in future version of pytorch.
# ```
# If this is causing problems for your build, this derivation may have to strip
# away the standard `buildPythonPackage` and use the
# [*Adjust Build Options*](https://github.com/pytorch/pytorch/tree/v1.2.0#adjust-build-options-optional)
# instructions. This will also add more flexibility around configurations
# (allowing FBGEMM to be built in pytorch-1.1), and may future proof this
# derivation.
brokenArchs = [ "3.0" ]; # this variable is only used as documentation.
cudaCapabilities = rec {
cuda9 = [
"3.5"
"5.0"
"5.2"
"6.0"
"6.1"
"7.0"
"7.0+PTX" # I am getting a "undefined architecture compute_75" on cuda 9
# which leads me to believe this is the final cuda-9-compatible architecture.
];
cuda10 = cuda9 ++ [
"7.5"
"7.5+PTX" # < most recent architecture as of cudatoolkit_10_0 and pytorch-1.2.0
];
cuda11 = cuda10 ++ [
"8.0"
"8.0+PTX" # < CUDA toolkit 11.0
"8.6"
"8.6+PTX" # < CUDA toolkit 11.1
];
};
final_cudaArchList =
if !cudaSupport || cudaArchList != null
then cudaArchList
else cudaCapabilities."cuda${lib.versions.major cudatoolkit.version}";
# Normally libcuda.so.1 is provided at runtime by nvidia-x11 via
# LD_LIBRARY_PATH=/run/opengl-driver/lib. We only use the stub
# libcuda.so from cudatoolkit for running tests, so that we dont have
@ -153,7 +94,7 @@ in buildPythonPackage rec {
];
preConfigure = lib.optionalString cudaSupport ''
export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}"
export TORCH_CUDA_ARCH_LIST="${cudaFlags.cudaCapabilitiesSemiColonString}"
export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
'' + lib.optionalString (cudaSupport && cudnn != null) ''
export CUDNN_INCLUDE_DIR=${cudnn}/include
@ -308,7 +249,6 @@ in buildPythonPackage rec {
passthru = {
inherit cudaSupport cudaPackages;
cudaArchList = final_cudaArchList;
# At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability.
blasProvider = blas.provider;
};

View file

@ -15,7 +15,7 @@
}:
let
inherit (torch.cudaPackages) cudatoolkit cudnn;
inherit (torch.cudaPackages) cudatoolkit cudaFlags cudnn;
cudatoolkit_joined = symlinkJoin {
name = "${cudatoolkit.name}-unsplit";
@ -45,7 +45,7 @@ in buildPythonPackage rec {
propagatedBuildInputs = [ numpy pillow torch scipy ];
preBuild = lib.optionalString cudaSupport ''
export TORCH_CUDA_ARCH_LIST="${cudaArchStr}"
export TORCH_CUDA_ARCH_LIST="${cudaFlags.cudaCapabilitiesSemiColonString}"
export FORCE_CUDA=1
'';

View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ginkgo";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
sha256 = "sha256-uL6GPi+dcPkSAaGt1Fv2cJT3Q8nJaxqs8b5w9PFJm9g=";
sha256 = "sha256-l1R/S6FHvCzdT0nhckyIi29Nntbj7lCeJghY2Tf9C2c=";
};
vendorSha256 = "sha256-a8NZ9Uws6OKfXWUL6oTZKoAG8pTYxxSNkefZtbqwyf4=";
vendorSha256 = "sha256-SV7G/FZ7kj2ghr15oTMK25Y4SjaIfRc3UfxMPFr4src=";
# integration tests expect more file changes
# types tests are missing CodeLocation

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.437";
version = "0.0.440";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-C6c202AlWvrITplhGi9FE9M40rYiGbHuqRVoSQc9wzw=";
sha256 = "sha256-pqly/5QEwKTp9wdh+Tq4KhOFmSD1TLodamo64e13o/s=";
};
vendorSha256 = "sha256-hKWh+/iC8KSxOhwXtpyMCBmDezhYgfzp3ZMfJObWgvw=";
vendorSha256 = "sha256-yVR3pUsveZf4052hr6aO4fnvEOQyHdm3N7khcobcoyE=";
subPackages = [ "." ];

View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "fastly";
version = "4.4.1";
version = "4.5.0";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-82OZwO6r+wPq6AMm27M9U6dQyE3iOpAzW31HzRji5Fo=";
hash = "sha256-l/EnlyrSofuk4/69R2VUdP6MyKOVAOI7cIOW1TLeBww=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,
@ -31,7 +31,7 @@ buildGoModule rec {
"cmd/fastly"
];
vendorHash = "sha256-zilgzfPD7HmHt0/u94JLaY6NPvn1JjXFu1K2YO0tF9M=";
vendorHash = "sha256-cXO5zhc9RZlweoU6pva2sBvcjNWBeFSUz+k9BbQpUX0=";
nativeBuildInputs = [
installShellFiles

View file

@ -0,0 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
, asciidoc
, libxcb
, xcbutil
, xcbutilkeysyms
, xcbutilwm
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sxhkd";
version = "0.6.2";
src = fetchFromGitHub {
owner = "baskerville";
repo = "sxhkd";
rev = finalAttrs.version;
hash = "sha256-OelMqenk0tiWMLraekS/ggGf6IsXP7Sz7bv75NvnNvI=";
};
nativeBuildInputs = [
asciidoc
];
buildInputs = [
libxcb
xcbutil
xcbutilkeysyms
xcbutilwm
];
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Simple X hotkey daemon";
homepage = "https://github.com/baskerville/sxhkd";
license = licenses.bsd2;
maintainers = with maintainers; [ vyp AndersonTorres ];
platforms = platforms.linux;
};
})

View file

@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
patches = [
# Needed for wingpanel-indicator-network and switchboard-plug-network
./hardcode-gsettings.patch
# Removing path from eap schema to fix bug when creating new VPN connection
# https://gitlab.gnome.org/GNOME/libnma/-/issues/18
./remove-path-from-eap.patch
];
nativeBuildInputs = [

View file

@ -0,0 +1,32 @@
From 0ab5c1e39e94e158650da847f8512ab5e2b03593 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Wed, 9 Nov 2022 08:00:19 +0000
Subject: [PATCH] gschema: Remove path from eap schema
This one needs to be relocatable, otherwise creating a new VPN
connection will fail with:
settings object created with schema 'org.gnome.nm-applet.eap'
and path '/org/gnome/nm-applet/eap/<uuid>/',
but path '/org/gnome/nm-applet/eap/' is specified by schema
Fixes: https://bugs.archlinux.org/task/76490
---
org.gnome.nm-applet.eap.gschema.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/org.gnome.nm-applet.eap.gschema.xml.in b/org.gnome.nm-applet.eap.gschema.xml.in
index 0fc3ca9f..f4a56ea6 100644
--- a/org.gnome.nm-applet.eap.gschema.xml.in
+++ b/org.gnome.nm-applet.eap.gschema.xml.in
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
- <schema id="org.gnome.nm-applet.eap" path="/org/gnome/nm-applet/eap/" gettext-domain="nm-applet">
+ <schema id="org.gnome.nm-applet.eap" gettext-domain="nm-applet">
<key name="ignore-ca-cert" type="b">
<default>false</default>
<summary>Ignore CA certificate</summary>
--
GitLab

View file

@ -8505,6 +8505,8 @@ with pkgs;
katana = callPackage ../tools/security/katana { };
katriawm = callPackage ../applications/window-managers/katriawm { };
kbdd = callPackage ../applications/window-managers/kbdd { };
kbs2 = callPackage ../tools/security/kbs2 {
@ -31034,7 +31036,7 @@ with pkgs;
sndpeek = callPackage ../applications/audio/sndpeek { };
sxhkd = callPackage ../applications/window-managers/sxhkd { };
sxhkd = callPackage ../tools/X11/sxhkd { };
mpop = callPackage ../applications/networking/mpop {
inherit (darwin.apple_sdk.frameworks) Security;