From a76dcd5293dcb110f14e05f312fa86b19a2def56 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 20 Dec 2021 19:34:01 +0530 Subject: [PATCH 1/6] cinny: init at 1.6.1 --- .../instant-messengers/cinny/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/cinny/default.nix diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix new file mode 100644 index 000000000000..4c8f356cdf47 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }: + +let + configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); +in stdenv.mkDerivation rec { + pname = "cinny"; + version = "1.6.1"; + + src = fetchurl { + url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; + sha256 = "sha256-RJpLK16bedpqo/JJf3atpiuL5spHJNowomcusjZtEWA="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + cp -R . $out/ + ${jq}/bin/jq -s '.[0] * .[1]' "config.json" "${configOverrides}" > "$out/config.json" + + runHook postInstall + ''; + + meta = with lib; { + description = "Yet another Matrix client for the web"; + homepage = "https://cinny.in/"; + maintainers = with maintainers; [ abbe ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c057511d2cb9..12ff76396923 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2473,6 +2473,8 @@ with pkgs; cht-sh = callPackage ../tools/misc/cht.sh { }; + cinny = callPackage ../applications/networking/instant-messengers/cinny {}; + ckbcomp = callPackage ../tools/X11/ckbcomp { }; clac = callPackage ../tools/misc/clac {}; From 4606c0e5c6f55e0d0e34e15b631c0c76f248dc90 Mon Sep 17 00:00:00 2001 From: Mathieu Post Date: Tue, 4 Jan 2022 15:20:27 +0100 Subject: [PATCH 2/6] golangci-lint: add fish completion --- pkgs/development/tools/golangci-lint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index a142d9a9d9bf..706d8e428ff9 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ]; postInstall = '' - for shell in bash zsh; do + for shell in bash zsh fish; do HOME=$TMPDIR $out/bin/golangci-lint completion $shell > golangci-lint.$shell installShellCompletion golangci-lint.$shell done From 8bedcacaf137c71bbc7096c88d37229e73c8e48c Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 5 Jan 2022 00:19:09 +0100 Subject: [PATCH 3/6] linux: enable X86_SGX{_KVM} on x86_64 only The config option X86_SGX is available on x86_64-linux only; i686-linux is not supported. https://github.com/torvalds/linux/blob/55a677b/arch/x86/Kconfig#L1914 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index b127ec9197cb..82de6a96e745 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -473,7 +473,7 @@ let # Detect buffer overflows on the stack CC_STACKPROTECTOR_REGULAR = {optional = true; tristate = whenOlder "4.18" "y";}; - } // optionalAttrs stdenv.hostPlatform.isx86 { + } // optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; # Allow KVM guests to load SGX enclaves From 271ca2b032cbf6106ecdabdf191cda0503c0c625 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Jan 2022 16:51:44 +0100 Subject: [PATCH 4/6] python3Packages.environs: 9.3.5 -> 9.4.0 --- pkgs/development/python-modules/environs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 04bb5dda00ea..a0a4fb88e0cd 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "environs"; - version = "9.3.5"; + version = "9.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sloria"; repo = pname; rev = version; - sha256 = "sha256-4jyqdA/xoIEsfouIneGs3A9++sNG2kRUhDzteN0Td6w="; + sha256 = "sha256-LPD46kxzQ/oTC7XjJn/SXaLQgX613ZoCrJuaRng57Gw="; }; propagatedBuildInputs = [ From ff81162833bf4614766c31f5c3056770817deeec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Jan 2022 16:54:30 +0100 Subject: [PATCH 5/6] python3Packages.hahomematic: 0.12.0 -> 0.13.3 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 9cb116a9a7a2..bf8bed9dd262 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.12.0"; + version = "0.13.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-A7fuTSrXMTK0oz87htylWKb868+YR7FXYYEC3hSgG7o="; + sha256 = "sha256-9dR0qYoHVovD4fwJz6v+/RItMuqr2vA9YHn0nMGHUX0="; }; propagatedBuildInputs = [ From 115a6f077fc29e7dc846618be86ece84c6d6aea7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 4 Jan 2022 12:30:40 +0100 Subject: [PATCH 6/6] llvmPackages_{12,13,git}.compiler-rt: remove new runtimes in useLLVM LLVM 12 added the memory profiling runtime and LLVM 13 the ORC runtime. Both need a libc in order to build (or at least headers not present in clang's resource root), so we'll disable them for any sort of baremetal-ish build. memprof likely doesn't work in a baremetal situation at all, orc is unknown. Whether both would compile with musl is to be checked. --- pkgs/development/compilers/llvm/12/compiler-rt/default.nix | 1 + pkgs/development/compilers/llvm/13/compiler-rt/default.nix | 2 ++ pkgs/development/compilers/llvm/git/compiler-rt/default.nix | 2 ++ 3 files changed, 5 insertions(+) diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index 13c611ca8cc6..4b2907ed3078 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index e30db5fcd954..10b89b91b96f 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 5874a91e03c8..019148039d17 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON"